Signed-off-by: Stelian Pop stelian@popies.net --- CREDITS | 4 ++++ MAKEALL | 1 + Makefile | 3 +++ drivers/mtd/dataflash.c | 4 ++-- net/eth.c | 4 ++++ 5 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/CREDITS b/CREDITS index 57a82d2..350c332 100644 --- a/CREDITS +++ b/CREDITS @@ -391,6 +391,10 @@ E: dan.poirot@windriver.com D: Support for the Wind River sbc405, sbc8240 board W: http://www.windriver.com
+N: Stelian Pop +E: stelian.pop@leadtechdesign.com +D: Atmel AT91CAP9ADK support + N: Stefan Roese E: sr@denx.de D: AMCC PPC4xx Support diff --git a/MAKEALL b/MAKEALL index d66a5fa..438c926 100755 --- a/MAKEALL +++ b/MAKEALL @@ -446,6 +446,7 @@ LIST_ARM7=" \ #########################################################################
LIST_ARM9=" \ + at91cap9adk \ at91rm9200dk \ cmc_pu2 \ ap920t \ diff --git a/Makefile b/Makefile index 0f6cc59..743c61f 100644 --- a/Makefile +++ b/Makefile @@ -2301,6 +2301,9 @@ xtract_omap1610xxx = $(subst _cs0boot,,$(subst _cs3boot,,$(subst _cs_autoboot,,$
xtract_omap730p2 = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1)))
+at91cap9adk_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk NULL at91cap9 + at91rm9200dk_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk NULL at91rm9200
diff --git a/drivers/mtd/dataflash.c b/drivers/mtd/dataflash.c index 2421407..81857a4 100644 --- a/drivers/mtd/dataflash.c +++ b/drivers/mtd/dataflash.c @@ -36,7 +36,7 @@ struct dataflash_addr cs[CFG_MAX_DATAFLASH_BANKS] = { {CFG_DATAFLASH_LOGIC_ADDR_CS0, 0}, /* Logical adress, CS */ {CFG_DATAFLASH_LOGIC_ADDR_CS1, 1} }; -#elif defined(CONFIG_AT91SAM9263EK) +#elif defined(CONFIG_AT91SAM9263EK) || defined(CONFIG_AT91CAP9ADK) struct dataflash_addr cs[CFG_MAX_DATAFLASH_BANKS] = { {CFG_DATAFLASH_LOGIC_ADDR_CS0, 0}, /* Logical adress, CS */ }; @@ -48,7 +48,7 @@ struct dataflash_addr cs[CFG_MAX_DATAFLASH_BANKS] = { #endif
/*define the area offsets*/ -#if defined(CONFIG_AT91SAM9261EK) || defined(CONFIG_AT91SAM9260EK) || defined(CONFIG_AT91SAM9263EK) +#if defined(CONFIG_AT91SAM9261EK) || defined(CONFIG_AT91SAM9260EK) || defined(CONFIG_AT91SAM9263EK) || defined(CONFIG_AT91CAP9ADK) #if defined(CONFIG_NEW_PARTITION) dataflash_protect_t area_list[NB_DATAFLASH_AREA] = { {0x00000000, 0x00003FFF, FLAG_PROTECT_SET, 0, "Bootstrap"}, /* ROM code */ diff --git a/net/eth.c b/net/eth.c index 75175ec..62297ab 100644 --- a/net/eth.c +++ b/net/eth.c @@ -63,6 +63,7 @@ extern int atstk1000_eth_initialize(bd_t *); extern int atngw100_eth_initialize(bd_t *); extern int mcffec_initialize(bd_t*); extern int mcdmafec_initialize(bd_t*); +extern int at91cap9_eth_initialize(bd_t *);
#ifdef CONFIG_API extern void (*push_packet)(volatile void *, int); @@ -283,6 +284,9 @@ int eth_initialize(bd_t *bis) #if defined(CONFIG_FSLDMAFEC) mcdmafec_initialize(bis); #endif +#if defined(CONFIG_AT91CAP9) + at91cap9_eth_initialize(bis); +#endif
if (!eth_devices) { puts ("No ethernet found.\n");