diff options
author | Stelian Pop <stelian@popies.net> | 2008-03-26 19:52:28 (GMT) |
---|---|---|
committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-03-31 23:44:18 (GMT) |
commit | a8a78f2d99dc1bd30dc3595da118539b506c6118 (patch) | |
tree | 469e2c9f740aa0b00ad6358ed74c110ab17478e4 /cpu | |
parent | 61106a565870ff503f92b251b94bd7afef889a04 (diff) | |
download | u-boot-a8a78f2d99dc1bd30dc3595da118539b506c6118.tar.xz |
Move at91cap9 specific files to at91sam9 directory
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>
Diffstat (limited to 'cpu')
-rw-r--r-- | cpu/arm926ejs/at91sam9/Makefile (renamed from cpu/arm926ejs/at91cap9/Makefile) | 0 | ||||
-rw-r--r-- | cpu/arm926ejs/at91sam9/config.mk (renamed from cpu/arm926ejs/at91cap9/config.mk) | 0 | ||||
-rw-r--r-- | cpu/arm926ejs/at91sam9/ether.c (renamed from cpu/arm926ejs/at91cap9/ether.c) | 4 | ||||
-rw-r--r-- | cpu/arm926ejs/at91sam9/lowlevel_init.S (renamed from cpu/arm926ejs/at91cap9/lowlevel_init.S) | 2 | ||||
-rw-r--r-- | cpu/arm926ejs/at91sam9/spi.c (renamed from cpu/arm926ejs/at91cap9/spi.c) | 0 | ||||
-rw-r--r-- | cpu/arm926ejs/at91sam9/timer.c (renamed from cpu/arm926ejs/at91cap9/timer.c) | 5 | ||||
-rw-r--r-- | cpu/arm926ejs/at91sam9/usb.c (renamed from cpu/arm926ejs/at91cap9/usb.c) | 2 |
7 files changed, 5 insertions, 8 deletions
diff --git a/cpu/arm926ejs/at91cap9/Makefile b/cpu/arm926ejs/at91sam9/Makefile index bf15e1e..bf15e1e 100644 --- a/cpu/arm926ejs/at91cap9/Makefile +++ b/cpu/arm926ejs/at91sam9/Makefile diff --git a/cpu/arm926ejs/at91cap9/config.mk b/cpu/arm926ejs/at91sam9/config.mk index ca2cae1..ca2cae1 100644 --- a/cpu/arm926ejs/at91cap9/config.mk +++ b/cpu/arm926ejs/at91sam9/config.mk diff --git a/cpu/arm926ejs/at91cap9/ether.c b/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 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 index 0953820..0953820 100644 --- a/cpu/arm926ejs/at91cap9/spi.c +++ b/cpu/arm926ejs/at91sam9/spi.c diff --git a/cpu/arm926ejs/at91cap9/timer.c b/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 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) */ |