From mboxrd@z Thu Jan 1 00:00:00 1970 From: Albert ARIBAUD Date: Fri, 30 Mar 2012 09:10:02 +0200 Subject: [U-Boot] Pull request: u-boot-arm/master Message-ID: <4F755C4A.5090606@aribaud.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Wolfgang, The following changes since commit 7cb30b13f12077c7eec8ce2419cd96cd65ace8e2: Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash (2012-03-23 21:59:16 +0100) are available in the git repository at: git://git.denx.de/u-boot-arm master Anatolij Gustschin (4): nhk8815: fix build errors board/vpac270/onenand.c: Fix build errors board/ti/beagle/beagle.c: Fix build warnings arch/arm/cpu/armv7/omap-common/clocks-common.c: Fix build warnings Andreas Bie?mann (1): atmel-boards: add missing atmel_mci.h Chander Kashyap (1): EXYNOS: Add structure for Exynos4 DMC Christian Riesch (1): calimain, enbw_cmc: Fix typo in comments David M?ller (ELSOFT AG) (1): ARM: fix s3c2410 timer code Dirk Behme (2): mx6q: mx6qsabrelite: Update the README imximage: Remove overwriting of flash_offset Doug Anderson (1): EXYNOS: SMDK5250: Support all 4 UARTs Eric Nelson (6): i.MX6: mx6qsabrelite: add ext2 support mx6q: mx6qsabrelite: setup_spi() should be called in board_init to allow use for environment i.MX6: mx6q_sabrelite: add CONFIG_REVISION_TAG i.MX6: mx6qsabrelite: add MACH_TYPE_MX6Q_SABRELITE net: force PKTALIGN to ARCH_DMA_MINALIGN net: fec_mxc: allow use with cache enabled Fabio Estevam (15): mx51evk: Fix CONFIG_SYS_MEMTEST_END mx53evk: Fix CONFIG_SYS_MEMTEST_END mx53smd: Fix CONFIG_SYS_MEMTEST_END efikamx: Fix CONFIG_SYS_MEMTEST_END mx31pdk: Fix CONFIG_SYS_MEMTEST_END mx6: Fix reset cause for Power On Reset case mx6: Remove duplicate definition of ANATOP_BASE_ADDR pmic_i2c: Return error in case of invalid pmic_i2c_tx_num mxs_spi: Return proper timeout error mx6: Read silicon revision from register USB: ehci-mx6: Add proper IO accessors mx28evk: Provide default values for SPI bus and chip select configs: imx: Use CONFIG_SF_DEFAULT_CS mx53: Make PLL2 to be the parent of UART clock mx53ard: Initialize return code with error Grazvydas Ignotas (1): twl4030: fix potential power supply handling issues Heiko Schocher (1): ARM: davinci: fixes for cam_enc_4xx board Helmut Raiger (1): mx31: add "ARM11P power gating" to get_reset_cause Jason Hobbs (1): ARM: highbank: change env config to use nvram Marek Vasut (23): PXA: Remove PXA PCMCIA support PXA: Fix warning in zipitz2 PXA: Fix missing get_tbclk() breaking vpac boards M28: Fix LCD PINMUX M28: Support for the old M28 SoM v1.0 i.MX28: Reformat the DRAM memory configuration data Examples: Properly append LDFLAGS to LD command IXP: Make IXP buildable with arm-linux- toolchains IXP: Fix missing MACH_TYPE_{ACTUX?,PNB3,DVLHOST} IXP: Squash warnings in IXP NPE IXP: Move PDNB3 and SCPU from Makefile to boards.cfg IXP: Fix NAND build warning on PDNB3 and SCPU IXP: Fix GPIO_INT_ACT_LOW_SET() i.MX28: Enable additional DRAM address bits i.MX28: Make the stabilization delays shorter i.MX28: Drop __naked function from spl_mem_init ARM926EJS: Implement cache operations i.MX28: Add cache support into the APBH DMA driver i.MX28: Add cache support to MXS NAND driver MMC: Implement generic bounce buffer i.MX28: Do data transfers via DMA in MMC driver i.MX28: Make use of the bounce buffer i.MX28: Enable caches by default Matt Porter (2): SPL: Add YMODEM over UART load support SPL: Enable YMODEM support on BeagleBone and AM335x EVM Rob Herring (8): net: calxedaxgmac: fix build due to missing __aligned definition ARM: highbank: fix warning for calxedaxgmac_initialize ARM: highbank: add missing get_tbclk ARM: highbank: fix us_to_tick calculation ARM: highbank: change TEXT_BASE to 0x8000 ARM: highbank: Add boot counter support ARM: highbank: add reset support ARM: highbank: setup env from boot source register Robert Delien (5): i.mx28: Added register definitions for DIGCTL registers i.mx28: Replaced magic numbers for scratch register addresses with register definitions Renamed mx28_register to mx28_register_32 to prepare for mx28_register_8 Introducing 8-bit wide register, mx28_register_8 Fix erroneous 32-bit access to hw_clkctrl_frac0 and hw_clkctrl_frac1 registers Simon Glass (39): arm: Remove jornada link script fdt: Add fdtdec_find_aliases() to deal with alias nodes fdt: Add tests for fdtdec fdt: Tidy up a few fdtdec problems fdt: Add functions to access phandles, arrays and bools fdt: Add basic support for decoding GPIO definitions arm: fdt: Add skeleton device tree file from kernel tegra: fdt: Add Tegra2x device tree file from kernel tegra: fdt: Add device tree file for Tegra2 Seaboard from kernel fdt: Add staging area for device tree binding documentation fdt: Add tegra-usb bindings file from linux tegra: fdt: Add additional USB binding tegra: fdt: Add clock bindings tegra: fdt: Add clock bindings for Tegra2 Seaboard tegra: usb: fdt: Add additional device tree definitions for USB ports tegra: usb: fdt: Add USB definitions for Tegra2 Seaboard usb: Add support for txfifo threshold tegra: fdt: Add function to return peripheral/clock ID tegra: usb: Add support for Tegra USB peripheral fdt: Avoid early panic() when there is no FDT present arm: Check for valid FDT after console is up tegra: usb: Add USB support to nvidia boards tegra: usb: Add common USB defines for tegra2 boards tegra: usb: Enable USB on Seaboard tegra: fdt: Enable FDT support for Seaboard tegra: Rename NV_PA_PMC_BASE to TEGRA2_PMC_BASE fdt: Add function to allow aliases to refer to multiple nodes tegra: Enhance clock support to handle 16-bit clock divisors tegra: i2c: Initialise I2C on Nvidia boards tegra: i2c: Select number of controllers for Tegra2 boards tegra: i2c: Enable I2C on Seaboard tegra: i2c: Select I2C ordering for Seaboard tegra: fdt: i2c: Add extra I2C bindings for U-Boot Allow arch directory to contain .lds without requiring Makefile arm: Remove zipitz2 link script Define CPUDIR for the .lds link script arm: Remove unneeded setting of LDCSRIPT arm: add a common .lds link script arm: Use common .lds file where possible Simon Schwarz (8): Add cmd_spl command devkit8000: add config for spl command omap-common: Add NAND SPL linux booting devkit8000/spl: init GPMC for dm9000 in SPL omap-common/spl: Add linux boot to SPL omap/spl: change output of spl_parse_image_header devkit8000: Implement and activate direct OS boot arm: Add Prep subcommand support to bootm Stefano Babic (8): Add cache functions to SPL for armv7 OMAP3: SPL: do not call I2C init if no I2C is set. SPL: call cleanup_before_linux() before booting Linux OMAP3: twister: add support to boot Linux from SPL NAND: TI: fix warnings in omap_gpmc.c OMAP3: mt_ventoux: updated timing for FPGA OMAP3: mt_ventoux: sets its own mtdparts Davinci: ea20: use gpio framework to access gpios Tom Rini (9): .gitignore: Add .su files config.mk: Make cc-option create a file under include/generated config.mk: Check for -fstack-usage support spl.c: Use __noreturn decorator README: document more SPL config options SPL: Add README.omap3 cam_enc_4xx: Rename 'images' to 'imgs' sdrc.c: Fix typo in do_sdrc_init() for SPL OMAP: Remove omap1610inn-based boards Tom Warren (2): arm: Tegra2: Fix ELDK42 gcc failure with inline asm stack pointer load tegra: fdt: Enable FDT support for Ventana Vasily Khoruzhick (2): zipitz2: fix boot issue introduced by PXA low level init rework zipitz2: use pxa_mmc_gen as MMC driver Wolfgang Grandegger (2): usb/ehci: Add USB support for the MX6Q mx6qsabrelite: add and enable USB Host 1 support Yen Lin (1): tegra: i2c: Add I2C driver jacopo mondi (1): omap3_spi: receive transmit mode .gitignore | 1 + MAINTAINERS | 1 - Makefile | 25 +- README | 72 +++- arch/arm/config.mk | 7 - arch/arm/cpu/arm1136/mx31/generic.c | 2 + arch/arm/cpu/arm1136/u-boot.lds | 89 --- arch/arm/cpu/arm1176/u-boot.lds | 78 --- arch/arm/cpu/arm720t/u-boot.lds | 79 --- arch/arm/cpu/arm920t/s3c24x0/timer.c | 64 +-- arch/arm/cpu/arm920t/u-boot.lds | 88 --- arch/arm/cpu/arm925t/u-boot.lds | 83 --- arch/arm/cpu/arm926ejs/cache.c | 66 ++- arch/arm/cpu/arm926ejs/mx28/clock.c | 74 +-- arch/arm/cpu/arm926ejs/mx28/iomux.c | 6 +- arch/arm/cpu/arm926ejs/mx28/mx28.c | 24 +- arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c | 130 +++--- arch/arm/cpu/arm926ejs/mx28/spl_power_init.c | 8 +- arch/arm/cpu/arm926ejs/nomadik/timer.c | 10 + arch/arm/cpu/arm926ejs/u-boot.lds | 80 --- arch/arm/cpu/arm946es/u-boot.lds | 80 --- arch/arm/cpu/arm_intcm/u-boot.lds | 80 --- arch/arm/cpu/armv7/Makefile | 2 - arch/arm/cpu/armv7/cpu.c | 2 + arch/arm/cpu/armv7/highbank/Makefile | 2 +- arch/arm/cpu/armv7/highbank/bootcount.c | 36 ++ arch/arm/cpu/armv7/highbank/config.mk | 1 + arch/arm/cpu/armv7/highbank/timer.c | 9 +- arch/arm/cpu/armv7/imx-common/cpu.c | 25 +- arch/arm/cpu/armv7/mx5/lowlevel_init.S | 20 +- arch/arm/cpu/armv7/mx6/clock.c | 13 + arch/arm/cpu/armv7/mx6/soc.c | 8 +- arch/arm/cpu/armv7/omap-common/Makefile | 3 + arch/arm/cpu/armv7/omap-common/clocks-common.c | 4 +- arch/arm/cpu/armv7/omap-common/spl.c | 56 ++- arch/arm/cpu/armv7/omap-common/spl_nand.c | 47 ++- arch/arm/cpu/armv7/omap-common/spl_ymodem.c | 76 +++ arch/arm/cpu/armv7/omap3/board.c | 2 + arch/arm/cpu/armv7/omap3/sdrc.c | 2 +- arch/arm/cpu/armv7/tegra2/Makefile | 4 +- arch/arm/cpu/armv7/tegra2/ap20.c | 20 +- arch/arm/cpu/armv7/tegra2/board.c | 2 +- arch/arm/cpu/armv7/tegra2/clock.c | 121 ++++- arch/arm/cpu/armv7/tegra2/config.mk | 2 + arch/arm/cpu/armv7/tegra2/usb.c | 460 ++++++++++++++++ arch/arm/cpu/ixp/config.mk | 3 + arch/arm/cpu/ixp/npe/IxEthAcc.c | 2 +- arch/arm/cpu/ixp/npe/IxEthDBAPISupport.c | 3 - arch/arm/cpu/ixp/npe/IxQMgrDispatcher.c | 3 - arch/arm/cpu/lh7a40x/u-boot.lds | 80 --- arch/arm/cpu/pxa/timer.c | 5 + arch/arm/cpu/pxa/u-boot.lds | 86 --- arch/arm/cpu/s3c44b0/u-boot.lds | 80 --- arch/arm/cpu/sa1100/u-boot.lds | 83 --- arch/arm/cpu/{armv7 => }/u-boot.lds | 15 +- arch/arm/dts/skeleton.dtsi | 13 + arch/arm/dts/tegra20.dtsi | 196 +++++++ arch/arm/include/asm/arch-exynos/dmc.h | 109 ++++ arch/arm/include/asm/arch-ixp/ixp425.h | 10 +- arch/arm/include/asm/arch-mx28/imx-regs.h | 1 + arch/arm/include/asm/arch-mx28/regs-apbh.h | 254 +++++----- arch/arm/include/asm/arch-mx28/regs-bch.h | 42 +- arch/arm/include/asm/arch-mx28/regs-clkctrl.h | 98 ++-- arch/arm/include/asm/arch-mx28/regs-common.h | 28 +- arch/arm/include/asm/arch-mx28/regs-digctl.h | 155 ++++++ arch/arm/include/asm/arch-mx28/regs-gpmi.h | 26 +- arch/arm/include/asm/arch-mx28/regs-i2c.h | 28 +- arch/arm/include/asm/arch-mx28/regs-ocotp.h | 86 ++-- arch/arm/include/asm/arch-mx28/regs-pinctrl.h | 168 +++--- arch/arm/include/asm/arch-mx28/regs-power.h | 28 +- arch/arm/include/asm/arch-mx28/regs-rtc.h | 28 +- arch/arm/include/asm/arch-mx28/regs-ssp.h | 40 +- arch/arm/include/asm/arch-mx28/regs-timrot.h | 38 +- arch/arm/include/asm/arch-mx28/regs-usbphy.h | 20 +- arch/arm/include/asm/arch-mx28/sys_proto.h | 10 +- arch/arm/include/asm/arch-mx6/clock.h | 1 + arch/arm/include/asm/arch-mx6/imx-regs.h | 146 +++++- arch/arm/include/asm/arch-tegra2/clk_rst.h | 10 +- arch/arm/include/asm/arch-tegra2/clock.h | 13 + arch/arm/include/asm/arch-tegra2/tegra2.h | 6 +- arch/arm/include/asm/arch-tegra2/tegra_i2c.h | 157 ++++++ arch/arm/include/asm/arch-tegra2/usb.h | 252 +++++++++ arch/arm/include/asm/bootm.h | 26 + arch/arm/include/asm/omap_common.h | 5 + arch/arm/lib/Makefile | 5 +- arch/arm/lib/board.c | 8 + arch/arm/lib/bootm.c | 349 ++++++------ board/actux1/actux1.c | 2 - board/actux2/actux2.c | 2 - board/actux3/actux3.c | 2 - board/actux4/actux4.c | 2 - board/ait/cam_enc_4xx/cam_enc_4xx.c | 103 +++-- board/ait/cam_enc_4xx/config.mk | 7 + board/ait/cam_enc_4xx/u-boot-spl.lds | 2 +- board/davinci/ea20/ea20.c | 38 +- board/denx/m28evk/spl_boot.c | 16 +- board/dvlhost/dvlhost.c | 2 - board/egnite/ethernut5/ethernut5.c | 1 + board/emk/top9000/top9000.c | 1 + board/enbw/enbw_cmc/enbw_cmc.c | 2 +- board/freescale/mx53ard/mx53ard.c | 2 +- board/freescale/mx6qsabrelite/mx6qsabrelite.c | 31 +- board/highbank/highbank.c | 23 + board/nvidia/common/board.c | 19 + board/nvidia/common/board.h | 6 + board/nvidia/dts/tegra2-seaboard.dts | 92 ++++ board/nvidia/seaboard/seaboard.c | 6 + board/omicron/calimain/calimain.c | 2 +- board/prodrive/pdnb3/nand.c | 16 +- board/prodrive/pdnb3/pdnb3.c | 3 - board/samsung/smdk5250/smdk5250.c | 44 ++- board/technexion/twister/twister.c | 23 + board/teejet/mt_ventoux/mt_ventoux.h | 11 +- board/ti/beagle/beagle.c | 3 +- board/ti/omap1610inn/Makefile | 45 -- board/ti/omap1610inn/config.mk | 26 - board/ti/omap1610inn/flash.c | 495 ----------------- board/ti/omap1610inn/lowlevel_init.S | 452 ---------------- board/ti/omap1610inn/omap1610innovator.c | 309 ----------- board/timll/devkit8000/devkit8000.c | 37 ++ board/vpac270/onenand.c | 3 - board/zipitz2/zipitz2.c | 9 + boards.cfg | 10 +- common/Makefile | 4 + common/cmd_spl.c | 188 +++++++ config.mk | 11 +- doc/README.PXA_CF | 56 -- doc/README.commands.spl | 31 ++ doc/README.mx6qsabrelite | 12 +- doc/SPL/README.omap3 | 74 +++ doc/device-tree-bindings/README | 17 + .../clock/nvidia,tegra20-car.txt | 207 +++++++ doc/device-tree-bindings/i2c/tegra20-i2c.txt | 23 + doc/device-tree-bindings/usb/tegra-usb.txt | 25 + drivers/dma/apbh_dma.c | 23 +- drivers/gpio/mxs_gpio.c | 16 +- drivers/i2c/Makefile | 1 + drivers/i2c/tegra_i2c.c | 569 ++++++++++++++++++++ drivers/misc/pmic_i2c.c | 6 + drivers/mmc/mmc.c | 102 ++++- drivers/mmc/mxsmmc.c | 70 ++- drivers/mtd/nand/mxs_nand.c | 53 ++- drivers/mtd/nand/omap_gpmc.c | 14 +- drivers/net/calxedaxgmac.c | 1 + drivers/net/fec_mxc.c | 277 +++++++--- drivers/net/fec_mxc.h | 19 +- drivers/pcmcia/Makefile | 1 - drivers/pcmcia/pxa_pcmcia.c | 93 ---- drivers/power/twl4030.c | 18 +- drivers/spi/mxs_spi.c | 6 +- drivers/spi/omap3_spi.c | 66 +++- drivers/spi/omap3_spi.h | 2 + drivers/usb/host/Makefile | 2 + drivers/usb/host/ehci-hcd.c | 7 + drivers/usb/host/ehci-mx6.c | 200 +++++++ drivers/usb/host/ehci-mxs.c | 8 +- .../u-boot.lds => drivers/usb/host/ehci-tegra.c | 62 ++- drivers/usb/host/ehci.h | 6 +- examples/standalone/Makefile | 2 +- board/zipitz2/u-boot.lds => include/cmd_spl.h | 43 +-- include/configs/actux1.h | 2 + include/configs/actux2.h | 2 + include/configs/actux3.h | 2 + include/configs/actux4.h | 2 + include/configs/am335x_evm.h | 1 + include/configs/cam_enc_4xx.h | 13 +- include/configs/devkit8000.h | 15 +- include/configs/dvlhost.h | 2 + include/configs/ea20.h | 2 + include/configs/efikamx.h | 4 +- include/configs/highbank.h | 21 +- include/configs/m28evk.h | 3 +- include/configs/mt_ventoux.h | 10 + include/configs/mx28evk.h | 3 + include/configs/mx31pdk.h | 2 +- include/configs/mx51evk.h | 2 +- include/configs/mx53evk.h | 2 +- include/configs/mx53smd.h | 2 +- include/configs/mx6qsabrelite.h | 17 + include/configs/omap1610h2.h | 197 ------- include/configs/omap1610inn.h | 202 ------- include/configs/pdnb3.h | 2 + include/configs/seaboard.h | 20 + include/configs/tegra2-common.h | 13 + include/configs/twister.h | 12 + include/configs/ventana.h | 5 + include/configs/vision2.h | 2 +- include/configs/zipitz2.h | 14 +- include/fdtdec.h | 197 +++++++- include/image.h | 2 + include/net.h | 3 +- include/pcmcia.h | 3 +- lib/Makefile | 4 + lib/fdtdec.c | 323 +++++++++++- lib/fdtdec_test.c | 226 ++++++++ spl/Makefile | 4 + tools/imximage.c | 18 +- tools/imximage.h | 1 + 198 files changed, 6109 insertions(+), 4188 deletions(-) delete mode 100644 arch/arm/cpu/arm1136/u-boot.lds delete mode 100644 arch/arm/cpu/arm1176/u-boot.lds delete mode 100644 arch/arm/cpu/arm720t/u-boot.lds delete mode 100644 arch/arm/cpu/arm920t/u-boot.lds delete mode 100644 arch/arm/cpu/arm925t/u-boot.lds delete mode 100644 arch/arm/cpu/arm926ejs/u-boot.lds delete mode 100644 arch/arm/cpu/arm946es/u-boot.lds delete mode 100644 arch/arm/cpu/arm_intcm/u-boot.lds create mode 100644 arch/arm/cpu/armv7/highbank/bootcount.c create mode 100644 arch/arm/cpu/armv7/highbank/config.mk create mode 100644 arch/arm/cpu/armv7/omap-common/spl_ymodem.c create mode 100644 arch/arm/cpu/armv7/tegra2/usb.c delete mode 100644 arch/arm/cpu/lh7a40x/u-boot.lds delete mode 100644 arch/arm/cpu/pxa/u-boot.lds delete mode 100644 arch/arm/cpu/s3c44b0/u-boot.lds delete mode 100644 arch/arm/cpu/sa1100/u-boot.lds rename arch/arm/cpu/{armv7 => }/u-boot.lds (88%) create mode 100644 arch/arm/dts/skeleton.dtsi create mode 100644 arch/arm/dts/tegra20.dtsi create mode 100644 arch/arm/include/asm/arch-mx28/regs-digctl.h create mode 100644 arch/arm/include/asm/arch-tegra2/tegra_i2c.h create mode 100644 arch/arm/include/asm/arch-tegra2/usb.h create mode 100644 arch/arm/include/asm/bootm.h create mode 100644 board/nvidia/dts/tegra2-seaboard.dts delete mode 100644 board/ti/omap1610inn/Makefile delete mode 100644 board/ti/omap1610inn/config.mk delete mode 100644 board/ti/omap1610inn/flash.c delete mode 100644 board/ti/omap1610inn/lowlevel_init.S delete mode 100644 board/ti/omap1610inn/omap1610innovator.c create mode 100644 common/cmd_spl.c delete mode 100644 doc/README.PXA_CF create mode 100644 doc/README.commands.spl create mode 100644 doc/SPL/README.omap3 create mode 100644 doc/device-tree-bindings/README create mode 100644 doc/device-tree-bindings/clock/nvidia,tegra20-car.txt create mode 100644 doc/device-tree-bindings/i2c/tegra20-i2c.txt create mode 100644 doc/device-tree-bindings/usb/tegra-usb.txt create mode 100644 drivers/i2c/tegra_i2c.c delete mode 100644 drivers/pcmcia/pxa_pcmcia.c create mode 100644 drivers/usb/host/ehci-mx6.c rename board/jornada/u-boot.lds => drivers/usb/host/ehci-tegra.c (53%) rename board/zipitz2/u-boot.lds => include/cmd_spl.h (56%) delete mode 100644 include/configs/omap1610h2.h delete mode 100644 include/configs/omap1610inn.h create mode 100644 lib/fdtdec_test.c Amicalement, -- Albert.