AT91CAP9 and AT91SAM9 SoCs are very close hardware wise, so a common infrastructure can be used. Let this infrastructure be named after the AT91SAM9 family, and move the existing AT91CAP9 files to the new place.
Signed-off-by: Stelian Pop stelian@popies.net --- Makefile | 2 +- cpu/arm926ejs/{at91cap9 => at91sam9}/Makefile | 0 cpu/arm926ejs/{at91cap9 => at91sam9}/config.mk | 0 cpu/arm926ejs/{at91cap9 => at91sam9}/ether.c | 4 ++-- .../{at91cap9 => at91sam9}/lowlevel_init.S | 2 +- cpu/arm926ejs/{at91cap9 => at91sam9}/spi.c | 0 cpu/arm926ejs/{at91cap9 => at91sam9}/timer.c | 5 ++--- cpu/arm926ejs/{at91cap9 => at91sam9}/usb.c | 2 -- .../{arch-at91cap9 => arch-at91sam9}/AT91CAP9.h | 0 .../asm-arm/{arch-at91cap9 => arch-at91sam9}/clk.h | 0 .../{arch-at91cap9 => arch-at91sam9}/hardware.h | 0 .../{arch-at91cap9 => arch-at91sam9}/memory-map.h | 0 net/eth.c | 4 ++-- 13 files changed, 8 insertions(+), 11 deletions(-) rename cpu/arm926ejs/{at91cap9 => at91sam9}/Makefile (100%) rename cpu/arm926ejs/{at91cap9 => at91sam9}/config.mk (100%) rename cpu/arm926ejs/{at91cap9 => at91sam9}/ether.c (94%) rename cpu/arm926ejs/{at91cap9 => at91sam9}/lowlevel_init.S (97%) rename cpu/arm926ejs/{at91cap9 => at91sam9}/spi.c (100%) rename cpu/arm926ejs/{at91cap9 => at91sam9}/timer.c (97%) rename cpu/arm926ejs/{at91cap9 => at91sam9}/usb.c (96%) rename include/asm-arm/{arch-at91cap9 => arch-at91sam9}/AT91CAP9.h (100%) rename include/asm-arm/{arch-at91cap9 => arch-at91sam9}/clk.h (100%) rename include/asm-arm/{arch-at91cap9 => arch-at91sam9}/hardware.h (100%) rename include/asm-arm/{arch-at91cap9 => arch-at91sam9}/memory-map.h (100%)
diff --git a/Makefile b/Makefile index 4fde699..ed5c13f 100644 --- a/Makefile +++ b/Makefile @@ -2301,7 +2301,7 @@ 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 atmel at91cap9 + @$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91sam9
at91rm9200dk_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200 diff --git a/cpu/arm926ejs/at91cap9/Makefile b/cpu/arm926ejs/at91sam9/Makefile similarity index 100% rename from cpu/arm926ejs/at91cap9/Makefile rename to cpu/arm926ejs/at91sam9/Makefile diff --git a/cpu/arm926ejs/at91cap9/config.mk b/cpu/arm926ejs/at91sam9/config.mk similarity index 100% rename from cpu/arm926ejs/at91cap9/config.mk rename to cpu/arm926ejs/at91sam9/config.mk diff --git a/cpu/arm926ejs/at91cap9/ether.c b/cpu/arm926ejs/at91sam9/ether.c similarity index 94% rename from cpu/arm926ejs/at91cap9/ether.c rename to cpu/arm926ejs/at91sam9/ether.c index b7958d5..8de1bb7 100644 --- a/cpu/arm926ejs/at91cap9/ether.c +++ b/cpu/arm926ejs/at91sam9/ether.c @@ -23,12 +23,12 @@ */
#include <common.h> -#include <asm/arch/AT91CAP9.h> +#include <asm/arch/hardware.h>
extern int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
#if defined(CONFIG_MACB) && defined(CONFIG_CMD_NET) -void at91cap9_eth_initialize(bd_t *bi) +void at91sam9_eth_initialize(bd_t *bi) { macb_eth_initialize(0, (void *)AT91C_BASE_MACB, 0x00); } diff --git a/cpu/arm926ejs/at91cap9/lowlevel_init.S b/cpu/arm926ejs/at91sam9/lowlevel_init.S similarity index 97% rename from cpu/arm926ejs/at91cap9/lowlevel_init.S rename to cpu/arm926ejs/at91sam9/lowlevel_init.S index 24d950c..40a3f6a 100644 --- a/cpu/arm926ejs/at91cap9/lowlevel_init.S +++ b/cpu/arm926ejs/at91sam9/lowlevel_init.S @@ -1,5 +1,5 @@ /* - * AT91CAP9 setup stuff + * AT91CAP9/SAM9 setup stuff * * (C) Copyright 2007-2008 * Stelian Pop <stelian.pop <at> leadtechdesign.com> diff --git a/cpu/arm926ejs/at91cap9/spi.c b/cpu/arm926ejs/at91sam9/spi.c similarity index 100% rename from cpu/arm926ejs/at91cap9/spi.c rename to cpu/arm926ejs/at91sam9/spi.c diff --git a/cpu/arm926ejs/at91cap9/timer.c b/cpu/arm926ejs/at91sam9/timer.c similarity index 97% rename from cpu/arm926ejs/at91cap9/timer.c rename to cpu/arm926ejs/at91sam9/timer.c index c6df5bd..79c135f 100644 --- a/cpu/arm926ejs/at91cap9/timer.c +++ b/cpu/arm926ejs/at91sam9/timer.c @@ -26,7 +26,7 @@ #include <asm/arch/hardware.h>
/* - * We're using the AT91CAP9 PITC in 32 bit mode, by + * We're using the AT91CAP9/SAM9 PITC in 32 bit mode, by * setting the 20 bit counter period to its maximum (0xfffff). */ #define TIMER_LOAD_VAL 0xfffff @@ -134,8 +134,7 @@ ulong get_tbclk(void) }
/* - * Reset the cpu by setting up the watchdog timer and let him time out - * on the AT91CAP9ADK board + * Reset the cpu by setting up the watchdog timer and let him time out. */ void reset_cpu(ulong ignored) { diff --git a/cpu/arm926ejs/at91cap9/usb.c b/cpu/arm926ejs/at91sam9/usb.c similarity index 96% rename from cpu/arm926ejs/at91cap9/usb.c rename to cpu/arm926ejs/at91sam9/usb.c index 69da5f3..09292a6 100644 --- a/cpu/arm926ejs/at91cap9/usb.c +++ b/cpu/arm926ejs/at91sam9/usb.c @@ -24,7 +24,6 @@ #include <common.h>
#if defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT) -#ifdef CONFIG_AT91CAP9
#include <asm/arch/hardware.h>
@@ -50,5 +49,4 @@ int usb_cpu_init_fail(void) return usb_cpu_stop(); }
-#endif /* CONFIG_AT91CAP9 */ #endif /* defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT) */ diff --git a/include/asm-arm/arch-at91cap9/AT91CAP9.h b/include/asm-arm/arch-at91sam9/AT91CAP9.h similarity index 100% rename from include/asm-arm/arch-at91cap9/AT91CAP9.h rename to include/asm-arm/arch-at91sam9/AT91CAP9.h diff --git a/include/asm-arm/arch-at91cap9/clk.h b/include/asm-arm/arch-at91sam9/clk.h similarity index 100% rename from include/asm-arm/arch-at91cap9/clk.h rename to include/asm-arm/arch-at91sam9/clk.h diff --git a/include/asm-arm/arch-at91cap9/hardware.h b/include/asm-arm/arch-at91sam9/hardware.h similarity index 100% rename from include/asm-arm/arch-at91cap9/hardware.h rename to include/asm-arm/arch-at91sam9/hardware.h diff --git a/include/asm-arm/arch-at91cap9/memory-map.h b/include/asm-arm/arch-at91sam9/memory-map.h similarity index 100% rename from include/asm-arm/arch-at91cap9/memory-map.h rename to include/asm-arm/arch-at91sam9/memory-map.h diff --git a/net/eth.c b/net/eth.c index 16a6dcb..1a98a91 100644 --- a/net/eth.c +++ b/net/eth.c @@ -63,7 +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 *); +extern int at91sam9_eth_initialize(bd_t *);
#ifdef CONFIG_API extern void (*push_packet)(volatile void *, int); @@ -285,7 +285,7 @@ int eth_initialize(bd_t *bis) mcdmafec_initialize(bis); #endif #if defined(CONFIG_AT91CAP9) - at91cap9_eth_initialize(bis); + at91sam9_eth_initialize(bis); #endif
if (!eth_devices) {