[U-Boot] [PATCH 1/1] at91: use Linux CONFIG scheme for board and arch

Jean-Christophe PLAGNIOL-VILLARD plagnioj at jcrosoft.com
Sat Jun 13 18:41:29 CEST 2009


Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
---
applied on testing branch
with the following patch
pm9263: lowlevel init update
pm9263: use macro instead of hardcode value for the lowlevel_init
at91: add support for the PM9261 board of Ronetix GmbH
at91sam9263ek: add nor flash support
at91: unify nor boot support
at91: use Linux CONFIG scheme for board and arch
Move libgcc inclusion from common Makefile to platform configs files
ARM: Don't include libgcc anymore

this branch is based on the wdenk/next which was rebased yesterday

Best Regards,
J.
 Makefile                                    |    4 ++--
 board/atmel/at91sam9260ek/at91sam9260ek.c   |    2 +-
 cpu/arm920t/at91rm9200/usb.c                |    4 ++--
 cpu/arm920t/start.S                         |    2 +-
 cpu/arm926ejs/at91/Makefile                 |   12 ++++++------
 cpu/arm926ejs/at91/at91sam9260_devices.c    |    2 +-
 cpu/arm926ejs/at91/clock.c                  |    8 ++++----
 cpu/arm926ejs/at91/lowlevel_init.S          |    4 ++--
 drivers/i2c/soft_i2c.c                      |    2 +-
 drivers/net/macb.c                          |    8 ++++----
 drivers/usb/host/ohci-at91.c                |   15 ++++++++-------
 drivers/usb/host/ohci-hcd.c                 |    2 +-
 drivers/video/atmel_lcdfb.c                 |    2 +-
 include/asm-arm/arch-at91/at91sam9260.h     |    4 ++--
 include/asm-arm/arch-at91/at91sam9_matrix.h |   10 +++++-----
 include/asm-arm/arch-at91/hardware.h        |   14 +++++++-------
 include/configs/afeb9260.h                  |    4 ++--
 include/configs/at91cap9adk.h               |    4 ++--
 include/configs/at91rm9200dk.h              |    4 ++--
 include/configs/at91rm9200ek.h              |    4 ++--
 include/configs/at91sam9260ek.h             |    8 ++++----
 include/configs/at91sam9261ek.h             |    4 ++--
 include/configs/at91sam9263ek.h             |    4 ++--
 include/configs/at91sam9rlek.h              |    4 ++--
 include/configs/cmc_pu2.h                   |    2 +-
 include/configs/csb637.h                    |    2 +-
 include/configs/kb9202.h                    |    2 +-
 include/configs/m501sk.h                    |    2 +-
 include/configs/mp2usb.h                    |    4 ++--
 include/configs/pm9261.h                    |    4 ++--
 include/configs/pm9263.h                    |    4 ++--
 net/eth.c                                   |    2 +-
 32 files changed, 77 insertions(+), 76 deletions(-)

diff --git a/Makefile b/Makefile
index b2a0e72..872f952 100644
--- a/Makefile
+++ b/Makefile
@@ -2695,10 +2695,10 @@ at91sam9g20ek_dataflash_cs1_config \
 at91sam9g20ek_config	:	unconfig
 	@mkdir -p $(obj)include
 	@if [ "$(findstring 9g20,$@)" ] ; then \
-		echo "#define CONFIG_AT91SAM9G20EK 1"	>>$(obj)include/config.h ; \
+		echo "#define CONFIG_MACH_AT91SAM9G20EK 1"	>>$(obj)include/config.h ; \
 		$(XECHO) "... 9G20 Variant" ; \
 	else \
-		echo "#define CONFIG_AT91SAM9260EK 1"	>>$(obj)include/config.h ; \
+		echo "#define CONFIG_MACH_AT91SAM9260EK 1"	>>$(obj)include/config.h ; \
 	fi;
 	@if [ "$(findstring _nandflash,$@)" ] ; then \
 		echo "#define CONFIG_SYS_USE_NANDFLASH 1"	>>$(obj)include/config.h ; \
diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c
index 6bd3b44..d9da4d8 100644
--- a/board/atmel/at91sam9260ek/at91sam9260ek.c
+++ b/board/atmel/at91sam9260ek/at91sam9260ek.c
@@ -141,7 +141,7 @@ int board_init(void)
 	/* Enable Ctrlc */
 	console_init_f();
 
-#ifdef CONFIG_AT91SAM9G20EK
+#ifdef CONFIG_MACH_AT91SAM9G20EK
 	/* arch number of AT91SAM9260EK-Board */
 	gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9G20EK;
 #else
diff --git a/cpu/arm920t/at91rm9200/usb.c b/cpu/arm920t/at91rm9200/usb.c
index 72355dc..9c923bc 100644
--- a/cpu/arm920t/at91rm9200/usb.c
+++ b/cpu/arm920t/at91rm9200/usb.c
@@ -24,7 +24,7 @@
 #include <common.h>
 
 #if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT)
-# ifdef CONFIG_AT91RM9200
+# ifdef CONFIG_ARCH_AT91RM9200
 
 #include <asm/arch/hardware.h>
 
@@ -49,5 +49,5 @@ int usb_cpu_init_fail(void)
 	return usb_cpu_stop();
 }
 
-# endif /* CONFIG_AT91RM9200 */
+# endif /* CONFIG_ARCH_AT91RM9200 */
 #endif /* defined(CONFIG_USB_OHCI) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT) */
diff --git a/cpu/arm920t/start.S b/cpu/arm920t/start.S
index 475cdaf..6c99359 100644
--- a/cpu/arm920t/start.S
+++ b/cpu/arm920t/start.S
@@ -118,7 +118,7 @@ start_code:
 	bl coloured_LED_init
 	bl red_LED_on
 
-#if	defined(CONFIG_AT91RM9200DK) || defined(CONFIG_AT91RM9200EK)
+#if	defined(CONFIG_ARCH_AT91RM9200DK) || defined(CONFIG_MACH_AT91RM9200EK)
 	/*
 	 * relocate exception table
 	 */
diff --git a/cpu/arm926ejs/at91/Makefile b/cpu/arm926ejs/at91/Makefile
index 3da89f4..adebeb5 100644
--- a/cpu/arm926ejs/at91/Makefile
+++ b/cpu/arm926ejs/at91/Makefile
@@ -25,12 +25,12 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(SOC).a
 
-COBJS-$(CONFIG_AT91CAP9)	+= at91cap9_devices.o
-COBJS-$(CONFIG_AT91SAM9260)	+= at91sam9260_devices.o
-COBJS-$(CONFIG_AT91SAM9G20)	+= at91sam9260_devices.o
-COBJS-$(CONFIG_AT91SAM9261)	+= at91sam9261_devices.o
-COBJS-$(CONFIG_AT91SAM9263)	+= at91sam9263_devices.o
-COBJS-$(CONFIG_AT91SAM9RL)	+= at91sam9rl_devices.o
+COBJS-$(CONFIG_ARCH_AT91CAP9)		+= at91cap9_devices.o
+COBJS-$(CONFIG_ARCH_AT91SAM9260)	+= at91sam9260_devices.o
+COBJS-$(CONFIG_ARCH_AT91SAM9G20)	+= at91sam9260_devices.o
+COBJS-$(CONFIG_ARCH_AT91SAM9261)	+= at91sam9261_devices.o
+COBJS-$(CONFIG_ARCH_AT91SAM9263)	+= at91sam9263_devices.o
+COBJS-$(CONFIG_ARCH_AT91SAM9RL)		+= at91sam9rl_devices.o
 COBJS-$(CONFIG_AT91_LED)	+= led.o
 COBJS-y += clock.o
 COBJS-y += cpu.o
diff --git a/cpu/arm926ejs/at91/at91sam9260_devices.c b/cpu/arm926ejs/at91/at91sam9260_devices.c
index 5309ba2..d6cde6d 100644
--- a/cpu/arm926ejs/at91/at91sam9260_devices.c
+++ b/cpu/arm926ejs/at91/at91sam9260_devices.c
@@ -167,7 +167,7 @@ void at91_macb_hw_init(void)
 	at91_set_B_periph(AT91_PIN_PA25, 0);	/* ERX2 */
 	at91_set_B_periph(AT91_PIN_PA26, 0);	/* ERX3 */
 	at91_set_B_periph(AT91_PIN_PA27, 0);	/* ERXCK */
-#if defined(CONFIG_AT91SAM9260EK) || defined(CONFIG_AFEB9260)
+#if defined(CONFIG_MACH_AT91SAM9260EK) || defined(CONFIG_MACH_AFEB9260)
 	/*
 	 * use PA10, PA11 for ETX2, ETX3.
 	 * PA23 and PA24 are for TWI EEPROM
diff --git a/cpu/arm926ejs/at91/clock.c b/cpu/arm926ejs/at91/clock.c
index 9f03468..4f987e5 100644
--- a/cpu/arm926ejs/at91/clock.c
+++ b/cpu/arm926ejs/at91/clock.c
@@ -90,7 +90,7 @@ static unsigned at91_pll_calc(unsigned main_freq, unsigned out_freq)
 		 * Warning: some newer products need 2MHz min.
 		 */
 		input = main_freq / i;
-#if defined(CONFIG_AT91SAM9G20)
+#if defined(CONFIG_ARCH_AT91SAM9G20)
 		if (input < 2000000)
 			continue;
 #endif
@@ -100,7 +100,7 @@ static unsigned at91_pll_calc(unsigned main_freq, unsigned out_freq)
 			continue;
 
 		mul1 = out_freq / input;
-#if defined(CONFIG_AT91SAM9G20)
+#if defined(CONFIG_ARCH_AT91SAM9G20)
 		if (mul > 63)
 			continue;
 #endif
@@ -185,9 +185,9 @@ int at91_clock_init(unsigned long main_clock)
 	mckr = at91_sys_read(AT91_PMC_MCKR);
 	freq = mck_rate_hz = at91_css_to_rate(mckr & AT91_PMC_CSS);
 	freq /= (1 << ((mckr & AT91_PMC_PRES) >> 2));			/* prescale */
-#if defined(CONFIG_AT91RM9200)
+#if defined(CONFIG_ARCH_AT91RM9200)
 	mck_rate_hz = freq / (1 + ((mckr & AT91_PMC_MDIV) >> 8));	/* mdiv */
-#elif defined(CONFIG_AT91SAM9G20)
+#elif defined(CONFIG_ARCH_AT91SAM9G20)
 	mck_rate_hz = (mckr & AT91_PMC_MDIV) ?
 		freq / ((mckr & AT91_PMC_MDIV) >> 7) : freq;	/* mdiv ; (x >> 7) = ((x >> 8) * 2) */
 	if (mckr & AT91_PMC_PDIV)
diff --git a/cpu/arm926ejs/at91/lowlevel_init.S b/cpu/arm926ejs/at91/lowlevel_init.S
index 5ed518c..5ded2cf 100644
--- a/cpu/arm926ejs/at91/lowlevel_init.S
+++ b/cpu/arm926ejs/at91/lowlevel_init.S
@@ -187,14 +187,14 @@ SMRDATA:
 	.word CONFIG_SYS_WDTC_WDMR_VAL
 
 	/* configure PIOx as EBI0 D[16-31] */
-#if defined(CONFIG_AT91SAM9263)
+#if defined(CONFIG_ARCH_AT91SAM9263)
 	.word (AT91_BASE_SYS + AT91_PIOD + PIO_PDR)
 	.word CONFIG_SYS_PIOD_PDR_VAL1
 	.word (AT91_BASE_SYS + AT91_PIOD + PIO_PUDR)
 	.word CONFIG_SYS_PIOD_PPUDR_VAL
 	.word (AT91_BASE_SYS + AT91_PIOD + PIO_ASR)
 	.word CONFIG_SYS_PIOD_PPUDR_VAL
-#elif defined(CONFIG_AT91SAM9261)
+#elif defined(CONFIG_ARCH_AT91SAM9261)
 	.word (AT91_BASE_SYS + AT91_PIOC + PIO_PDR)
 	.word CONFIG_SYS_PIOC_PDR_VAL1
 	.word (AT91_BASE_SYS + AT91_PIOC + PIO_PUDR)
diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c
index 59883a5..b51841d 100644
--- a/drivers/i2c/soft_i2c.c
+++ b/drivers/i2c/soft_i2c.c
@@ -30,7 +30,7 @@
 #include <ioports.h>
 #include <asm/io.h>
 #endif
-#ifdef	CONFIG_AT91RM9200		/* need this for the at91rm9200 */
+#ifdef	CONFIG_ARCH_AT91RM9200		/* need this for the at91rm9200 */
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #endif
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 6de0a04..664294b 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -446,15 +446,15 @@ static int macb_init(struct eth_device *netdev, bd_t *bd)
 
 	/* choose RMII or MII mode. This depends on the board */
 #ifdef CONFIG_RMII
-#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
-    defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20)
+#if defined(CONFIG_ARCH_AT91CAP9) || defined(CONFIG_ARCH_AT91SAM9260) || \
+    defined(CONFIG_ARCH_AT91SAM9263) || defined(CONFIG_ARCH_AT91SAM9G20)
 	macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN));
 #else
 	macb_writel(macb, USRIO, 0);
 #endif
 #else
-#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
-    defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20)
+#if defined(CONFIG_ARCH_AT91CAP9) || defined(CONFIG_ARCH_AT91SAM9260) || \
+    defined(CONFIG_ARCH_AT91SAM9263) || defined(CONFIG_ARCH_AT91SAM9G20)
 	macb_writel(macb, USRIO, MACB_BIT(CLKEN));
 #else
 	macb_writel(macb, USRIO, MACB_BIT(MII));
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 226859a..7fa0a77 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -33,9 +33,9 @@
 int usb_cpu_init(void)
 {
 
-#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
-    defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20) || \
-    defined(CONFIG_AT91SAM9261)
+#if defined(CONFIG_ARCH_AT91CAP9) || defined(CONFIG_ARCH_AT91SAM9260) || \
+    defined(CONFIG_ARCH_AT91SAM9263) || defined(CONFIG_ARCH_AT91SAM9G20) || \
+    defined(CONFIG_ARCH_AT91SAM9261)
 	/* Enable PLLB */
 	at91_sys_write(AT91_CKGR_PLLBR, get_pllb_init());
 	while ((at91_sys_read(AT91_PMC_SR) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB)
@@ -44,7 +44,7 @@ int usb_cpu_init(void)
 
 	/* Enable USB host clock. */
 	at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_UHP);
-#ifdef CONFIG_AT91SAM9261
+#ifdef CONFIG_ARCH_AT91SAM9261
 	at91_sys_write(AT91_PMC_SCER, AT91_PMC_UHP | AT91_PMC_HCK0);
 #else
 	at91_sys_write(AT91_PMC_SCER, AT91_PMC_UHP);
@@ -57,14 +57,15 @@ int usb_cpu_stop(void)
 {
 	/* Disable USB host clock. */
 	at91_sys_write(AT91_PMC_PCDR, 1 << AT91_ID_UHP);
-#ifdef CONFIG_AT91SAM9261
+#ifdef CONFIG_ARCH_AT91SAM9261
 	at91_sys_write(AT91_PMC_SCDR, AT91_PMC_UHP | AT91_PMC_HCK0);
 #else
 	at91_sys_write(AT91_PMC_SCDR, AT91_PMC_UHP);
 #endif
 
-#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
-    defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20)
+#if defined(CONFIG_ARCH_AT91CAP9) || defined(CONFIG_ARCH_AT91SAM9260) || \
+    defined(CONFIG_ARCH_AT91SAM9263) || defined(CONFIG_ARCH_AT91SAM9G20) || \
+    defined(CONFIG_ARCH_AT91SAM9261)
 	/* Disable PLLB */
 	at91_sys_write(AT91_CKGR_PLLBR, 0);
 	while ((at91_sys_read(AT91_PMC_SR) & AT91_PMC_LOCKB) != 0)
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 67d478f..72832e3 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -60,7 +60,7 @@
 
 #include "ohci.h"
 
-#ifdef CONFIG_AT91RM9200
+#ifdef CONFIG_ARCH_AT91RM9200
 #include <asm/arch/hardware.h>	/* needed for AT91_USB_HOST_BASE */
 #endif
 
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 3a51cc7..0edb071 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -43,7 +43,7 @@ short console_row;
 #define ATMEL_LCDC_CVAL_DEFAULT		0xc8
 #define ATMEL_LCDC_DMA_BURST_LEN	8
 
-#if defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91CAP9)
+#if defined(CONFIG_ARCH_AT91SAM9263) || defined(CONFIG_ARCH_AT91CAP9)
 #define ATMEL_LCDC_FIFO_SIZE		2048
 #else
 #define ATMEL_LCDC_FIFO_SIZE		512
diff --git a/include/asm-arm/arch-at91/at91sam9260.h b/include/asm-arm/arch-at91/at91sam9260.h
index 73975f4..edb4352 100644
--- a/include/asm-arm/arch-at91/at91sam9260.h
+++ b/include/asm-arm/arch-at91/at91sam9260.h
@@ -124,9 +124,9 @@
 /*
  * Cpu Name
  */
-#if defined(CONFIG_AT91SAM9260)
+#if defined(CONFIG_ARCH_AT91SAM9260)
 #define AT91_CPU_NAME	"AT91SAM9260"
-#elif defined(CONFIG_AT91SAM9G20)
+#elif defined(CONFIG_ARCH_AT91SAM9G20)
 #define AT91_CPU_NAME	"AT91SAM9G20"
 #endif
 
diff --git a/include/asm-arm/arch-at91/at91sam9_matrix.h b/include/asm-arm/arch-at91/at91sam9_matrix.h
index 913f374..41d25a1 100644
--- a/include/asm-arm/arch-at91/at91sam9_matrix.h
+++ b/include/asm-arm/arch-at91/at91sam9_matrix.h
@@ -11,15 +11,15 @@
 #ifndef __ASM_ARCH_AT91SAM9_MATRIX_H
 #define __ASM_ARCH_AT91SAM9_MATRIX_H
 
-#if defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9G20)
+#if defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20)
 #include <asm/arch/at91sam9260_matrix.h>
-#elif defined(CONFIG_AT91SAM9261)
+#elif defined(CONFIG_ARCH_AT91SAM9261)
 #include <asm/arch/at91sam9261_matrix.h>
-#elif defined(CONFIG_AT91SAM9263)
+#elif defined(CONFIG_ARCH_AT91SAM9263)
 #include <asm/arch/at91sam9263_matrix.h>
-#elif defined(CONFIG_AT91SAM9RL)
+#elif defined(CONFIG_ARCH_AT91SAM9RL)
 #include <asm/arch/at91sam9rl_matrix.h>
-#elif defined(CONFIG_AT91CAP9)
+#elif defined(CONFIG_ARCH_AT91CAP9)
 #include <asm/arch/at91cap9_matrix.h>
 #else
 #error "Unsupported AT91SAM9/CAP9 processor"
diff --git a/include/asm-arm/arch-at91/hardware.h b/include/asm-arm/arch-at91/hardware.h
index 8704106..f56f8b9 100644
--- a/include/asm-arm/arch-at91/hardware.h
+++ b/include/asm-arm/arch-at91/hardware.h
@@ -16,33 +16,33 @@
 
 #include <asm/sizes.h>
 
-#if defined(CONFIG_AT91RM9200)
+#if defined(CONFIG_ARCH_AT91RM9200)
 #include <asm/arch/at91rm9200.h>
-#elif defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9G20)
+#elif defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20)
 #include <asm/arch/at91sam9260.h>
 #define AT91_BASE_SPI	AT91SAM9260_BASE_SPI0
 #define AT91_ID_UHP	AT91SAM9260_ID_UHP
 #define AT91_PMC_UHP	AT91SAM926x_PMC_UHP
-#elif defined(CONFIG_AT91SAM9261)
+#elif defined(CONFIG_ARCH_AT91SAM9261)
 #include <asm/arch/at91sam9261.h>
 #define AT91_BASE_SPI	AT91SAM9261_BASE_SPI0
 #define AT91_ID_UHP	AT91SAM9261_ID_UHP
 #define AT91_PMC_UHP	AT91SAM926x_PMC_UHP
-#elif defined(CONFIG_AT91SAM9263)
+#elif defined(CONFIG_ARCH_AT91SAM9263)
 #include <asm/arch/at91sam9263.h>
 #define AT91_BASE_SPI	AT91SAM9263_BASE_SPI0
 #define AT91_ID_UHP	AT91SAM9263_ID_UHP
 #define AT91_PMC_UHP	AT91SAM926x_PMC_UHP
-#elif defined(CONFIG_AT91SAM9RL)
+#elif defined(CONFIG_ARCH_AT91SAM9RL)
 #include <asm/arch/at91sam9rl.h>
 #define AT91_BASE_SPI	AT91SAM9RL_BASE_SPI
 #define AT91_ID_UHP	AT91SAM9RL_ID_UHP
-#elif defined(CONFIG_AT91CAP9)
+#elif defined(CONFIG_ARCH_AT91CAP9)
 #include <asm/arch/at91cap9.h>
 #define AT91_BASE_SPI	AT91CAP9_BASE_SPI0
 #define AT91_ID_UHP	AT91CAP9_ID_UHP
 #define AT91_PMC_UHP	AT91CAP9_PMC_UHP
-#elif defined(CONFIG_AT91X40)
+#elif defined(CONFIG_ARCH_AT91X40)
 #include <asm/arch/at91x40.h>
 #else
 #error "Unsupported AT91 processor"
diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h
index c5134a2..188f54f 100644
--- a/include/configs/afeb9260.h
+++ b/include/configs/afeb9260.h
@@ -30,8 +30,8 @@
 #define AT91_MAIN_CLOCK		18429952	/* from 18.432 MHz crystal */
 #define CONFIG_SYS_HZ		1000
 
-#define CONFIG_AT91SAM9260	1	/* It's an Atmel AT91SAM9260 SoC*/
-#define CONFIG_AFEB9260		1	/* on an AFEB9260 Board	*/
+#define CONFIG_ARCH_AT91SAM9260	1	/* It's an Atmel AT91SAM9260 SoC*/
+#define CONFIG_MACH_AFEB9260	1	/* on an AFEB9260 Board	*/
 #define CONFIG_ARCH_CPU_INIT
 #undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
 
diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index 526cd60..ad526d1 100644
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -32,8 +32,8 @@
 #define CONFIG_SYS_HZ		1000
 
 #define CONFIG_ARM926EJS	1	/* This is an ARM926EJS Core	*/
-#define CONFIG_AT91CAP9		1	/* It's an Atmel AT91CAP9 SoC	*/
-#define CONFIG_AT91CAP9ADK	1	/* on an AT91CAP9ADK Board	*/
+#define CONFIG_ARCH_AT91CAP9		1	/* It's an Atmel AT91CAP9 SoC	*/
+#define CONFIG_MACH_AT91CAP9ADK	1	/* on an AT91CAP9ADK Board	*/
 #define CONFIG_ARCH_CPU_INIT
 #undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
 
diff --git a/include/configs/at91rm9200dk.h b/include/configs/at91rm9200dk.h
index 56128c1..942cf27 100644
--- a/include/configs/at91rm9200dk.h
+++ b/include/configs/at91rm9200dk.h
@@ -33,8 +33,8 @@
 #define AT91_SLOW_CLOCK		32768	/* slow clock */
 
 #define CONFIG_ARM920T		1	/* This is an ARM920T Core	*/
-#define CONFIG_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
-#define CONFIG_AT91RM9200DK	1	/* on an AT91RM9200DK Board	*/
+#define CONFIG_ARCH_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
+#define CONFIG_ARCH_AT91RM9200DK	1	/* on an AT91RM9200DK Board	*/
 #undef  CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
 #define USE_920T_MMU		1
 
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index c898c73..43f1068 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -41,8 +41,8 @@
 #define AT91_SLOW_CLOCK		32768	/* slow clock */
 
 #define CONFIG_ARM920T		1	/* This is an ARM920T Core	*/
-#define CONFIG_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
-#define CONFIG_AT91RM9200EK	1	/* on an AT91RM9200EK Board	*/
+#define CONFIG_ARCH_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
+#define CONFIG_MACH_AT91RM9200EK	1	/* on an AT91RM9200EK Board	*/
 #undef  CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
 #define USE_920T_MMU		1
 
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 1828c63..ee1128e 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -33,10 +33,10 @@
 
 #define CONFIG_ARM926EJS	1	/* This is an ARM926EJS Core	*/
 
-#ifdef CONFIG_AT91SAM9G20EK
-#define CONFIG_AT91SAM9G20	1	/* It's an Atmel AT91SAM9G20 SoC*/
+#ifdef CONFIG_MACH_AT91SAM9G20EK
+#define CONFIG_ARCH_AT91SAM9G20	1	/* It's an Atmel AT91SAM9G20 SoC*/
 #else
-#define CONFIG_AT91SAM9260	1	/* It's an Atmel AT91SAM9260 SoC*/
+#define CONFIG_ARCH_AT91SAM9260	1	/* It's an Atmel AT91SAM9260 SoC*/
 #endif
 
 #define CONFIG_ARCH_CPU_INIT
@@ -103,7 +103,7 @@
 #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1	0xD0000000	/* CS1 */
 #define AT91_SPI_CLK			15000000
 
-#ifdef CONFIG_AT91SAM9G20EK
+#ifdef CONFIG_MACH_AT91SAM9G20EK
 #define DATAFLASH_TCSS			(0x22 << 16)
 #else
 #define DATAFLASH_TCSS			(0x1a << 16)
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 4f6b640..9faaa1c 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -32,8 +32,8 @@
 #define CONFIG_SYS_HZ		1000
 
 #define CONFIG_ARM926EJS	1	/* This is an ARM926EJS Core	*/
-#define CONFIG_AT91SAM9261	1	/* It's an Atmel AT91SAM9261 SoC*/
-#define CONFIG_AT91SAM9261EK	1	/* on an AT91SAM9261EK Board	*/
+#define CONFIG_ARCH_AT91SAM9261	1	/* It's an Atmel AT91SAM9261 SoC*/
+#define CONFIG_MACH_AT91SAM9261EK	1	/* on an AT91SAM9261EK Board	*/
 #define CONFIG_ARCH_CPU_INIT
 #undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
 
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 00f3114..9dafbd3 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -32,8 +32,8 @@
 #define CONFIG_SYS_HZ		1000
 
 #define CONFIG_ARM926EJS	1	/* This is an ARM926EJS Core	*/
-#define CONFIG_AT91SAM9263	1	/* It's an Atmel AT91SAM9263 SoC*/
-#define CONFIG_AT91SAM9263EK	1	/* on an AT91SAM9263EK Board	*/
+#define CONFIG_ARCH_AT91SAM9263	1	/* It's an Atmel AT91SAM9263 SoC*/
+#define CONFIG_MACH_AT91SAM9263EK	1	/* on an AT91SAM9263EK Board	*/
 #define CONFIG_ARCH_CPU_INIT
 #undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
 
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index c466823..47a23f1 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -32,8 +32,8 @@
 #define CONFIG_SYS_HZ		1000
 
 #define CONFIG_ARM926EJS	1	/* This is an ARM926EJS Core	*/
-#define CONFIG_AT91SAM9RL	1	/* It's an Atmel AT91SAM9RL SoC*/
-#define CONFIG_AT91SAM9RLEK	1	/* on an AT91SAM9RLEK Board	*/
+#define CONFIG_ARCH_AT91SAM9RL	1	/* It's an Atmel AT91SAM9RL SoC*/
+#define CONFIG_MACH_AT91SAM9RLEK	1	/* on an AT91SAM9RLEK Board	*/
 #define CONFIG_ARCH_CPU_INIT
 #undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
 
diff --git a/include/configs/cmc_pu2.h b/include/configs/cmc_pu2.h
index 80559bf..e676f7b 100644
--- a/include/configs/cmc_pu2.h
+++ b/include/configs/cmc_pu2.h
@@ -32,7 +32,7 @@
 #define AT91_SLOW_CLOCK		32768	/* slow clock */
 
 #define CONFIG_ARM920T		1	/* This is an ARM920T Core	*/
-#define CONFIG_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
+#define CONFIG_ARCH_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
 #define CONFIG_CMC_PU2		1	/* on an CMC_PU2 Board		*/
 #undef  CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
 #define USE_920T_MMU		1
diff --git a/include/configs/csb637.h b/include/configs/csb637.h
index e1cdc7f..3e4f3ef 100644
--- a/include/configs/csb637.h
+++ b/include/configs/csb637.h
@@ -33,7 +33,7 @@
 #define AT91_SLOW_CLOCK		32768	/* slow clock */
 
 #define CONFIG_ARM920T		1	/* This is an ARM920T Core	*/
-#define CONFIG_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
+#define CONFIG_ARCH_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
 #define CONFIG_CSB637		1	/* on a CSB637 board		*/
 #undef  CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
 #define USE_920T_MMU		1
diff --git a/include/configs/kb9202.h b/include/configs/kb9202.h
index 7dd81e6..08f71e5 100644
--- a/include/configs/kb9202.h
+++ b/include/configs/kb9202.h
@@ -36,7 +36,7 @@
 #define AT91_SLOW_CLOCK		32768	/* slow clock */
 
 #define CONFIG_ARM920T		1	/* This is an ARM920T Core	*/
-#define CONFIG_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
+#define CONFIG_ARCH_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
 /* Only define one of the following, based on board type		*/
 /* #define	CONFIG_KB9200		1	 KwikByte KB9202 board	*/
 /* #define	CONFIG_KB9201		1	 KwikByte KB9202 board	*/
diff --git a/include/configs/m501sk.h b/include/configs/m501sk.h
index 1e7d90e..c76c120 100644
--- a/include/configs/m501sk.h
+++ b/include/configs/m501sk.h
@@ -34,7 +34,7 @@
 #define AT91C_MASTER_CLOCK	59904000
 #define AT91_SLOW_CLOCK	32768 /* slow clock */
 
-#define CONFIG_AT91RM9200DK	1 /* on an AT91RM9200DK Board    */
+#define CONFIG_ARCH_AT91RM9200DK	1 /* on an AT91RM9200DK Board    */
 #undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */
 #define CONFIG_CMDLINE_TAG	1 /* enable passing of ATAGs    */
 #define CONFIG_SETUP_MEMORY_TAGS	1
diff --git a/include/configs/mp2usb.h b/include/configs/mp2usb.h
index 3225ce7..2015dad 100644
--- a/include/configs/mp2usb.h
+++ b/include/configs/mp2usb.h
@@ -35,8 +35,8 @@
 #define AT91_SLOW_CLOCK		32768	/* slow clock */
 
 #define CONFIG_ARM920T		1	/* This is an ARM920T Core	*/
-#define CONFIG_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
-#define CONFIG_AT91RM9200DK	1	/* on an AT91RM9200DK Board	*/
+#define CONFIG_ARCH_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
+#define CONFIG_ARCH_AT91RM9200DK	1	/* on an AT91RM9200DK Board	*/
 #define CONFIG_MP2USB		1	/* on an MP2USB Board		*/
 #undef  CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
 #define USE_920T_MMU		1
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index ac09cf2..8e86f80 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -41,8 +41,8 @@
 #define CONFIG_SYS_HZ		1000
 
 #define CONFIG_ARM926EJS	1	/* This is an ARM926EJS Core	*/
-#define CONFIG_AT91SAM9261	1	/* It's an Atmel AT91SAM9261 SoC*/
-#define CONFIG_PM9261		1	/* on a Ronetix PM9261 Board	*/
+#define CONFIG_ARCH_AT91SAM9261	1	/* It's an Atmel AT91SAM9261 SoC*/
+#define CONFIG_MACH_PM9261	1	/* on a Ronetix PM9261 Board	*/
 #define CONFIG_ARCH_CPU_INIT
 #undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
 
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 94e1eb9..d82f6d7 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -40,8 +40,8 @@
 #define CONFIG_SYS_HZ		1000
 
 #define CONFIG_ARM926EJS	1	/* This is an ARM926EJS Core	*/
-#define CONFIG_AT91SAM9263	1	/* It's an Atmel AT91SAM9263 SoC*/
-#define CONFIG_PM9263		1	/* on a Ronetix PM9263 Board	*/
+#define CONFIG_ARCH_AT91SAM9263	1	/* It's an Atmel AT91SAM9263 SoC*/
+#define CONFIG_MACH_PM9263		1	/* on a Ronetix PM9263 Board	*/
 #define CONFIG_ARCH_CPU_INIT
 #undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
 
diff --git a/net/eth.c b/net/eth.c
index 8940ebf..d331e7d 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -513,7 +513,7 @@ int eth_initialize(bd_t *bis)
 	miiphy_init();
 #endif
 
-#if defined(CONFIG_AT91RM9200)
+#if defined(CONFIG_ARCH_AT91RM9200)
 	at91rm9200_miiphy_initialize(bis);
 #endif
 #if defined(CONFIG_PPC4xx_EMAC)
-- 
1.6.3.1



More information about the U-Boot mailing list