January 2011 - U-Boot

[U-Boot] [PATCH 0/3] Add basic NVIDIA Tegra2 SoC support
by Tom Warren 13 Jan '11

13 Jan '11

This series of patches adds preliminary/baseline support for NVIDIA's Tegra2 Soc. Basic CPU (AVP), RAM and UART init are covered so that the system (Harmony and/or Seaboard) can boot to the U-Boot serial prompt. Further support (for Coretex-A9 CPU(s), USB, SD/MMC, etc.) to follow. Tom Warren (3): arm: Tegra2: Add generic Tegra2 SoC support arm: Tegra2: Add support for NVIDIA Harmony board arm: Tegra2: Add support for NVIDIA Seaboard board Signed-off-by: Tom Warren <twarren(a)nvidia.com> MAINTAINERS | 5 + arch/arm/cpu/armv7/tegra2/Makefile | 48 +++++ arch/arm/cpu/armv7/tegra2/board.c | 91 ++++++++++ arch/arm/cpu/armv7/tegra2/config.mk | 28 +++ arch/arm/cpu/armv7/tegra2/lowlevel_init.S | 66 +++++++ arch/arm/cpu/armv7/tegra2/sys_info.c | 35 ++++ arch/arm/cpu/armv7/tegra2/timer.c | 122 +++++++++++++ arch/arm/include/asm/arch-tegra2/clk_rst.h | 155 ++++++++++++++++ arch/arm/include/asm/arch-tegra2/pinmux.h | 52 ++++++ arch/arm/include/asm/arch-tegra2/pmc.h | 126 +++++++++++++ arch/arm/include/asm/arch-tegra2/sys_proto.h | 33 ++++ arch/arm/include/asm/arch-tegra2/tegra2.h | 56 ++++++ arch/arm/include/asm/arch-tegra2/uart.h | 45 +++++ arch/arm/include/asm/mach-types.h | 1 + board/tegra2/common/board.c | 242 ++++++++++++++++++++++++++ board/tegra2/common/board.h | 59 +++++++ board/tegra2/harmony/Makefile | 50 ++++++ board/tegra2/seaboard/Makefile | 50 ++++++ boards.cfg | 2 + common/serial.c | 3 +- include/configs/harmony.h | 48 +++++ include/configs/nv-common.h | 166 ++++++++++++++++++ include/configs/seaboard.h | 43 +++++ include/serial.h | 3 +- 24 files changed, 1527 insertions(+), 2 deletions(-) create mode 100644 arch/arm/cpu/armv7/tegra2/Makefile create mode 100644 arch/arm/cpu/armv7/tegra2/board.c create mode 100644 arch/arm/cpu/armv7/tegra2/config.mk create mode 100644 arch/arm/cpu/armv7/tegra2/lowlevel_init.S create mode 100644 arch/arm/cpu/armv7/tegra2/sys_info.c create mode 100644 arch/arm/cpu/armv7/tegra2/timer.c create mode 100644 arch/arm/include/asm/arch-tegra2/clk_rst.h create mode 100644 arch/arm/include/asm/arch-tegra2/pinmux.h create mode 100644 arch/arm/include/asm/arch-tegra2/pmc.h create mode 100644 arch/arm/include/asm/arch-tegra2/sys_proto.h create mode 100644 arch/arm/include/asm/arch-tegra2/tegra2.h create mode 100644 arch/arm/include/asm/arch-tegra2/uart.h create mode 100644 board/tegra2/common/board.c create mode 100644 board/tegra2/common/board.h create mode 100644 board/tegra2/harmony/Makefile create mode 100644 board/tegra2/seaboard/Makefile create mode 100644 include/configs/harmony.h create mode 100644 include/configs/nv-common.h create mode 100644 include/configs/seaboard.h -- 1.7.3.5

4 10

[U-Boot] Notification From FedEx
by FedEx West Africa 13 Jan '11

13 Jan '11

Please contact us with the information requested below for the delivery of your draft of $800,000.00 ( Eight Hundred Thousand) usd. 1.First name: 2.Last Name: 3.Telephone: 4.Nationality: 5.Age: 6.Occupation: 7.Address: FEDEX WEST AFRICA NEW YEAR PROMO FOR CUSTOMERS (FWA) EMAIL: selected(a)luckymail.com Your replies must be sent to this address (selected(a)luckymail.com) Please verify before replying. Regards, FedEx Award Team.

1 0

[U-Boot] [PATCH 00/28] Blackfin updates for v2011.03
by Mike Frysinger 13 Jan '11

13 Jan '11

More processor header cleanups, board config.mk unification and removal, a few new board ports, and random bug fixes. Most clean up work is to address complaints from Wolfgang since he won't pull patches otherwise. The processor header updates are too large for the list, but you can of course find them in my git tree: git://git.denx.de/u-boot-blackfin.git Andreas Schallenberg (1): Blackfin: dnp5370: new board port Chong Huang (1): Blackfin: bf525-ucr2: new board port Mike Frysinger (26): MAINTAINERS: sort Blackfin entries Blackfin: bf518f-ezbrd: don't require SPI logic all the time Blackfin: skip RAM display for 0 mem systems Blackfin: drop CONFIG_SYS_TEXT_BASE from boards Blackfin: unify bootmode based LDR_FLAGS setup Blackfin: move CONFIG_BFIN_CPU back to board config.h Blackfin: bf527-sdp: update custom CFLAGS paths Blackfin: bf537-pnav/blackstamp/blackvme: drop empty config.mk files Blackfin: serial: clean up muxing a bit Blackfin: bf537-minotaur/bf537-srv1: undefine nfs when net is disabled Blackfin: bf537: fix L1 data defines Blackfin: bf561-ezkit/ibf-dsp561: invert env offset/addr logic Blackfin: fix bd_t handling Blackfin: BF50x: new processor port Blackfin: drop duplicate system mmr and L1 scratch defines Blackfin: BF52x: unify duplicated headers Blackfin: BF537: unify duplicated headers Blackfin: only check for os log when we have external memory Blackfin: turn off caches when self initializing Blackfin: default to L1 bank A when L1 bank B does not exist Blackfin: bf506f-ezkit: new board port Blackfin: adi boards: drop old ELF define Blackfin: bootrom.h: sync with toolchain Blackfin: bootldr: use common defines Blackfin: ldrinfo: new command Blackfin: adi boards: enable ldrinfo MAINTAINERS | 54 +- arch/blackfin/config.mk | 15 +- arch/blackfin/cpu/gpio.c | 8 +- arch/blackfin/cpu/initcode.c | 25 +- arch/blackfin/cpu/serial.h | 72 +- arch/blackfin/cpu/start.S | 45 +- arch/blackfin/include/asm/blackfin_cdef.h | 6 + arch/blackfin/include/asm/blackfin_def.h | 10 + arch/blackfin/include/asm/config.h | 10 +- arch/blackfin/include/asm/mach-bf506/BF504_cdef.h | 1782 ++++++++++++++++++++ arch/blackfin/include/asm/mach-bf506/BF504_def.h | 944 +++++++++++ arch/blackfin/include/asm/mach-bf506/BF506_cdef.h | 11 + arch/blackfin/include/asm/mach-bf506/BF506_def.h | 11 + arch/blackfin/include/asm/mach-bf506/anomaly.h | 128 ++ arch/blackfin/include/asm/mach-bf506/def_local.h | 5 + arch/blackfin/include/asm/mach-bf506/gpio.h | 52 + arch/blackfin/include/asm/mach-bf506/portmux.h | 148 ++ arch/blackfin/include/asm/mach-bf506/ports.h | 59 + arch/blackfin/include/asm/mach-bf518/BF512_def.h | 6 - .../asm/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h | 994 ----------- .../asm/mach-bf527/ADSP-EDN-BF52x-extended_def.h | 503 ------ arch/blackfin/include/asm/mach-bf527/BF522_cdef.h | 986 +++++++++++- arch/blackfin/include/asm/mach-bf527/BF522_def.h | 495 ++++++- arch/blackfin/include/asm/mach-bf527/BF524_cdef.h | 20 +- arch/blackfin/include/asm/mach-bf527/BF524_def.h | 12 +- arch/blackfin/include/asm/mach-bf527/BF526_cdef.h | 358 +---- arch/blackfin/include/asm/mach-bf527/BF526_def.h | 181 +-- arch/blackfin/include/asm/mach-bf533/BF531_def.h | 6 - arch/blackfin/include/asm/mach-bf533/BF532_def.h | 6 - arch/blackfin/include/asm/mach-bf533/BF533_def.h | 6 - .../asm/mach-bf537/ADSP-EDN-BF534-extended_cdef.h | 1624 ------------------ .../asm/mach-bf537/ADSP-EDN-BF534-extended_def.h | 819 --------- arch/blackfin/include/asm/mach-bf537/BF534_cdef.h | 1614 ++++++++++++++++++- arch/blackfin/include/asm/mach-bf537/BF534_def.h | 816 +++++++++- arch/blackfin/include/asm/mach-bf538/BF538_def.h | 6 - arch/blackfin/include/asm/mach-bf561/BF561_def.h | 7 +- .../include/asm/mach-common/bits/bootrom.h | 86 +- arch/blackfin/lib/board.c | 21 +- arch/blackfin/lib/u-boot.lds.S | 10 +- board/bct-brettl2/config.mk | 8 - board/bf506f-ezkit/Makefile | 54 + board/bf506f-ezkit/bf506f-ezkit.c | 27 + board/bf518f-ezbrd/bf518f-ezbrd.c | 30 +- board/bf518f-ezbrd/config.mk | 8 - board/bf525-ucr2/Makefile | 54 + board/bf525-ucr2/bf525-ucr2.c | 16 + board/bf526-ezbrd/config.mk | 8 - board/bf527-ad7160-eval/config.mk | 8 - board/bf527-ezkit/config.mk | 8 - board/bf527-sdp/config.mk | 10 +- board/bf533-ezkit/config.mk | 6 - board/bf533-stamp/config.mk | 6 - board/bf537-minotaur/config.mk | 8 +- board/bf537-pnav/config.mk | 32 - board/bf537-srv1/config.mk | 8 +- board/bf537-stamp/config.mk | 6 - board/bf538f-ezkit/config.mk | 6 - board/bf548-ezkit/config.mk | 6 - board/bf561-acvilon/config.mk | 6 - board/bf561-ezkit/config.mk | 6 - board/blackstamp/config.mk | 32 - board/blackvme/config.mk | 32 - board/cm-bf527/config.mk | 8 - board/cm-bf533/config.mk | 6 - board/cm-bf537e/config.mk | 6 - board/cm-bf537u/config.mk | 6 - board/cm-bf548/config.mk | 6 - board/cm-bf561/config.mk | 6 - board/dnp5370/Makefile | 54 + board/dnp5370/dnp5370.c | 104 ++ board/ibf-dsp561/config.mk | 6 - board/ip04/config.mk | 6 - board/tcm-bf518/config.mk | 8 - board/tcm-bf537/config.mk | 6 - boards.cfg | 3 + common/Makefile | 1 + common/cmd_bootldr.c | 21 +- common/cmd_ldrinfo.c | 192 +++ doc/README.dnp5370 | 67 + drivers/mmc/bfin_sdh.c | 2 +- drivers/spi/bfin_spi.c | 2 + include/configs/bct-brettl2.h | 3 +- include/configs/bf506f-ezkit.h | 106 ++ include/configs/bf518f-ezbrd.h | 1 + include/configs/bf525-ucr2.h | 102 ++ include/configs/bf526-ezbrd.h | 1 + include/configs/bf527-ad7160-eval.h | 1 + include/configs/bf527-ezkit.h | 1 + include/configs/bf527-sdp.h | 1 + include/configs/bf533-ezkit.h | 1 + include/configs/bf533-stamp.h | 1 + include/configs/bf537-minotaur.h | 2 + include/configs/bf537-pnav.h | 1 + include/configs/bf537-srv1.h | 2 + include/configs/bf537-stamp.h | 1 + include/configs/bf538f-ezkit.h | 1 + include/configs/bf548-ezkit.h | 1 + include/configs/bf561-acvilon.h | 3 +- include/configs/bf561-ezkit.h | 5 +- include/configs/bfin_adi_common.h | 2 +- include/configs/blackstamp.h | 1 + include/configs/blackvme.h | 3 +- include/configs/cm-bf527.h | 1 + include/configs/cm-bf533.h | 1 + include/configs/cm-bf537e.h | 1 + include/configs/cm-bf537u.h | 1 + include/configs/cm-bf548.h | 1 + include/configs/cm-bf561.h | 1 + include/configs/dnp5370.h | 128 ++ include/configs/ibf-dsp561.h | 5 +- include/configs/ip04.h | 1 + include/configs/tcm-bf518.h | 1 + include/configs/tcm-bf537.h | 1 + 113 files changed, 8257 insertions(+), 4981 deletions(-) create mode 100644 arch/blackfin/include/asm/mach-bf506/BF504_cdef.h create mode 100644 arch/blackfin/include/asm/mach-bf506/BF504_def.h create mode 100644 arch/blackfin/include/asm/mach-bf506/BF506_cdef.h create mode 100644 arch/blackfin/include/asm/mach-bf506/BF506_def.h create mode 100644 arch/blackfin/include/asm/mach-bf506/anomaly.h create mode 100644 arch/blackfin/include/asm/mach-bf506/def_local.h create mode 100644 arch/blackfin/include/asm/mach-bf506/gpio.h create mode 100644 arch/blackfin/include/asm/mach-bf506/portmux.h create mode 100644 arch/blackfin/include/asm/mach-bf506/ports.h delete mode 100644 arch/blackfin/include/asm/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h delete mode 100644 arch/blackfin/include/asm/mach-bf527/ADSP-EDN-BF52x-extended_def.h delete mode 100644 arch/blackfin/include/asm/mach-bf537/ADSP-EDN-BF534-extended_cdef.h delete mode 100644 arch/blackfin/include/asm/mach-bf537/ADSP-EDN-BF534-extended_def.h create mode 100644 board/bf506f-ezkit/Makefile create mode 100644 board/bf506f-ezkit/bf506f-ezkit.c create mode 100644 board/bf525-ucr2/Makefile create mode 100644 board/bf525-ucr2/bf525-ucr2.c delete mode 100644 board/bf537-pnav/config.mk delete mode 100644 board/blackstamp/config.mk delete mode 100644 board/blackvme/config.mk create mode 100644 board/dnp5370/Makefile create mode 100644 board/dnp5370/dnp5370.c create mode 100644 common/cmd_ldrinfo.c create mode 100644 doc/README.dnp5370 create mode 100644 include/configs/bf506f-ezkit.h create mode 100644 include/configs/bf525-ucr2.h create mode 100644 include/configs/dnp5370.h -- 1.7.3.4

3 38

[U-Boot] Please pull u-boot-sh
by Nobuhiro Iwamatsu 13 Jan '11

13 Jan '11

Dear Wolfgang Denk, The following changes since commit 0e7790d450000c1a2cda40458adb28707eaa5041: LAN91C*: Change chip names to fit the eth_device struct size (2011-01-10 22:38:36 +0100) are available in the git repository at: git://git.denx.de/u-boot-sh.git master Nobuhiro Iwamatsu (14): sh: serial: Update serial driver for SH sh: Add support SH7706 sh: Add support shmin board sh: Add support showing KByte of flash memory size sh: Remove SCIF/SCI register infomation sh: sh7722: Fix multiple definition of PSDR in serial_sh sh: serial_sh: Fix build in serial_sh sh: Delete the function that was not necessary sh: Divided macro for zImage and add asm/zimage.h sh: Add support zimageboot command for Renesas SH sh: sh7785lcr: Add support zimageboot sh: r2dplus: Add support zimageboot sh: Fix build of shmin board sh: Add support T-SH7706LSR board MAINTAINERS | 1 + arch/sh/include/asm/cpu_sh3.h | 6 +- arch/sh/include/asm/cpu_sh7706.h | 53 +++ arch/sh/include/asm/cpu_sh7722.h | 38 -- arch/sh/include/asm/cpu_sh7750.h | 16 - arch/sh/include/asm/cpu_sh7780.h | 21 +-- arch/sh/include/asm/zimage.h | 41 +++ arch/sh/lib/Makefile | 3 + arch/sh/lib/board.c | 8 +- arch/sh/lib/bootm.c | 21 +- arch/sh/lib/zimageboot.c | 80 +++++ board/shmin/Makefile | 49 +++ board/shmin/config.mk | 27 ++ board/shmin/lowlevel_init.S | 36 ++ board/shmin/shmin.c | 108 ++++++ boards.cfg | 1 + drivers/serial/serial_sh.c | 200 ++++------- drivers/serial/serial_sh.h | 690 ++++++++++++++++++++++++++++++++++++++ include/configs/r2dplus.h | 1 + include/configs/sh7785lcr.h | 1 + include/configs/shmin.h | 128 +++++++ 21 files changed, 1307 insertions(+), 222 deletions(-) create mode 100644 arch/sh/include/asm/cpu_sh7706.h create mode 100644 arch/sh/include/asm/zimage.h create mode 100644 arch/sh/lib/zimageboot.c create mode 100644 board/shmin/Makefile create mode 100644 board/shmin/config.mk create mode 100644 board/shmin/lowlevel_init.S create mode 100644 board/shmin/shmin.c create mode 100644 drivers/serial/serial_sh.h create mode 100644 include/configs/shmin.h

2 1

[U-Boot] Please pull u-boot-ubi/master
by Stefan Roese 12 Jan '11

12 Jan '11

Hi Wolfgang, The following changes since commit 0e7790d450000c1a2cda40458adb28707eaa5041: LAN91C*: Change chip names to fit the eth_device struct size (2011-01-10 22:38:36 +0100) are available in the git repository at: git://www.denx.de/git/u-boot-ubi.git master Dirk Behme (1): UBIFS: Fix dereferencing type-punned pointer compiler warning fs/ubifs/misc.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

2 1

[U-Boot] Please pull u-boot-cfi-flash
by Stefan Roese 12 Jan '11

12 Jan '11

Hi Wolfgang, The following changes since commit 0e7790d450000c1a2cda40458adb28707eaa5041: LAN91C*: Change chip names to fit the eth_device struct size (2011-01-10 22:38:36 +0100) are available in the git repository at: git://www.denx.de/git/u-boot-cfi-flash.git master David Müller (1): add AM29F400BB to table of supported legacy flashs drivers/mtd/jedec_flash.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-)

2 1

[U-Boot] Please pull u-boot-ppc4xx (Update)
by Stefan Roese 12 Jan '11

12 Jan '11

Hi Wolfgang, The following changes since commit 89c95f0cd3f8140f3b8a82a22a6a144c148d09c6: asm-offsets: generate bd_t size (2011-01-09 18:08:20 +0100) are available in the git repository at: git://www.denx.de/git/u-boot-ppc4xx.git master Felix Radensky (1): PPC4xx: Reduce NAND TLB window size on Canyonlands Ricardo Ribalda Delgado (1): xilinx-ppc4xx-generic: Fix Makefile to work with MAKEALL Stefan Roese (2): ppc4xx: Remove PCI support from lwmon5 ppc4xx: Fix compilation breakage in miiphy.c arch/powerpc/cpu/ppc4xx/miiphy.c | 2 +- board/amcc/canyonlands/init.S | 2 +- board/xilinx/ppc405-generic/Makefile | 11 +++-------- board/xilinx/ppc440-generic/Makefile | 14 ++++---------- include/configs/lwmon5.h | 17 ----------------- 5 files changed, 9 insertions(+), 37 deletions(-)

2 1

[U-Boot] [U-BOOT] [PATCH] arm: fix flush cache function on arm926ejs
by Lei Wen 12 Jan '11

12 Jan '11

flush_cache function should only be called when the dcache is on. And original flush method for arm926ejs seems don't work, replace it with new version. Test on Marvell Pantheon pxa920 board with usb ether function. Signed-off-by: Lei Wen <leiwen(a)marvell.com> --- arch/arm/lib/cache.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c index 30686fe..b8d5eee 100644 --- a/arch/arm/lib/cache.c +++ b/arch/arm/lib/cache.c @@ -27,16 +27,16 @@ void flush_cache (unsigned long dummy1, unsigned long dummy2) { + if (!dcache_status()) + return; #if defined(CONFIG_OMAP2420) || defined(CONFIG_ARM1136) void arm1136_cache_flush(void); arm1136_cache_flush(); #endif #ifdef CONFIG_ARM926EJS - /* test and clean, page 2-23 of arm926ejs manual */ - asm("0: mrc p15, 0, r15, c7, c10, 3\n\t" "bne 0b\n" : : : "memory"); - /* disable write buffer as well (page 2-22) */ - asm("mcr p15, 0, %0, c7, c10, 4" : : "r" (0)); + /* clean & invalidate all D cache */ + asm("mcr p15, 0, %0, c7, c14, 0" : : "r" (0)); #endif #ifdef CONFIG_OMAP34XX void v7_flush_cache_all(void); -- 1.7.0.4

3 4

[U-Boot] [PATCH 1/2] PowerPC: Add relocation support for -fpic
by Joakim Tjernlund 12 Jan '11

12 Jan '11

By rearranging the linker script we get support for relocation of -fpic for free. Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund(a)transmode.se> --- arch/powerpc/cpu/74xx_7xx/u-boot.lds | 5 +++-- arch/powerpc/cpu/mpc512x/u-boot.lds | 5 +++-- arch/powerpc/cpu/mpc5xx/u-boot.lds | 5 +++-- arch/powerpc/cpu/mpc5xxx/u-boot.lds | 5 +++-- arch/powerpc/cpu/mpc8220/u-boot.lds | 5 +++-- arch/powerpc/cpu/mpc824x/u-boot.lds | 5 +++-- arch/powerpc/cpu/mpc8260/u-boot.lds | 5 +++-- arch/powerpc/cpu/mpc83xx/u-boot.lds | 5 +++-- arch/powerpc/cpu/mpc85xx/u-boot.lds | 5 +++-- arch/powerpc/cpu/mpc86xx/u-boot.lds | 5 +++-- arch/powerpc/cpu/ppc4xx/u-boot.lds | 5 +++-- 11 files changed, 33 insertions(+), 22 deletions(-) diff --git a/arch/powerpc/cpu/74xx_7xx/u-boot.lds b/arch/powerpc/cpu/74xx_7xx/u-boot.lds index 771a845..8429f33 100644 --- a/arch/powerpc/cpu/74xx_7xx/u-boot.lds +++ b/arch/powerpc/cpu/74xx_7xx/u-boot.lds @@ -43,13 +43,14 @@ SECTIONS PROVIDE (erotext = .); .reloc : { - KEEP(*(.got)) _GOT2_TABLE_ = .; KEEP(*(.got2)) + KEEP(*(.got)) + PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } - __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >>2; + __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1; __fixup_entries = (. - _FIXUP_TABLE_)>>2; .data : diff --git a/arch/powerpc/cpu/mpc512x/u-boot.lds b/arch/powerpc/cpu/mpc512x/u-boot.lds index 361e714..ab9303f 100644 --- a/arch/powerpc/cpu/mpc512x/u-boot.lds +++ b/arch/powerpc/cpu/mpc512x/u-boot.lds @@ -37,14 +37,15 @@ SECTIONS PROVIDE (erotext = .); .reloc : { - KEEP(*(.got)) _GOT2_TABLE_ = .; KEEP(*(.got2)) + KEEP(*(.got)) + PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); _FIXUP_TABLE_ = .; KEEP(*(.fixup)) *(.fixup) } - __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >> 2; + __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1; __fixup_entries = (. - _FIXUP_TABLE_) >> 2; .data : diff --git a/arch/powerpc/cpu/mpc5xx/u-boot.lds b/arch/powerpc/cpu/mpc5xx/u-boot.lds index b7fd4bc..69bd7aa 100644 --- a/arch/powerpc/cpu/mpc5xx/u-boot.lds +++ b/arch/powerpc/cpu/mpc5xx/u-boot.lds @@ -46,13 +46,14 @@ SECTIONS PROVIDE (erotext = .); .reloc : { - KEEP(*(.got)) _GOT2_TABLE_ = .; KEEP(*(.got2)) + KEEP(*(.got)) + PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } - __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >>2; + __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1; __fixup_entries = (. - _FIXUP_TABLE_)>>2; .data : diff --git a/arch/powerpc/cpu/mpc5xxx/u-boot.lds b/arch/powerpc/cpu/mpc5xxx/u-boot.lds index eeeff6c..7e3b70a 100644 --- a/arch/powerpc/cpu/mpc5xxx/u-boot.lds +++ b/arch/powerpc/cpu/mpc5xxx/u-boot.lds @@ -41,13 +41,14 @@ SECTIONS PROVIDE (erotext = .); .reloc : { - KEEP(*(.got)) _GOT2_TABLE_ = .; KEEP(*(.got2)) + KEEP(*(.got)) + PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } - __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >> 2; + __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1; __fixup_entries = (. - _FIXUP_TABLE_) >> 2; .data : diff --git a/arch/powerpc/cpu/mpc8220/u-boot.lds b/arch/powerpc/cpu/mpc8220/u-boot.lds index 63cbbd7..72ff671 100644 --- a/arch/powerpc/cpu/mpc8220/u-boot.lds +++ b/arch/powerpc/cpu/mpc8220/u-boot.lds @@ -40,13 +40,14 @@ SECTIONS PROVIDE (erotext = .); .reloc : { - KEEP(*(.got)) _GOT2_TABLE_ = .; KEEP(*(.got2)) + KEEP(*(.got)) + PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } - __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >> 2; + __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1; __fixup_entries = (. - _FIXUP_TABLE_) >> 2; .data : diff --git a/arch/powerpc/cpu/mpc824x/u-boot.lds b/arch/powerpc/cpu/mpc824x/u-boot.lds index e7f2837..3b9299c 100644 --- a/arch/powerpc/cpu/mpc824x/u-boot.lds +++ b/arch/powerpc/cpu/mpc824x/u-boot.lds @@ -41,13 +41,14 @@ SECTIONS PROVIDE (erotext = .); .reloc : { - KEEP(*(.got)) _GOT2_TABLE_ = .; KEEP(*(.got2)) + KEEP(*(.got)) + PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } - __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >> 2; + __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1; __fixup_entries = (. - _FIXUP_TABLE_) >> 2; .data : diff --git a/arch/powerpc/cpu/mpc8260/u-boot.lds b/arch/powerpc/cpu/mpc8260/u-boot.lds index ad2ce37..c76555e 100644 --- a/arch/powerpc/cpu/mpc8260/u-boot.lds +++ b/arch/powerpc/cpu/mpc8260/u-boot.lds @@ -40,13 +40,14 @@ SECTIONS PROVIDE (erotext = .); .reloc : { - KEEP(*(.got)) _GOT2_TABLE_ = .; KEEP(*(.got2)) + KEEP(*(.got)) + PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } - __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >> 2; + __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1; __fixup_entries = (. - _FIXUP_TABLE_) >> 2; .data : diff --git a/arch/powerpc/cpu/mpc83xx/u-boot.lds b/arch/powerpc/cpu/mpc83xx/u-boot.lds index 81a7ace..752a175 100644 --- a/arch/powerpc/cpu/mpc83xx/u-boot.lds +++ b/arch/powerpc/cpu/mpc83xx/u-boot.lds @@ -39,13 +39,14 @@ SECTIONS PROVIDE (erotext = .); .reloc : { - KEEP(*(.got)) _GOT2_TABLE_ = .; KEEP(*(.got2)) + KEEP(*(.got)) + PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } - __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >> 2; + __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1; __fixup_entries = (. - _FIXUP_TABLE_) >> 2; .data : diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds index 85042c5..67d7763 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds @@ -54,13 +54,14 @@ SECTIONS PROVIDE (erotext = .); .reloc : { - KEEP(*(.got)) _GOT2_TABLE_ = .; KEEP(*(.got2)) + KEEP(*(.got)) + PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } - __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >> 2; + __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1; __fixup_entries = (. - _FIXUP_TABLE_) >> 2; .data : diff --git a/arch/powerpc/cpu/mpc86xx/u-boot.lds b/arch/powerpc/cpu/mpc86xx/u-boot.lds index 49a4c78..c550ef5 100644 --- a/arch/powerpc/cpu/mpc86xx/u-boot.lds +++ b/arch/powerpc/cpu/mpc86xx/u-boot.lds @@ -45,13 +45,14 @@ SECTIONS PROVIDE (erotext = .); .reloc : { - KEEP(*(.got)) _GOT2_TABLE_ = .; KEEP(*(.got2)) + KEEP(*(.got)) + PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } - __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >> 2; + __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1; __fixup_entries = (. - _FIXUP_TABLE_) >> 2; .data : diff --git a/arch/powerpc/cpu/ppc4xx/u-boot.lds b/arch/powerpc/cpu/ppc4xx/u-boot.lds index dac0e5b..ee9cd81 100644 --- a/arch/powerpc/cpu/ppc4xx/u-boot.lds +++ b/arch/powerpc/cpu/ppc4xx/u-boot.lds @@ -55,13 +55,14 @@ SECTIONS PROVIDE (erotext = .); .reloc : { - KEEP(*(.got)) _GOT2_TABLE_ = .; KEEP(*(.got2)) + KEEP(*(.got)) + PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } - __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >> 2; + __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1; __fixup_entries = (. - _FIXUP_TABLE_) >> 2; .data : -- 1.7.2.2

5 16

[U-Boot] [PATCH][v3] PBL: add support for boot from SPI flash.
by Shaohui Xie 12 Jan '11

12 Jan '11

PBL(pre-boot loader): SPI flash used as RCW(Reset Configuration Word) and PBI(pre-boot initialization) source, CPC(CoreNet Platform Cache) used as 1M SRAM where PBL will copy whole U-BOOT image to, U-boot can boot from CPC after PBL completes RCW and PBI phases. Signed-off-by: Chunhe Lan <b25806(a)freescale.com> Signed-off-by: Mingkai Hu <Mingkai.hu(a)freescale.com> Signed-off-by: Shaohui Xie <b21989(a)freescale.com> --- Use CONFIG_RAMBOOT_PBL instead of CONFIG_PBL_BOOT_INDIRECT according to Kumar's comment. arch/powerpc/cpu/mpc85xx/cpu_init.c | 19 +++++++++++++++++++ board/freescale/corenet_ds/config.mk | 6 ++++++ board/freescale/corenet_ds/tlb.c | 9 +++++++++ boards.cfg | 1 + include/configs/corenet_ds.h | 30 ++++++++++++++++++++++++++++-- 5 files changed, 63 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index 4b8faa5..a58cd1a 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -139,6 +139,22 @@ static void enable_cpc(void) for (i = 0; i < CONFIG_SYS_NUM_CPC; i++, cpc++) { u32 cpccfg0 = in_be32(&cpc->cpccfg0); size += CPC_CFG0_SZ_K(cpccfg0); +#ifdef CONFIG_RAMBOOT_PBL + if (in_be32(&cpc->cpcsrcr0) & CPC_SRCR0_SRAMEN) { + /* find and disable LAW of SRAM */ + struct law_entry law = find_law(CONFIG_SYS_INIT_L3_ADDR); + + if (law.index == -1) { + printf("\nFatal error happened\n"); + return; + } + disable_law(law.index); + + clrbits_be32(&cpc->cpchdbcr0, CPC_HDBCR0_CDQ_SPEC_DIS); + out_be32(&cpc->cpccsr0, 0); + out_be32(&cpc->cpcsrcr0, 0); + } +#endif out_be32(&cpc->cpccsr0, CPC_CSR0_CE | CPC_CSR0_PE); /* Read back to sync write */ @@ -155,6 +171,9 @@ void invalidate_cpc(void) cpc_corenet_t *cpc = (cpc_corenet_t *)CONFIG_SYS_FSL_CPC_ADDR; for (i = 0; i < CONFIG_SYS_NUM_CPC; i++, cpc++) { + /* skip CPC when it used as all SRAM */ + if (in_be32(&cpc->cpcsrcr0) & CPC_SRCR0_SRAMEN) + continue; /* Flash invalidate the CPC and clear all the locks */ out_be32(&cpc->cpccsr0, CPC_CSR0_FI | CPC_CSR0_LFC); while (in_be32(&cpc->cpccsr0) & (CPC_CSR0_FI | CPC_CSR0_LFC)) diff --git a/board/freescale/corenet_ds/config.mk b/board/freescale/corenet_ds/config.mk index 15bbf20..918775d 100644 --- a/board/freescale/corenet_ds/config.mk +++ b/board/freescale/corenet_ds/config.mk @@ -24,4 +24,10 @@ # P4080DS board # +ifeq ($(CONFIG_RAMBOOT_PBL), y) +RESET_VECTOR_ADDRESS = 0xfffffffc +endif + +ifndef RESET_VECTOR_ADDRESS RESET_VECTOR_ADDRESS = 0xeffffffc +endif diff --git a/board/freescale/corenet_ds/tlb.c b/board/freescale/corenet_ds/tlb.c index 1ae0416..08f91a7 100644 --- a/board/freescale/corenet_ds/tlb.c +++ b/board/freescale/corenet_ds/tlb.c @@ -51,9 +51,18 @@ struct fsl_e_tlb_entry tlb_table[] = { /* TLB 1 */ /* *I*** - Covers boot page */ +#if defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_SYS_INIT_L3_ADDR) + /* *I*G - L3SRAM. When L3 is used as 1M SRAM, the address of the + * SRAM is at 0xfff00000, it covered the 0xfffff000. + * */ + SET_TLB_ENTRY(1, CONFIG_SYS_INIT_L3_ADDR, CONFIG_SYS_INIT_L3_ADDR, + MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, + 0, 0, BOOKE_PAGESZ_1M, 1), +#else SET_TLB_ENTRY(1, 0xfffff000, 0xfffff000, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 0, BOOKE_PAGESZ_4K, 1), +#endif /* *I*G* - CCSRBAR */ SET_TLB_ENTRY(1, CONFIG_SYS_CCSRBAR, CONFIG_SYS_CCSRBAR_PHYS, diff --git a/boards.cfg b/boards.cfg index 94b8745..2052efc 100644 --- a/boards.cfg +++ b/boards.cfg @@ -502,6 +502,7 @@ P2020RDB_NAND powerpc mpc85xx p1_p2_rdb freesca P2020RDB_SDCARD powerpc mpc85xx p1_p2_rdb freescale - P1_P2_RDB:P2020,SDCARD P2020RDB_SPIFLASH powerpc mpc85xx p1_p2_rdb freescale - P1_P2_RDB:P2020,SPIFLASH P4080DS powerpc mpc85xx corenet_ds freescale +P4080DS_RAMBOOT_PBL powerpc mpc85xx corenet_ds freescale - P4080DS:RAMBOOT_PBL,SYS_TEXT_BASE=0xFFF80000 stxgp3 powerpc mpc85xx stxgp3 stx stxssa powerpc mpc85xx stxssa stx - stxssa stxssa_4M powerpc mpc85xx stxssa stx - stxssa:STXSSA_4M diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 454a30a..663dff2 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -28,6 +28,10 @@ #include "../board/freescale/common/ics307_clk.h" +#ifdef CONFIG_RAMBOOT_PBL +#define CONFIG_RAMBOOT_TEXT_BASE 0xfff80000 +#endif + /* High Level Configuration Options */ #define CONFIG_BOOKE #define CONFIG_E500 /* BOOKE e500 family */ @@ -62,11 +66,17 @@ #ifdef CONFIG_SYS_NO_FLASH #define CONFIG_ENV_IS_NOWHERE #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #endif +#if defined(CONFIG_RAMBOOT_PBL) + #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ +#else + #define CONFIG_ENV_IS_IN_FLASH + #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) +#endif + #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() /* sysclk for MPC85xx */ /* @@ -96,6 +106,19 @@ #define CONFIG_PANIC_HANG /* do not reset board on panic */ /* + * Config the L3 Cache as L3 SRAM + */ +#define CONFIG_SYS_INIT_L3_ADDR CONFIG_RAMBOOT_TEXT_BASE +#ifdef CONFIG_PHYS_64BIT +#define CONFIG_SYS_INIT_L3_ADDR_PHYS (0xf00000000ull | CONFIG_RAMBOOT_TEXT_BASE) +#else +#define CONFIG_SYS_INIT_L3_ADDR_PHYS CONFIG_SYS_INIT_L3_ADDR +#endif +#define CONFIG_SYS_L3_SIZE (1024 << 10) +#define CONFIG_SYS_INIT_L3_END (CONFIG_SYS_INIT_L3_ADDR + CONFIG_SYS_L3_SIZE) + + +/* * Base addresses -- Note these are effective addresses where the * actual resources get mapped (not physical addresses) */ @@ -188,6 +211,10 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ +#if defined(CONFIG_RAMBOOT_PBL) +#define CONFIG_SYS_RAMBOOT +#endif + #define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_AMD_CHECK_DQ7 #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000, CONFIG_SYS_FLASH_BASE_PHYS} @@ -459,7 +486,6 @@ /* * Environment */ -#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ -- 1.6.4

4 3