diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -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 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91sam9/AT91CAP9.h (renamed from include/asm-arm/arch-at91cap9/AT91CAP9.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91sam9/clk.h (renamed from include/asm-arm/arch-at91cap9/clk.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91sam9/hardware.h (renamed from include/asm-arm/arch-at91cap9/hardware.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91sam9/memory-map.h (renamed from include/asm-arm/arch-at91cap9/memory-map.h) | 0 | ||||
| -rw-r--r-- | net/eth.c | 4 |
13 files changed, 8 insertions, 11 deletions
@@ -2303,7 +2303,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 index bf15e1edb3..bf15e1edb3 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 ca2cae181b..ca2cae181b 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 b7958d5aba..8de1bb7c33 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 24d950cf74..40a3f6aaef 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 0953820bdf..0953820bdf 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 c6df5bd81b..79c135fad4 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 69da5f3a92..09292a6bed 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 index 02ef9a8592..02ef9a8592 100644 --- a/include/asm-arm/arch-at91cap9/AT91CAP9.h +++ b/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 index ca65a2a852..ca65a2a852 100644 --- a/include/asm-arm/arch-at91cap9/clk.h +++ b/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 index ec0a67163d..ec0a67163d 100644 --- a/include/asm-arm/arch-at91cap9/hardware.h +++ b/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 index eee7bd6d1b..eee7bd6d1b 100644 --- a/include/asm-arm/arch-at91cap9/memory-map.h +++ b/include/asm-arm/arch-at91sam9/memory-map.h @@ -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) { |
