From abda4017111c0f81149ca627857d34742dd506cc Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Fri, 2 Jan 2009 11:18:09 +0000 Subject: Support AT91 in vanilla U-Boot --- target/device/Atmel/AT91_Config.in | 37 ++++++++++++++++++++++++++ target/device/Atmel/Makefile.in | 4 ++- target/device/Atmel/at91rm9200df/Makefile.in | 3 ++- target/device/Atmel/at91sam9260dfc/Makefile.in | 18 ++++++++++++- target/device/Atmel/at91sam9261ek/Makefile.in | 9 +++++++ target/device/Atmel/at91sam9263ek/Makefile.in | 9 +++++++ target/device/Atmel/at91sam9g20dfc/Makefile.in | 11 +++++++- target/device/Atmel/u-boot/Config.in | 5 +++- 8 files changed, 91 insertions(+), 5 deletions(-) (limited to 'target/device') diff --git a/target/device/Atmel/AT91_Config.in b/target/device/Atmel/AT91_Config.in index 9d9b8d50e..83021badc 100644 --- a/target/device/Atmel/AT91_Config.in +++ b/target/device/Atmel/AT91_Config.in @@ -188,96 +188,132 @@ choice config BR2_TARGET_AT91RM9200DF bool "Atmel AT91RM9200 Generic Dataflash(Card) Board Support" depends on BR2_TARGET_AT91RM9200 + select BR2_BOOTSOURCE_DATAFLASHCARD help The Atmel AT91RM9200EK Development Board using Dataflashcard config BR2_TARGET_AT91RM9200SE bool "Atmel AT91RM9200 Generic Dataflash(Card) Board Support (SE)" depends on BR2_TARGET_AT91RM9200 + select BR2_BOOTSOURCE_DATAFLASHCARD help The Atmel AT91RM9200EK Development Board using Dataflashcard (SE) config BR2_TARGET_AT91RM9200EK bool "Atmel AT91RM9200EK Development Board Support" depends on BR2_TARGET_AT91RM9200 + select BR2_BOOTSOURCE_DATAFLASHCARD + select BR2_BOOTSOURCE_FLASH help The Atmel AT91RM9200EK Development Board config BR2_TARGET_AT91RM9200DK bool "Atmel AT91RM9200DK Development Board Support" depends on BR2_TARGET_AT91RM9200 + select BR2_BOOTSOURCE_DATAFLASH + select BR2_BOOTSOURCE_FLASH help The Atmel AT91RM9200DK Development Board config BR2_TARGET_AT91SAM9260DFC bool "Atmel AT91SAM9260DFC" depends on BR2_TARGET_AT91SAM9260 || BR2_TARGET_AT91SAM9XE + select BR2_BOOTSOURCE_DATAFLASHCARD + select BR2_BOOTSOURCE_DATAFLASH help The Atmel AT91SAM9260 Development Board booting from Dataflashcard config BR2_TARGET_AT91SAM9260EK bool "Atmel AT91SAM9260EK" depends on BR2_TARGET_AT91SAM9260 || BR2_TARGET_AT91SAM9XE + select BR2_BOOTSOURCE_DATAFLASHCARD + select BR2_BOOTSOURCE_DATAFLASH + select BR2_BOOTSOURCE_NANDFLASH help The Atmel AT91SAM9260 Development Board booting from dataflash config BR2_TARGET_AT91SAM9G20DFC bool "Atmel AT91SAM9G20DFC" depends on BR2_TARGET_AT91SAM9G20 + select BR2_BOOTSOURCE_DATAFLASHCARD help The Atmel AT91SAM9G20 Development Board booting from Dataflashcard config BR2_TARGET_AT91SAM9G20EK bool "Atmel AT91SAM9G20EK" depends on BR2_TARGET_AT91SAM9G20 + select BR2_BOOTSOURCE_DATAFLASHCARD + select BR2_BOOTSOURCE_DATAFLASH + select BR2_BOOTSOURCE_NANDFLASH help The Atmel AT91SAM9G20 Development Board booting from dataflash config BR2_TARGET_AT91SAM9XEEK bool "Atmel AT91SAM9XE-EK" depends on BR2_TARGET_AT91SAM9260 || BR2_TARGET_AT91SAM9XE + select BR2_BOOTSOURCE_DATAFLASHCARD + select BR2_BOOTSOURCE_DATAFLASH + select BR2_BOOTSOURCE_NANDFLASH help The Atmel AT91SAM9xe Development Board (Not Yet Implemented) config BR2_TARGET_AT91SAM9261EK bool "Atmel AT91SAM9261EK" depends on BR2_TARGET_AT91SAM9261 || BR2_TARGET_AT91SAM9261S + select BR2_BOOTSOURCE_DATAFLASH + select BR2_BOOTSOURCE_NANDFLASH help The Atmel AT91SAM9261 Development Board config BR2_TARGET_AT91SAM9RL64EK bool "Atmel AT91SAM9RL64EK" depends on BR2_TARGET_AT91SAM9RL64 + select BR2_BOOTSOURCE_DATAFLASHCARD + select BR2_BOOTSOURCE_DATAFLASH + select BR2_BOOTSOURCE_NANDFLASH + select BR2_BOOTSOURCE_SDCARD help The Atmel AT91SAM9RL64 Development Board config BR2_TARGET_AT91SAM9262EK bool "Atmel AT91SAM9262EK" depends on BR2_TARGET_AT91SAM9262 + select BR2_BOOTSOURCE_DATAFLASHCARD + select BR2_BOOTSOURCE_NANDFLASH help The Atmel AT91SAM9262 Development Board (Not Yet Implemented) config BR2_TARGET_AT91SAM9263EK bool "Atmel AT91SAM9263EK" depends on BR2_TARGET_AT91SAM9263 + select BR2_BOOTSOURCE_DATAFLASHCARD + select BR2_BOOTSOURCE_NANDFLASH help The Atmel AT91SAM9263 Development Board (Not Yet Implemented) config BR2_TARGET_AT572D940DCM bool "Atmel AT572D940 Diopsis Computer Module" depends on BR2_TARGET_AT572D940HF + select BR2_BOOTSOURCE_FLASH + select BR2_BOOTSOURCE_SDCARD help The Atmel Diopsis CPU Module (Not Yet Implemented) config BR2_TARGET_AT91CAP9DK bool "Atmel AT91CAP9DK" depends on BR2_TARGET_AT91CAP9 + select BR2_BOOTSOURCE_DATAFLASHCARD + select BR2_BOOTSOURCE_DATAFLASH + select BR2_BOOTSOURCE_NANDFLASH help The Atmel AT91CAP9 Development Kit (Not Yet Implemented) config BR2_TARGET_AT91CAP9STK bool "Atmel AT91CAP9STK" depends on BR2_TARGET_AT91CAP9 + select BR2_BOOTSOURCE_DATAFLASHCARD + select BR2_BOOTSOURCE_DATAFLASH + select BR2_BOOTSOURCE_NANDFLASH help The Atmel AT91CAP9 Starter Kit (Not Yet Implemented) @@ -304,3 +340,4 @@ config BR2_TARGET_AT91SAM9261EK_SPIMODE3 endchoice + diff --git a/target/device/Atmel/Makefile.in b/target/device/Atmel/Makefile.in index 117a7c252..342b129de 100644 --- a/target/device/Atmel/Makefile.in +++ b/target/device/Atmel/Makefile.in @@ -49,7 +49,7 @@ LINUX26_COPYTO:=/tftpboot # The board specific Makefile.in can redefine BOARD_NAME's LINUX_BOARD_NAME:=$(BOARD_NAME) -UBOOT_BOARD_NAME:=$(BOARD_NAME) +#UBOOT_BOARD_NAME:=$(BOARD_NAME) DFB_BOARD_NAME:=$(BOARD_NAME) #BR2_PACKAGE_BUSYBOX_CONFIG:=$(BR2_BOARD_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config @@ -84,6 +84,8 @@ atmel_status: @echo DOWNLOAD_LINUX26_VERSION=$(DOWNLOAD_LINUX26_VERSION) @echo LINUX_SOURCE=$(LINUX_SOURCE) @echo TARGETS=$(TARGETS) + @echo ALLAN=$(ALLAN) + #TARGETS+=atmel_status endif diff --git a/target/device/Atmel/at91rm9200df/Makefile.in b/target/device/Atmel/at91rm9200df/Makefile.in index 95b5ba7a2..12219c8d7 100644 --- a/target/device/Atmel/at91rm9200df/Makefile.in +++ b/target/device/Atmel/at91rm9200df/Makefile.in @@ -1,6 +1,7 @@ -ifeq ($(strip$(BOARD_NAME)),at91rm9200df) +ifeq ($(strip $(BOARD_NAME)),at91rm9200df) LINUX_BOARD_NAME=at91rm9200ek BR2_PACKAGE_BUSYBOX_CONFIG:=$(BOARD_PATH)/busybox-1.7.1.config +UBOOT_BOARD_NAME:=at91rm9200df endif diff --git a/target/device/Atmel/at91sam9260dfc/Makefile.in b/target/device/Atmel/at91sam9260dfc/Makefile.in index e10b007b6..50b8e3ca5 100644 --- a/target/device/Atmel/at91sam9260dfc/Makefile.in +++ b/target/device/Atmel/at91sam9260dfc/Makefile.in @@ -1,4 +1,20 @@ -ifeq ($(strip$(BOARD_NAME)),at91sam9260dfc) +ifeq ($(strip $(BOARD_NAME)),at91sam9260dfc) LINUX26_BOARD_NAME=at91sam9260ek BR2_PACKAGE_BUSYBOX_CONFIG:=$(BOARD_PATH)/busybox-1.9.1.config + +ifneq ($(BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD),) +UBOOT_BOARD_NAME:=at91sam9260ek_dataflash_cs0 +else +UBOOT_BOARD_NAME:=at91sam9260ek_dataflash_cs0x endif +ifneq ($(BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH),) +UBOOT_BOARD_NAME:=at91sam9260ek_dataflash_cs1 +endif +ifneq ($(BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH),) +UBOOT_BOARD_NAME:=at91sam9260ek_nandflash +endif +ALLAN=1 +else +ALLAN=2 +endif + diff --git a/target/device/Atmel/at91sam9261ek/Makefile.in b/target/device/Atmel/at91sam9261ek/Makefile.in index 7bd61a423..e9074485f 100644 --- a/target/device/Atmel/at91sam9261ek/Makefile.in +++ b/target/device/Atmel/at91sam9261ek/Makefile.in @@ -1,3 +1,12 @@ ifeq ($(strip $(BOARD_NAME)),at91sam9261ek) BR2_PACKAGE_BUSYBOX_CONFIG:=$(BOARD_PATH)/busybox-1.6.0.config +ifneq ($(BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD),) +UBOOT_BOARD_NAME:=at91sam9261ek_dataflash_cs0 +endif +ifneq ($(BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH),) +UBOOT_BOARD_NAME:=at91sam9261ek_dataflash_cs0 +endif +ifneq ($(BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH),) +UBOOT_BOARD_NAME:=at91sam9261ek_nandflash +endif endif diff --git a/target/device/Atmel/at91sam9263ek/Makefile.in b/target/device/Atmel/at91sam9263ek/Makefile.in index e10adb4b1..dce340765 100644 --- a/target/device/Atmel/at91sam9263ek/Makefile.in +++ b/target/device/Atmel/at91sam9263ek/Makefile.in @@ -1,3 +1,12 @@ ifeq ($(strip $(BOARD_NAME)),at91sam9263ek) BR2_PACKAGE_BUSYBOX_CONFIG:=$(BOARD_PATH)/busybox-1.6.0.config +ifneq ($(BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD),) +UBOOT_BOARD_NAME:=at91sam9263ek_dataflash_cs0 +endif +ifneq ($(BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH),) +UBOOT_BOARD_NAME:=at91sam9263ek_dataflash_cs0 +endif +ifneq ($(BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH),) +UBOOT_BOARD_NAME:=at91sam9263ek_nandflash +endif endif diff --git a/target/device/Atmel/at91sam9g20dfc/Makefile.in b/target/device/Atmel/at91sam9g20dfc/Makefile.in index bcd9e58f1..79135c876 100644 --- a/target/device/Atmel/at91sam9g20dfc/Makefile.in +++ b/target/device/Atmel/at91sam9g20dfc/Makefile.in @@ -1,4 +1,13 @@ -ifeq ($(strip$(BOARD_NAME)),at91sam9g20dfc) +ifeq ($(strip $(BOARD_NAME)),at91sam9g20dfc) LINUX26_BOARD_NAME=at91sam9g20ek BR2_PACKAGE_BUSYBOX_CONFIG:=$(BOARD_PATH)/busybox-1.9.1.config +ifneq ($(BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD),) +UBOOT_BOARD_NAME:=at91sam9g20ek_dataflash_cs0 +endif +ifneq ($(BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH),) +UBOOT_BOARD_NAME:=at91sam9g20ek_dataflash_cs0 +endif +ifneq ($(BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH),) +UBOOT_BOARD_NAME:=at91sam9g20ek_nandflash +endif endif diff --git a/target/device/Atmel/u-boot/Config.in b/target/device/Atmel/u-boot/Config.in index 40764512a..ca1398169 100644 --- a/target/device/Atmel/u-boot/Config.in +++ b/target/device/Atmel/u-boot/Config.in @@ -2,9 +2,11 @@ config BR2_TARGET_UBOOT_AT91 bool "Das U-Boot Boot Monitor" depends on BR2_TARGET_AT91 && !BR2_TARGET_AT91SAM9G20 depends on !BR2_TARGET_AT91SAM9260PF + select BR2_TARGET_CUSTOM_UBOOT help - Build "Das U-Boot" Boot Monitor + Build "Das U-Boot" Boot Monitor for AT91 +if BR2_TARGET_UBOOT_AT91 config BR2_TARGET_UBOOT_SERVERIP_AT91 string "server ip" depends on BR2_TARGET_UBOOT_AT91 @@ -40,4 +42,5 @@ config BR2_TARGET_UBOOT_ETHADDR_AT91 help Target ip address, this should be changed for production units +endif -- cgit v1.2.3