* [U-Boot] [PATCH v2 1/4] include/asm/arch-at91: update several .h files to ATMEL_xxx name scheme
@ 2011-06-07 8:48 Eric Bénard
2011-06-07 8:48 ` [U-Boot] [PATCH v2 2/4] arm926ejs/at91/lowlevel_init.S: fix defines Eric Bénard
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Eric Bénard @ 2011-06-07 8:48 UTC (permalink / raw)
To: u-boot
Signed-off-by: Eric B?nard <eric@eukrea.com>
---
arch/arm/include/asm/arch-at91/at91_matrix.h | 10 +++---
arch/arm/include/asm/arch-at91/at91_rstc.h | 2 +-
arch/arm/include/asm/arch-at91/at91_wdt.h | 2 +-
arch/arm/include/asm/arch-at91/at91sam9_sdramc.h | 30 +++++++++++-----------
arch/arm/include/asm/arch-at91/at91sam9_smc.h | 12 ++++----
5 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/arch/arm/include/asm/arch-at91/at91_matrix.h b/arch/arm/include/asm/arch-at91/at91_matrix.h
index f99b1d4..a9ba9e9 100644
--- a/arch/arm/include/asm/arch-at91/at91_matrix.h
+++ b/arch/arm/include/asm/arch-at91/at91_matrix.h
@@ -26,18 +26,18 @@
#ifdef __ASSEMBLY__
#if defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9G20)
-#define AT91_ASM_MATRIX_CSA0 (AT91_MATRIX_BASE + 0x11C)
+#define AT91_ASM_MATRIX_CSA0 (ATMEL_BASE_MATRIX + 0x11C)
#elif defined(CONFIG_AT91SAM9261)
-#define AT91_ASM_MATRIX_CSA0 (AT91_MATRIX_BASE + 0x30)
+#define AT91_ASM_MATRIX_CSA0 (ATMEL_BASE_MATRIX + 0x30)
#elif defined(CONFIG_AT91SAM9263)
-#define AT91_ASM_MATRIX_CSA0 (AT91_MATRIX_BASE + 0x120)
+#define AT91_ASM_MATRIX_CSA0 (ATMEL_BASE_MATRIX + 0x120)
#elif defined(CONFIG_AT91SAM9G45)
-#define AT91_ASM_MATRIX_CSA0 (AT91_MATRIX_BASE + 0x128)
+#define AT91_ASM_MATRIX_CSA0 (ATMEL_BASE_MATRIX + 0x128)
#else
#error AT91_ASM_MATRIX_CSA0 is not definied for current CPU
#endif
-#define AT91_ASM_MATRIX_MCFG AT91_MATRIX_BASE
+#define AT91_ASM_MATRIX_MCFG ATMEL_BASE_MATRIX
#else
#if defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9G20)
diff --git a/arch/arm/include/asm/arch-at91/at91_rstc.h b/arch/arm/include/asm/arch-at91/at91_rstc.h
index 510eed5..15ffd18 100644
--- a/arch/arm/include/asm/arch-at91/at91_rstc.h
+++ b/arch/arm/include/asm/arch-at91/at91_rstc.h
@@ -16,7 +16,7 @@
#ifndef AT91_RSTC_H
#define AT91_RSTC_H
-#define AT91_ASM_RSTC_MR (AT91_RSTC_BASE + 0x08)
+#define AT91_ASM_RSTC_MR (ATMEL_BASE_RSTC + 0x08)
#ifndef __ASSEMBLY__
diff --git a/arch/arm/include/asm/arch-at91/at91_wdt.h b/arch/arm/include/asm/arch-at91/at91_wdt.h
index cf08daf..dc22ea1 100644
--- a/arch/arm/include/asm/arch-at91/at91_wdt.h
+++ b/arch/arm/include/asm/arch-at91/at91_wdt.h
@@ -19,7 +19,7 @@
#ifdef __ASSEMBLY__
-#define AT91_ASM_WDT_MR (AT91_WDT_BASE + 0x04)
+#define AT91_ASM_WDT_MR (ATMEL_BASE_WDT + 0x04)
#else
diff --git a/arch/arm/include/asm/arch-at91/at91sam9_sdramc.h b/arch/arm/include/asm/arch-at91/at91sam9_sdramc.h
index c3da3a6..54159a7 100644
--- a/arch/arm/include/asm/arch-at91/at91sam9_sdramc.h
+++ b/arch/arm/include/asm/arch-at91/at91sam9_sdramc.h
@@ -19,19 +19,19 @@
#ifdef __ASSEMBLY__
-#ifndef AT91_SDRAMC_BASE
-#define AT91_SDRAMC_BASE AT91_SDRAMC0_BASE
+#ifndef ATMEL_BASE_SDRAMC
+#define ATMEL_BASE_SDRAMC AT91_SDRAMC0_BASE
#endif
-#define AT91_ASM_SDRAMC_MR AT91_SDRAMC_BASE
-#define AT91_ASM_SDRAMC_TR (AT91_SDRAMC_BASE + 0x04)
-#define AT91_ASM_SDRAMC_CR (AT91_SDRAMC_BASE + 0x08)
-#define AT91_ASM_SDRAMC_MDR (AT91_SDRAMC_BASE + 0x24)
+#define AT91_ASM_SDRAMC_MR ATMEL_BASE_SDRAMC
+#define AT91_ASM_SDRAMC_TR (ATMEL_BASE_SDRAMC + 0x04)
+#define AT91_ASM_SDRAMC_CR (ATMEL_BASE_SDRAMC + 0x08)
+#define AT91_ASM_SDRAMC_MDR (ATMEL_BASE_SDRAMC + 0x24)
#endif
/* SDRAM Controller (SDRAMC) registers */
-#define AT91_SDRAMC_MR (AT91_SDRAMC + 0x00) /* SDRAM Controller Mode Register */
+#define AT91_SDRAMC_MR (ATMEL_BASE_SDRAMC + 0x00) /* SDRAM Controller Mode Register */
#define AT91_SDRAMC_MODE (0xf << 0) /* Command Mode */
#define AT91_SDRAMC_MODE_NORMAL 0
#define AT91_SDRAMC_MODE_NOP 1
@@ -41,10 +41,10 @@
#define AT91_SDRAMC_MODE_EXT_LMR 5
#define AT91_SDRAMC_MODE_DEEP 6
-#define AT91_SDRAMC_TR (AT91_SDRAMC + 0x04) /* SDRAM Controller Refresh Timer Register */
+#define AT91_SDRAMC_TR (ATMEL_BASE_SDRAMC + 0x04) /* SDRAM Controller Refresh Timer Register */
#define AT91_SDRAMC_COUNT (0xfff << 0) /* Refresh Timer Counter */
-#define AT91_SDRAMC_CR (AT91_SDRAMC + 0x08) /* SDRAM Controller Configuration Register */
+#define AT91_SDRAMC_CR (ATMEL_BASE_SDRAMC + 0x08) /* SDRAM Controller Configuration Register */
#define AT91_SDRAMC_NC (3 << 0) /* Number of Column Bits */
#define AT91_SDRAMC_NC_8 (0 << 0)
#define AT91_SDRAMC_NC_9 (1 << 0)
@@ -71,7 +71,7 @@
#define AT91_SDRAMC_TRAS (0xf << 24) /* Active to Precharge Delay */
#define AT91_SDRAMC_TXSR (0xf << 28) /* Exit Self Refresh to Active Delay */
-#define AT91_SDRAMC_LPR (AT91_SDRAMC + 0x10) /* SDRAM Controller Low Power Register */
+#define AT91_SDRAMC_LPR (ATMEL_BASE_SDRAMC + 0x10) /* SDRAM Controller Low Power Register */
#define AT91_SDRAMC_LPCB (3 << 0) /* Low-power Configurations */
#define AT91_SDRAMC_LPCB_DISABLE 0
#define AT91_SDRAMC_LPCB_SELF_REFRESH 1
@@ -85,13 +85,13 @@
#define AT91_SDRAMC_TIMEOUT_64_CLK_CYCLES (1 << 12)
#define AT91_SDRAMC_TIMEOUT_128_CLK_CYCLES (2 << 12)
-#define AT91_SDRAMC_IER (AT91_SDRAMC + 0x14) /* SDRAM Controller Interrupt Enable Register */
-#define AT91_SDRAMC_IDR (AT91_SDRAMC + 0x18) /* SDRAM Controller Interrupt Disable Register */
-#define AT91_SDRAMC_IMR (AT91_SDRAMC + 0x1C) /* SDRAM Controller Interrupt Mask Register */
-#define AT91_SDRAMC_ISR (AT91_SDRAMC + 0x20) /* SDRAM Controller Interrupt Status Register */
+#define AT91_SDRAMC_IER (ATMEL_BASE_SDRAMC + 0x14) /* SDRAM Controller Interrupt Enable Register */
+#define AT91_SDRAMC_IDR (ATMEL_BASE_SDRAMC + 0x18) /* SDRAM Controller Interrupt Disable Register */
+#define AT91_SDRAMC_IMR (ATMEL_BASE_SDRAMC + 0x1C) /* SDRAM Controller Interrupt Mask Register */
+#define AT91_SDRAMC_ISR (ATMEL_BASE_SDRAMC + 0x20) /* SDRAM Controller Interrupt Status Register */
#define AT91_SDRAMC_RES (1 << 0) /* Refresh Error Status */
-#define AT91_SDRAMC_MDR (AT91_SDRAMC + 0x24) /* SDRAM Memory Device Register */
+#define AT91_SDRAMC_MDR (ATMEL_BASE_SDRAMC + 0x24) /* SDRAM Memory Device Register */
#define AT91_SDRAMC_MD (3 << 0) /* Memory Device Type */
#define AT91_SDRAMC_MD_SDRAM 0
#define AT91_SDRAMC_MD_LOW_POWER_SDRAM 1
diff --git a/arch/arm/include/asm/arch-at91/at91sam9_smc.h b/arch/arm/include/asm/arch-at91/at91sam9_smc.h
index d180c8a..2ea2791 100644
--- a/arch/arm/include/asm/arch-at91/at91sam9_smc.h
+++ b/arch/arm/include/asm/arch-at91/at91sam9_smc.h
@@ -18,14 +18,14 @@
#ifdef __ASSEMBLY__
-#ifndef AT91_SMC_BASE
-#define AT91_SMC_BASE AT91_SMC0_BASE
+#ifndef ATMEL_BASE_SMC
+#define ATMEL_BASE_SMC ATMEL_BASE_SMC0
#endif
-#define AT91_ASM_SMC_SETUP0 AT91_SMC_BASE
-#define AT91_ASM_SMC_PULSE0 (AT91_SMC_BASE + 0x04)
-#define AT91_ASM_SMC_CYCLE0 (AT91_SMC_BASE + 0x08)
-#define AT91_ASM_SMC_MODE0 (AT91_SMC_BASE + 0x0C)
+#define AT91_ASM_SMC_SETUP0 ATMEL_BASE_SMC
+#define AT91_ASM_SMC_PULSE0 (ATMEL_BASE_SMC + 0x04)
+#define AT91_ASM_SMC_CYCLE0 (ATMEL_BASE_SMC + 0x08)
+#define AT91_ASM_SMC_MODE0 (ATMEL_BASE_SMC + 0x0C)
#else
--
1.7.4.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [U-Boot] [PATCH v2 2/4] arm926ejs/at91/lowlevel_init.S: fix defines 2011-06-07 8:48 [U-Boot] [PATCH v2 1/4] include/asm/arch-at91: update several .h files to ATMEL_xxx name scheme Eric Bénard @ 2011-06-07 8:48 ` Eric Bénard 2011-06-07 8:48 ` [U-Boot] [PATCH v2 3/4] cpu9260/9G20: fix board support Eric Bénard ` (2 subsequent siblings) 3 siblings, 0 replies; 10+ messages in thread From: Eric Bénard @ 2011-06-07 8:48 UTC (permalink / raw) To: u-boot atmel rework changed define names which broke this file Signed-off-by: Eric B?nard <eric@eukrea.com> --- arch/arm/cpu/arm926ejs/at91/lowlevel_init.S | 24 ++++++++++++------------ arch/arm/include/asm/arch-at91/at91_pio.h | 14 +++++++------- arch/arm/include/asm/arch-at91/at91sam9260.h | 1 + arch/arm/include/asm/arch-at91/at91sam9261.h | 1 + arch/arm/include/asm/arch-at91/at91sam9263.h | 1 + 5 files changed, 22 insertions(+), 19 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S index 7f7ca5e..17ff0dd 100644 --- a/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S +++ b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S @@ -230,37 +230,37 @@ SMRDATA1: .word CONFIG_SYS_SDRC_MDR_VAL .word AT91_ASM_SDRAMC_MR .word CONFIG_SYS_SDRC_MR_VAL2 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL1 .word AT91_ASM_SDRAMC_MR .word CONFIG_SYS_SDRC_MR_VAL3 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL2 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL3 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL4 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL5 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL6 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL7 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL8 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL9 .word AT91_ASM_SDRAMC_MR .word CONFIG_SYS_SDRC_MR_VAL4 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL10 .word AT91_ASM_SDRAMC_MR .word CONFIG_SYS_SDRC_MR_VAL5 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL11 .word AT91_ASM_SDRAMC_TR .word CONFIG_SYS_SDRC_TR_VAL2 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL12 /* User reset enable*/ .word AT91_ASM_RSTC_MR diff --git a/arch/arm/include/asm/arch-at91/at91_pio.h b/arch/arm/include/asm/arch-at91/at91_pio.h index 0b5bd69..416cabf 100644 --- a/arch/arm/include/asm/arch-at91/at91_pio.h +++ b/arch/arm/include/asm/arch-at91/at91_pio.h @@ -20,20 +20,20 @@ #define AT91_ASM_PIO_RANGE 0x200 #define AT91_ASM_PIOC_ASR \ - (AT91_PIO_BASE + AT91_PIO_PORTC * AT91_ASM_PIO_RANGE + 0x70) + (ATMEL_BASE_PIO + AT91_PIO_PORTC * AT91_ASM_PIO_RANGE + 0x70) #define AT91_ASM_PIOC_BSR \ - (AT91_PIO_BASE + AT91_PIO_PORTC * AT91_ASM_PIO_RANGE + 0x74) + (ATMEL_BASE_PIO + AT91_PIO_PORTC * AT91_ASM_PIO_RANGE + 0x74) #define AT91_ASM_PIOC_PDR \ - (AT91_PIO_BASE + AT91_PIO_PORTC * AT91_ASM_PIO_RANGE + 0x04) + (ATMEL_BASE_PIO + AT91_PIO_PORTC * AT91_ASM_PIO_RANGE + 0x04) #define AT91_ASM_PIOC_PUDR \ - (AT91_PIO_BASE + AT91_PIO_PORTC * AT91_ASM_PIO_RANGE + 0x60) + (ATMEL_BASE_PIO + AT91_PIO_PORTC * AT91_ASM_PIO_RANGE + 0x60) #define AT91_ASM_PIOD_PDR \ - (AT91_PIO_BASE + AT91_PIO_PORTD * AT91_ASM_PIO_RANGE + 0x04) + (ATMEL_BASE_PIO + AT91_PIO_PORTD * AT91_ASM_PIO_RANGE + 0x04) #define AT91_ASM_PIOD_PUDR \ - (AT91_PIO_BASE + AT91_PIO_PORTD * AT91_ASM_PIO_RANGE + 0x60) + (ATMEL_BASE_PIO + AT91_PIO_PORTD * AT91_ASM_PIO_RANGE + 0x60) #define AT91_ASM_PIOD_ASR \ - (AT91_PIO_BASE + AT91_PIO_PORTD * AT91_ASM_PIO_RANGE + 0x70) + (ATMEL_BASE_PIO + AT91_PIO_PORTD * AT91_ASM_PIO_RANGE + 0x70) #ifndef __ASSEMBLY__ diff --git a/arch/arm/include/asm/arch-at91/at91sam9260.h b/arch/arm/include/asm/arch-at91/at91sam9260.h index dd68485..08cb42d 100644 --- a/arch/arm/include/asm/arch-at91/at91sam9260.h +++ b/arch/arm/include/asm/arch-at91/at91sam9260.h @@ -141,6 +141,7 @@ */ #define ATMEL_PIO_PORTS 3 /* these SoCs have 3 PIO */ #define ATMEL_PMC_UHP AT91SAM926x_PMC_UHP +#define ATMEL_BASE_PIO ATMEL_BASE_PIOA /* * SoC specific defines diff --git a/arch/arm/include/asm/arch-at91/at91sam9261.h b/arch/arm/include/asm/arch-at91/at91sam9261.h index f8048d5..c85fd29 100644 --- a/arch/arm/include/asm/arch-at91/at91sam9261.h +++ b/arch/arm/include/asm/arch-at91/at91sam9261.h @@ -125,6 +125,7 @@ * Other misc defines */ #define ATMEL_PIO_PORTS 3 /* theese SoCs have 3 PIO */ +#define ATMEL_BASE_PIO ATMEL_BASE_PIOA /* * SoC specific defines diff --git a/arch/arm/include/asm/arch-at91/at91sam9263.h b/arch/arm/include/asm/arch-at91/at91sam9263.h index bfd408b..2a1d6ee 100644 --- a/arch/arm/include/asm/arch-at91/at91sam9263.h +++ b/arch/arm/include/asm/arch-at91/at91sam9263.h @@ -128,6 +128,7 @@ * Other misc defines */ #define ATMEL_PIO_PORTS 5 /* this SoCs has 5 PIO */ +#define ATMEL_BASE_PIO ATMEL_BASE_PIOA /* * Cpu Name -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2 3/4] cpu9260/9G20: fix board support 2011-06-07 8:48 [U-Boot] [PATCH v2 1/4] include/asm/arch-at91: update several .h files to ATMEL_xxx name scheme Eric Bénard 2011-06-07 8:48 ` [U-Boot] [PATCH v2 2/4] arm926ejs/at91/lowlevel_init.S: fix defines Eric Bénard @ 2011-06-07 8:48 ` Eric Bénard 2011-06-09 8:29 ` Reinhard Meyer 2011-06-07 8:48 ` [U-Boot] [PATCH v2 4/4] cpuat91: " Eric Bénard 2011-06-09 8:17 ` [U-Boot] [PATCH v2 1/4] include/asm/arch-at91: update several .h files to ATMEL_xxx name scheme Reinhard Meyer 3 siblings, 1 reply; 10+ messages in thread From: Eric Bénard @ 2011-06-07 8:48 UTC (permalink / raw) To: u-boot Signed-off-by: Eric B?nard <eric@eukrea.com> --- MAKEALL | 2 -- Makefile | 8 -------- board/eukrea/cpu9260/cpu9260.c | 33 ++++++++++++++++----------------- board/eukrea/cpu9260/led.c | 6 +++--- include/configs/cpu9260.h | 11 +++++------ 5 files changed, 24 insertions(+), 36 deletions(-) diff --git a/MAKEALL b/MAKEALL index d592374..13dde6f 100755 --- a/MAKEALL +++ b/MAKEALL @@ -455,8 +455,6 @@ LIST_at91="$(boards_by_soc at91)\ at91sam9m10g45ek \ at91sam9rlek \ CPUAT91 \ - CPU9260 \ - CPU9G20 \ pm9g45 \ SBC35_A9G20 \ TNY_A9260 \ diff --git a/Makefile b/Makefile index dcf5d93..eb3bda7 100644 --- a/Makefile +++ b/Makefile @@ -857,14 +857,6 @@ at91sam9rlek_config : unconfig fi; @$(MKCONFIG) -n $@ -a at91sam9rlek arm arm926ejs at91sam9rlek atmel at91 -CPU9G20_128M_config \ -CPU9G20_config \ -CPU9260_128M_config \ -CPU9260_config : unconfig - @mkdir -p $(obj)include - @echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h - @$(MKCONFIG) -n $@ -a cpu9260 arm arm926ejs cpu9260 eukrea at91 - at91sam9m10g45ek_nandflash_config \ at91sam9m10g45ek_dataflash_config \ at91sam9m10g45ek_dataflash_cs0_config \ diff --git a/board/eukrea/cpu9260/cpu9260.c b/board/eukrea/cpu9260/cpu9260.c index 9ec48a0..0959c5c 100644 --- a/board/eukrea/cpu9260/cpu9260.c +++ b/board/eukrea/cpu9260/cpu9260.c @@ -4,7 +4,7 @@ * Lead Tech Design <www.leadtechdesign.com> * Ilko Iliev <www.ronetix.at> * - * (C) Copyright 2009 + * (C) Copyright 2009-2011 * Eric Benard <eric@eukrea.com> * * See file CREDITS for list of people who contributed to this @@ -27,16 +27,15 @@ */ #include <common.h> -#include <asm/sizes.h> +#include <asm/io.h> #include <asm/arch/at91sam9260.h> #include <asm/arch/at91sam9_smc.h> #include <asm/arch/at91_common.h> +#include <asm/arch/at91_matrix.h> #include <asm/arch/at91_pmc.h> #include <asm/arch/at91_rstc.h> -#include <asm/arch/at91_matrix.h> #include <asm/arch/at91_pio.h> #include <asm/arch/clk.h> -#include <asm/arch/io.h> #include <asm/arch/hardware.h> #if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB) #include <net.h> @@ -54,9 +53,9 @@ DECLARE_GLOBAL_DATA_PTR; static void cpu9260_nand_hw_init(void) { unsigned long csa; - at91_smc_t *smc = (at91_smc_t *) AT91_SMC_BASE; - at91_matrix_t *matrix = (at91_matrix_t *) AT91_MATRIX_BASE; - at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; + at91_smc_t *smc = (at91_smc_t *) ATMEL_BASE_SMC; + at91_matrix_t *matrix = (at91_matrix_t *) ATMEL_BASE_MATRIX; + at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC; /* Enable CS3 */ csa = readl(&matrix->csa) | AT91_MATRIX_CSA_EBI_CS3A; @@ -93,7 +92,7 @@ static void cpu9260_nand_hw_init(void) &smc->cs[3].mode); #endif - writel(1 << AT91SAM9260_ID_PIOC, &pmc->pcer); + writel(1 << ATMEL_ID_PIOC, &pmc->pcer); /* Configure RDY/BSY */ at91_set_pio_input(CONFIG_SYS_NAND_READY_PIN, 1); @@ -107,11 +106,11 @@ static void cpu9260_nand_hw_init(void) static void cpu9260_macb_hw_init(void) { unsigned long rstcmr; - at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; - at91_rstc_t *rstc = (at91_rstc_t *) AT91_RSTC_BASE; + at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC; + at91_rstc_t *rstc = (at91_rstc_t *) ATMEL_BASE_RSTC; /* Enable clock */ - writel(1 << AT91SAM9260_ID_EMAC, &pmc->pcer); + writel(1 << ATMEL_ID_EMAC0, &pmc->pcer); at91_set_pio_pullup(AT91_PIO_PORTA, 17, 1); @@ -136,14 +135,14 @@ static void cpu9260_macb_hw_init(void) int board_early_init_f(void) { - at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; + at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC; - writel((1 << AT91SAM9260_ID_PIOA) | - (1 << AT91SAM9260_ID_PIOC) | - (1 << AT91SAM9260_ID_PIOB), + writel((1 << ATMEL_ID_PIOA) | + (1 << ATMEL_ID_PIOB) | + (1 << ATMEL_ID_PIOC), &pmc->pcer); - at91_serial_hw_init(); + at91_seriald_hw_init(); return 0; } @@ -184,7 +183,7 @@ int board_eth_init(bd_t *bis) { int rc = 0; #ifdef CONFIG_MACB - rc = macb_eth_initialize(0, (void *)AT91_EMAC_BASE, 0); + rc = macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC0, 0); #endif return rc; } diff --git a/board/eukrea/cpu9260/led.c b/board/eukrea/cpu9260/led.c index d0906bc..8d865eb 100644 --- a/board/eukrea/cpu9260/led.c +++ b/board/eukrea/cpu9260/led.c @@ -28,17 +28,17 @@ #include <asm/arch/at91sam9260.h> #include <asm/arch/at91_pmc.h> #include <asm/arch/gpio.h> -#include <asm/arch/io.h> +#include <asm/io.h> static unsigned int saved_state[4] = {STATUS_LED_OFF, STATUS_LED_OFF, STATUS_LED_OFF, STATUS_LED_OFF}; void coloured_LED_init(void) { - at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; + at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC; /* Enable clock */ - writel(1 << AT91SAM9260_ID_PIOC, &pmc->pcer); + writel(1 << ATMEL_ID_PIOC, &pmc->pcer); at91_set_pio_output(CONFIG_RED_LED, 1); at91_set_pio_output(CONFIG_GREEN_LED, 1); diff --git a/include/configs/cpu9260.h b/include/configs/cpu9260.h index a8ada2d..ba9f797 100644 --- a/include/configs/cpu9260.h +++ b/include/configs/cpu9260.h @@ -37,8 +37,7 @@ #define CONFIG_SYS_AT91_MAIN_CLOCK 18432000 #define CONFIG_SYS_HZ 1000 - -#define CONFIG_ARM926EJS +#define CONFIG_SYS_AT91_SLOW_CLOCK 32768 #if defined(CONFIG_CPU9G20) #define CONFIG_AT91SAM9G20 @@ -48,6 +47,8 @@ #error "Unknown board" #endif +#include <asm/arch/hardware.h> + #define CONFIG_AT91FAMILY #define CONFIG_ARCH_CPU_INIT #undef CONFIG_USE_IRQ @@ -251,10 +252,8 @@ #define CONFIG_AT91SAM9_WATCHDOG #define CONFIG_AT91_GPIO #define CONFIG_ATMEL_USART -#undef CONFIG_USART0 -#undef CONFIG_USART1 -#undef CONFIG_USART2 -#define CONFIG_USART3 +#define CONFIG_USART_BASE ATMEL_BASE_DBGU +#define CONFIG_USART_ID ATMEL_ID_SYS #define CONFIG_BOOTDELAY 3 -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2 3/4] cpu9260/9G20: fix board support 2011-06-07 8:48 ` [U-Boot] [PATCH v2 3/4] cpu9260/9G20: fix board support Eric Bénard @ 2011-06-09 8:29 ` Reinhard Meyer 0 siblings, 0 replies; 10+ messages in thread From: Reinhard Meyer @ 2011-06-09 8:29 UTC (permalink / raw) To: u-boot Am 07.06.2011 10:48, schrieb Eric B?nard: > Signed-off-by: Eric B?nard <eric@eukrea.com> > --- > MAKEALL | 2 -- > Makefile | 8 -------- > board/eukrea/cpu9260/cpu9260.c | 33 ++++++++++++++++----------------- > board/eukrea/cpu9260/led.c | 6 +++--- > include/configs/cpu9260.h | 11 +++++------ > 5 files changed, 24 insertions(+), 36 deletions(-) Applied to u-boot-atmel/master. Thanks, Reinhard ^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2 4/4] cpuat91: fix board support 2011-06-07 8:48 [U-Boot] [PATCH v2 1/4] include/asm/arch-at91: update several .h files to ATMEL_xxx name scheme Eric Bénard 2011-06-07 8:48 ` [U-Boot] [PATCH v2 2/4] arm926ejs/at91/lowlevel_init.S: fix defines Eric Bénard 2011-06-07 8:48 ` [U-Boot] [PATCH v2 3/4] cpu9260/9G20: fix board support Eric Bénard @ 2011-06-07 8:48 ` Eric Bénard 2011-06-09 8:29 ` Reinhard Meyer 2011-06-09 8:17 ` [U-Boot] [PATCH v2 1/4] include/asm/arch-at91: update several .h files to ATMEL_xxx name scheme Reinhard Meyer 3 siblings, 1 reply; 10+ messages in thread From: Eric Bénard @ 2011-06-07 8:48 UTC (permalink / raw) To: u-boot Signed-off-by: Eric B?nard <eric@eukrea.com> --- MAKEALL | 1 - board/eukrea/cpuat91/cpuat91.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/MAKEALL b/MAKEALL index 13dde6f..50c0080 100755 --- a/MAKEALL +++ b/MAKEALL @@ -454,7 +454,6 @@ LIST_at91="$(boards_by_soc at91)\ at91sam9g20ek \ at91sam9m10g45ek \ at91sam9rlek \ - CPUAT91 \ pm9g45 \ SBC35_A9G20 \ TNY_A9260 \ diff --git a/board/eukrea/cpuat91/cpuat91.c b/board/eukrea/cpuat91/cpuat91.c index 4c4dad6..fa4b25b 100644 --- a/board/eukrea/cpuat91/cpuat91.c +++ b/board/eukrea/cpuat91/cpuat91.c @@ -63,7 +63,7 @@ int dram_init(void) #ifdef CONFIG_DRIVER_AT91EMAC int board_eth_init(bd_t *bis) { - return at91emac_register(bis, (u32) AT91_EMAC_BASE); + return at91emac_register(bis, (u32) ATMEL_BASE_EMAC); } #endif @@ -71,8 +71,8 @@ int board_eth_init(bd_t *bis) void i2c_init_board(void) { u32 pin; - at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; - at91_pio_t *pio = (at91_pio_t *) AT91_PIO_BASE; + at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC; + at91_pio_t *pio = (at91_pio_t *) ATMEL_BASE_PIO; writel(1 << AT91_ID_PIOA, &pmc->pcer); pin = AT91_PMX_AA_TWD | AT91_PMX_AA_TWCK; -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2 4/4] cpuat91: fix board support 2011-06-07 8:48 ` [U-Boot] [PATCH v2 4/4] cpuat91: " Eric Bénard @ 2011-06-09 8:29 ` Reinhard Meyer 0 siblings, 0 replies; 10+ messages in thread From: Reinhard Meyer @ 2011-06-09 8:29 UTC (permalink / raw) To: u-boot Am 07.06.2011 10:48, schrieb Eric B?nard: > Signed-off-by: Eric B?nard <eric@eukrea.com> > --- > MAKEALL | 1 - > board/eukrea/cpuat91/cpuat91.c | 6 +++--- > 2 files changed, 3 insertions(+), 4 deletions(-) Applied to u-boot-atmel/master. Thanks, Reinhard ^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2 1/4] include/asm/arch-at91: update several .h files to ATMEL_xxx name scheme 2011-06-07 8:48 [U-Boot] [PATCH v2 1/4] include/asm/arch-at91: update several .h files to ATMEL_xxx name scheme Eric Bénard ` (2 preceding siblings ...) 2011-06-07 8:48 ` [U-Boot] [PATCH v2 4/4] cpuat91: " Eric Bénard @ 2011-06-09 8:17 ` Reinhard Meyer 2011-06-09 8:25 ` Eric Bénard 3 siblings, 1 reply; 10+ messages in thread From: Reinhard Meyer @ 2011-06-09 8:17 UTC (permalink / raw) To: u-boot Dear Eric B?nard, > Signed-off-by: Eric B?nard <eric@eukrea.com> > --- > arch/arm/include/asm/arch-at91/at91_matrix.h | 10 +++--- > arch/arm/include/asm/arch-at91/at91_rstc.h | 2 +- > arch/arm/include/asm/arch-at91/at91_wdt.h | 2 +- > arch/arm/include/asm/arch-at91/at91sam9_sdramc.h | 30 +++++++++++----------- > arch/arm/include/asm/arch-at91/at91sam9_smc.h | 12 ++++---- > 5 files changed, 28 insertions(+), 28 deletions(-) > > diff --git a/arch/arm/include/asm/arch-at91/at91_matrix.h b/arch/arm/include/asm/arch-at91/at91_matrix.h > index f99b1d4..a9ba9e9 100644 > --- a/arch/arm/include/asm/arch-at91/at91_matrix.h > +++ b/arch/arm/include/asm/arch-at91/at91_matrix.h Several lines are longer than 80 chars. Can you fix this asap? I think the comments could be left away completely or at least shortened by removing the obvios "SDAM Controller" part. Before someone complains about this out of context: those defines are used by ASM and therefore no struct SoC access is possible in that case. Thank you, Reinhard > +#define AT91_SDRAMC_MR (ATMEL_BASE_SDRAMC + 0x00) /* SDRAM Controller Mode Register */ > +#define AT91_SDRAMC_TR (ATMEL_BASE_SDRAMC + 0x04) /* SDRAM Controller Refresh Timer Register */ > +#define AT91_SDRAMC_CR (ATMEL_BASE_SDRAMC + 0x08) /* SDRAM Controller Configuration Register */ > +#define AT91_SDRAMC_LPR (ATMEL_BASE_SDRAMC + 0x10) /* SDRAM Controller Low Power Register */ > +#define AT91_SDRAMC_IER (ATMEL_BASE_SDRAMC + 0x14) /* SDRAM Controller Interrupt Enable Register */ > +#define AT91_SDRAMC_IDR (ATMEL_BASE_SDRAMC + 0x18) /* SDRAM Controller Interrupt Disable Register */ > +#define AT91_SDRAMC_IMR (ATMEL_BASE_SDRAMC + 0x1C) /* SDRAM Controller Interrupt Mask Register */ > +#define AT91_SDRAMC_ISR (ATMEL_BASE_SDRAMC + 0x20) /* SDRAM Controller Interrupt Status Register */ > +#define AT91_SDRAMC_MDR (ATMEL_BASE_SDRAMC + 0x24) /* SDRAM Memory Device Register */ ^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2 1/4] include/asm/arch-at91: update several .h files to ATMEL_xxx name scheme 2011-06-09 8:17 ` [U-Boot] [PATCH v2 1/4] include/asm/arch-at91: update several .h files to ATMEL_xxx name scheme Reinhard Meyer @ 2011-06-09 8:25 ` Eric Bénard 2011-06-09 8:58 ` Reinhard Meyer 0 siblings, 1 reply; 10+ messages in thread From: Eric Bénard @ 2011-06-09 8:25 UTC (permalink / raw) To: u-boot Hi Reinhard, On 09/06/2011 10:17, Reinhard Meyer wrote: > Several lines are longer than 80 chars. Can you fix this asap? > > I think the comments could be left away completely or at least shortened by > removing the obvios "SDAM Controller" part. > These lines are already over 80 char before this patch which only fix the define names : please apply this patch as is. In today's u-boot, linux's checkpatch.pl finds 483 "over 80" in arch/arm/include/asm/arch-at91/ so I don't think this patch creates more trouble here. Eric ^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2 1/4] include/asm/arch-at91: update several .h files to ATMEL_xxx name scheme 2011-06-09 8:25 ` Eric Bénard @ 2011-06-09 8:58 ` Reinhard Meyer 2011-06-09 11:13 ` Wolfgang Denk 0 siblings, 1 reply; 10+ messages in thread From: Reinhard Meyer @ 2011-06-09 8:58 UTC (permalink / raw) To: u-boot Am 09.06.2011 10:25, schrieb Eric B?nard: > Hi Reinhard, > > On 09/06/2011 10:17, Reinhard Meyer wrote: >> Several lines are longer than 80 chars. Can you fix this asap? >> >> I think the comments could be left away completely or at least shortened by >> removing the obvios "SDAM Controller" part. >> > These lines are already over 80 char before this patch which only fix the define names : please apply this patch as is. I am not sure about current policy about this... > In today's u-boot, linux's checkpatch.pl finds 483 "over 80" in arch/arm/include/asm/arch-at91/ so I don't think this patch creates more trouble here. > Applied to u-boot-atmel/master. Thanks, Reinhard ^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2 1/4] include/asm/arch-at91: update several .h files to ATMEL_xxx name scheme 2011-06-09 8:58 ` Reinhard Meyer @ 2011-06-09 11:13 ` Wolfgang Denk 0 siblings, 0 replies; 10+ messages in thread From: Wolfgang Denk @ 2011-06-09 11:13 UTC (permalink / raw) To: u-boot Dear Reinhard Meyer, In message <4DF08B3D.5040500@emk-elektronik.de> you wrote: > > > These lines are already over 80 char before this patch which only > > fix the define names : please apply this patch as is. > > I am not sure about current policy about this... Policy is that in such situations an initial patch (Marked as "cosmetic:") should clean up the relevant files, so that the rest of the patches can go in without such problems. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Just because your doctor has a name for your condition doesn't mean he knows what it is. ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2011-06-09 11:13 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-06-07 8:48 [U-Boot] [PATCH v2 1/4] include/asm/arch-at91: update several .h files to ATMEL_xxx name scheme Eric Bénard 2011-06-07 8:48 ` [U-Boot] [PATCH v2 2/4] arm926ejs/at91/lowlevel_init.S: fix defines Eric Bénard 2011-06-07 8:48 ` [U-Boot] [PATCH v2 3/4] cpu9260/9G20: fix board support Eric Bénard 2011-06-09 8:29 ` Reinhard Meyer 2011-06-07 8:48 ` [U-Boot] [PATCH v2 4/4] cpuat91: " Eric Bénard 2011-06-09 8:29 ` Reinhard Meyer 2011-06-09 8:17 ` [U-Boot] [PATCH v2 1/4] include/asm/arch-at91: update several .h files to ATMEL_xxx name scheme Reinhard Meyer 2011-06-09 8:25 ` Eric Bénard 2011-06-09 8:58 ` Reinhard Meyer 2011-06-09 11:13 ` Wolfgang Denk
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox