Fix new found CFG_

PATCH New Jean-Christophe PLAGNIOL-VILLARD 2 participants 3 messages Dec 14, 2008

Subsystems (2)

Arm/Microchip (AT91) SoC support Arm/Zynq architecture

lore

Share & tools

lore

Jean-Christophe PLAGNIOL-VILLARD

author

2008-12-14 09:29 UTC #0 lore raw

PATCH 1/1 Fix new found CFG_

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
 board/esd/pmc440/cmd_pmc440.c              |    2 +-
 board/xilinx/ppc405-generic/u-boot-ram.lds |    2 +-
 board/xilinx/ppc405-generic/u-boot-rom.lds |    2 +-
 cpu/arm926ejs/at91/usb.c                   |    2 +-
 cpu/mpc86xx/release.S                      |    2 +-
 include/configs/PMC440.h                   |    8 ++++----
 include/configs/afeb9260.h                 |    4 ++--
 include/configs/at91cap9adk.h              |    2 +-
 include/configs/at91sam9260ek.h            |    2 +-
 include/configs/at91sam9263ek.h            |    2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

board/esd/pmc440/cmd_pmc440.c +1 -1

index 3f0dca0..16c9c7e 100644
@@ -364,7 +364,7 @@ int do_painit(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	base -= LOGBUFF_LEN + LOGBUFF_OVERHEAD;
 #endif
 	/*
-	 * gd->bd->bi_memsize == physical ram size - CFG_MEM_TOP_HIDE
+	 * gd->bd->bi_memsize == physical ram size - CONFIG_SYS_MEM_TOP_HIDE
 	 */
 	param = base - (pram << 10);
 	printf("PARAM: @%08x\n", param);

board/xilinx/ppc405-generic/u-boot-ram.lds +1 -1

index 0004d61..b7d7b92 100644
@@ -127,7 +127,7 @@ SECTIONS
    *(COMMON)
   }
 
-  ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your confguration: CFG_MONITOR_BASE, CFG_MONITOR_LEN and TEXT_BASE may need to be modified.");
+  ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your confguration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and TEXT_BASE may need to be modified.");
 
   _end = . ;
   PROVIDE (end = .);

board/xilinx/ppc405-generic/u-boot-rom.lds +1 -1

index d2bac9f..150a827 100644
@@ -137,7 +137,7 @@ SECTIONS
    *(COMMON)
   }
 
-  ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your confguration: CFG_MONITOR_BASE, CFG_MONITOR_LEN and TEXT_BASE may need to be modified.");
+  ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your confguration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and TEXT_BASE may need to be modified.");
 
   _end = . ;
   PROVIDE (end = .);

cpu/arm926ejs/at91/usb.c +1 -1

index 2f5c337..a15ab16 100644
@@ -35,7 +35,7 @@ int usb_cpu_init(void)
 #if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
     defined(CONFIG_AT91SAM9263)
 	/* Enable PLLB */
-	at91_sys_write(AT91_CKGR_PLLBR, CFG_AT91_PLLB);
+	at91_sys_write(AT91_CKGR_PLLBR, CONFIG_SYS_AT91_PLLB);
 	while ((at91_sys_read(AT91_PMC_SR) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB)
 		;
 #endif

cpu/mpc86xx/release.S +1 -1

index b524e50..95efbb4 100644
@@ -125,7 +125,7 @@ invl2:
 	mtspr	HID0, r5		/* enable + invalidate */
 	mtspr	HID0, r3		/* enable */
 	sync
-#ifdef CFG_L2
+#ifdef CONFIG_SYS_L2
 	sync
 	lis	r3, L2_ENABLE at h
 	ori	r3, r3, L2_ENABLE@l

include/configs/PMC440.h +4 -4

index 7219bb8..ddb0bec 100644
@@ -219,8 +219,8 @@
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
 #define CONFIG_DDR_DATA_EYE	/* use DDR2 optimization        */
 #endif
-#define CFG_MEM_TOP_HIDE	(4 << 10) /* don't use last 4kbytes	*/
-					/* 440EPx errata CHIP 11	*/
+#define CONFIG_SYSY_MEM_TOP_HIDE	(4 << 10) /* don't use last 4kbytes */
+						  /* 440EPx errata CHIP 11 */
 
 /*-----------------------------------------------------------------------
  * I2C

@@ -490,8 +490,8 @@
 #endif
 
 /* Memory Bank 1 (RESET) initialization */
-#define CFG_EBC_PB1AP		0x7f817200 //0x03017200
-#define CFG_EBC_PB1CR		(CFG_RESET_BASE | 0x1c000)
+#define CONFIG_SYS_EBC_PB1AP		0x7f817200 //0x03017200
+#define CONFIG_SYS_EBC_PB1CR		(CONFIG_SYS_RESET_BASE | 0x1c000)
 
 /* Memory Bank 4 (FPGA / 32Bit) initialization */
 #define CONFIG_SYS_EBC_PB4AP		0x03840f40	/* BME=0,TWT=7,CSN=1,TH=7,RE=1,SOR=0,BEM=1 */

include/configs/afeb9260.h +2 -2

index f077ad9..90e553d 100644
@@ -29,7 +29,7 @@
 /* ARM asynchronous clock */
 #define AT91_MAIN_CLOCK		18429952	/* from 18.432 MHz crystal */
 #define AT91_MASTER_CLOCK	89999598	/* peripheral = main / 2 */
-#define CFG_AT91_PLLB		0x107c3e18	/* PLLB settings for USB */
+#define CONFIG_SYS_AT91_PLLB	0x107c3e18	/* PLLB settings for USB */
 #define CONFIG_SYS_HZ		1000000		/* 1us resolution */
 
 #define AT91_SLOW_CLOCK		32768	/* slow clock */

@@ -150,7 +150,7 @@
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CFG_LONGHELP		1
+#define CONFIG_SYS_LONGHELP		1
 #define CONFIG_CMDLINE_EDITING	1
 
 #define ROUND(A, B)		(((A) + (B)) & ~((B) - 1))

include/configs/at91cap9adk.h +1 -1

index aeb06ac..363df67 100644
@@ -32,7 +32,7 @@
 #define AT91_MAIN_CLOCK		12000000	/* 12 MHz crystal */
 #define AT91_MASTER_CLOCK	100000000	/* peripheral */
 #define AT91_CPU_CLOCK		200000000	/* cpu */
-#define CFG_AT91_PLLB		0x10073e01	/* PLLB settings for USB */
+#define CONFUG_SYS_AT91_PLLB	0x10073e01	/* PLLB settings for USB */
 #define CONFIG_SYS_HZ		1000000		/* 1us resolution */
 
 #define AT91_SLOW_CLOCK		32768	/* slow clock */

include/configs/at91sam9260ek.h +1 -1

index 2df8d54..1538929 100644
@@ -32,7 +32,7 @@
 #define AT91_MAIN_CLOCK		18432000	/* 18.432 MHz crystal */
 #define AT91_MASTER_CLOCK	100000000	/* peripheral */
 #define AT91_CPU_CLOCK		200000000	/* cpu */
-#define CFG_AT91_PLLB		0x107c3e18	/* PLLB settings for USB */
+#define CONFIG_SYS_AT91_PLLB	0x107c3e18	/* PLLB settings for USB */
 #define CONFIG_SYS_HZ		1000000		/* 1us resolution */
 
 #define AT91_SLOW_CLOCK		32768	/* slow clock */

include/configs/at91sam9263ek.h +1 -1

index fc7c941..d9ebc87 100644
@@ -32,7 +32,7 @@
 #define AT91_MAIN_CLOCK		16367660	/* 16.367 MHz crystal */
 #define AT91_MASTER_CLOCK	100000000	/* peripheral */
 #define AT91_CPU_CLOCK		200000000	/* cpu */
-#define CFG_AT91_PLLB		0x133a3e8d	/* PLLB settings for USB */
+#define CONFIG_SYS_AT91_PLLB	0x133a3e8d	/* PLLB settings for USB */
 #define CONFIG_SYS_HZ		1000000		/* 1us resolution */
 
 #define AT91_SLOW_CLOCK		32768	/* slow clock */

Signature · 1 line

1.5.6.5

Wolfgang Denk

2008-12-14 09:58 UTC #1 lore raw

PATCH 1/1 Fix new found CFG_

Dear Jean-Christophe PLAGNIOL-VILLARD,

Quoted 13 lines · In message <[email protected]> you wrote:

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
 board/esd/pmc440/cmd_pmc440.c              |    2 +-
 board/xilinx/ppc405-generic/u-boot-ram.lds |    2 +-
 board/xilinx/ppc405-generic/u-boot-rom.lds |    2 +-
 cpu/arm926ejs/at91/usb.c                   |    2 +-
 cpu/mpc86xx/release.S                      |    2 +-
 include/configs/PMC440.h                   |    8 ++++----
 include/configs/afeb9260.h                 |    4 ++--
 include/configs/at91cap9adk.h              |    2 +-
 include/configs/at91sam9260ek.h            |    2 +-
 include/configs/at91sam9263ek.h            |    2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

Applied - with fixes, thanks.

board/xilinx/ppc405-generic/u-boot-ram.lds SECTIONS · line 130

Quoted 9 lines

index 0004d61..b7d7b92 100644

board/xilinx/ppc405-generic/u-boot-ram.lds +1 -1

@@ -127,7 +127,7 @@ SECTIONS
    *(COMMON)
   }
 
-  ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your confguration: CFG_MONITOR_BASE, CFG_MONITOR_LEN and TEXT_BASE may need to be modified.");
+  ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your confguration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and TEXT_BASE may need to be modified.");

I also fixed the 'confguration' typo while we are@it.

board/xilinx/ppc405-generic/u-boot-rom.lds SECTIONS · line 140

Quoted 9 lines

index d2bac9f..150a827 100644

board/xilinx/ppc405-generic/u-boot-rom.lds +1 -1

@@ -137,7 +137,7 @@ SECTIONS
    *(COMMON)
   }
 
-  ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your confguration: CFG_MONITOR_BASE, CFG_MONITOR_LEN and TEXT_BASE may need to be modified.");
+  ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your confguration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and TEXT_BASE may need to be modified.");

Ditto.

include/configs/PMC440.h line 222

Quoted 9 lines

include/configs/PMC440.h +1 -2

@@ -219,8 +219,8 @@
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
 #define CONFIG_DDR_DATA_EYE	/* use DDR2 optimization        */
 #endif
-#define CFG_MEM_TOP_HIDE	(4 << 10) /* don't use last 4kbytes	*/
-					/* 440EPx errata CHIP 11	*/
+#define CONFIG_SYSY_MEM_TOP_HIDE	(4 << 10) /* don't use last 4kbytes */

I fixed this "SYSY" typo as well.

Best regards,

Wolfgang Denk

Signature · 6 lines

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
C++ was an interesting and valuable experiment, but we've learned its
lessons and it's time to move on.
                            - Peter Curran in <[email protected]>

Jean-Christophe PLAGNIOL-VILLARD

author

2008-12-14 10:21 UTC #2 lore raw

PATCH 1/1 Fix new found CFG_

Quoted 17 lines · Wolfgang Denk

Dear Jean-Christophe PLAGNIOL-VILLARD,

Quoted 13 lines · In message <[email protected]> you wrote:

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
 board/esd/pmc440/cmd_pmc440.c              |    2 +-
 board/xilinx/ppc405-generic/u-boot-ram.lds |    2 +-
 board/xilinx/ppc405-generic/u-boot-rom.lds |    2 +-
 cpu/arm926ejs/at91/usb.c                   |    2 +-
 cpu/mpc86xx/release.S                      |    2 +-
 include/configs/PMC440.h                   |    8 ++++----
 include/configs/afeb9260.h                 |    4 ++--
 include/configs/at91cap9adk.h              |    2 +-
 include/configs/at91sam9260ek.h            |    2 +-
 include/configs/at91sam9263ek.h            |    2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

Quoted 1 line

Applied - with fixes, thanks.

Tks

Best Regards,
J.