leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move at91cap9 specific files to at91sam9 directory

Browse Source 
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>
This commit is contained in:
Stelian Pop 2008-03-26 20:52:28 +01:00 committed by Jean-Christophe PLAGNIOL-VILLARD
parent 61106a5658
commit a8a78f2d99
13 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2303,7 +2303,7 @@ xtract_omap1610xxx = $(subst _cs0boot,,$(subst _cs3boot,,$(subst _cs_autoboot,,$
xtract_omap730p2 = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1))) xtract_omap730p2 = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1)))
at91cap9adk_config : unconfig at91cap9adk_config : unconfig
@$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91cap9 @$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91sam9
at91rm9200dk_config : unconfig at91rm9200dk_config : unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200 @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200

0
cpu/arm926ejs/at91cap9/Makefile → cpu/arm926ejs/at91sam9/Makefile
View File

0
cpu/arm926ejs/at91cap9/config.mk → cpu/arm926ejs/at91sam9/config.mk
View File

4
cpu/arm926ejs/at91cap9/ether.c → cpu/arm926ejs/at91sam9/ether.c
View File

@ -23,12 +23,12 @@
*/ */
#include <common.h> #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); extern int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
#if defined(CONFIG_MACB) && defined(CONFIG_CMD_NET) #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); macb_eth_initialize(0, (void *)AT91C_BASE_MACB, 0x00);
} }

2
cpu/arm926ejs/at91cap9/lowlevel_init.S → cpu/arm926ejs/at91sam9/lowlevel_init.S
View File

@ -1,5 +1,5 @@
/* /*
* AT91CAP9 setup stuff * AT91CAP9/SAM9 setup stuff
* *
* (C) Copyright 2007-2008 * (C) Copyright 2007-2008
* Stelian Pop <stelian.pop <at> leadtechdesign.com> * Stelian Pop <stelian.pop <at> leadtechdesign.com>

0
cpu/arm926ejs/at91cap9/spi.c → cpu/arm926ejs/at91sam9/spi.c
View File

5
cpu/arm926ejs/at91cap9/timer.c → cpu/arm926ejs/at91sam9/timer.c
View File

@ -26,7 +26,7 @@
#include <asm/arch/hardware.h> #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). * setting the 20 bit counter period to its maximum (0xfffff).
*/ */
#define TIMER_LOAD_VAL 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 * Reset the cpu by setting up the watchdog timer and let him time out.
* on the AT91CAP9ADK board
*/ */
void reset_cpu(ulong ignored) void reset_cpu(ulong ignored)
{ {

2
cpu/arm926ejs/at91cap9/usb.c → cpu/arm926ejs/at91sam9/usb.c
View File

@ -24,7 +24,6 @@
#include <common.h> #include <common.h>
#if defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT) #if defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT)
#ifdef CONFIG_AT91CAP9
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
@ -50,5 +49,4 @@ int usb_cpu_init_fail(void)
return usb_cpu_stop(); return usb_cpu_stop();
} }
#endif /* CONFIG_AT91CAP9 */
#endif /* defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT) */ #endif /* defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT) */

0
include/asm-arm/arch-at91cap9/AT91CAP9.h → include/asm-arm/arch-at91sam9/AT91CAP9.h
View File

0
include/asm-arm/arch-at91cap9/clk.h → include/asm-arm/arch-at91sam9/clk.h
View File

0
include/asm-arm/arch-at91cap9/hardware.h → include/asm-arm/arch-at91sam9/hardware.h
View File

0
include/asm-arm/arch-at91cap9/memory-map.h → include/asm-arm/arch-at91sam9/memory-map.h
View File

4
net/eth.c
View File

@ -63,7 +63,7 @@ extern int atstk1000_eth_initialize(bd_t *);
extern int atngw100_eth_initialize(bd_t *); extern int atngw100_eth_initialize(bd_t *);
extern int mcffec_initialize(bd_t*); extern int mcffec_initialize(bd_t*);
extern int mcdmafec_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 #ifdef CONFIG_API
extern void (*push_packet)(volatile void *, int); extern void (*push_packet)(volatile void *, int);
@ -285,7 +285,7 @@ int eth_initialize(bd_t *bis)
mcdmafec_initialize(bis); mcdmafec_initialize(bis);
#endif #endif
#if defined(CONFIG_AT91CAP9) #if defined(CONFIG_AT91CAP9)
at91cap9_eth_initialize(bis); at91sam9_eth_initialize(bis);
#endif #endif
if (!eth_devices) { if (!eth_devices) {