November 2010 - U-Boot

[U-Boot] [PATCH] mpc512x: aria: cleanup board config file
by Anatolij Gustschin 01 Dec '10

01 Dec '10

CONFIG_FSL_DIU_LOGO_BMP has been removed while refactoring MPC8610 and MPC5121 DIU code, so remove it. Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- include/configs/aria.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/include/configs/aria.h b/include/configs/aria.h index b3ca8d2..3a60de0 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -49,7 +49,6 @@ #define CONFIG_E300 1 /* E300 Family */ #define CONFIG_MPC512X 1 /* MPC512X family */ #define CONFIG_FSL_DIU_FB 1 /* FSL DIU */ -#define CONFIG_FSL_DIU_LOGO_BMP 1 /* Don't include FSL DIU binary bmp */ #define CONFIG_SYS_TEXT_BASE 0xFFF00000 -- 1.7.1

1 1

[U-Boot] [PATCH 0/7] Address partial linking issues
by Wolfgang Denk 01 Dec '10

01 Dec '10

The switch from archive libraries to partial linking has introduced a number of problems, that are non-trivial to solve. For example, it is no longer possible to include individual object files in the linker script as we did before for example in the case of boards with embedded environment to fill up the gap caused by the need to align the environment on flash erase block boundaries. The best (but unfortunately not easiest) approach to address this problem is probably to enable -ffunction-sections (and -ffunction-sections) so we can again (and even in much finer granularity) place certain code where we want it. When doing this step, it seems only consequent to also add --gc-sections which has the added benefit of reducing the memory footprint of the U-Boot image (both in flash and in RAM). Unfortunately, this requires changes to a lot of linker scripts. The following patch series prepares the groung a bit, then enables --gc-sections, -ffunction-sections and -ffunction-sections for the Power Archtiecture, and then starts to make all PowerPC boards build again, beginning with 4xx. As it turns out, this process uncovers a number of (so far undetected) bugs that have creapt in, which I try to fix as well. To Stefan Roese: Stefan, I need your help fixing the kilauea_nand and haleakala_nand board configurations; currently these fail with a "undefined reference to `initdram'" error. It appears that in the past these included the code from cpu/ppc4xx/denali_spd_ddr2.c, but I doubt that was correct? Comments and.or help converting the remaining processors welcome. Note: these patches are also available in the "gc-sections" branch of the u-boot-testing repository. Overview: ========= [PATCH 1/7] common/Makefile: don't include env_embedded.o into libcommon common/Makefile | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) [PATCH 2/7] cpu/ppc4xx/Makefile: build only needed object files arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c | 4 --- arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c | 3 -- arch/powerpc/cpu/ppc4xx/Makefile | 25 ++++++++------------- 3 files changed, 10 insertions(+), 22 deletions(-) [PATCH 3/7] arch/powerpc/config.mk: make CONFIG_SYS_LDSCRIPT settings work arch/powerpc/config.mk | 7 +++++++ arch/powerpc/cpu/ppc4xx/config.mk | 6 +++++- 2 files changed, 12 insertions(+), 1 deletions(-) [PATCH 4/7] PPChameleonEVB and CATcenter need a custom linker script board/dave/PPChameleonEVB/u-boot.lds | 128 ++++++++++++++++++++++++++++++++++ include/configs/CATcenter.h | 1 + include/configs/PPChameleonEVB.h | 1 + 3 files changed, 130 insertions(+), 0 deletions(-) create mode 100644 board/dave/PPChameleonEVB/u-boot.lds [PATCH 5/7] ERIC: drop unsupported board configuration CREDITS | 4 - MAINTAINERS | 2 - board/eric/Makefile | 51 --- board/eric/eric.c | 203 --------- board/eric/eric.h | 44 -- board/eric/flash.c | 1131 ------------------------------------------------ board/eric/init.S | 359 --------------- boards.cfg | 1 - doc/README.scrapyard | 3 +- include/configs/ERIC.h | 369 ---------------- 10 files changed, 2 insertions(+), 2165 deletions(-) delete mode 100644 board/eric/Makefile delete mode 100644 board/eric/eric.c delete mode 100644 board/eric/eric.h delete mode 100644 board/eric/flash.c delete mode 100644 board/eric/init.S delete mode 100644 include/configs/ERIC.h [PATCH 6/7] POWERPC: enable --gc-sections and -ffunction-sections -fdata-sections arch/powerpc/config.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) [PATCH 7/7] 4xx: Cleanup for partial linking and --gc-sections arch/powerpc/cpu/ppc4xx/Makefile | 2 +- arch/powerpc/cpu/ppc4xx/u-boot.lds | 53 +++++-------------------- board/amcc/bamboo/Makefile | 6 ++- board/amcc/bamboo/u-boot-nand.lds | 50 +++++------------------ board/amcc/bluestone/Makefile | 6 ++- board/amcc/canyonlands/Makefile | 6 ++- board/amcc/canyonlands/u-boot-nand.lds | 48 ++++------------------ board/amcc/sequoia/Makefile | 6 ++- board/amcc/sequoia/u-boot-nand.lds | 48 ++++------------------ board/amcc/sequoia/u-boot-ram.lds | 50 +++++------------------ board/amirix/ap1000/Makefile | 4 +- board/amirix/ap1000/u-boot.lds | 67 +++++-------------------------- board/cray/L1/L1.c | 6 --- board/esd/dasa_sim/u-boot.lds | 57 ++++++--------------------- board/esd/du440/Makefile | 6 ++- board/esd/pmc440/Makefile | 6 ++- board/gdsys/intip/Makefile | 6 ++- board/korat/Makefile | 6 ++- board/lwmon5/Makefile | 6 ++- board/ml2/u-boot.lds | 69 ++++--------------------------- board/netstal/hcu5/Makefile | 4 +- board/sbc405/sbc405.c | 7 --- board/t3corp/Makefile | 6 ++- include/configs/AP1000.h | 8 ++++ include/configs/CANBT.h | 2 +- include/configs/CPCI2DP.h | 2 +- include/configs/DP405.h | 1 + include/configs/ML2.h | 9 ++++ include/configs/sc3.h | 2 +- 29 files changed, 147 insertions(+), 402 deletions(-) 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(a)denx.de I used to be indecisive, now I'm not sure.

9 67

[U-Boot] [PATCH] powerpc/85xx: Enable HWCONFIG on MPC8572DS
by Kumar Gala 01 Dec '10

01 Dec '10

We need HWCONFIG to allow configuration of DDR params Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- include/configs/MPC8572DS.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 2e40237..0abb8a6 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -242,6 +242,7 @@ #define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */ +#define CONFIG_HWCONFIG /* enable hwconfig */ #define CONFIG_FSL_PIXIS 1 /* use common PIXIS code */ #define PIXIS_BASE 0xffdf0000 /* PIXIS registers */ #ifdef CONFIG_PHYS_64BIT -- 1.7.2.3

1 1

[U-Boot] Build failures with older toolchain
by Premi, Sanjeev 01 Dec '10

01 Dec '10

Hi all, I pulled u-boot about an hour ago and master is at this commit: Author: Matthias Weisser <weisserm(a)arcor.de> Date: Thu Nov 18 09:35:09 2010 +0100 Makefile: Fix build with USE_PRIVATE_LIBGCC (plus a small change in omap3_config.h - unrelated) When trying to build u-boot I was constantly, getting these errors: arm-none-linux-gnueabi-ld: section .bss [8003f5c8 -> 8007e327] overlaps section .rel.dyn [8003f5c8 -> 80044e57] arm-none-linux-gnueabi-ld: section .dynsym [80044e58 -> 80044ef7] overlaps section .bss [8003f5c8 -> 8007e327] arm-none-linux-gnueabi-ld: u-boot: section .bss vma 0x8003f5c8 overlaps previous sections Tried to build omap3_beagle and there were no issues; unable to debug for long, I decided to come back on this problem later. Opened a new window and started working on my Linux tree. Returned back to u-boot, and this time build was successful for no evident change. Took me some time to realise that the toolchain I was using to work on Linux repo was different - I use an env script based on activity. To verify the doubts, I explicitly ran this command with two different versions of toolchain in my path and I see different results. Here are last few lines of final build step Failure with Codesourcery 2009q1-203: h/arm/lib/eabi_compat.o -L /opt/codesourcery/2009q1-203/bin/../lib/gcc/arm-none-linux-gnueabi/4.3.3 -lgcc -Map u-boot.map -o u-boot arm-none-linux-gnueabi-ld: section .bss [8003f5c8 -> 8007e327] overlaps section .rel.dyn [8003f5c8 -> 80044e57] arm-none-linux-gnueabi-ld: section .dynsym [80044e58 -> 80044ef7] overlaps section .bss [8003f5c8 -> 8007e327] arm-none-linux-gnueabi-ld: u-boot: section .bss vma 0x8003f5c8 overlaps previous sections make: *** [u-boot] Error 1 premi # pwd /home/premi/git/u-boot premi # Success with Codesourcery 2010q1-202: 19/u-boot/arch/arm/lib/eabi_compat.o -L /opt/codesourcery/2010q1-202/bin/../lib/gcc/arm-none-linux-gnueabi/4.4.1/armv4t -lgcc -Map u-boot.map -o u-boot arm-none-linux-gnueabi-ld: u-boot: section .bss vma 0x8003e8e8 overlaps previous sections arm-none-linux-gnueabi-objcopy -O srec u-boot u-boot.srec arm-none-linux-gnueabi-objcopy --gap-fill=0xff -O binary u-boot u-boot.bin premi # pwd /home/premi/git/u-boot premi # The configuration for beagle still build successfully for both toolchain versions. Any clues/ suggestions? Is there a recent change which hasn't yet been adapted or ported for omap3evm? Best regards, Sanjeev

4 27

[U-Boot] (no subject)
by Wolfgang Denk 01 Dec '10

01 Dec '10

Dear Kyungmin Park & Minkyu Kang, "onenand_ipl/board/apollon/config.mk" and "onenand_ipl/board/vpac270/config.mk" define CONFIG_SYS_TEXT_BASE; do you think it is possible to move these definitions into the respective board config files and remove the then empty "config.mk" files? 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(a)denx.de If the hours are long enough and the pay is short enough, someone will say it's women's work.

2 2

[U-Boot] [PATCH v2 0/7] Add Marvell New Soc Support ARMADA100
by Prafulla Wadaskar 01 Dec '10

01 Dec '10

From: Prafulla WADASKAR <prafulla(a)marvell.com> This patch series adds basic ARMADA100 support, with minimal drivers (UART, MFP) support and Aspenite-DB board support for simple boot Changelog v2: 1. This patch series is in sync latest u-boot 2. config.mk removed 3. CONFIG_SYS_NS16550_IER used for serial drivers 4. mv-common.h updated for aspenite support 5. c-struct used for dram.c 6. All review feedback for v1 implemented These patches are tested on board Regards.. Prafulla . . Prafulla Wadaskar (7): arm: Add Support for Marvell ARMADA 100 Familiy SoCs. gpio: Add Multi-Function-Pin configuration driver for Marvell SoCs add Multi Function Pin configuration support for ARMADA100 Serial: ns16550: Add support for CONFIG_SYS_NS16550_IER macro Serial: Add UART support for Marvell ARMADA 100 SoCs. mv-common.h: Add support for ARMADA100 Platforms Armada100: Add Board Support for Marvell Aspenite-DB MAINTAINERS | 1 + MAKEALL | 1 + arch/arm/cpu/arm926ejs/armada100/Makefile | 46 +++++ arch/arm/cpu/arm926ejs/armada100/cpu.c | 92 ++++++++++ arch/arm/cpu/arm926ejs/armada100/dram.c | 131 ++++++++++++++ arch/arm/cpu/arm926ejs/armada100/timer.c | 199 +++++++++++++++++++++ arch/arm/include/asm/arch-armada100/armada100.h | 120 +++++++++++++ arch/arm/include/asm/arch-armada100/cpu.h | 53 ++++++ arch/arm/include/asm/arch-armada100/mfp.h | 218 +++++++++++++++++++++++ board/Marvell/aspenite/Makefile | 52 ++++++ board/Marvell/aspenite/aspenite.c | 53 ++++++ boards.cfg | 1 + drivers/gpio/Makefile | 1 + drivers/gpio/mfp.c | 105 +++++++++++ drivers/serial/ns16550.c | 4 +- drivers/serial/serial.c | 14 +- include/configs/aspenite.h | 65 +++++++ include/configs/mv-common.h | 65 +++++-- include/mfp.h | 97 ++++++++++ include/ns16550.h | 4 + 20 files changed, 1298 insertions(+), 24 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/armada100/Makefile create mode 100644 arch/arm/cpu/arm926ejs/armada100/cpu.c create mode 100644 arch/arm/cpu/arm926ejs/armada100/dram.c create mode 100644 arch/arm/cpu/arm926ejs/armada100/timer.c create mode 100644 arch/arm/include/asm/arch-armada100/armada100.h create mode 100644 arch/arm/include/asm/arch-armada100/cpu.h create mode 100755 arch/arm/include/asm/arch-armada100/mfp.h create mode 100644 board/Marvell/aspenite/Makefile create mode 100644 board/Marvell/aspenite/aspenite.c create mode 100644 drivers/gpio/mfp.c create mode 100644 include/configs/aspenite.h create mode 100644 include/mfp.h

4 13

[U-Boot] Pull request: u-boot-arm (master + next)
by Wolfgang Denk 01 Dec '10

01 Dec '10

The following changes since commit d0d2271f8c62e830ec65fb069b6d12dd708e3e2f: Prepare v2010.12-rc2 (2010-11-28 19:48:11 +0100) are available in the git repository at: git://git.denx.de/u-boot-arm.git master Dirk Behme (4): OMAP4: SDP4430: Disable CMD_NFS OMAP3: SDP3430: Fix ARM relocation support OMAP3: Zoom1: Fix ARM relocation support OMAP3: Zoom2: Fix ARM relocation support Enric Balletbo i Serra (1): ARMV7: OMAP3: Fix build failure for igep0030 machine Minkyu Kang (6): Merge branch 'master' of git://git.denx.de/u-boot-arm Merge branch 'master' of git://git.denx.de/u-boot-arm Merge branch 'master' of git://git.denx.de/u-boot-arm S5P: smdkc100: fix for relocation S5P: goni: fix for relocation ARMV7: S5P: timer: get the count_value from register when call udelay Sanjeev Premi (1): omap3evm: Use GENERATED_GBL_DATA_SIZE Vaibhav Hiremath (3): AM3517:Fix for ARM Relocation support AM3517:Build FIX: undef CONFIG_CMD_NFS support AM3517:EMIF4: fix SDRAM size to 256Mb Wolfgang Denk (1): Merge branch 'master' of git://git.denx.de/u-boot-samsung arch/arm/cpu/armv7/omap3/emif4.c | 5 +++-- arch/arm/cpu/armv7/s5p-common/timer.c | 18 +++++++++--------- board/logicpd/am3517evm/config.mk | 2 +- board/logicpd/zoom1/config.mk | 2 +- board/logicpd/zoom2/config.mk | 2 +- board/samsung/goni/goni.c | 10 ++++++++-- board/samsung/smdkc100/smdkc100.c | 10 +++++++--- board/ti/sdp3430/config.mk | 2 +- include/configs/am3517_evm.h | 7 +++++++ include/configs/igep0030.h | 1 + include/configs/omap3_evm.h | 6 +++++- include/configs/omap3_sdp3430.h | 6 ++++++ include/configs/omap3_zoom1.h | 6 ++++++ include/configs/omap3_zoom2.h | 6 ++++++ include/configs/omap4_sdp4430.h | 1 + include/configs/s5p_goni.h | 2 ++ include/configs/smdkc100.h | 2 ++ 17 files changed, 67 insertions(+), 21 deletions(-) The following changes since commit c87f6457bb9cb465e9630b00b4c824847a62c6c5: ext2: constify file/dir names (2010-11-28 21:58:51 +0100) are available in the git repository at: git://git.denx.de/u-boot-arm.git next Stefano Babic (3): da850: Enable SPI Flash Davinci 8xx: Move common functions to share code Davinci: add support for the ea20 board Sudhakar Rajashekhara (2): da8xx: Add cpu_is_da8xx macros da850: Add RMII support for EMAC Sughosh Ganu (3): Move and rename common headers from under Remove board_init_f function from nand_boot.c Add board support for hawkboard MAINTAINERS | 6 + .../arm/include/asm/arch-davinci/davinci_misc.h | 15 ++ arch/arm/include/asm/arch-davinci/hardware.h | 37 ++++- board/davinci/common/Makefile | 2 +- board/davinci/common/davinci_pinmux.c | 105 ++++++++++ board/davinci/common/misc.c | 99 ++++------ board/davinci/da8xxevm/Makefile | 2 +- board/davinci/da8xxevm/common.c | 55 ------ board/davinci/da8xxevm/common.h | 30 --- board/davinci/da8xxevm/da830evm.c | 3 +- board/davinci/da8xxevm/da850evm.c | 115 +++++++++++- board/davinci/da8xxevm/hawkboard.c | 68 +++++++ board/davinci/da8xxevm/hawkboard_nand_spl.c | 157 +++++++++++++++ board/davinci/dm355evm/dm355evm.c | 2 +- board/davinci/dm355leopard/dm355leopard.c | 2 +- board/davinci/dm365evm/dm365evm.c | 2 +- board/davinci/dvevm/dvevm.c | 2 +- board/davinci/ea20/Makefile | 53 +++++ board/davinci/ea20/ea20.c | 196 +++++++++++++++++++ board/davinci/schmoogie/schmoogie.c | 2 +- board/davinci/sffsdr/sffsdr.c | 2 +- board/davinci/sonata/sonata.c | 2 +- board/samsung/smdk6400/smdk6400_nand_spl.c | 37 ++++ boards.cfg | 4 + doc/README.hawkboard | 93 +++++++++ drivers/net/davinci_emac.c | 41 ++++- include/configs/da850evm.h | 29 +++ include/configs/ea20.h | 192 ++++++++++++++++++ include/configs/hawkboard.h | 206 ++++++++++++++++++++ nand_spl/board/davinci/da8xxevm/Makefile | 141 +++++++++++++ nand_spl/board/davinci/da8xxevm/u-boot.lds | 75 +++++++ nand_spl/board/samsung/smdk6400/Makefile | 6 +- nand_spl/nand_boot.c | 9 +- 33 files changed, 1615 insertions(+), 175 deletions(-) rename board/davinci/common/misc.h => arch/arm/include/asm/arch-davinci/davinci_misc.h (80%) create mode 100644 board/davinci/common/davinci_pinmux.c delete mode 100644 board/davinci/da8xxevm/common.c delete mode 100644 board/davinci/da8xxevm/common.h create mode 100644 board/davinci/da8xxevm/hawkboard.c create mode 100644 board/davinci/da8xxevm/hawkboard_nand_spl.c create mode 100644 board/davinci/ea20/Makefile create mode 100644 board/davinci/ea20/ea20.c create mode 100644 board/samsung/smdk6400/smdk6400_nand_spl.c create mode 100644 doc/README.hawkboard create mode 100644 include/configs/ea20.h create mode 100644 include/configs/hawkboard.h create mode 100644 nand_spl/board/davinci/da8xxevm/Makefile create mode 100644 nand_spl/board/davinci/da8xxevm/u-boot.lds 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(a)denx.de Of all the things I've lost, I miss my mind the most.

3 6

[U-Boot] [PATCH] mpc83xx: remove some dead code, saving space
by Joakim Tjernlund 01 Dec '10

01 Dec '10

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund(a)transmode.se> --- arch/powerpc/cpu/mpc83xx/start.S | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S index f7da14b..121c276 100644 --- a/arch/powerpc/cpu/mpc83xx/start.S +++ b/arch/powerpc/cpu/mpc83xx/start.S @@ -967,13 +967,6 @@ relocate_code: 30: li r3, 0 blr -2: slwi r0,r0,2 /* re copy in reverse order ... y do we needed it? */ - add r8,r4,r0 - add r7,r3,r0 -3: lwzu r0,-4(r8) - stwu r0,-4(r7) - bdnz 3b - /* * Now flush the cache: note that we must start from a cache aligned * address. Otherwise we might miss one cache line. -- 1.7.2.2

5 8

[U-Boot] [PATCH v3] hwconfig: Fix dummy initialization of {board, cpu}_hwconfig
by Kumar Gala 30 Nov '10

30 Nov '10

Since board_hwconfig & cpu_hwconfig are defined as weak and dont have a default value they will get put into the BSS if they aren't defined elsewhere. This is problematic as we try to utilize hwconfig before we've relocated and thus BSS isn't setup. Instead of giving dummy values in the board files that utilize this feature, we can just initialize the variables to an empty string and thus move them out of the BSS if they aren't defined elsewhere. Also made board_hwconfig & cpu_hwconfig arrays to reduce size associated with string pointers vs arrays. Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- * Removed null checks for board_hwconfig & cpu_hwconfig board/freescale/mpc8641hpcn/mpc8641hpcn.c | 3 --- board/freescale/p2020ds/p2020ds.c | 3 --- common/hwconfig.c | 14 ++++++-------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c index 812111d..882ff0b 100644 --- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c +++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c @@ -60,9 +60,6 @@ int checkboard(void) return 0; } -const char *board_hwconfig = "foo:bar=baz"; -const char *cpu_hwconfig = "foo:bar=baz"; - phys_size_t initdram(int board_type) { diff --git a/board/freescale/p2020ds/p2020ds.c b/board/freescale/p2020ds/p2020ds.c index b507677..b05ef98 100644 --- a/board/freescale/p2020ds/p2020ds.c +++ b/board/freescale/p2020ds/p2020ds.c @@ -69,9 +69,6 @@ int checkboard(void) return 0; } -const char *board_hwconfig = "foo:bar=baz"; -const char *cpu_hwconfig = "foo:bar=baz"; - phys_size_t initdram(int board_type) { phys_size_t dram_size = 0; diff --git a/common/hwconfig.c b/common/hwconfig.c index 3c9759f..da8d3ed 100644 --- a/common/hwconfig.c +++ b/common/hwconfig.c @@ -68,8 +68,8 @@ next: return NULL; } -const char *cpu_hwconfig __attribute__((weak)); -const char *board_hwconfig __attribute__((weak)); +const char cpu_hwconfig[] __attribute__((weak)) = ""; +const char board_hwconfig[] __attribute__((weak)) = ""; #define HWCONFIG_PRE_RELOC_BUF_SIZE 128 @@ -96,13 +96,11 @@ static const char *__hwconfig(const char *opt, size_t *arglen) return hwconfig_parse(env_hwconfig, strlen(env_hwconfig), opt, ";", ':', arglen); - if (board_hwconfig) - return hwconfig_parse(board_hwconfig, strlen(board_hwconfig), - opt, ";", ':', arglen); + return hwconfig_parse(board_hwconfig, strlen(board_hwconfig), + opt, ";", ':', arglen); - if (cpu_hwconfig) - return hwconfig_parse(cpu_hwconfig, strlen(cpu_hwconfig), - opt, ";", ':', arglen); + return hwconfig_parse(cpu_hwconfig, strlen(cpu_hwconfig), + opt, ";", ':', arglen); return NULL; } -- 1.7.2.3

3 3

[U-Boot] [PATCH v3] powerpc/85xx: Introduce CONFIG_SYS_EXTRA_ENV_RELOC
by Kumar Gala 30 Nov '10

30 Nov '10

Some systems need to relocate the env_addr pointer early because the location it points to will get invalidated before env_relocate is called. One example is on systems that might use a L2 or L3 cache in SRAM mode and initialize that cache from SRAM mode back to being a cache in cpu_init_r. We set this on the 85xx boards that have support for NAND, SPI, or SDHC/MMC boot support as they use a secondary cache in SRAM mode and need the env_addr pointer relocated since we change from SRAM to normal cache mode in cpu_init_r. Also removed CONFIG_SYS_SPL as its not used anywhere. Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- * Removed CONFIG_SYS_SPL as its not used anywhere arch/powerpc/lib/board.c | 11 +++++++++++ include/configs/MPC8536DS.h | 5 +++-- include/configs/MPC8569MDS.h | 3 ++- include/configs/P1_P2_RDB.h | 5 +++-- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c index b21c1d6..9759e23 100644 --- a/arch/powerpc/lib/board.c +++ b/arch/powerpc/lib/board.c @@ -645,6 +645,17 @@ void board_init_r (gd_t *id, ulong dest_addr) gd->cpu += dest_addr - CONFIG_SYS_MONITOR_BASE; #endif +#ifdef CONFIG_SYS_EXTRA_ENV_RELOC + /* + * Some systems need to relocate the env_addr pointer early because the + * location it points to will get invalidated before env_relocate is + * called. One example is on systems that might use a L2 or L3 cache + * in SRAM mode and initialize that cache from SRAM mode back to being + * a cache in cpu_init_r. + */ + gd->env_addr += dest_addr - CONFIG_SYS_MONITOR_BASE; +#endif + #ifdef CONFIG_SERIAL_MULTI serial_initialize(); #endif diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 850665a..5c5be0c 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -242,9 +242,10 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#if defined(CONFIG_SYS_SPL) || defined(CONFIG_RAMBOOT_NAND) \ - || defined(CONFIG_RAMBOOT_SDCARD) || defined(CONFIG_RAMBOOT_SPIFLASH) +#if defined(CONFIG_RAMBOOT_NAND) || defined(CONFIG_RAMBOOT_SDCARD) || \ + defined(CONFIG_RAMBOOT_SPIFLASH) #define CONFIG_SYS_RAMBOOT +#define CONFIG_SYS_EXTRA_ENV_RELOC #else #undef CONFIG_SYS_RAMBOOT #endif diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index c7973b4..9620fd0 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -203,8 +203,9 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#if defined(CONFIG_SYS_SPL) || defined(CONFIG_RAMBOOT_NAND) +#if defined(CONFIG_RAMBOOT_NAND) #define CONFIG_SYS_RAMBOOT +#define CONFIG_SYS_EXTRA_ENV_RELOC #else #undef CONFIG_SYS_RAMBOOT #endif diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h index 610f3ed..a21afb7 100644 --- a/include/configs/P1_P2_RDB.h +++ b/include/configs/P1_P2_RDB.h @@ -201,9 +201,10 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#if defined(CONFIG_SYS_SPL) || defined(CONFIG_RAMBOOT_NAND) \ - || defined(CONFIG_RAMBOOT_SDCARD) || defined(CONFIG_RAMBOOT_SPIFLASH) +#if defined(CONFIG_RAMBOOT_NAND) || defined(CONFIG_RAMBOOT_SDCARD) || \ + defined(CONFIG_RAMBOOT_SPIFLASH) #define CONFIG_SYS_RAMBOOT +#define CONFIG_SYS_EXTRA_ENV_RELOC #else #undef CONFIG_SYS_RAMBOOT #endif -- 1.7.2.3

2 1