May 2012 - U-Boot

[U-Boot] Pull request: u-boot-net/master
by Joe Hershberger 20 May '12

20 May '12

The following changes since commit 0a6deb3251a68b5be640ab1b848ca67e906b75ce: Wolfgang Denk (1): Merge branch 'agust(a)denx.de' of git://git.denx.de/u-boot-staging are available in the git repository at: git://git.denx.de/u-boot-net.git master Joe Hershberger (10): net: Remove volatile from net API net: cosmetic: net.h checkpatch compliance net: cosmetic: bootp.* checkpatch compliance net: cosmetic: eth.c checkpatch compliance net: cosmetic: net.c checkpatch compliance net: cosmetic: nfs.* checkpatch compliance net: cosmetic: rarp.* checkpatch compliance net: cosmetic: sntp.* checkpatch compliance net: cosmetic: tftp.* checkpatch compliance net: cosmetic: netconsole.c checkpatch compliance Mike Frysinger (2): net: punt bd->bi_ip_addr net: move bootfile init into eth_initialize arch/arm/include/asm/u-boot.h | 1 - arch/arm/lib/board.c | 11 - arch/avr32/include/asm/u-boot.h | 1 - arch/avr32/lib/board.c | 5 - arch/blackfin/include/asm/u-boot.h | 1 - arch/blackfin/lib/board.c | 10 +- arch/m68k/include/asm/u-boot.h | 1 - arch/m68k/lib/board.c | 14 -- arch/microblaze/include/asm/u-boot.h | 1 - arch/microblaze/lib/board.c | 7 - arch/mips/include/asm/u-boot.h | 1 - arch/mips/lib/board.c | 11 - arch/nds32/include/asm/u-boot.h | 1 - arch/nds32/lib/board.c | 9 - arch/nios2/include/asm/u-boot.h | 1 - arch/nios2/lib/board.c | 2 - arch/openrisc/include/asm/u-boot.h | 1 - arch/powerpc/include/asm/u-boot.h | 1 - arch/powerpc/lib/board.c | 11 - arch/sandbox/include/asm/u-boot.h | 1 - arch/sandbox/lib/board.c | 3 - arch/sh/include/asm/u-boot.h | 1 - arch/sh/lib/board.c | 22 +-- arch/sparc/include/asm/u-boot.h | 1 - arch/sparc/lib/board.c | 7 - arch/x86/include/asm/init_helpers.h | 2 - arch/x86/include/asm/u-boot.h | 1 - arch/x86/lib/board.c | 6 - arch/x86/lib/init_helpers.c | 20 -- board/esd/cpci405/cpci405.c | 9 +- common/cmd_bdinfo.c | 28 ++-- common/cmd_nvedit.c | 16 +-- common/main.c | 1 - drivers/net/netconsole.c | 122 ++++++------ include/common.h | 4 + include/net.h | 146 ++++++++------- net/bootp.c | 344 +++++++++++++++++----------------- net/bootp.h | 56 +++--- net/eth.c | 89 +++++---- net/net.c | 58 +++---- net/nfs.c | 300 +++++++++++++++--------------- net/nfs.h | 2 +- net/rarp.c | 30 ++-- net/rarp.h | 4 +- net/sntp.c | 31 ++-- net/sntp.h | 2 +- net/tftp.c | 36 ++-- net/tftp.h | 2 +- 48 files changed, 648 insertions(+), 786 deletions(-)

2 1

[U-Boot] Pull request: u-boot-arm/master
by Albert ARIBAUD 20 May '12

20 May '12

Hi Wolfgang, The following changes since commit 0a6deb3251a68b5be640ab1b848ca67e906b75ce: Merge branch 'agust(a)denx.de' of git://git.denx.de/u-boot-staging (2012-04-30 18:19:28 +0200) are available in the git repository at: git://git.denx.de/u-boot-arm master for you to fetch changes up to 2ca4a209a5b961ad1be8782c68dabe326d77dfaf: OMAP4/5: Change omap4_sdp, omap4_panda, omap5_evm maintainer (2012-05-15 08:31:41 +0200) ---------------------------------------------------------------- Aneesh V (6): arm: adapt asm/linkage.h from Linux armv7: add appropriate headers for assembly functions ARM: enable Thumb build armv7: Use -march=armv7-a and thereby enable Thumb-2 omap4+: Avoid using __attribute__ ((__packed__)) OMAP4: enable Thumb build Anton Staff (3): fdt: Add fdtdec functions to read byte array tegra: fdt: Add keyboard controller definition tegra: fdt: Add keyboard definitions for Seaboard Balaji T K (3): arm: omap5: correct boot device mode7 for eMMC omap5: pbias ldo9 turn on mmc: omap5evm: Add eMMC saveenv support Bernie Thompson (1): input: Add support for keyboard matrix decoding from an fdt Chander Kashyap (1): EXYNOS: Rename exynos5_tzpc structure to exynos_tzpc David Purdy (1): kirkwood: add support for Cloud Engines Pogoplug E02 Dirk Behme (1): i.MX6: Add ANATOP regulator init Donghwa Lee (8): EXYNOS: definitions of system resgister and power management registers. EXYNOS: add LCD and MIPI DSI clock interface. LCD: add data structure for EXYNOS display driver EXYNOS: support EXYNOS framebuffer and FIMD display drivers. EXYNOS: support EXYNOS MIPI DSI interface driver. LCD: support S6E8AX0 amoled driver based on EXYNOS MIPI DSI EXYNOS: support TRATS board display function EXYNOS: Change bits per pixel value proper for u-boot. Enric Balletbo i Serra (2): igep00x0: enable the use of a plain text file igep00x0: change mpurate from 500 to auto Enric Balletbò i Serra (1): OMAP3: igep00x0: Reduce lines of code for IGEP-based boards. Eric Nelson (3): i.MX6Q: mx6qsabrelite: Add keypress support to alter boot flow i.MX6: add enable_sata_clock() i.MX6: mx6q_sabrelite: add SATA bindings Fabio Estevam (19): pmic: Add support for the Dialog DA9053 PMIC mx6qsabrelite: No need to set the direction for GPIO3_23 again mx28evk: Allow to booting a dt kernel m28evk: Allow to booting a dt kernel mx28evk: Allow booting a zImage kernel mx6qsabrelite: Allow booting a zImage kernel mx6qarm2: Allow booting a zImage kernel mx31pdk: Allow booting a zImage kernel imx-common: Factor out get_ahb_clk() mx5: Add clock config interface mx53loco: Allow to print CPU information at a later stage mx53loco: Add support for 1GHz operation for DA9053-based boards pmic: dialog: Avoid name conflicts mx53loco: Add mc34708 support and set mx53 frequency at 1GHz mx53loco: Turn on VUSB regulator mx53loco: Add CONFIG_REVISION_TAG mx53loco: Remove unneeded gpio_set_value() spi: mxs: Introduce spi_cs_is_valid() spi: mxs: Allow other chip selects to work Grazvydas Ignotas (3): OMAP3: pandora: pin mux updates for DM3730 board variant OMAP3: pandora: revise GPIO configuration OMAP3: pandora: drop console kernel argument Ian Campbell (1): ARM: dreamplug: Enable FDT support Jaehoon Chung (1): TRATS: modify the trats's configuration Jimmy Zhang (3): tegra: Add EMC support for optimal memory timings tegra: Add PMU to manage power supplies tegra: Add EMC settings for Seaboard Jon Hunter (1): OMAP4: Set fdt_high for OMAP4 devices to enable booting with Device Tree Jonathan Solnit (1): ARM:OMAP+:MMC: Add parameters to MMC init Lauri Hintsala (1): mx28evk: add NAND support Lucas Stach (1): tegra2: trivially enable 13 mhz crystal frequency Luka Perkov (1): kirkwood: add NAS62x0 board support Marek Vasut (17): M28: Enable FDT support Revert "i.MX28: Enable additional DRAM address bits" M28: Scan only first 512 MB of DRAM to avoid memory wraparound i.MX28: Add delay after CPU bypass is cleared FEC: Abstract out register setup M28EVK: Implement support for new board V2.0 M28EVK: Add SD update command i.MX28: Improve passing of data from SPL to U-Boot i.MX28: Implement boot pads sampling and reporting i.MX28: Add LCDIF register definitions i.MX28: Shut down the LCD controller before reset i.MX28: Add LRADC register definitions i.MX28: Add LRADC init to i.MX28 SPL i.MX28: Reorder battery status functions in SPL i.MX28: Add battery boot components to SPL i.MX28: Check if WP detection is implemented at all i.MX28: Avoid redefining serial_put[cs]() Matt Porter (1): arm, omap3: fix warm reset serial output on OMAP36xx/AM/DM37xx Minkyu Kang (1): SMDK5250: fix compiler warning Nikita Kiryanov (1): cm-t35: add I2C multi-bus support Nishanth Menon (3): OMAP3+: Introduce generic logic for OMAP voltage controller OMAP4460: TPS Ensure SET1 is selected after voltage configuration OMAP4: scale voltage of core before MPU scales Nobuhiro Iwamatsu (2): arm: cam_enc_4xx: Change macro from BOARD_LATE_INIT to CONFIG_BOARD_LATE_INIT arm: ea20: Change macro from BOARD_LATE_INIT to CONFIG_BOARD_LATE_INIT Rakesh Iyer (1): tegra: Add tegra keyboard driver SRICHARAN R (17): OMAP5: clocks: Change clock settings as required for ES1.0 silicon. OMAP5: board: Add pinmux data for omap5_evm board. OMAP5: io: Configure the io settings for omap5430 sevm board. OMAP5: emif/ddr: Change emif settings as required for ES1.0 silicon. OMAP5: palmas: Configure nominal opp vdd values OMAP5: hwinit: Add the missing break statement OMAP4/5: Make the silicon revision variable common. OMAP5: SRAM: Change the SRAM base address. OMAP4/5: Make the sysctrl structure common OMAP4/5: device: Add support to get the device type. OMAP5: defconfig: Align the defconfig for 5430 ES1.0 OMAP5: ddr: Change the ddr device name. OMAP4/5: emif: Correct the emif power mgt shadow register bit fields. power: twl6035: add palmas PMIC support OMAP3+: reset: Create a common reset layer. OMAP5: reset: Use cold reset in case of 5430ES1.0 OMAP4/5: Change omap4_sdp, omap4_panda, omap5_evm maintainer Simon Glass (19): fdt: Add function to locate an array in the device tree fdt: Add function to return next compatible subnode Add abs() macro to return absolute value i2c: Add TPS6586X driver tegra: Move ap20.h header into arch location tegra: Add functions to access low-level Osc/PLL details tegra: Add tegra_get_chip_type() to detect SKU tegra: Add header file for APB_MISC register tegra: Set up PMU for Nvidia boards tegra: Set up warmboot code on Nvidia boards fdt: tegra: Add EMC node to device tree tegra: i2c: Add function to find DVC bus tegra: fdt: Add EMC data for Tegra2 Seaboard tegra: Enable LP0 on Seaboard input: Add linux/input.h for key code support input: Add generic keyboard input handler tegra: Add keyboard support to funcmux tegra: Switch on console mux and use environment for console tegra: Enable keyboard for Seaboard Stefano Babic (9): Define UART4 and UART5 base addresses NET: fec_mxc.c: Add a way to disable auto negotiation MX5: Add definitions for SATA controller SATA: check for return value from sata functions MX53: add function to set SATA clock to internal SATA: add driver for MX5 / MX6 SOCs MX53: Add support to ESG ima3 board MX53: mx53loco: Add SATA support MX5: PAD_CTL_DRV_VOT_LOW and PAD_CTL_DRV_VOT_HIGH exchanged Tero Kristo (3): omap4: panda: disable uart2 pads during boot omap4: do not enable fs-usb module omap4: do not enable auxiliary cores Timo Ketola (7): i.MX25: esdhc: Add mxc_get_clock infrastructure i.MX25: This architecture has a GPIO4 too imx: nand: Support flash based BBT i.MX25: usb: Set PORTSCx register imx: usb: There is no such register i.MX2: Include asm/types.h in arch-mx25/imx-regs.h imx: Add u-boot.imx as target for ARM9 i.MX SOCs Tom Rini (11): tools, config.mk: Add gcc-version.sh, cc-version test from Linux Makefile: Add a 'checkthumb' rule omap4: Remove CONFIG_SYS_MMC_SET_DEV omap4+: Remove CONFIG_ARCH_CPU_INIT omap5912osk: Remove empty misc_init_r omap730p2: Remove empty misc_init_r omap3: Introduce weak misc_init_r include/configs: Remove CONFIG_SYS_64BIT_VSPRINTF include/configs: Remove CONFIG_SYS_64BIT_STRTOUL ARM: omap3: Set SPL stack size to 8KB, image to 54KB. ARM: omap3: Add CONFIG_SPL_BOARD_INIT for CONFIG_SPL_MMC_SUPPORT Vladimir Zapolskiy (3): arm926ejs: add NXP LPC32x0 cpu series support serial: add LPC32X0 high-speed UART devices support devkit3250: add Timll DevKit3250 board initial support Wei Ni (1): tegra: Turn off power detect in board init Wolfgang Grandegger (1): USB: ehci-mx6: Fix broken IO access Yen Lin (5): Add AES crypto library tegra: Add crypto library for warmboot code tegra: Add flow, gp_padctl, fuse, sdram headers tegra: Add warmboot implementation tegra: Setup PMC scratch info from ap20 setup Łukasz Majewski (3): ARM: Exynos4: ADC: Universal_C210: Enable LDO4 power line for ADC measurement misc:pmic:max8997 MAX8997 support for PMIC driver misc:pmic:samsung Convert TRATS target to use MAX8997 instead of MAX8998 MAINTAINERS | 24 +- Makefile | 7 + README | 8 + arch/arm/config.mk | 27 +- arch/arm/cpu/arm926ejs/config.mk | 6 + arch/arm/cpu/arm926ejs/lpc32xx/Makefile | 45 + arch/arm/cpu/arm926ejs/lpc32xx/clk.c | 117 +++ arch/arm/cpu/arm926ejs/lpc32xx/cpu.c | 70 ++ arch/arm/cpu/arm926ejs/lpc32xx/devices.c | 52 ++ arch/arm/cpu/arm926ejs/lpc32xx/timer.c | 95 ++ arch/arm/cpu/arm926ejs/mx25/generic.c | 27 + arch/arm/cpu/arm926ejs/mx28/Makefile | 2 +- arch/arm/cpu/arm926ejs/mx28/mx28.c | 29 +- arch/arm/cpu/arm926ejs/mx28/mx28_init.h | 4 + arch/arm/cpu/arm926ejs/mx28/spl_boot.c | 57 ++ arch/arm/cpu/arm926ejs/mx28/spl_lradc_init.c | 86 ++ arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c | 14 +- arch/arm/cpu/arm926ejs/mx28/spl_power_init.c | 224 +++-- arch/arm/cpu/armv7/am33xx/board.c | 2 +- arch/arm/cpu/armv7/config.mk | 7 +- arch/arm/cpu/armv7/exynos/Makefile | 2 +- arch/arm/cpu/armv7/exynos/clock.c | 184 ++++ arch/arm/cpu/armv7/exynos/power.c | 54 ++ arch/arm/cpu/armv7/exynos/system.c | 48 + arch/arm/cpu/armv7/imx-common/cpu.c | 15 +- arch/arm/cpu/armv7/mx5/clock.c | 493 +++++++++- arch/arm/cpu/armv7/mx5/lowlevel_init.S | 5 +- arch/arm/cpu/armv7/mx6/clock.c | 50 +- arch/arm/cpu/armv7/mx6/lowlevel_init.S | 5 +- arch/arm/cpu/armv7/mx6/soc.c | 30 + arch/arm/cpu/armv7/omap-common/Makefile | 1 + arch/arm/cpu/armv7/omap-common/clocks-common.c | 99 +- arch/arm/cpu/armv7/omap-common/emif-common.c | 41 +- arch/arm/cpu/armv7/omap-common/hwinit-common.c | 16 +- arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 14 +- .../arm/cpu/armv7/omap-common/{reset.S => reset.c} | 30 +- arch/arm/cpu/armv7/omap-common/spl.c | 1 + arch/arm/cpu/armv7/omap-common/spl_mmc.c | 5 +- arch/arm/cpu/armv7/omap-common/vc.c | 138 +++ arch/arm/cpu/armv7/omap3/board.c | 12 + arch/arm/cpu/armv7/omap3/clock.c | 16 + arch/arm/cpu/armv7/omap3/lowlevel_init.S | 41 +- arch/arm/cpu/armv7/omap4/clocks.c | 85 +- arch/arm/cpu/armv7/omap4/hwinit.c | 24 +- arch/arm/cpu/armv7/omap4/sdram_elpida.c | 4 + arch/arm/cpu/armv7/omap5/Makefile | 2 +- arch/arm/cpu/armv7/omap5/clocks.c | 143 ++- arch/arm/cpu/armv7/omap5/hwinit.c | 104 ++- .../cpu/armv7/omap5/{sdram_elpida.c => sdram.c} | 101 +- arch/arm/cpu/armv7/s5pc1xx/cache.S | 10 +- arch/arm/cpu/armv7/s5pc1xx/reset.S | 5 +- arch/arm/cpu/armv7/start.S | 13 +- arch/arm/cpu/armv7/tegra2/Makefile | 4 + arch/arm/cpu/armv7/tegra2/ap20.c | 44 +- arch/arm/cpu/armv7/tegra2/board.c | 4 +- arch/arm/cpu/armv7/tegra2/clock.c | 37 +- arch/arm/cpu/armv7/tegra2/crypto.c | 230 +++++ arch/arm/cpu/armv7/tegra2/crypto.h | 36 + arch/arm/cpu/armv7/tegra2/emc.c | 286 ++++++ arch/arm/cpu/armv7/tegra2/funcmux.c | 16 + arch/arm/cpu/armv7/tegra2/lowlevel_init.S | 5 +- arch/arm/cpu/armv7/tegra2/pmu.c | 70 ++ arch/arm/cpu/armv7/tegra2/warmboot.c | 386 ++++++++ arch/arm/cpu/armv7/tegra2/warmboot_avp.c | 250 +++++ arch/arm/cpu/armv7/tegra2/warmboot_avp.h | 81 ++ arch/arm/cpu/armv7/u8500/lowlevel.S | 9 +- arch/arm/dts/tegra20.dtsi | 11 + arch/arm/include/asm/arch-am33xx/mmc_host_def.h | 2 +- arch/arm/include/asm/arch-exynos/clk.h | 3 + arch/arm/include/asm/arch-exynos/cpu.h | 5 + arch/arm/include/asm/arch-exynos/dsim.h | 181 ++++ arch/arm/include/asm/arch-exynos/fb.h | 446 +++++++++ arch/arm/include/asm/arch-exynos/mipi_dsim.h | 380 ++++++++ arch/arm/include/asm/arch-exynos/power.h | 6 + arch/arm/include/asm/arch-exynos/system.h | 53 ++ arch/arm/include/asm/arch-exynos/tzpc.h | 2 +- arch/arm/include/asm/arch-lpc32xx/clk.h | 170 ++++ arch/arm/include/asm/arch-lpc32xx/config.h | 76 ++ arch/arm/include/asm/arch-lpc32xx/cpu.h | 64 ++ arch/arm/include/asm/arch-lpc32xx/emc.h | 92 ++ arch/arm/include/asm/arch-lpc32xx/sys_proto.h | 25 + arch/arm/include/asm/arch-lpc32xx/timer.h | 74 ++ arch/arm/include/asm/arch-lpc32xx/uart.h | 114 +++ arch/arm/include/asm/arch-lpc32xx/wdt.h | 51 ++ arch/arm/include/asm/arch-mx25/clock.h | 23 + arch/arm/include/asm/arch-mx25/imx-regs.h | 3 + arch/arm/include/asm/arch-mx28/imx-regs.h | 2 + arch/arm/include/asm/arch-mx28/regs-lcdif.h | 212 +++++ arch/arm/include/asm/arch-mx28/regs-lradc.h | 400 ++++++++ arch/arm/include/asm/arch-mx28/sys_proto.h | 30 + arch/arm/include/asm/arch-mx5/clock.h | 7 +- arch/arm/include/asm/arch-mx5/crm_regs.h | 6 + arch/arm/include/asm/arch-mx5/imx-regs.h | 11 + arch/arm/include/asm/arch-mx5/iomux.h | 4 +- arch/arm/include/asm/arch-mx5/sys_proto.h | 3 + arch/arm/include/asm/arch-mx6/clock.h | 1 + .../asm/arch-mx6/{ccm_regs.h => crm_regs.h} | 2 +- arch/arm/include/asm/arch-mx6/imx-regs.h | 9 + arch/arm/include/asm/arch-mx6/iomux-v3.h | 111 +++ arch/arm/include/asm/arch-mx6/sys_proto.h | 5 +- arch/arm/include/asm/arch-omap3/cpu.h | 5 +- arch/arm/include/asm/arch-omap3/mmc_host_def.h | 8 +- arch/arm/include/asm/arch-omap3/mux.h | 6 + arch/arm/include/asm/arch-omap4/clocks.h | 18 +- arch/arm/include/asm/arch-omap4/cpu.h | 11 + arch/arm/include/asm/arch-omap4/mmc_host_def.h | 2 +- arch/arm/include/asm/arch-omap4/mux_omap4.h | 2 +- arch/arm/include/asm/arch-omap4/omap.h | 25 +- arch/arm/include/asm/arch-omap4/sys_proto.h | 8 +- arch/arm/include/asm/arch-omap5/clocks.h | 52 +- arch/arm/include/asm/arch-omap5/cpu.h | 11 + arch/arm/include/asm/arch-omap5/mmc_host_def.h | 2 +- arch/arm/include/asm/arch-omap5/mux_omap5.h | 504 +++++----- arch/arm/include/asm/arch-omap5/omap.h | 153 +++- arch/arm/include/asm/arch-omap5/sys_proto.h | 8 +- .../tegra2 => include/asm/arch-tegra2}/ap20.h | 7 + arch/arm/include/asm/arch-tegra2/apb_misc.h | 36 + arch/arm/include/asm/arch-tegra2/clk_rst.h | 3 + arch/arm/include/asm/arch-tegra2/clock.h | 22 + arch/arm/include/asm/arch-tegra2/emc.h | 113 +++ arch/arm/include/asm/arch-tegra2/flow.h | 36 + arch/arm/include/asm/arch-tegra2/fuse.h | 39 + arch/arm/include/asm/arch-tegra2/gp_padctrl.h | 73 ++ arch/arm/include/asm/arch-tegra2/pmu.h | 30 + arch/arm/include/asm/arch-tegra2/sdram_param.h | 148 +++ arch/arm/include/asm/arch-tegra2/tegra2.h | 25 + arch/arm/include/asm/arch-tegra2/tegra_i2c.h | 7 + arch/arm/include/asm/arch-tegra2/warmboot.h | 150 +++ arch/arm/include/asm/emif.h | 76 +- arch/arm/include/asm/linkage.h | 7 + arch/arm/include/asm/omap_common.h | 11 +- board/cloudengines/pogo_e02/Makefile | 43 + board/cloudengines/pogo_e02/kwbimage.cfg | 169 ++++ board/cloudengines/pogo_e02/pogo_e02.c | 118 +++ board/cloudengines/pogo_e02/pogo_e02.h | 44 + board/cm_t35/cm_t35.c | 19 +- board/comelit/dig297/dig297.c | 2 +- board/corscience/tricorder/tricorder.c | 2 +- board/davinci/ea20/ea20.c | 4 +- board/denx/m28evk/m28evk.c | 20 +- board/denx/m28evk/spl_boot.c | 8 +- board/esg/ima3-mx53/Makefile | 41 + board/esg/ima3-mx53/ima3-mx53.c | 302 ++++++ board/esg/ima3-mx53/imximage.cfg | 108 +++ board/freescale/mx28evk/iomux.c | 21 + board/freescale/mx53loco/mx53loco.c | 146 ++- board/freescale/mx6qsabrelite/mx6qsabrelite.c | 155 +++- board/htkw/mcx/mcx.c | 13 +- board/isee/igep0020/igep0020.c | 4 +- board/isee/igep0030/igep0030.c | 4 +- board/logicpd/am3517evm/am3517evm.c | 2 +- board/logicpd/omap3som/omap3logic.c | 13 +- board/logicpd/zoom1/zoom1.c | 2 +- board/logicpd/zoom2/zoom2.c | 2 +- board/matrix_vision/mvblx/mvblx.c | 4 +- board/nvidia/common/Makefile | 1 + board/nvidia/common/board.c | 42 +- board/nvidia/common/emc.c | 53 ++ board/nvidia/common/emc.h | 29 + board/nvidia/dts/tegra2-seaboard.dts | 64 ++ board/overo/overo.c | 2 +- board/pandora/pandora.c | 59 +- board/pandora/pandora.h | 6 + board/raidsonic/ib62x0/Makefile | 43 + board/raidsonic/ib62x0/ib62x0.c | 79 ++ board/raidsonic/ib62x0/ib62x0.h | 40 + board/raidsonic/ib62x0/kwbimage.cfg | 169 ++++ board/samsung/smdk5250/tzpc_init.c | 4 +- board/samsung/trats/trats.c | 173 +++- board/samsung/universal_c210/universal.c | 25 +- board/technexion/twister/twister.c | 2 +- board/teejet/mt_ventoux/mt_ventoux.c | 9 +- board/ti/am3517crane/am3517crane.c | 2 +- board/ti/beagle/beagle.c | 2 +- board/ti/evm/evm.c | 2 +- board/ti/omap5912osk/omap5912osk.c | 7 - board/ti/omap5_evm/evm.c | 10 +- board/ti/omap5_evm/mux_data.h | 489 +++++----- board/ti/omap730p2/omap730p2.c | 6 - board/ti/panda/panda.c | 2 +- board/ti/panda/panda_mux_data.h | 10 +- board/ti/sdp3430/sdp.c | 2 +- board/ti/sdp4430/sdp.c | 4 +- board/ti/sdp4430/sdp4430_mux_data.h | 2 +- board/timll/devkit3250/Makefile | 44 + board/timll/devkit3250/devkit3250.c | 65 ++ board/timll/devkit8000/devkit8000.c | 2 +- boards.cfg | 8 +- common/cmd_sata.c | 9 +- config.mk | 6 +- doc/SPL/README.omap3 | 4 +- drivers/bios_emulator/x86emu/prim_ops.c | 5 - drivers/block/Makefile | 1 + drivers/block/dwc_ahsata.c | 969 ++++++++++++++++++++ drivers/block/dwc_ahsata.h | 335 +++++++ drivers/gpio/mxc_gpio.c | 3 +- drivers/i2c/tegra_i2c.c | 14 + drivers/input/Makefile | 3 + drivers/input/input.c | 430 +++++++++ drivers/input/key_matrix.c | 208 +++++ drivers/input/tegra-kbc.c | 375 ++++++++ drivers/misc/Makefile | 2 + drivers/misc/pmic_dialog.c | 37 + drivers/misc/pmic_max8997.c | 43 + drivers/mmc/mxsmmc.c | 3 +- drivers/mmc/omap_hsmmc.c | 61 +- drivers/mtd/nand/mxc_nand.c | 33 + drivers/net/fec_mxc.c | 88 +- drivers/power/Makefile | 2 + drivers/power/tps6586x.c | 280 ++++++ drivers/power/twl6035.c | 65 ++ drivers/serial/Makefile | 1 + drivers/serial/lpc32xx_hsuart.c | 112 +++ drivers/spi/mxs_spi.c | 23 +- drivers/usb/host/ehci-mx6.c | 5 +- drivers/usb/host/ehci-mxc.c | 4 - drivers/video/Makefile | 4 + drivers/video/exynos_fb.c | 128 +++ drivers/video/exynos_fb.h | 61 ++ drivers/video/exynos_fimd.c | 354 +++++++ drivers/video/exynos_mipi_dsi.c | 253 +++++ drivers/video/exynos_mipi_dsi_common.c | 637 +++++++++++++ drivers/video/exynos_mipi_dsi_common.h | 48 + drivers/video/exynos_mipi_dsi_lowlevel.c | 652 +++++++++++++ drivers/video/exynos_mipi_dsi_lowlevel.h | 111 +++ drivers/video/s6e8ax0.c | 256 ++++++ include/aes.h | 70 ++ include/ahci.h | 5 +- include/common.h | 25 + include/configs/P1023RDS.h | 3 - include/configs/P2020COME.h | 2 - include/configs/am3517_crane.h | 3 +- include/configs/am3517_evm.h | 4 +- include/configs/at91sam9263ek.h | 2 - include/configs/cam_enc_4xx.h | 2 +- include/configs/cm_t35.h | 1 + include/configs/da830evm.h | 1 - include/configs/devkit3250.h | 117 +++ include/configs/devkit8000.h | 2 +- include/configs/dreamplug.h | 2 + include/configs/ea20.h | 3 +- include/configs/eb_cpux9k2.h | 2 - include/configs/flea3.h | 2 - include/configs/hawkboard.h | 1 - include/configs/ib62x0.h | 152 +++ include/configs/igep0030.h | 261 ------ include/configs/{igep0020.h => igep00x0.h} | 45 +- include/configs/ima3-mx53.h | 269 ++++++ include/configs/imx27lite-common.h | 1 - include/configs/m28evk.h | 15 +- include/configs/mcx.h | 4 +- include/configs/meesc.h | 1 - include/configs/mv-common.h | 1 - include/configs/mx25pdk.h | 1 - include/configs/mx28evk.h | 13 + include/configs/mx31pdk.h | 1 + include/configs/mx35pdk.h | 2 - include/configs/mx53loco.h | 29 +- include/configs/mx6qarm2.h | 1 + include/configs/mx6qsabrelite.h | 17 + include/configs/omap3_beagle.h | 3 +- include/configs/omap3_evm_common.h | 3 +- include/configs/omap3_overo.h | 3 +- include/configs/omap3_pandora.h | 3 +- include/configs/omap4_common.h | 5 +- include/configs/omap5912osk.h | 2 - include/configs/omap5_evm.h | 26 +- include/configs/omap730p2.h | 2 - include/configs/otc570.h | 1 - include/configs/p1_p2_rdb_pc.h | 3 - include/configs/pogo_e02.h | 119 +++ include/configs/seaboard.h | 16 + include/configs/spear-common.h | 1 - include/configs/tam3517-common.h | 3 +- include/configs/tegra2-common.h | 26 +- include/configs/trats.h | 15 +- include/configs/tricorder.h | 3 +- include/configs/tx25.h | 2 - include/configs/zmx25.h | 2 - include/dialog_pmic.h | 187 ++++ include/fdtdec.h | 71 ++ include/fsl_pmic.h | 11 + include/input.h | 147 +++ include/key_matrix.h | 99 ++ include/lcd.h | 64 ++ include/linux/input.h | 155 ++++ include/linux/linkage.h | 7 +- include/max8997_pmic.h | 190 ++++ include/max8998_pmic.h | 1 + include/pmic.h | 1 + include/tegra-kbc.h | 33 + include/tps6586x.h | 68 ++ include/twl6035.h | 42 + lib/Makefile | 1 + lib/aes.c | 598 ++++++++++++ lib/fdtdec.c | 53 ++ tools/gcc-version.sh | 32 + 297 files changed, 18126 insertions(+), 1594 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/lpc32xx/Makefile create mode 100644 arch/arm/cpu/arm926ejs/lpc32xx/clk.c create mode 100644 arch/arm/cpu/arm926ejs/lpc32xx/cpu.c create mode 100644 arch/arm/cpu/arm926ejs/lpc32xx/devices.c create mode 100644 arch/arm/cpu/arm926ejs/lpc32xx/timer.c create mode 100644 arch/arm/cpu/arm926ejs/mx28/spl_lradc_init.c create mode 100644 arch/arm/cpu/armv7/exynos/power.c create mode 100644 arch/arm/cpu/armv7/exynos/system.c rename arch/arm/cpu/armv7/omap-common/{reset.S => reset.c} (70%) create mode 100644 arch/arm/cpu/armv7/omap-common/vc.c rename arch/arm/cpu/armv7/omap5/{sdram_elpida.c => sdram.c} (64%) create mode 100644 arch/arm/cpu/armv7/tegra2/crypto.c create mode 100644 arch/arm/cpu/armv7/tegra2/crypto.h create mode 100644 arch/arm/cpu/armv7/tegra2/emc.c create mode 100644 arch/arm/cpu/armv7/tegra2/pmu.c create mode 100644 arch/arm/cpu/armv7/tegra2/warmboot.c create mode 100644 arch/arm/cpu/armv7/tegra2/warmboot_avp.c create mode 100644 arch/arm/cpu/armv7/tegra2/warmboot_avp.h create mode 100644 arch/arm/include/asm/arch-exynos/dsim.h create mode 100644 arch/arm/include/asm/arch-exynos/fb.h create mode 100644 arch/arm/include/asm/arch-exynos/mipi_dsim.h create mode 100644 arch/arm/include/asm/arch-exynos/system.h create mode 100644 arch/arm/include/asm/arch-lpc32xx/clk.h create mode 100644 arch/arm/include/asm/arch-lpc32xx/config.h create mode 100644 arch/arm/include/asm/arch-lpc32xx/cpu.h create mode 100644 arch/arm/include/asm/arch-lpc32xx/emc.h create mode 100644 arch/arm/include/asm/arch-lpc32xx/sys_proto.h create mode 100644 arch/arm/include/asm/arch-lpc32xx/timer.h create mode 100644 arch/arm/include/asm/arch-lpc32xx/uart.h create mode 100644 arch/arm/include/asm/arch-lpc32xx/wdt.h create mode 100644 arch/arm/include/asm/arch-mx28/regs-lcdif.h create mode 100644 arch/arm/include/asm/arch-mx28/regs-lradc.h rename arch/arm/include/asm/arch-mx6/{ccm_regs.h => crm_regs.h} (99%) rename arch/arm/{cpu/armv7/tegra2 => include/asm/arch-tegra2}/ap20.h (96%) create mode 100644 arch/arm/include/asm/arch-tegra2/apb_misc.h create mode 100644 arch/arm/include/asm/arch-tegra2/emc.h create mode 100644 arch/arm/include/asm/arch-tegra2/flow.h create mode 100644 arch/arm/include/asm/arch-tegra2/fuse.h create mode 100644 arch/arm/include/asm/arch-tegra2/gp_padctrl.h create mode 100644 arch/arm/include/asm/arch-tegra2/pmu.h create mode 100644 arch/arm/include/asm/arch-tegra2/sdram_param.h create mode 100644 arch/arm/include/asm/arch-tegra2/warmboot.h create mode 100644 arch/arm/include/asm/linkage.h create mode 100644 board/cloudengines/pogo_e02/Makefile create mode 100644 board/cloudengines/pogo_e02/kwbimage.cfg create mode 100644 board/cloudengines/pogo_e02/pogo_e02.c create mode 100644 board/cloudengines/pogo_e02/pogo_e02.h create mode 100644 board/esg/ima3-mx53/Makefile create mode 100644 board/esg/ima3-mx53/ima3-mx53.c create mode 100644 board/esg/ima3-mx53/imximage.cfg create mode 100644 board/nvidia/common/emc.c create mode 100644 board/nvidia/common/emc.h create mode 100644 board/raidsonic/ib62x0/Makefile create mode 100644 board/raidsonic/ib62x0/ib62x0.c create mode 100644 board/raidsonic/ib62x0/ib62x0.h create mode 100644 board/raidsonic/ib62x0/kwbimage.cfg create mode 100644 board/timll/devkit3250/Makefile create mode 100644 board/timll/devkit3250/devkit3250.c create mode 100644 drivers/block/dwc_ahsata.c create mode 100644 drivers/block/dwc_ahsata.h create mode 100644 drivers/input/input.c create mode 100644 drivers/input/key_matrix.c create mode 100644 drivers/input/tegra-kbc.c create mode 100644 drivers/misc/pmic_dialog.c create mode 100644 drivers/misc/pmic_max8997.c create mode 100644 drivers/power/tps6586x.c create mode 100644 drivers/power/twl6035.c create mode 100644 drivers/serial/lpc32xx_hsuart.c create mode 100644 drivers/video/exynos_fb.c create mode 100644 drivers/video/exynos_fb.h create mode 100644 drivers/video/exynos_fimd.c create mode 100644 drivers/video/exynos_mipi_dsi.c create mode 100644 drivers/video/exynos_mipi_dsi_common.c create mode 100644 drivers/video/exynos_mipi_dsi_common.h create mode 100644 drivers/video/exynos_mipi_dsi_lowlevel.c create mode 100644 drivers/video/exynos_mipi_dsi_lowlevel.h create mode 100644 drivers/video/s6e8ax0.c create mode 100644 include/aes.h create mode 100644 include/configs/devkit3250.h create mode 100644 include/configs/ib62x0.h delete mode 100644 include/configs/igep0030.h rename include/configs/{igep0020.h => igep00x0.h} (91%) create mode 100644 include/configs/ima3-mx53.h create mode 100644 include/configs/pogo_e02.h create mode 100644 include/dialog_pmic.h create mode 100644 include/input.h create mode 100644 include/key_matrix.h create mode 100644 include/linux/input.h create mode 100644 include/max8997_pmic.h create mode 100644 include/tegra-kbc.h create mode 100644 include/tps6586x.h create mode 100644 include/twl6035.h create mode 100644 lib/aes.c create mode 100755 tools/gcc-version.sh Amicalement, -- Albert.

2 1

[U-Boot] Please pull u-boot-mmc.git
by Andy Fleming 20 May '12

20 May '12

The following changes since commit 0a6deb3251a68b5be640ab1b848ca67e906b75ce: Merge branch 'agust(a)denx.de' of git://git.denx.de/u-boot-staging (2012-04-30 18:19:28 +0200) are available in the git repository at: git://www.denx.de/git/u-boot-mmc.git master Andreas Bießmann (1): include/mmc.h: remove struct mmc_csd Dirk Behme (1): mmc: fsl_esdhc: Poll until card is not busy anymore Grazvydas Ignotas (3): mmc: omap: follow TRM procedure to power on cards mmc: omap: improve stat wait message mmc: omap: handle controller errors properly Jaehoon Chung (4): mmc: sdhci: add the quirk for broken r1b response mmc: add the quirk to use the sdhci for samsung-soc mmc: support the sdhci instead of s5p_mmc for samsung-soc ARM: SAMSUNG: support sdhci controller Marek Vasut (1): i.MX28: Lower the amount of blocks transfered in one DMA cycle Łukasz Majewski (1): mmc:fix: Set mmc width according to MMC host capabilities arch/arm/include/asm/arch-exynos/mmc.h | 93 +++--- arch/arm/include/asm/arch-s5pc1xx/mmc.h | 93 +++--- drivers/mmc/Makefile | 2 +- drivers/mmc/fsl_esdhc.c | 39 +++- drivers/mmc/mmc.c | 4 +- drivers/mmc/mxsmmc.c | 2 +- drivers/mmc/omap_hsmmc.c | 55 +++- drivers/mmc/s5p_mmc.c | 490 ------------------------------- drivers/mmc/s5p_sdhci.c | 98 ++++++ drivers/mmc/sdhci.c | 24 ++ include/configs/origen.h | 7 +- include/configs/s5p_goni.h | 7 +- include/configs/s5pc210_universal.h | 7 +- include/configs/smdk5250.h | 3 +- include/configs/smdkv310.h | 7 +- include/configs/trats.h | 3 +- include/fsl_esdhc.h | 4 +- include/mmc.h | 53 +---- include/sdhci.h | 7 + 19 files changed, 339 insertions(+), 659 deletions(-) delete mode 100644 drivers/mmc/s5p_mmc.c create mode 100644 drivers/mmc/s5p_sdhci.c

2 1

[U-Boot] [PATCH 1/1] DaVinci: fix ddr2 vtp i/o calibration
by Troy Kisky 19 May '12

19 May '12

Previously, only the low 5 bits (NCH) were being transfered from DDRVTPR to DDRVTPIOCR, the bits 5-9 where zeroed. VTP_RECAL should be bit 15, not 18. The only mainline board affected by this change is davinci_sonata. The other Davinci boards define CONFIG_SKIP_LOWLEVEL_INIT. However, if the program that loads u-boot on these boards copied the code from u-boot, they will need fixed as well. Signed-off-by: Troy Kisky <troy.kisky(a)boundarydevices.com> Please get tested by acks before applying, where tested by means an overnight memory test. Thanks Troy --- arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S b/arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S index 5b39484..0e45426 100644 --- a/arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S +++ b/arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S @@ -523,9 +523,8 @@ VTPLock: ldr r6, DDRVTPR ldr r7, [r6] - and r7, r7, $0x1f - and r8, r7, $0x3e0 - orr r8, r7, r8 + mov r8, r7, LSL #32-10 + mov r8, r8, LSR #32-10 /* grab low 10 bits */ ldr r7, VTP_RECAL orr r8, r7, r8 ldr r7, VTP_EN @@ -644,7 +643,7 @@ VTP_LOCK_COUNT: VTP_MASK: .word 0xffffdfff VTP_RECAL: - .word 0x40000 + .word 0x08000 VTP_EN: .word 0x02000 CFGTEST: -- 1.7.5.4

1 0

[U-Boot] [PATCH] driver/mtd:IFC: Fix possible memory leak
by Prabhakar Kushwaha 19 May '12

19 May '12

if priv->bank >= MAX_BANK, priv should be freed before returning ENODEV. Signed-off-by: Prabhakar Kushwaha <prabhakar(a)freescale.com> --- Based upon git://git.denx.de/u-boot.git branch master drivers/mtd/nand/fsl_ifc_nand.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c index 7ff231b..5767a3e 100644 --- a/drivers/mtd/nand/fsl_ifc_nand.c +++ b/drivers/mtd/nand/fsl_ifc_nand.c @@ -764,6 +764,7 @@ int board_nand_init(struct nand_chip *nand) if (priv->bank >= MAX_BANKS) { printf("%s: address did not match any " "chip selects\n", __func__); + kfree(priv); return -ENODEV; } -- 1.7.5.4

2 1

[U-Boot] [PATCH] driver/mtd: IFC NAND: Add support of ONFI NAND flash
by Prabhakar Kushwaha 19 May '12

19 May '12

- Fix NAND_CMD_READID command for ONFI detect. - Add NAND_CMD_PARAM command to read the ONFI parameter page. Signed-off-by: Prabhakar Kushwaha <prabhakar(a)freescale.com> Acked-by: Scott Wood <scottwood(a)freescale.com> --- Based upon http://git.denx.de/u-boot.git branch master drivers/mtd/nand/fsl_ifc_nand.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c index 5cac78b..99630f9 100644 --- a/drivers/mtd/nand/fsl_ifc_nand.c +++ b/drivers/mtd/nand/fsl_ifc_nand.c @@ -384,19 +384,30 @@ static void fsl_ifc_cmdfunc(struct mtd_info *mtd, unsigned int command, /* READID must read all possible bytes while CEB is active */ case NAND_CMD_READID: + case NAND_CMD_PARAM: { + int timing = IFC_FIR_OP_RB; + if (command == NAND_CMD_PARAM) + timing = IFC_FIR_OP_RBCD; + out_be32(&ifc->ifc_nand.nand_fir0, (IFC_FIR_OP_CMD0 << IFC_NAND_FIR0_OP0_SHIFT) | (IFC_FIR_OP_UA << IFC_NAND_FIR0_OP1_SHIFT) | - (IFC_FIR_OP_RB << IFC_NAND_FIR0_OP2_SHIFT)); + (timing << IFC_NAND_FIR0_OP2_SHIFT)); out_be32(&ifc->ifc_nand.nand_fcr0, - NAND_CMD_READID << IFC_NAND_FCR0_CMD0_SHIFT); - /* 4 bytes for manuf, device and exts */ - out_be32(&ifc->ifc_nand.nand_fbcr, 4); - ctrl->read_bytes = 4; + command << IFC_NAND_FCR0_CMD0_SHIFT); + out_be32(&ifc->ifc_nand.row3, column); + + /* + * although currently it's 8 bytes for READID, we always read + * the maximum 256 bytes(for PARAM) + */ + out_be32(&ifc->ifc_nand.nand_fbcr, 256); + ctrl->read_bytes = 256; set_addr(mtd, 0, 0, 0); fsl_ifc_run_command(mtd); return; + } /* ERASE1 stores the block and page address */ case NAND_CMD_ERASE1: -- 1.7.5.4

2 1

[U-Boot] [PATCH] mtd, nand: move some printfs to debug output.
by Heiko Schocher 19 May '12

19 May '12

current U-Boot shows on startup (for example on the enbw_cmc board) the following printfs from the nand subsystem: Flash: 2 MiB NAND: Bad block table found at page 65472, version 0x01 Bad block table found at page 65408, version 0x01 nand_read_bbt: Bad block at 0x000002980000 nand_read_bbt: Bad block at 0x000003240000 128 MiB MMC: davinci: 0 remove them to debug output, so it shows with this patch: Flash: 2 MiB NAND: 128 MiB MMC: davinci: 0 Signed-off-by: Heiko Schocher <hs(a)denx.de> Cc: Scott Wood <scottwood(a)freescale.com> --- [hs@pollux u-boot]$ ./tools/checkpatch.pl 20120215/0001-mtd-nand-move-some-printfs-to-debug-output.patch total: 0 errors, 0 warnings, 25 lines checked NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE 20120215/0001-mtd-nand-move-some-printfs-to-debug-output.patch has no obvious style problems and is ready for submission. [hs@pollux u-boot]$ drivers/mtd/nand/nand_bbt.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c index 2b730e0..bf12df8 100644 --- a/drivers/mtd/nand/nand_bbt.c +++ b/drivers/mtd/nand/nand_bbt.c @@ -259,10 +259,10 @@ static int read_bbt(struct mtd_info *mtd, uint8_t *buf, int page, int num, mtd->ecc_stats.bbtblocks++; continue; } - /* Leave it for now, if its matured we can move this - * message to MTD_DEBUG_LEVEL0 */ - printk(KERN_DEBUG "nand_read_bbt: Bad block at 0x%012llx\n", - (loff_t)((offs << 2) + (act >> 1)) << this->bbt_erase_shift); + MTDDEBUG(MTD_DEBUG_LEVEL0, "nand_read_bbt: " \ + "Bad block at 0x%012llx\n", + (loff_t)((offs << 2) + (act >> 1)) + << this->bbt_erase_shift); /* Factory marked bad or worn out ? */ if (tmp == 0) this->bbt[offs + (act >> 3)] |= 0x3 << (act & 0x06); @@ -651,8 +651,9 @@ static int search_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr if (td->pages[i] == -1) printk(KERN_WARNING "Bad block table not found for chip %d\n", i); else - printk(KERN_DEBUG "Bad block table found at page %d, version 0x%02X\n", td->pages[i], - td->version[i]); + MTDDEBUG(MTD_DEBUG_LEVEL0, "Bad block table found " \ + "at page %d, version 0x%02X\n", td->pages[i], + td->version[i]); } return 0; } -- 1.7.7.6

2 1

[U-Boot] [PATCH] nand_util: correct YAFFS image write function
by Liu, Wentao 19 May '12

19 May '12

In function nand_write_skip_bad(),for YAFFS filesystem part, write_oob() will return 0 when success, so when rval equals 0, it should continue to write the next page, and no break. Signed-off-by: Wentao, Liu <wentao.liu(a)intel.com> diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c index 60c778e..7ed8b18 100644 --- a/drivers/mtd/nand/nand_util.c +++ b/drivers/mtd/nand/nand_util.c @@ -564,7 +564,7 @@ int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length, ops.oobbuf = ops.datbuf + pagesize; rval = nand->write_oob(nand, offset, &ops); - if (!rval) + if (rval != 0) break; offset += pagesize; -- 1.7.4.1

4 4

[U-Boot] [PATCH] powerpc/85xx: fix NAND boot linker scripts for -fpic
by Scott Wood 19 May '12

19 May '12

GOT is now handled the way the main u-boot.lds does it. Without this, the boot hangs when built with newer GCC (since 4.6). Older toolchains hid the issue by converting -fpic to -fPIC. Signed-off-by: Scott Wood <scottwood(a)freescale.com> --- arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 5 +++-- arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds index b1a1dac..8ba9399 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds @@ -51,13 +51,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-nand_spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds index 852f9aa..668158f 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds @@ -37,10 +37,12 @@ SECTIONS .reloc : { _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; . = ALIGN(8); -- 1.7.7.rc3.4.g8d714

3 3

[U-Boot] [PATCH 1/2] nand: extend .raw accesses to work on multiple pages
by Scott Wood 19 May '12

19 May '12

A use for this is to read, modify, erase, and write an entire block as a single unit, as a replacement for the biterr command. This way gives more flexibility in that you can also test multiple bit errors, errors in the ECC, etc. Signed-off-by: Scott Wood <scottwood(a)freescale.com> --- common/cmd_nand.c | 95 +++++++++++++++++++++++++++++++++++++++------------- doc/README.nand | 16 ++++---- 2 files changed, 79 insertions(+), 32 deletions(-) diff --git a/common/cmd_nand.c b/common/cmd_nand.c index bae630d..4456706 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -11,7 +11,7 @@ * Added 16-bit nand support * (C) 2004 Texas Instruments * - * Copyright 2010 Freescale Semiconductor + * Copyright 2010, 2012 Freescale Semiconductor * The portions of this file whose copyright is held by Freescale and which * are not considered a derived work of GPL v2-only code may be distributed * and/or modified under the terms of the GNU General Public License as @@ -390,6 +390,41 @@ static void nand_print_and_set_info(int idx) setenv("nand_erasesize", buf); } +static int raw_access(nand_info_t *nand, ulong addr, loff_t off, ulong count, + int read) +{ + int ret = 0; + size_t rwsize; + + while (count--) { + /* Raw access */ + mtd_oob_ops_t ops = { + .datbuf = (u8 *)addr, + .oobbuf = ((u8 *)addr) + nand->writesize, + .len = nand->writesize, + .ooblen = nand->oobsize, + .mode = MTD_OOB_RAW + }; + + rwsize = nand->writesize + nand->oobsize; + if (read) + ret = nand->read_oob(nand, off, &ops); + else + ret = nand->write_oob(nand, off, &ops); + + if (ret) { + printf("%s: error at offset %llx, ret %d\n", + __func__, (long long)off, ret); + break; + } + + addr += nand->writesize + nand->oobsize; + off += nand->writesize; + } + + return ret; +} + int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) { int i, ret = 0; @@ -568,7 +603,9 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) if (strncmp(cmd, "read", 4) == 0 || strncmp(cmd, "write", 5) == 0) { size_t rwsize; + ulong pagecount = 1; int read; + int raw; if (argc < 4) goto usage; @@ -577,13 +614,36 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) read = strncmp(cmd, "read", 4) == 0; /* 1 = read, 0 = write */ printf("\nNAND %s: ", read ? "read" : "write"); - if (arg_off_size(argc - 3, argv + 3, &dev, &off, &size) != 0) - return 1; nand = &nand_info[dev]; - rwsize = size; s = strchr(cmd, '.'); + + if (!strcmp(s, ".raw")) { + raw = 1; + + if (arg_off(argv[3], &dev, &off, &size)) + return 1; + + if (argc > 4 && !str2long(argv[4], &pagecount)) { + printf("'%s' is not a number\n", argv[4]); + return 1; + } + + if (pagecount * nand->writesize > size) { + puts("Size exceeds partition or device limit\n"); + return -1; + } + + rwsize = pagecount * (nand->writesize + nand->oobsize); + } else { + if (arg_off_size(argc - 3, argv + 3, &dev, + &off, &size) != 0) + return 1; + + rwsize = size; + } + if (!s || !strcmp(s, ".jffs2") || !strcmp(s, ".e") || !strcmp(s, ".i")) { if (read) @@ -609,7 +669,8 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) return 1; } ret = nand_write_skip_bad(nand, off, &rwsize, - (u_char *)addr, WITH_YAFFS_OOB); + (u_char *)addr, + WITH_INLINE_OOB); #endif } else if (!strcmp(s, ".oob")) { /* out-of-band data */ @@ -623,22 +684,8 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) ret = nand->read_oob(nand, off, &ops); else ret = nand->write_oob(nand, off, &ops); - } else if (!strcmp(s, ".raw")) { - /* Raw access */ - mtd_oob_ops_t ops = { - .datbuf = (u8 *)addr, - .oobbuf = ((u8 *)addr) + nand->writesize, - .len = nand->writesize, - .ooblen = nand->oobsize, - .mode = MTD_OOB_RAW - }; - - rwsize = nand->writesize + nand->oobsize; - - if (read) - ret = nand->read_oob(nand, off, &ops); - else - ret = nand->write_oob(nand, off, &ops); + } else if (raw) { + ret = raw_access(nand, addr, off, pagecount, read); } else { printf("Unknown nand command suffix '%s'.\n", s); return 1; @@ -732,9 +779,9 @@ U_BOOT_CMD( "nand write - addr off|partition size\n" " read/write 'size' bytes starting at offset 'off'\n" " to/from memory address 'addr', skipping bad blocks.\n" - "nand read.raw - addr off|partition\n" - "nand write.raw - addr off|partition\n" - " Use read.raw/write.raw to avoid ECC and access the page as-is.\n" + "nand read.raw - addr off|partition [count]\n" + "nand write.raw - addr off|partition [count]\n" + " Use read.raw/write.raw to avoid ECC and access the flash as-is.\n" #ifdef CONFIG_CMD_NAND_TRIMFFS "nand write.trimffs - addr off|partition size\n" " write 'size' bytes starting at offset 'off' from memory address\n" diff --git a/doc/README.nand b/doc/README.nand index 04a87c9..1602b5e 100644 --- a/doc/README.nand +++ b/doc/README.nand @@ -94,14 +94,14 @@ Commands: of data for one 512-byte page or 2 256-byte pages. There is no check for bad blocks. - nand read.raw addr ofs|partition - Read page from `ofs' in NAND flash to `addr'. This reads the raw page, - so ECC is avoided and the OOB area is read as well. - - nand write.raw addr ofs|partition - Write page from `addr' to `ofs' in NAND flash. This writes the raw page, - so ECC is avoided and the OOB area is written as well, making the whole - page written as-is. + nand read.raw addr ofs|partition [count] + nand write.raw addr ofs|partition [count] + Read or write one or more pages at "ofs" in NAND flash, from or to + "addr" in memory. This is a raw access, so ECC is avoided and the + OOB area is transferred as well. If count is absent, it is assumed + to be one page. As with .yaffs2 accesses, the data is formatted as + a packed sequence of "data, oob, data, oob, ..." -- no alignment of + individual pages is maintained. Configuration Options: -- 1.7.7.rc3.4.g8d714

3 4