[U-Boot] Pull request: u-boot-arm/master
Hello,
The following changes since commit 009d75ccc11d27b9a083375a88bb93cb746b4800:
Merge branch 'u-boot/master' into 'u-boot-arm/master' (2013-03-28 18:50:01 +0100)
are available in the git repository at:
git://git.denx.de/u-boot-arm master
for you to fetch changes up to aad17a2f2bdd0b456522e24a90a0f8b8d8adb1f9:
ARM: fix CONFIG_SPL_MAX_SIZE semantics (2013-04-11 00:18:03 +0200)
*** NOTE *** there should be a single, and trivial, merge conflict on file drivers/video/exynos_fb.c.
---------------------------------------------------------------- Abbas Raza (1): mmc: i.MX6: fsl_esdhc: Define maximum bus width supported by a board
Ajay Kumar (13): video: exynos_fb: Remove callbacks from the driver video: exynos_dp: Remove callbacks from the driver video: exynos_fb: Make fimd_ctrl global EXYNOS: FDT: Add compatible strings for FIMD video: exynos_fb: add DT support for FIMD driver EXYNOS5: Add device node for FIMD SMDK5250: Add device node for FIMD video: exynos_dp: Make dp_regs global EXYNOS5: FDT: Add compatible strings for FIMD video: exynos_dp: Add function to parse DP DT node EXYNOS5: Add device node for DP SMDK5250: Add device node for DP SMDK5250: Use statically defined structures only in non DT case
Akshay Saraswat (8): Exynos: clock: Fix a bug in PLL lock check condition Exynos: Add hardware accelerated SHA256 and SHA1 Exynos: config: Enable ACE HW for SHA 256 for Exynos gen: Add sha h/w acceleration to hash Exynos: config: Enable hash command Exynos5: clock: Fix a typo bug in exynos clock init Exynos5: config: enable time command Exynos: pwm: Remove dead code of function exynos5_get_pwm_clk
Albert ARIBAUD (7): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master' Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' cam_enc_4xx: fix CONFIG_SPL_MAX_SIZE semantics da850evm, da850_am18xxevm: fix CONFIG_SPL_MAX_SIZE semantics smdk5250, snow: fix CONFIG_SPL_MAX_SIZE semantics ARM: fix CONFIG_SPL_MAX_SIZE semantics
Alexandre Pereira da Silva (1): mx23_olinuxino: Fix netboot console
Andreas Bießmann (6): omap3/cpu.h: add BCH support asm/omap_gpmc.h: consolidate common defines omap3/omap_gpmc.h: add ooblayout for BCH8 as in kernel omap_gpmc: change nandecc command omap_gpmc: add support for hw assisted BCH8 tricorder: enable hw assisted BCH8 in SPL and u-boot
Benoît Thébaudeau (29): mx25pdk: Enable imxdi RTC nand: mxc: Prepare to add support for i.MX5 nand: mxc: Add support for i.MX5 imx: mx5: lowlevel_init: Simplify code imx: mx53ard: Add support for NAND Flash nand: mxc: Fix debug trace in mxc_nand_read_oob_syndrome() nand: mxc: Use appropriate page number in syndrome functions arm: start.S: Fix _TEXT_BASE for SPL arm: relocate_code() is no longer noreturn arm1136: Remove redundant relocate_code() return arm: relocate_code(): Remove useless relocation offset computation arm: relocate_code(): Use __image_copy_end for end of relocation arm: crt0.S: Remove bogus .globl autoconfig.mk: Make it possible to define configs from other configs Makefile: Change CONFIG_SPL_PAD_TO to image offset imx: Fix automatic make targets for imx images nand: mxc: Switch NAND SPL to generic SPL arm926ejs: Remove deprecated and now unused NAND SPL arm: Remove unused relocate_code() parameters Makefile: Move SHELL setup to config.mk .gitignore: Add /SPL imx: Add u-boot-with-spl.imx make target imx: Add u-boot-with-nand-spl.imx make target arm: Remove support for smdk6400 Revert "mkconfig: start deprecating Makefile config targets" arm: Remove support for unused s3c64xx arm: Remove deprecated and now unused NAND SPL arm1176: Remove unused MMU setup from start.S arm: Make all linker scripts compatible with per-symbol sections
Bin Liu (2): musb: am335x: disable bulk split-combine feature musb: set MUSB speed based on CONFIG
Che-Liang Chiou (1): Exynos: Add timer_get_us function
Dirk Behme (1): spi: mxc_spi: Fix ECSPI reset handling
Eric Nelson (2): i.MX6: Add hdmidet command to detect attached HDMI monitor i.MX6: mx6qsabrelite: discard override of CONFIG_ARP_TIMEOUT
Fabio Estevam (13): mxs: spl_mem_init: Align DDR2 init with FSL bootlets source configs: mx28evk: Use single-line comments mx28evk: Disable CONFIG_CMD_I2C Add initial support for Wandboard dual lite and solo. mx28evk: Introduce a new target for saving env vars to NAND mx6qsabrelite: README: No need to pass 'u-boot.imx' mx6: Fix get_board_rev() for the mx6 solo case wandboard: Remove duplicate 'mmc dev' mx6qsabrelite: Remove duplicate 'mmc dev' wandboard: Remove CONFIG_SYS_FSL_USDHC_NUM mtd: nand: Introduce CONFIG_SYS_NAND_BUSWIDTH_16BIT mtd: nand: mxc_nand: Fix is_16bit_nand() mx31pdk: Remove watchdog support
Gabe Black (3): Exynos: pwm: Fix two bugs in the exynos pwm configuration code Exynos: Avoid a divide by zero by specifying a non-zero period for pwm 4 Exynos: Tidy up the pwm_config function in the exynos pwm driver
Hunter, Jon (4): omap2420-h4: Fix DRAM initialisation omap2420-h4: Fix booting from NOR flash omap2420-h4: Add device tree support omap2420-h4: Fix get_timer() and CONFIG_SYS_HZ
Javier Martinez Canillas (1): i.MX6: mx6qsabrelite: README: don't pass chip-select to sf probe command
Jon Hunter (5): omap5912-osk: Fix DRAM initialisation omap5912-osk: Fix booting from NOR flash omap5912-osk: Fix device initialisation omap5912-osk: Increase flash partition for u-boot omap5912-osk: Fix get_timer() and CONFIG_SYS_HZ
Josh Wu (1): logo: update to the new logo for ATMEL
Knut Wohlrab (1): imx-common: timer: fix 32-bit overflow
Lars Poeschel (1): pcm051: Enable DDR PHY dynamic power down bit
Lokesh Vutla (1): arm: omap4: Fix SDRAM AUTO DETECTION
Lubomir Popov (2): OMAP: Fix copy-paste bug that did not enable UART4 clock OMAP4: Fix bug in omap4460_volts struct
Manfred Huber (1): omap3_beagle: Flush UART3 xmit on enable if TEMT is broken
Minkyu Kang (1): exynos: change indentation of defines in cpu.h
Nishanth Menon (1): omap5: Allow use of a plain text env file
Otavio Salvador (4): mx6qsabresd: Document the mapping of USDHC[2-4] mx6qsabresd: Fix card detection for invalid card id case mx6qsabre{sd,auto}: Add boot mode select mx23_olinuxino: Change definitions to use spaces instead of tabs
Padmavathi Venna (4): Exynos: Add peripherial id for pwm Exynos: clock: Add generic api to get the clk freq Exynos: clock: Correct pwm source clk selection Exynos: pwm: Use generic api to get pwm clk freq
Przemyslaw Marczak (1): spl:falcon:trats: Fix SPL image size computing.
Rajeshwari Shinde (1): EXYNOS5: Add L2 Cache Support.
SRICHARAN R (4): ARM: OMAP5: Rename omap5_evm to omap5_uevm ARM: OMAP5: Set fdt_high to enable booting with Device tree ARM: OMAP4/5: Change the default boot command to work with device tree ARM: OMAP4/5: Make bootz as the default boot command
Simon Glass (1): Exynos: Change get_timer() to work correctly
Stephen Warren (1): ARM: bcm2835: fix get_timer() to return ms
Tom Rini (8): am335x: Enable MMC1 clock doc/feature-removal-schedule.txt: Add CONFIG_SYS_(CLOCKS|PADS)_ENABLE_ALL OMAP3/4/5/AM33xx: Correct logic for checking FAT or RAW MMC omap5_uevm.h: Move uEVM-specific choices to omap5_uevm.h omap5_common.h: Use fallback CONFIG_SYS_BAUDRATE_TABLE am335x/ti814x: Correct MMC_BOOT_DEVICES_START/END am335x: Update timings for the beaglebone again omap5_uevm: Correct to 2MiB aligned partitions on eMMC
Vivek Gautam (2): SMDK5250: Fix compiler warning for non-dt systems spi: exynos: Fix compiler warnings for non-dt systems
.gitignore | 3 + MAINTAINERS | 5 +- Makefile | 40 +- README | 42 +- arch/arm/config.mk | 2 - arch/arm/cpu/arm1136/config.mk | 7 + arch/arm/cpu/arm1136/omap24xx/timer.c | 8 +- arch/arm/cpu/arm1136/start.S | 28 +- arch/arm/cpu/arm1136/u-boot-spl.lds | 2 +- arch/arm/cpu/arm1176/bcm2835/timer.c | 14 +- arch/arm/cpu/arm1176/s3c64xx/config.mk | 34 - arch/arm/cpu/arm1176/s3c64xx/cpu_init.S | 135 --- arch/arm/cpu/arm1176/s3c64xx/init.c | 26 - arch/arm/cpu/arm1176/s3c64xx/reset.S | 34 - arch/arm/cpu/arm1176/s3c64xx/speed.c | 145 ---- arch/arm/cpu/arm1176/s3c64xx/timer.c | 160 ---- arch/arm/cpu/arm1176/start.S | 127 +-- arch/arm/cpu/arm720t/start.S | 26 +- arch/arm/cpu/arm920t/ep93xx/u-boot.lds | 13 +- arch/arm/cpu/arm920t/start.S | 28 +- arch/arm/cpu/arm925t/start.S | 28 +- arch/arm/cpu/arm926ejs/config.mk | 8 +- arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 18 +- arch/arm/cpu/arm926ejs/mxs/start.S | 4 + arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds | 6 +- arch/arm/cpu/arm926ejs/omap/timer.c | 15 +- arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds | 6 +- arch/arm/cpu/arm926ejs/start.S | 40 +- arch/arm/cpu/arm946es/start.S | 28 +- arch/arm/cpu/arm_intcm/start.S | 30 +- arch/arm/cpu/armv7/am33xx/clock_am33xx.c | 5 + arch/arm/cpu/armv7/am33xx/elm.c | 2 +- arch/arm/cpu/armv7/config.mk | 6 + arch/arm/cpu/armv7/exynos/clock.c | 167 +++- arch/arm/cpu/armv7/exynos/soc.c | 36 + arch/arm/cpu/armv7/mx5/lowlevel_init.S | 8 +- arch/arm/cpu/armv7/mx6/soc.c | 12 + arch/arm/cpu/armv7/omap-common/clocks-common.c | 4 +- arch/arm/cpu/armv7/omap-common/emif-common.c | 29 +- arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 10 +- arch/arm/cpu/armv7/omap-common/u-boot-spl.lds | 2 +- arch/arm/cpu/armv7/omap3/board.c | 31 +- arch/arm/cpu/armv7/omap4/emif.c | 1 - arch/arm/cpu/armv7/omap4/hw_data.c | 8 +- arch/arm/cpu/armv7/omap5/emif.c | 1 - arch/arm/cpu/armv7/s5p-common/pwm.c | 42 +- arch/arm/cpu/armv7/s5p-common/timer.c | 117 ++- arch/arm/cpu/armv7/socfpga/u-boot-spl.lds | 2 +- arch/arm/cpu/armv7/start.S | 26 +- arch/arm/cpu/ixp/start.S | 28 +- arch/arm/cpu/ixp/u-boot.lds | 2 + arch/arm/cpu/pxa/start.S | 26 +- arch/arm/cpu/s3c44b0/start.S | 28 +- arch/arm/cpu/sa1100/start.S | 28 +- arch/arm/cpu/u-boot-spl.lds | 19 +- arch/arm/cpu/u-boot.lds | 4 - arch/arm/dts/exynos5250.dtsi | 13 + arch/arm/imx-common/Makefile | 18 + .../arm/imx-common/cmd_hdmidet.c | 32 +- arch/arm/imx-common/timer.c | 26 +- arch/arm/include/asm/arch-am33xx/ddr_defs.h | 20 +- arch/arm/include/asm/arch-am33xx/omap_gpmc.h | 58 +- arch/arm/include/asm/arch-am33xx/spl.h | 8 + arch/arm/include/asm/arch-am33xx/sys_proto.h | 2 +- arch/arm/include/asm/arch-bcm2835/timer.h | 2 + arch/arm/include/asm/arch-exynos/clk.h | 15 + arch/arm/include/asm/arch-exynos/cpu.h | 10 +- arch/arm/include/asm/arch-exynos/dp_info.h | 1 - arch/arm/include/asm/arch-exynos/periph.h | 5 + arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 3 + arch/arm/include/asm/arch-omap24xx/omap2420.h | 6 +- arch/arm/include/asm/arch-omap3/cpu.h | 6 + arch/arm/include/asm/arch-omap3/omap_gpmc.h | 68 +- arch/arm/include/asm/arch-omap3/spl.h | 3 + arch/arm/include/asm/arch-omap3/sys_proto.h | 2 +- arch/arm/include/asm/arch-omap4/omap.h | 1 - arch/arm/include/asm/arch-omap4/spl.h | 2 + arch/arm/include/asm/arch-omap5/omap.h | 1 - arch/arm/include/asm/arch-omap5/spl.h | 2 + arch/arm/include/asm/arch-s3c64xx/hardware.h | 63 -- arch/arm/include/asm/arch-s3c64xx/s3c6400.h | 895 -------------------- arch/arm/include/asm/arch-s3c64xx/s3c64x0.h | 90 -- arch/arm/include/asm/emif.h | 1 - arch/arm/include/asm/mach-types.h | 13 - arch/arm/include/asm/omap_gpmc.h | 87 ++ arch/arm/lib/crt0.S | 52 +- board/actux1/u-boot.lds | 3 + board/actux2/u-boot.lds | 3 + board/actux3/u-boot.lds | 3 + board/ait/cam_enc_4xx/u-boot-spl.lds | 4 +- board/boundary/nitrogen6x/nitrogen6x.c | 8 +- board/davinci/da8xxevm/u-boot-spl-da850evm.lds | 4 +- board/davinci/da8xxevm/u-boot-spl-hawk.lds | 9 +- board/dvlhost/u-boot.lds | 3 + board/freescale/mx31ads/u-boot.lds | 18 +- board/freescale/mx31pdk/Makefile | 3 + board/freescale/mx31pdk/config.mk | 5 - board/freescale/mx31pdk/mx31pdk.c | 8 + board/freescale/mx53ard/mx53ard.c | 66 ++ board/freescale/mx6qsabreauto/mx6qsabreauto.c | 18 + board/freescale/mx6qsabrelite/README | 4 +- board/freescale/mx6qsabrelite/mx6qsabrelite.c | 8 +- board/freescale/mx6qsabresd/mx6qsabresd.c | 48 +- board/isee/igep00x0/igep00x0.c | 2 +- board/karo/tx25/Makefile | 4 +- board/karo/tx25/config.mk | 5 - board/karo/tx25/tx25.c | 8 + board/overo/overo.c | 2 +- board/phytec/pcm051/board.c | 3 +- board/samsung/dts/exynos5250-smdk5250.dts | 40 + board/samsung/smdk5250/clock_init.c | 22 +- board/samsung/smdk5250/setup.h | 2 +- board/samsung/smdk5250/smdk5250-uboot-spl.lds | 4 +- board/samsung/smdk5250/smdk5250.c | 19 +- board/samsung/smdk6400/.gitignore | 5 - board/samsung/smdk6400/Makefile | 48 -- board/samsung/smdk6400/config.mk | 30 - board/samsung/smdk6400/lowlevel_init.S | 323 ------- board/samsung/smdk6400/smdk6400.c | 134 --- board/samsung/smdk6400/smdk6400_nand_spl.c | 37 - board/samsung/smdk6400/u-boot-nand.lds | 86 -- board/samsung/trats/trats.c | 6 +- board/samsung/universal_c210/universal.c | 23 +- board/ti/am335x/board.c | 2 +- board/ti/omap2420h4/config.mk | 4 +- board/ti/omap2420h4/mem.c | 13 - board/ti/omap2420h4/omap2420h4.c | 24 +- board/ti/omap5912osk/config.mk | 12 +- board/ti/omap5912osk/lowlevel_init.S | 20 + board/ti/omap5912osk/omap5912osk.c | 23 +- board/ti/{omap5_evm => omap5_uevm}/Makefile | 0 board/ti/{omap5_evm => omap5_uevm}/evm.c | 0 board/ti/{omap5_evm => omap5_uevm}/mux_data.h | 0 board/vpac270/u-boot-spl.lds | 6 +- board/wandboard/Makefile | 29 + board/wandboard/README | 40 + board/wandboard/wandboard.c | 178 ++++ boards.cfg | 9 +- common/hash.c | 18 + config.mk | 7 + doc/README.arm-relocation | 14 +- doc/README.mx28evk | 18 + doc/README.omap3 | 28 + doc/README.scrapyard | 1 + doc/device-tree-bindings/video/exynos-dp.txt | 69 ++ doc/device-tree-bindings/video/exynos-fb.txt | 92 ++ doc/driver-model/UDM-serial.txt | 42 +- doc/feature-removal-schedule.txt | 32 +- .../arm1176/s3c64xx => drivers/crypto}/Makefile | 27 +- drivers/crypto/ace_sha.c | 126 +++ drivers/crypto/ace_sha.h | 325 +++++++ drivers/mmc/bcm2835_sdhci.c | 5 +- drivers/mmc/fsl_esdhc.c | 7 + drivers/mtd/nand/Makefile | 2 +- drivers/mtd/nand/mxc_nand.c | 260 +++--- drivers/mtd/nand/mxc_nand.h | 225 +++++ .../mtd/nand/mxc_nand_spl.c | 130 ++- drivers/mtd/nand/ndfc.c | 4 +- drivers/mtd/nand/omap_gpmc.c | 424 +++++++--- drivers/mtd/nand/s3c64xx.c | 295 ------- drivers/mtd/onenand/onenand_base.c | 4 - drivers/mtd/onenand/samsung.c | 60 +- drivers/serial/Makefile | 1 - drivers/serial/ns16550.c | 18 +- drivers/serial/s3c64xx.c | 187 ---- drivers/serial/serial.c | 2 - drivers/spi/exynos_spi.c | 2 + drivers/spi/mxc_spi.c | 8 +- drivers/usb/host/Makefile | 1 - drivers/usb/host/ohci-hcd.c | 1 - drivers/usb/musb-new/musb_core.c | 7 + drivers/usb/musb-new/musb_uboot.c | 2 +- drivers/video/exynos_dp.c | 76 +- drivers/video/exynos_dp_lowlevel.c | 69 +- drivers/video/exynos_dp_lowlevel.h | 1 + drivers/video/exynos_fb.c | 230 ++++- drivers/video/exynos_fimd.c | 44 +- include/common.h | 7 +- include/config_fallbacks.h | 16 + include/configs/MPC8313ERDB.h | 2 +- include/configs/am335x_evm.h | 1 + include/configs/cam_enc_4xx.h | 4 +- include/configs/da850evm.h | 4 +- include/configs/dra7xx_evm.h | 2 + include/configs/exynos5250-dt.h | 11 +- include/configs/igep00x0.h | 3 - include/configs/mx23_olinuxino.h | 162 ++-- include/configs/mx25pdk.h | 4 + include/configs/mx28evk.h | 92 +- include/configs/mx31pdk.h | 23 +- include/configs/mx53ard.h | 10 + include/configs/mx6qsabre_common.h | 2 + include/configs/mx6qsabrelite.h | 3 - include/configs/omap2420h4.h | 5 +- include/configs/omap4_common.h | 22 +- include/configs/omap5912osk.h | 15 +- include/configs/omap5_common.h | 51 +- include/configs/{omap5_evm.h => omap5_uevm.h} | 17 + include/configs/rpi_b.h | 2 +- include/configs/smdk6400.h | 296 ------- include/configs/trats.h | 1 + include/configs/tricorder.h | 13 +- include/configs/tx25.h | 22 +- include/configs/wandboard.h | 209 +++++ include/fdtdec.h | 2 + include/fsl_esdhc.h | 1 + include/fsl_nfc.h | 170 ---- include/hw_sha.h | 50 ++ include/lcd.h | 9 - include/onenand_uboot.h | 4 - lib/Makefile | 2 +- lib/fdtdec.c | 2 + mkconfig | 9 - nand_spl/board/freescale/mx31pdk/Makefile | 63 -- nand_spl/board/freescale/mx31pdk/u-boot.lds | 87 -- nand_spl/board/karo/tx25/Makefile | 84 -- nand_spl/board/karo/tx25/config.mk | 1 - nand_spl/board/karo/tx25/u-boot.lds | 85 -- nand_spl/board/samsung/smdk6400/Makefile | 117 --- nand_spl/board/samsung/smdk6400/config.mk | 40 - nand_spl/board/samsung/smdk6400/u-boot.lds | 80 -- tools/logos/atmel.bmp | Bin 26334 -> 15478 bytes tools/scripts/define2mk.sed | 2 + 223 files changed, 3941 insertions(+), 5319 deletions(-) delete mode 100644 arch/arm/cpu/arm1176/s3c64xx/config.mk delete mode 100644 arch/arm/cpu/arm1176/s3c64xx/cpu_init.S delete mode 100644 arch/arm/cpu/arm1176/s3c64xx/init.c delete mode 100644 arch/arm/cpu/arm1176/s3c64xx/reset.S delete mode 100644 arch/arm/cpu/arm1176/s3c64xx/speed.c delete mode 100644 arch/arm/cpu/arm1176/s3c64xx/timer.c rename drivers/usb/host/s3c64xx-hcd.c => arch/arm/imx-common/cmd_hdmidet.c (65%) delete mode 100644 arch/arm/include/asm/arch-s3c64xx/hardware.h delete mode 100644 arch/arm/include/asm/arch-s3c64xx/s3c6400.h delete mode 100644 arch/arm/include/asm/arch-s3c64xx/s3c64x0.h create mode 100644 arch/arm/include/asm/omap_gpmc.h delete mode 100644 board/freescale/mx31pdk/config.mk delete mode 100644 board/karo/tx25/config.mk delete mode 100644 board/samsung/smdk6400/.gitignore delete mode 100644 board/samsung/smdk6400/Makefile delete mode 100644 board/samsung/smdk6400/config.mk delete mode 100644 board/samsung/smdk6400/lowlevel_init.S delete mode 100644 board/samsung/smdk6400/smdk6400.c delete mode 100644 board/samsung/smdk6400/smdk6400_nand_spl.c delete mode 100644 board/samsung/smdk6400/u-boot-nand.lds rename board/ti/{omap5_evm => omap5_uevm}/Makefile (100%) rename board/ti/{omap5_evm => omap5_uevm}/evm.c (100%) rename board/ti/{omap5_evm => omap5_uevm}/mux_data.h (100%) create mode 100644 board/wandboard/Makefile create mode 100644 board/wandboard/README create mode 100644 board/wandboard/wandboard.c create mode 100644 doc/device-tree-bindings/video/exynos-dp.txt create mode 100644 doc/device-tree-bindings/video/exynos-fb.txt rename {arch/arm/cpu/arm1176/s3c64xx => drivers/crypto}/Makefile (69%) create mode 100644 drivers/crypto/ace_sha.c create mode 100644 drivers/crypto/ace_sha.h create mode 100644 drivers/mtd/nand/mxc_nand.h rename nand_spl/nand_boot_fsl_nfc.c => drivers/mtd/nand/mxc_nand_spl.c (65%) delete mode 100644 drivers/mtd/nand/s3c64xx.c delete mode 100644 drivers/serial/s3c64xx.c rename include/configs/{omap5_evm.h => omap5_uevm.h} (71%) delete mode 100644 include/configs/smdk6400.h create mode 100644 include/configs/wandboard.h delete mode 100644 include/fsl_nfc.h create mode 100644 include/hw_sha.h delete mode 100644 nand_spl/board/freescale/mx31pdk/Makefile delete mode 100644 nand_spl/board/freescale/mx31pdk/u-boot.lds delete mode 100644 nand_spl/board/karo/tx25/Makefile delete mode 100644 nand_spl/board/karo/tx25/config.mk delete mode 100644 nand_spl/board/karo/tx25/u-boot.lds delete mode 100644 nand_spl/board/samsung/smdk6400/Makefile delete mode 100644 nand_spl/board/samsung/smdk6400/config.mk delete mode 100644 nand_spl/board/samsung/smdk6400/u-boot.lds
Amicalement,
Hi Albert,
On Thursday, April 11, 2013 1:12:17 AM, Albert ARIBAUD wrote:
Hello,
The following changes since commit 009d75ccc11d27b9a083375a88bb93cb746b4800:
Merge branch 'u-boot/master' into 'u-boot-arm/master' (2013-03-28 18:50:01 +0100)
are available in the git repository at:
git://git.denx.de/u-boot-arm master
for you to fetch changes up to aad17a2f2bdd0b456522e24a90a0f8b8d8adb1f9:
ARM: fix CONFIG_SPL_MAX_SIZE semantics (2013-04-11 00:18:03 +0200)
*** NOTE *** there should be a single, and trivial, merge conflict on file drivers/video/exynos_fb.c.
Abbas Raza (1): mmc: i.MX6: fsl_esdhc: Define maximum bus width supported by a board
Ajay Kumar (13): video: exynos_fb: Remove callbacks from the driver video: exynos_dp: Remove callbacks from the driver video: exynos_fb: Make fimd_ctrl global EXYNOS: FDT: Add compatible strings for FIMD video: exynos_fb: add DT support for FIMD driver EXYNOS5: Add device node for FIMD SMDK5250: Add device node for FIMD video: exynos_dp: Make dp_regs global EXYNOS5: FDT: Add compatible strings for FIMD video: exynos_dp: Add function to parse DP DT node EXYNOS5: Add device node for DP SMDK5250: Add device node for DP SMDK5250: Use statically defined structures only in non DT case
Akshay Saraswat (8): Exynos: clock: Fix a bug in PLL lock check condition Exynos: Add hardware accelerated SHA256 and SHA1 Exynos: config: Enable ACE HW for SHA 256 for Exynos gen: Add sha h/w acceleration to hash Exynos: config: Enable hash command Exynos5: clock: Fix a typo bug in exynos clock init Exynos5: config: enable time command Exynos: pwm: Remove dead code of function exynos5_get_pwm_clk
Albert ARIBAUD (7): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master' Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' cam_enc_4xx: fix CONFIG_SPL_MAX_SIZE semantics da850evm, da850_am18xxevm: fix CONFIG_SPL_MAX_SIZE semantics smdk5250, snow: fix CONFIG_SPL_MAX_SIZE semantics ARM: fix CONFIG_SPL_MAX_SIZE semantics
Alexandre Pereira da Silva (1): mx23_olinuxino: Fix netboot console
Andreas Bießmann (6): omap3/cpu.h: add BCH support asm/omap_gpmc.h: consolidate common defines omap3/omap_gpmc.h: add ooblayout for BCH8 as in kernel omap_gpmc: change nandecc command omap_gpmc: add support for hw assisted BCH8 tricorder: enable hw assisted BCH8 in SPL and u-boot
Benoît Thébaudeau (29): mx25pdk: Enable imxdi RTC nand: mxc: Prepare to add support for i.MX5 nand: mxc: Add support for i.MX5 imx: mx5: lowlevel_init: Simplify code imx: mx53ard: Add support for NAND Flash nand: mxc: Fix debug trace in mxc_nand_read_oob_syndrome() nand: mxc: Use appropriate page number in syndrome functions arm: start.S: Fix _TEXT_BASE for SPL arm: relocate_code() is no longer noreturn arm1136: Remove redundant relocate_code() return arm: relocate_code(): Remove useless relocation offset computation arm: relocate_code(): Use __image_copy_end for end of relocation arm: crt0.S: Remove bogus .globl autoconfig.mk: Make it possible to define configs from other configs Makefile: Change CONFIG_SPL_PAD_TO to image offset imx: Fix automatic make targets for imx images nand: mxc: Switch NAND SPL to generic SPL arm926ejs: Remove deprecated and now unused NAND SPL arm: Remove unused relocate_code() parameters Makefile: Move SHELL setup to config.mk .gitignore: Add /SPL imx: Add u-boot-with-spl.imx make target imx: Add u-boot-with-nand-spl.imx make target arm: Remove support for smdk6400 Revert "mkconfig: start deprecating Makefile config targets" arm: Remove support for unused s3c64xx arm: Remove deprecated and now unused NAND SPL arm1176: Remove unused MMU setup from start.S arm: Make all linker scripts compatible with per-symbol sections
Bin Liu (2): musb: am335x: disable bulk split-combine feature musb: set MUSB speed based on CONFIG
Che-Liang Chiou (1): Exynos: Add timer_get_us function
Dirk Behme (1): spi: mxc_spi: Fix ECSPI reset handling
Eric Nelson (2): i.MX6: Add hdmidet command to detect attached HDMI monitor i.MX6: mx6qsabrelite: discard override of CONFIG_ARP_TIMEOUT
Fabio Estevam (13): mxs: spl_mem_init: Align DDR2 init with FSL bootlets source configs: mx28evk: Use single-line comments mx28evk: Disable CONFIG_CMD_I2C Add initial support for Wandboard dual lite and solo. mx28evk: Introduce a new target for saving env vars to NAND mx6qsabrelite: README: No need to pass 'u-boot.imx' mx6: Fix get_board_rev() for the mx6 solo case wandboard: Remove duplicate 'mmc dev' mx6qsabrelite: Remove duplicate 'mmc dev' wandboard: Remove CONFIG_SYS_FSL_USDHC_NUM mtd: nand: Introduce CONFIG_SYS_NAND_BUSWIDTH_16BIT mtd: nand: mxc_nand: Fix is_16bit_nand() mx31pdk: Remove watchdog support
Gabe Black (3): Exynos: pwm: Fix two bugs in the exynos pwm configuration code Exynos: Avoid a divide by zero by specifying a non-zero period for pwm 4 Exynos: Tidy up the pwm_config function in the exynos pwm driver
Hunter, Jon (4): omap2420-h4: Fix DRAM initialisation omap2420-h4: Fix booting from NOR flash omap2420-h4: Add device tree support omap2420-h4: Fix get_timer() and CONFIG_SYS_HZ
Javier Martinez Canillas (1): i.MX6: mx6qsabrelite: README: don't pass chip-select to sf probe command
Jon Hunter (5): omap5912-osk: Fix DRAM initialisation omap5912-osk: Fix booting from NOR flash omap5912-osk: Fix device initialisation omap5912-osk: Increase flash partition for u-boot omap5912-osk: Fix get_timer() and CONFIG_SYS_HZ
Josh Wu (1): logo: update to the new logo for ATMEL
Knut Wohlrab (1): imx-common: timer: fix 32-bit overflow
Lars Poeschel (1): pcm051: Enable DDR PHY dynamic power down bit
Lokesh Vutla (1): arm: omap4: Fix SDRAM AUTO DETECTION
Lubomir Popov (2): OMAP: Fix copy-paste bug that did not enable UART4 clock OMAP4: Fix bug in omap4460_volts struct
Manfred Huber (1): omap3_beagle: Flush UART3 xmit on enable if TEMT is broken
Minkyu Kang (1): exynos: change indentation of defines in cpu.h
Nishanth Menon (1): omap5: Allow use of a plain text env file
Otavio Salvador (4): mx6qsabresd: Document the mapping of USDHC[2-4] mx6qsabresd: Fix card detection for invalid card id case mx6qsabre{sd,auto}: Add boot mode select mx23_olinuxino: Change definitions to use spaces instead of tabs
Padmavathi Venna (4): Exynos: Add peripherial id for pwm Exynos: clock: Add generic api to get the clk freq Exynos: clock: Correct pwm source clk selection Exynos: pwm: Use generic api to get pwm clk freq
Przemyslaw Marczak (1): spl:falcon:trats: Fix SPL image size computing.
Rajeshwari Shinde (1): EXYNOS5: Add L2 Cache Support.
SRICHARAN R (4): ARM: OMAP5: Rename omap5_evm to omap5_uevm ARM: OMAP5: Set fdt_high to enable booting with Device tree ARM: OMAP4/5: Change the default boot command to work with device tree ARM: OMAP4/5: Make bootz as the default boot command
Simon Glass (1): Exynos: Change get_timer() to work correctly
Stephen Warren (1): ARM: bcm2835: fix get_timer() to return ms
Tom Rini (8): am335x: Enable MMC1 clock doc/feature-removal-schedule.txt: Add CONFIG_SYS_(CLOCKS|PADS)_ENABLE_ALL OMAP3/4/5/AM33xx: Correct logic for checking FAT or RAW MMC omap5_uevm.h: Move uEVM-specific choices to omap5_uevm.h omap5_common.h: Use fallback CONFIG_SYS_BAUDRATE_TABLE am335x/ti814x: Correct MMC_BOOT_DEVICES_START/END am335x: Update timings for the beaglebone again omap5_uevm: Correct to 2MiB aligned partitions on eMMC
Vivek Gautam (2): SMDK5250: Fix compiler warning for non-dt systems spi: exynos: Fix compiler warnings for non-dt systems
.gitignore | 3 + MAINTAINERS | 5 +- Makefile | 40 +- README | 42 +- arch/arm/config.mk | 2 - arch/arm/cpu/arm1136/config.mk | 7 + arch/arm/cpu/arm1136/omap24xx/timer.c | 8 +- arch/arm/cpu/arm1136/start.S | 28 +- arch/arm/cpu/arm1136/u-boot-spl.lds | 2 +- arch/arm/cpu/arm1176/bcm2835/timer.c | 14 +- arch/arm/cpu/arm1176/s3c64xx/config.mk | 34 - arch/arm/cpu/arm1176/s3c64xx/cpu_init.S | 135 --- arch/arm/cpu/arm1176/s3c64xx/init.c | 26 - arch/arm/cpu/arm1176/s3c64xx/reset.S | 34 - arch/arm/cpu/arm1176/s3c64xx/speed.c | 145 ---- arch/arm/cpu/arm1176/s3c64xx/timer.c | 160 ---- arch/arm/cpu/arm1176/start.S | 127 +-- arch/arm/cpu/arm720t/start.S | 26 +- arch/arm/cpu/arm920t/ep93xx/u-boot.lds | 13 +- arch/arm/cpu/arm920t/start.S | 28 +- arch/arm/cpu/arm925t/start.S | 28 +- arch/arm/cpu/arm926ejs/config.mk | 8 +- arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 18 +- arch/arm/cpu/arm926ejs/mxs/start.S | 4 + arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds | 6 +- arch/arm/cpu/arm926ejs/omap/timer.c | 15 +- arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds | 6 +- arch/arm/cpu/arm926ejs/start.S | 40 +- arch/arm/cpu/arm946es/start.S | 28 +- arch/arm/cpu/arm_intcm/start.S | 30 +- arch/arm/cpu/armv7/am33xx/clock_am33xx.c | 5 + arch/arm/cpu/armv7/am33xx/elm.c | 2 +- arch/arm/cpu/armv7/config.mk | 6 + arch/arm/cpu/armv7/exynos/clock.c | 167 +++- arch/arm/cpu/armv7/exynos/soc.c | 36 + arch/arm/cpu/armv7/mx5/lowlevel_init.S | 8 +- arch/arm/cpu/armv7/mx6/soc.c | 12 + arch/arm/cpu/armv7/omap-common/clocks-common.c | 4 +- arch/arm/cpu/armv7/omap-common/emif-common.c | 29 +- arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 10 +- arch/arm/cpu/armv7/omap-common/u-boot-spl.lds | 2 +- arch/arm/cpu/armv7/omap3/board.c | 31 +- arch/arm/cpu/armv7/omap4/emif.c | 1 - arch/arm/cpu/armv7/omap4/hw_data.c | 8 +- arch/arm/cpu/armv7/omap5/emif.c | 1 - arch/arm/cpu/armv7/s5p-common/pwm.c | 42 +- arch/arm/cpu/armv7/s5p-common/timer.c | 117 ++- arch/arm/cpu/armv7/socfpga/u-boot-spl.lds | 2 +- arch/arm/cpu/armv7/start.S | 26 +- arch/arm/cpu/ixp/start.S | 28 +- arch/arm/cpu/ixp/u-boot.lds | 2 + arch/arm/cpu/pxa/start.S | 26 +- arch/arm/cpu/s3c44b0/start.S | 28 +- arch/arm/cpu/sa1100/start.S | 28 +- arch/arm/cpu/u-boot-spl.lds | 19 +- arch/arm/cpu/u-boot.lds | 4 - arch/arm/dts/exynos5250.dtsi | 13 + arch/arm/imx-common/Makefile | 18 + .../arm/imx-common/cmd_hdmidet.c | 32 +- arch/arm/imx-common/timer.c | 26 +- arch/arm/include/asm/arch-am33xx/ddr_defs.h | 20 +- arch/arm/include/asm/arch-am33xx/omap_gpmc.h | 58 +- arch/arm/include/asm/arch-am33xx/spl.h | 8 + arch/arm/include/asm/arch-am33xx/sys_proto.h | 2 +- arch/arm/include/asm/arch-bcm2835/timer.h | 2 + arch/arm/include/asm/arch-exynos/clk.h | 15 + arch/arm/include/asm/arch-exynos/cpu.h | 10 +- arch/arm/include/asm/arch-exynos/dp_info.h | 1 - arch/arm/include/asm/arch-exynos/periph.h | 5 + arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 3 + arch/arm/include/asm/arch-omap24xx/omap2420.h | 6 +- arch/arm/include/asm/arch-omap3/cpu.h | 6 + arch/arm/include/asm/arch-omap3/omap_gpmc.h | 68 +- arch/arm/include/asm/arch-omap3/spl.h | 3 + arch/arm/include/asm/arch-omap3/sys_proto.h | 2 +- arch/arm/include/asm/arch-omap4/omap.h | 1 - arch/arm/include/asm/arch-omap4/spl.h | 2 + arch/arm/include/asm/arch-omap5/omap.h | 1 - arch/arm/include/asm/arch-omap5/spl.h | 2 + arch/arm/include/asm/arch-s3c64xx/hardware.h | 63 -- arch/arm/include/asm/arch-s3c64xx/s3c6400.h | 895
arch/arm/include/asm/arch-s3c64xx/s3c64x0.h | 90 -- arch/arm/include/asm/emif.h | 1 - arch/arm/include/asm/mach-types.h | 13 - arch/arm/include/asm/omap_gpmc.h | 87 ++ arch/arm/lib/crt0.S | 52 +- board/actux1/u-boot.lds | 3 + board/actux2/u-boot.lds | 3 + board/actux3/u-boot.lds | 3 + board/ait/cam_enc_4xx/u-boot-spl.lds | 4 +- board/boundary/nitrogen6x/nitrogen6x.c | 8 +- board/davinci/da8xxevm/u-boot-spl-da850evm.lds | 4 +- board/davinci/da8xxevm/u-boot-spl-hawk.lds | 9 +- board/dvlhost/u-boot.lds | 3 + board/freescale/mx31ads/u-boot.lds | 18 +- board/freescale/mx31pdk/Makefile | 3 + board/freescale/mx31pdk/config.mk | 5 - board/freescale/mx31pdk/mx31pdk.c | 8 + board/freescale/mx53ard/mx53ard.c | 66 ++ board/freescale/mx6qsabreauto/mx6qsabreauto.c | 18 + board/freescale/mx6qsabrelite/README | 4 +- board/freescale/mx6qsabrelite/mx6qsabrelite.c | 8 +- board/freescale/mx6qsabresd/mx6qsabresd.c | 48 +- board/isee/igep00x0/igep00x0.c | 2 +- board/karo/tx25/Makefile | 4 +- board/karo/tx25/config.mk | 5 - board/karo/tx25/tx25.c | 8 + board/overo/overo.c | 2 +- board/phytec/pcm051/board.c | 3 +- board/samsung/dts/exynos5250-smdk5250.dts | 40 + board/samsung/smdk5250/clock_init.c | 22 +- board/samsung/smdk5250/setup.h | 2 +- board/samsung/smdk5250/smdk5250-uboot-spl.lds | 4 +- board/samsung/smdk5250/smdk5250.c | 19 +- board/samsung/smdk6400/.gitignore | 5 - board/samsung/smdk6400/Makefile | 48 -- board/samsung/smdk6400/config.mk | 30 - board/samsung/smdk6400/lowlevel_init.S | 323 ------- board/samsung/smdk6400/smdk6400.c | 134 --- board/samsung/smdk6400/smdk6400_nand_spl.c | 37 - board/samsung/smdk6400/u-boot-nand.lds | 86 -- board/samsung/trats/trats.c | 6 +- board/samsung/universal_c210/universal.c | 23 +- board/ti/am335x/board.c | 2 +- board/ti/omap2420h4/config.mk | 4 +- board/ti/omap2420h4/mem.c | 13 - board/ti/omap2420h4/omap2420h4.c | 24 +- board/ti/omap5912osk/config.mk | 12 +- board/ti/omap5912osk/lowlevel_init.S | 20 + board/ti/omap5912osk/omap5912osk.c | 23 +- board/ti/{omap5_evm => omap5_uevm}/Makefile | 0 board/ti/{omap5_evm => omap5_uevm}/evm.c | 0 board/ti/{omap5_evm => omap5_uevm}/mux_data.h | 0 board/vpac270/u-boot-spl.lds | 6 +- board/wandboard/Makefile | 29 + board/wandboard/README | 40 + board/wandboard/wandboard.c | 178 ++++ boards.cfg | 9 +- common/hash.c | 18 + config.mk | 7 + doc/README.arm-relocation | 14 +- doc/README.mx28evk | 18 + doc/README.omap3 | 28 + doc/README.scrapyard | 1 + doc/device-tree-bindings/video/exynos-dp.txt | 69 ++ doc/device-tree-bindings/video/exynos-fb.txt | 92 ++ doc/driver-model/UDM-serial.txt | 42 +- doc/feature-removal-schedule.txt | 32 +- .../arm1176/s3c64xx => drivers/crypto}/Makefile | 27 +- drivers/crypto/ace_sha.c | 126 +++ drivers/crypto/ace_sha.h | 325 +++++++ drivers/mmc/bcm2835_sdhci.c | 5 +- drivers/mmc/fsl_esdhc.c | 7 + drivers/mtd/nand/Makefile | 2 +- drivers/mtd/nand/mxc_nand.c | 260 +++--- drivers/mtd/nand/mxc_nand.h | 225 +++++ .../mtd/nand/mxc_nand_spl.c | 130 ++- drivers/mtd/nand/ndfc.c | 4 +- drivers/mtd/nand/omap_gpmc.c | 424 +++++++--- drivers/mtd/nand/s3c64xx.c | 295 ------- drivers/mtd/onenand/onenand_base.c | 4 - drivers/mtd/onenand/samsung.c | 60 +- drivers/serial/Makefile | 1 - drivers/serial/ns16550.c | 18 +- drivers/serial/s3c64xx.c | 187 ---- drivers/serial/serial.c | 2 - drivers/spi/exynos_spi.c | 2 + drivers/spi/mxc_spi.c | 8 +- drivers/usb/host/Makefile | 1 - drivers/usb/host/ohci-hcd.c | 1 - drivers/usb/musb-new/musb_core.c | 7 + drivers/usb/musb-new/musb_uboot.c | 2 +- drivers/video/exynos_dp.c | 76 +- drivers/video/exynos_dp_lowlevel.c | 69 +- drivers/video/exynos_dp_lowlevel.h | 1 + drivers/video/exynos_fb.c | 230 ++++- drivers/video/exynos_fimd.c | 44 +- include/common.h | 7 +- include/config_fallbacks.h | 16 + include/configs/MPC8313ERDB.h | 2 +- include/configs/am335x_evm.h | 1 + include/configs/cam_enc_4xx.h | 4 +- include/configs/da850evm.h | 4 +- include/configs/dra7xx_evm.h | 2 + include/configs/exynos5250-dt.h | 11 +- include/configs/igep00x0.h | 3 - include/configs/mx23_olinuxino.h | 162 ++-- include/configs/mx25pdk.h | 4 + include/configs/mx28evk.h | 92 +- include/configs/mx31pdk.h | 23 +- include/configs/mx53ard.h | 10 + include/configs/mx6qsabre_common.h | 2 + include/configs/mx6qsabrelite.h | 3 - include/configs/omap2420h4.h | 5 +- include/configs/omap4_common.h | 22 +- include/configs/omap5912osk.h | 15 +- include/configs/omap5_common.h | 51 +- include/configs/{omap5_evm.h => omap5_uevm.h} | 17 + include/configs/rpi_b.h | 2 +- include/configs/smdk6400.h | 296 ------- include/configs/trats.h | 1 + include/configs/tricorder.h | 13 +- include/configs/tx25.h | 22 +- include/configs/wandboard.h | 209 +++++ include/fdtdec.h | 2 + include/fsl_esdhc.h | 1 + include/fsl_nfc.h | 170 ---- include/hw_sha.h | 50 ++ include/lcd.h | 9 - include/onenand_uboot.h | 4 - lib/Makefile | 2 +- lib/fdtdec.c | 2 + mkconfig | 9 - nand_spl/board/freescale/mx31pdk/Makefile | 63 -- nand_spl/board/freescale/mx31pdk/u-boot.lds | 87 -- nand_spl/board/karo/tx25/Makefile | 84 -- nand_spl/board/karo/tx25/config.mk | 1 - nand_spl/board/karo/tx25/u-boot.lds | 85 -- nand_spl/board/samsung/smdk6400/Makefile | 117 --- nand_spl/board/samsung/smdk6400/config.mk | 40 - nand_spl/board/samsung/smdk6400/u-boot.lds | 80 -- tools/logos/atmel.bmp | Bin 26334 -> 15478 bytes tools/scripts/define2mk.sed | 2
- 223 files changed, 3941 insertions(+), 5319 deletions(-) delete mode
100644 arch/arm/cpu/arm1176/s3c64xx/config.mk delete mode 100644 arch/arm/cpu/arm1176/s3c64xx/cpu_init.S delete mode 100644 arch/arm/cpu/arm1176/s3c64xx/init.c delete mode 100644 arch/arm/cpu/arm1176/s3c64xx/reset.S delete mode 100644 arch/arm/cpu/arm1176/s3c64xx/speed.c delete mode 100644 arch/arm/cpu/arm1176/s3c64xx/timer.c rename drivers/usb/host/s3c64xx-hcd.c => arch/arm/imx-common/cmd_hdmidet.c (65%) delete mode 100644 arch/arm/include/asm/arch-s3c64xx/hardware.h delete mode 100644 arch/arm/include/asm/arch-s3c64xx/s3c6400.h delete mode 100644 arch/arm/include/asm/arch-s3c64xx/s3c64x0.h create mode 100644 arch/arm/include/asm/omap_gpmc.h delete mode 100644 board/freescale/mx31pdk/config.mk delete mode 100644 board/karo/tx25/config.mk delete mode 100644 board/samsung/smdk6400/.gitignore delete mode 100644 board/samsung/smdk6400/Makefile delete mode 100644 board/samsung/smdk6400/config.mk delete mode 100644 board/samsung/smdk6400/lowlevel_init.S delete mode 100644 board/samsung/smdk6400/smdk6400.c delete mode 100644 board/samsung/smdk6400/smdk6400_nand_spl.c delete mode 100644 board/samsung/smdk6400/u-boot-nand.lds rename board/ti/{omap5_evm => omap5_uevm}/Makefile (100%) rename board/ti/{omap5_evm => omap5_uevm}/evm.c (100%) rename board/ti/{omap5_evm => omap5_uevm}/mux_data.h (100%) create mode 100644 board/wandboard/Makefile create mode 100644 board/wandboard/README create mode 100644 board/wandboard/wandboard.c create mode 100644 doc/device-tree-bindings/video/exynos-dp.txt create mode 100644 doc/device-tree-bindings/video/exynos-fb.txt rename {arch/arm/cpu/arm1176/s3c64xx => drivers/crypto}/Makefile (69%) create mode 100644 drivers/crypto/ace_sha.c create mode 100644 drivers/crypto/ace_sha.h create mode 100644 drivers/mtd/nand/mxc_nand.h rename nand_spl/nand_boot_fsl_nfc.c => drivers/mtd/nand/mxc_nand_spl.c (65%) delete mode 100644 drivers/mtd/nand/s3c64xx.c delete mode 100644 drivers/serial/s3c64xx.c rename include/configs/{omap5_evm.h => omap5_uevm.h} (71%) delete mode 100644 include/configs/smdk6400.h create mode 100644 include/configs/wandboard.h delete mode 100644 include/fsl_nfc.h create mode 100644 include/hw_sha.h delete mode 100644 nand_spl/board/freescale/mx31pdk/Makefile delete mode 100644 nand_spl/board/freescale/mx31pdk/u-boot.lds delete mode 100644 nand_spl/board/karo/tx25/Makefile delete mode 100644 nand_spl/board/karo/tx25/config.mk delete mode 100644 nand_spl/board/karo/tx25/u-boot.lds delete mode 100644 nand_spl/board/samsung/smdk6400/Makefile delete mode 100644 nand_spl/board/samsung/smdk6400/config.mk delete mode 100644 nand_spl/board/samsung/smdk6400/u-boot.lds
Amicalement,
Albert. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
You have forgotten to apply this one: http://patchwork.ozlabs.org/patch/233964/
Best regards, Benoît
Hi Benoît,
On Thu, 11 Apr 2013 01:20:44 +0200 (CEST), Benoît Thébaudeau benoit.thebaudeau@advansee.com wrote:
Hi Albert,
On Thursday, April 11, 2013 1:12:17 AM, Albert ARIBAUD wrote:
Hello,
The following changes since commit 009d75ccc11d27b9a083375a88bb93cb746b4800:
Merge branch 'u-boot/master' into 'u-boot-arm/master' (2013-03-28 18:50:01 +0100)
are available in the git repository at:
git://git.denx.de/u-boot-arm master
for you to fetch changes up to aad17a2f2bdd0b456522e24a90a0f8b8d8adb1f9:
ARM: fix CONFIG_SPL_MAX_SIZE semantics (2013-04-11 00:18:03 +0200)
*** NOTE *** there should be a single, and trivial, merge conflict on file drivers/video/exynos_fb.c.
You have forgotten to apply this one: http://patchwork.ozlabs.org/patch/233964/
Thanks for pointing it out -- it got flushed from my mental cache by the SPL max size one.
I have superseded my original request, am build-testing for any hiccup, and will sent out an amended PR including 233964 (with the typo in the commit fixed).
Best regards, Benoît
Amicalement,
Hi Tom,
On Thu, 11 Apr 2013 01:12:17 +0200, Albert ARIBAUD albert.u.boot@aribaud.net wrote:
The following changes since commit 009d75ccc11d27b9a083375a88bb93cb746b4800:
Merge branch 'u-boot/master' into 'u-boot-arm/master' (2013-03-28 18:50:01 +0100)
are available in the git repository at:
git://git.denx.de/u-boot-arm master
for you to fetch changes up to abbecf4c873aa3e9ec9331c5b3eba1e2a9c84902:
ARM: Fix __bss_start and __bss_end in linker scripts (2013-04-11 08:10:59 +0200)
*** NOTE *** there should be a single, and trivial, merge conflict on file drivers/video/exynos_fb.c.
---------------------------------------------------------------- Abbas Raza (1): mmc: i.MX6: fsl_esdhc: Define maximum bus width supported by a board
Ajay Kumar (13): video: exynos_fb: Remove callbacks from the driver video: exynos_dp: Remove callbacks from the driver video: exynos_fb: Make fimd_ctrl global EXYNOS: FDT: Add compatible strings for FIMD video: exynos_fb: add DT support for FIMD driver EXYNOS5: Add device node for FIMD SMDK5250: Add device node for FIMD video: exynos_dp: Make dp_regs global EXYNOS5: FDT: Add compatible strings for FIMD video: exynos_dp: Add function to parse DP DT node EXYNOS5: Add device node for DP SMDK5250: Add device node for DP SMDK5250: Use statically defined structures only in non DT case
Akshay Saraswat (8): Exynos: clock: Fix a bug in PLL lock check condition Exynos: Add hardware accelerated SHA256 and SHA1 Exynos: config: Enable ACE HW for SHA 256 for Exynos gen: Add sha h/w acceleration to hash Exynos: config: Enable hash command Exynos5: clock: Fix a typo bug in exynos clock init Exynos5: config: enable time command Exynos: pwm: Remove dead code of function exynos5_get_pwm_clk
Albert ARIBAUD (8): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master' Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' cam_enc_4xx: fix CONFIG_SPL_MAX_SIZE semantics da850evm, da850_am18xxevm: fix CONFIG_SPL_MAX_SIZE semantics smdk5250, snow: fix CONFIG_SPL_MAX_SIZE semantics ARM: fix CONFIG_SPL_MAX_SIZE semantics ARM: Fix __bss_start and __bss_end in linker scripts
Alexandre Pereira da Silva (1): mx23_olinuxino: Fix netboot console
Andreas Bießmann (6): omap3/cpu.h: add BCH support asm/omap_gpmc.h: consolidate common defines omap3/omap_gpmc.h: add ooblayout for BCH8 as in kernel omap_gpmc: change nandecc command omap_gpmc: add support for hw assisted BCH8 tricorder: enable hw assisted BCH8 in SPL and u-boot
Benoît Thébaudeau (29): mx25pdk: Enable imxdi RTC nand: mxc: Prepare to add support for i.MX5 nand: mxc: Add support for i.MX5 imx: mx5: lowlevel_init: Simplify code imx: mx53ard: Add support for NAND Flash nand: mxc: Fix debug trace in mxc_nand_read_oob_syndrome() nand: mxc: Use appropriate page number in syndrome functions arm: start.S: Fix _TEXT_BASE for SPL arm: relocate_code() is no longer noreturn arm1136: Remove redundant relocate_code() return arm: relocate_code(): Remove useless relocation offset computation arm: relocate_code(): Use __image_copy_end for end of relocation arm: crt0.S: Remove bogus .globl autoconfig.mk: Make it possible to define configs from other configs Makefile: Change CONFIG_SPL_PAD_TO to image offset imx: Fix automatic make targets for imx images nand: mxc: Switch NAND SPL to generic SPL arm926ejs: Remove deprecated and now unused NAND SPL arm: Remove unused relocate_code() parameters Makefile: Move SHELL setup to config.mk .gitignore: Add /SPL imx: Add u-boot-with-spl.imx make target imx: Add u-boot-with-nand-spl.imx make target arm: Remove support for smdk6400 Revert "mkconfig: start deprecating Makefile config targets" arm: Remove support for unused s3c64xx arm: Remove deprecated and now unused NAND SPL arm1176: Remove unused MMU setup from start.S arm: Make all linker scripts compatible with per-symbol sections
Bin Liu (2): musb: am335x: disable bulk split-combine feature musb: set MUSB speed based on CONFIG
Che-Liang Chiou (1): Exynos: Add timer_get_us function
Dirk Behme (1): spi: mxc_spi: Fix ECSPI reset handling
Eric Nelson (2): i.MX6: Add hdmidet command to detect attached HDMI monitor i.MX6: mx6qsabrelite: discard override of CONFIG_ARP_TIMEOUT
Fabio Estevam (13): mxs: spl_mem_init: Align DDR2 init with FSL bootlets source configs: mx28evk: Use single-line comments mx28evk: Disable CONFIG_CMD_I2C Add initial support for Wandboard dual lite and solo. mx28evk: Introduce a new target for saving env vars to NAND mx6qsabrelite: README: No need to pass 'u-boot.imx' mx6: Fix get_board_rev() for the mx6 solo case wandboard: Remove duplicate 'mmc dev' mx6qsabrelite: Remove duplicate 'mmc dev' wandboard: Remove CONFIG_SYS_FSL_USDHC_NUM mtd: nand: Introduce CONFIG_SYS_NAND_BUSWIDTH_16BIT mtd: nand: mxc_nand: Fix is_16bit_nand() mx31pdk: Remove watchdog support
Gabe Black (3): Exynos: pwm: Fix two bugs in the exynos pwm configuration code Exynos: Avoid a divide by zero by specifying a non-zero period for pwm 4 Exynos: Tidy up the pwm_config function in the exynos pwm driver
Hunter, Jon (4): omap2420-h4: Fix DRAM initialisation omap2420-h4: Fix booting from NOR flash omap2420-h4: Add device tree support omap2420-h4: Fix get_timer() and CONFIG_SYS_HZ
Javier Martinez Canillas (1): i.MX6: mx6qsabrelite: README: don't pass chip-select to sf probe command
Jon Hunter (5): omap5912-osk: Fix DRAM initialisation omap5912-osk: Fix booting from NOR flash omap5912-osk: Fix device initialisation omap5912-osk: Increase flash partition for u-boot omap5912-osk: Fix get_timer() and CONFIG_SYS_HZ
Josh Wu (1): logo: update to the new logo for ATMEL
Knut Wohlrab (1): imx-common: timer: fix 32-bit overflow
Lars Poeschel (1): pcm051: Enable DDR PHY dynamic power down bit
Lokesh Vutla (1): arm: omap4: Fix SDRAM AUTO DETECTION
Lubomir Popov (2): OMAP: Fix copy-paste bug that did not enable UART4 clock OMAP4: Fix bug in omap4460_volts struct
Manfred Huber (1): omap3_beagle: Flush UART3 xmit on enable if TEMT is broken
Minkyu Kang (1): exynos: change indentation of defines in cpu.h
Nishanth Menon (1): omap5: Allow use of a plain text env file
Otavio Salvador (4): mx6qsabresd: Document the mapping of USDHC[2-4] mx6qsabresd: Fix card detection for invalid card id case mx6qsabre{sd,auto}: Add boot mode select mx23_olinuxino: Change definitions to use spaces instead of tabs
Padmavathi Venna (4): Exynos: Add peripherial id for pwm Exynos: clock: Add generic api to get the clk freq Exynos: clock: Correct pwm source clk selection Exynos: pwm: Use generic api to get pwm clk freq
Przemyslaw Marczak (1): spl:falcon:trats: Fix SPL image size computing.
Rajeshwari Shinde (1): EXYNOS5: Add L2 Cache Support.
SRICHARAN R (4): ARM: OMAP5: Rename omap5_evm to omap5_uevm ARM: OMAP5: Set fdt_high to enable booting with Device tree ARM: OMAP4/5: Change the default boot command to work with device tree ARM: OMAP4/5: Make bootz as the default boot command
Simon Glass (1): Exynos: Change get_timer() to work correctly
Stephen Warren (1): ARM: bcm2835: fix get_timer() to return ms
Tom Rini (8): am335x: Enable MMC1 clock doc/feature-removal-schedule.txt: Add CONFIG_SYS_(CLOCKS|PADS)_ENABLE_ALL OMAP3/4/5/AM33xx: Correct logic for checking FAT or RAW MMC omap5_uevm.h: Move uEVM-specific choices to omap5_uevm.h omap5_common.h: Use fallback CONFIG_SYS_BAUDRATE_TABLE am335x/ti814x: Correct MMC_BOOT_DEVICES_START/END am335x: Update timings for the beaglebone again omap5_uevm: Correct to 2MiB aligned partitions on eMMC
Vivek Gautam (2): SMDK5250: Fix compiler warning for non-dt systems spi: exynos: Fix compiler warnings for non-dt systems
.gitignore | 3 + MAINTAINERS | 5 +- Makefile | 40 +- README | 42 +- arch/arm/config.mk | 2 - arch/arm/cpu/arm1136/config.mk | 7 + arch/arm/cpu/arm1136/omap24xx/timer.c | 8 +- arch/arm/cpu/arm1136/start.S | 28 +- arch/arm/cpu/arm1136/u-boot-spl.lds | 2 +- arch/arm/cpu/arm1176/bcm2835/timer.c | 14 +- arch/arm/cpu/arm1176/s3c64xx/config.mk | 34 - arch/arm/cpu/arm1176/s3c64xx/cpu_init.S | 135 --- arch/arm/cpu/arm1176/s3c64xx/init.c | 26 - arch/arm/cpu/arm1176/s3c64xx/reset.S | 34 - arch/arm/cpu/arm1176/s3c64xx/speed.c | 145 ---- arch/arm/cpu/arm1176/s3c64xx/timer.c | 160 ---- arch/arm/cpu/arm1176/start.S | 127 +-- arch/arm/cpu/arm720t/start.S | 26 +- arch/arm/cpu/arm920t/ep93xx/u-boot.lds | 13 +- arch/arm/cpu/arm920t/start.S | 28 +- arch/arm/cpu/arm925t/start.S | 28 +- arch/arm/cpu/arm926ejs/config.mk | 8 +- arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 18 +- arch/arm/cpu/arm926ejs/mxs/start.S | 4 + arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds | 6 +- arch/arm/cpu/arm926ejs/omap/timer.c | 15 +- arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds | 6 +- arch/arm/cpu/arm926ejs/start.S | 40 +- arch/arm/cpu/arm946es/start.S | 28 +- arch/arm/cpu/arm_intcm/start.S | 30 +- arch/arm/cpu/armv7/am33xx/clock_am33xx.c | 5 + arch/arm/cpu/armv7/am33xx/elm.c | 2 +- arch/arm/cpu/armv7/config.mk | 6 + arch/arm/cpu/armv7/exynos/clock.c | 167 +++- arch/arm/cpu/armv7/exynos/soc.c | 36 + arch/arm/cpu/armv7/mx5/lowlevel_init.S | 8 +- arch/arm/cpu/armv7/mx6/soc.c | 12 + arch/arm/cpu/armv7/omap-common/clocks-common.c | 4 +- arch/arm/cpu/armv7/omap-common/emif-common.c | 29 +- arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 10 +- arch/arm/cpu/armv7/omap-common/u-boot-spl.lds | 2 +- arch/arm/cpu/armv7/omap3/board.c | 31 +- arch/arm/cpu/armv7/omap4/emif.c | 1 - arch/arm/cpu/armv7/omap4/hw_data.c | 8 +- arch/arm/cpu/armv7/omap5/emif.c | 1 - arch/arm/cpu/armv7/s5p-common/pwm.c | 42 +- arch/arm/cpu/armv7/s5p-common/timer.c | 117 ++- arch/arm/cpu/armv7/socfpga/u-boot-spl.lds | 2 +- arch/arm/cpu/armv7/start.S | 26 +- arch/arm/cpu/ixp/start.S | 28 +- arch/arm/cpu/ixp/u-boot.lds | 16 +- arch/arm/cpu/pxa/start.S | 26 +- arch/arm/cpu/s3c44b0/start.S | 28 +- arch/arm/cpu/sa1100/start.S | 28 +- arch/arm/cpu/u-boot-spl.lds | 19 +- arch/arm/cpu/u-boot.lds | 18 +- arch/arm/dts/exynos5250.dtsi | 13 + arch/arm/imx-common/Makefile | 18 + .../arm/imx-common/cmd_hdmidet.c | 32 +- arch/arm/imx-common/timer.c | 26 +- arch/arm/include/asm/arch-am33xx/ddr_defs.h | 20 +- arch/arm/include/asm/arch-am33xx/omap_gpmc.h | 58 +- arch/arm/include/asm/arch-am33xx/spl.h | 8 + arch/arm/include/asm/arch-am33xx/sys_proto.h | 2 +- arch/arm/include/asm/arch-bcm2835/timer.h | 2 + arch/arm/include/asm/arch-exynos/clk.h | 15 + arch/arm/include/asm/arch-exynos/cpu.h | 10 +- arch/arm/include/asm/arch-exynos/dp_info.h | 1 - arch/arm/include/asm/arch-exynos/periph.h | 5 + arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 3 + arch/arm/include/asm/arch-omap24xx/omap2420.h | 6 +- arch/arm/include/asm/arch-omap3/cpu.h | 6 + arch/arm/include/asm/arch-omap3/omap_gpmc.h | 68 +- arch/arm/include/asm/arch-omap3/spl.h | 3 + arch/arm/include/asm/arch-omap3/sys_proto.h | 2 +- arch/arm/include/asm/arch-omap4/omap.h | 1 - arch/arm/include/asm/arch-omap4/spl.h | 2 + arch/arm/include/asm/arch-omap5/omap.h | 1 - arch/arm/include/asm/arch-omap5/spl.h | 2 + arch/arm/include/asm/arch-s3c64xx/hardware.h | 63 -- arch/arm/include/asm/arch-s3c64xx/s3c6400.h | 895 -------------------- arch/arm/include/asm/arch-s3c64xx/s3c64x0.h | 90 -- arch/arm/include/asm/emif.h | 1 - arch/arm/include/asm/mach-types.h | 13 - arch/arm/include/asm/omap_gpmc.h | 87 ++ arch/arm/lib/crt0.S | 52 +- board/actux1/u-boot.lds | 17 +- board/actux2/u-boot.lds | 17 +- board/actux3/u-boot.lds | 17 +- board/ait/cam_enc_4xx/u-boot-spl.lds | 4 +- board/boundary/nitrogen6x/nitrogen6x.c | 8 +- board/davinci/da8xxevm/u-boot-spl-da850evm.lds | 4 +- board/davinci/da8xxevm/u-boot-spl-hawk.lds | 9 +- board/dvlhost/u-boot.lds | 17 +- board/freescale/mx31ads/u-boot.lds | 32 +- board/freescale/mx31pdk/Makefile | 3 + board/freescale/mx31pdk/config.mk | 5 - board/freescale/mx31pdk/mx31pdk.c | 8 + board/freescale/mx53ard/mx53ard.c | 66 ++ board/freescale/mx6qsabreauto/mx6qsabreauto.c | 18 + board/freescale/mx6qsabrelite/README | 4 +- board/freescale/mx6qsabrelite/mx6qsabrelite.c | 8 +- board/freescale/mx6qsabresd/mx6qsabresd.c | 48 +- board/isee/igep00x0/igep00x0.c | 2 +- board/karo/tx25/Makefile | 4 +- board/karo/tx25/config.mk | 5 - board/karo/tx25/tx25.c | 8 + board/overo/overo.c | 2 +- board/phytec/pcm051/board.c | 3 +- board/samsung/dts/exynos5250-smdk5250.dts | 40 + board/samsung/smdk5250/clock_init.c | 22 +- board/samsung/smdk5250/setup.h | 2 +- board/samsung/smdk5250/smdk5250-uboot-spl.lds | 4 +- board/samsung/smdk5250/smdk5250.c | 19 +- board/samsung/smdk6400/.gitignore | 5 - board/samsung/smdk6400/Makefile | 48 -- board/samsung/smdk6400/config.mk | 30 - board/samsung/smdk6400/lowlevel_init.S | 323 ------- board/samsung/smdk6400/smdk6400.c | 134 --- board/samsung/smdk6400/smdk6400_nand_spl.c | 37 - board/samsung/smdk6400/u-boot-nand.lds | 86 -- board/samsung/trats/trats.c | 6 +- board/samsung/universal_c210/universal.c | 23 +- board/ti/am335x/board.c | 2 +- board/ti/omap2420h4/config.mk | 4 +- board/ti/omap2420h4/mem.c | 13 - board/ti/omap2420h4/omap2420h4.c | 24 +- board/ti/omap5912osk/config.mk | 12 +- board/ti/omap5912osk/lowlevel_init.S | 20 + board/ti/omap5912osk/omap5912osk.c | 23 +- board/ti/{omap5_evm => omap5_uevm}/Makefile | 0 board/ti/{omap5_evm => omap5_uevm}/evm.c | 0 board/ti/{omap5_evm => omap5_uevm}/mux_data.h | 0 board/vpac270/u-boot-spl.lds | 6 +- board/wandboard/Makefile | 29 + board/wandboard/README | 40 + board/wandboard/wandboard.c | 178 ++++ boards.cfg | 9 +- common/hash.c | 18 + config.mk | 7 + doc/README.arm-relocation | 14 +- doc/README.mx28evk | 18 + doc/README.omap3 | 28 + doc/README.scrapyard | 1 + doc/device-tree-bindings/video/exynos-dp.txt | 69 ++ doc/device-tree-bindings/video/exynos-fb.txt | 92 ++ doc/driver-model/UDM-serial.txt | 42 +- doc/feature-removal-schedule.txt | 32 +- .../arm1176/s3c64xx => drivers/crypto}/Makefile | 27 +- drivers/crypto/ace_sha.c | 126 +++ drivers/crypto/ace_sha.h | 325 +++++++ drivers/mmc/bcm2835_sdhci.c | 5 +- drivers/mmc/fsl_esdhc.c | 7 + drivers/mtd/nand/Makefile | 2 +- drivers/mtd/nand/mxc_nand.c | 260 +++--- drivers/mtd/nand/mxc_nand.h | 225 +++++ .../mtd/nand/mxc_nand_spl.c | 130 ++- drivers/mtd/nand/ndfc.c | 4 +- drivers/mtd/nand/omap_gpmc.c | 424 +++++++--- drivers/mtd/nand/s3c64xx.c | 295 ------- drivers/mtd/onenand/onenand_base.c | 4 - drivers/mtd/onenand/samsung.c | 60 +- drivers/serial/Makefile | 1 - drivers/serial/ns16550.c | 18 +- drivers/serial/s3c64xx.c | 187 ---- drivers/serial/serial.c | 2 - drivers/spi/exynos_spi.c | 2 + drivers/spi/mxc_spi.c | 8 +- drivers/usb/host/Makefile | 1 - drivers/usb/host/ohci-hcd.c | 1 - drivers/usb/musb-new/musb_core.c | 7 + drivers/usb/musb-new/musb_uboot.c | 2 +- drivers/video/exynos_dp.c | 76 +- drivers/video/exynos_dp_lowlevel.c | 69 +- drivers/video/exynos_dp_lowlevel.h | 1 + drivers/video/exynos_fb.c | 230 ++++- drivers/video/exynos_fimd.c | 44 +- include/common.h | 7 +- include/config_fallbacks.h | 16 + include/configs/MPC8313ERDB.h | 2 +- include/configs/am335x_evm.h | 1 + include/configs/cam_enc_4xx.h | 4 +- include/configs/da850evm.h | 4 +- include/configs/dra7xx_evm.h | 2 + include/configs/exynos5250-dt.h | 11 +- include/configs/igep00x0.h | 3 - include/configs/mx23_olinuxino.h | 162 ++-- include/configs/mx25pdk.h | 4 + include/configs/mx28evk.h | 92 +- include/configs/mx31pdk.h | 23 +- include/configs/mx53ard.h | 10 + include/configs/mx6qsabre_common.h | 2 + include/configs/mx6qsabrelite.h | 3 - include/configs/omap2420h4.h | 5 +- include/configs/omap4_common.h | 22 +- include/configs/omap5912osk.h | 15 +- include/configs/omap5_common.h | 51 +- include/configs/{omap5_evm.h => omap5_uevm.h} | 17 + include/configs/rpi_b.h | 2 +- include/configs/smdk6400.h | 296 ------- include/configs/trats.h | 1 + include/configs/tricorder.h | 13 +- include/configs/tx25.h | 22 +- include/configs/wandboard.h | 209 +++++ include/fdtdec.h | 2 + include/fsl_esdhc.h | 1 + include/fsl_nfc.h | 170 ---- include/hw_sha.h | 50 ++ include/lcd.h | 9 - include/onenand_uboot.h | 4 - lib/Makefile | 2 +- lib/fdtdec.c | 2 + mkconfig | 9 - nand_spl/board/freescale/mx31pdk/Makefile | 63 -- nand_spl/board/freescale/mx31pdk/u-boot.lds | 87 -- nand_spl/board/karo/tx25/Makefile | 84 -- nand_spl/board/karo/tx25/config.mk | 1 - nand_spl/board/karo/tx25/u-boot.lds | 85 -- nand_spl/board/samsung/smdk6400/Makefile | 117 --- nand_spl/board/samsung/smdk6400/config.mk | 40 - nand_spl/board/samsung/smdk6400/u-boot.lds | 80 -- tools/logos/atmel.bmp | Bin 26334 -> 15478 bytes tools/scripts/define2mk.sed | 2 + 223 files changed, 4011 insertions(+), 5347 deletions(-) delete mode 100644 arch/arm/cpu/arm1176/s3c64xx/config.mk delete mode 100644 arch/arm/cpu/arm1176/s3c64xx/cpu_init.S delete mode 100644 arch/arm/cpu/arm1176/s3c64xx/init.c delete mode 100644 arch/arm/cpu/arm1176/s3c64xx/reset.S delete mode 100644 arch/arm/cpu/arm1176/s3c64xx/speed.c delete mode 100644 arch/arm/cpu/arm1176/s3c64xx/timer.c rename drivers/usb/host/s3c64xx-hcd.c => arch/arm/imx-common/cmd_hdmidet.c (65%) delete mode 100644 arch/arm/include/asm/arch-s3c64xx/hardware.h delete mode 100644 arch/arm/include/asm/arch-s3c64xx/s3c6400.h delete mode 100644 arch/arm/include/asm/arch-s3c64xx/s3c64x0.h create mode 100644 arch/arm/include/asm/omap_gpmc.h delete mode 100644 board/freescale/mx31pdk/config.mk delete mode 100644 board/karo/tx25/config.mk delete mode 100644 board/samsung/smdk6400/.gitignore delete mode 100644 board/samsung/smdk6400/Makefile delete mode 100644 board/samsung/smdk6400/config.mk delete mode 100644 board/samsung/smdk6400/lowlevel_init.S delete mode 100644 board/samsung/smdk6400/smdk6400.c delete mode 100644 board/samsung/smdk6400/smdk6400_nand_spl.c delete mode 100644 board/samsung/smdk6400/u-boot-nand.lds rename board/ti/{omap5_evm => omap5_uevm}/Makefile (100%) rename board/ti/{omap5_evm => omap5_uevm}/evm.c (100%) rename board/ti/{omap5_evm => omap5_uevm}/mux_data.h (100%) create mode 100644 board/wandboard/Makefile create mode 100644 board/wandboard/README create mode 100644 board/wandboard/wandboard.c create mode 100644 doc/device-tree-bindings/video/exynos-dp.txt create mode 100644 doc/device-tree-bindings/video/exynos-fb.txt rename {arch/arm/cpu/arm1176/s3c64xx => drivers/crypto}/Makefile (69%) create mode 100644 drivers/crypto/ace_sha.c create mode 100644 drivers/crypto/ace_sha.h create mode 100644 drivers/mtd/nand/mxc_nand.h rename nand_spl/nand_boot_fsl_nfc.c => drivers/mtd/nand/mxc_nand_spl.c (65%) delete mode 100644 drivers/mtd/nand/s3c64xx.c delete mode 100644 drivers/serial/s3c64xx.c rename include/configs/{omap5_evm.h => omap5_uevm.h} (71%) delete mode 100644 include/configs/smdk6400.h create mode 100644 include/configs/wandboard.h delete mode 100644 include/fsl_nfc.h create mode 100644 include/hw_sha.h delete mode 100644 nand_spl/board/freescale/mx31pdk/Makefile delete mode 100644 nand_spl/board/freescale/mx31pdk/u-boot.lds delete mode 100644 nand_spl/board/karo/tx25/Makefile delete mode 100644 nand_spl/board/karo/tx25/config.mk delete mode 100644 nand_spl/board/karo/tx25/u-boot.lds delete mode 100644 nand_spl/board/samsung/smdk6400/Makefile delete mode 100644 nand_spl/board/samsung/smdk6400/config.mk delete mode 100644 nand_spl/board/samsung/smdk6400/u-boot.lds
Amicalement,
On Thu, Apr 11, 2013 at 08:45:30AM +0200, Albert ARIBAUD wrote:
Hi Tom,
On Thu, 11 Apr 2013 01:12:17 +0200, Albert ARIBAUD albert.u.boot@aribaud.net wrote:
The following changes since commit 009d75ccc11d27b9a083375a88bb93cb746b4800:
Merge branch 'u-boot/master' into 'u-boot-arm/master' (2013-03-28 18:50:01 +0100)
are available in the git repository at:
git://git.denx.de/u-boot-arm master
for you to fetch changes up to abbecf4c873aa3e9ec9331c5b3eba1e2a9c84902:
ARM: Fix __bss_start and __bss_end in linker scripts (2013-04-11 08:10:59 +0200)
*** NOTE *** there should be a single, and trivial, merge conflict on file drivers/video/exynos_fb.c.
Abbas Raza (1): mmc: i.MX6: fsl_esdhc: Define maximum bus width supported by a board
Ajay Kumar (13): video: exynos_fb: Remove callbacks from the driver video: exynos_dp: Remove callbacks from the driver video: exynos_fb: Make fimd_ctrl global EXYNOS: FDT: Add compatible strings for FIMD video: exynos_fb: add DT support for FIMD driver EXYNOS5: Add device node for FIMD SMDK5250: Add device node for FIMD video: exynos_dp: Make dp_regs global EXYNOS5: FDT: Add compatible strings for FIMD video: exynos_dp: Add function to parse DP DT node EXYNOS5: Add device node for DP SMDK5250: Add device node for DP SMDK5250: Use statically defined structures only in non DT case
Akshay Saraswat (8): Exynos: clock: Fix a bug in PLL lock check condition Exynos: Add hardware accelerated SHA256 and SHA1 Exynos: config: Enable ACE HW for SHA 256 for Exynos gen: Add sha h/w acceleration to hash Exynos: config: Enable hash command Exynos5: clock: Fix a typo bug in exynos clock init Exynos5: config: enable time command Exynos: pwm: Remove dead code of function exynos5_get_pwm_clk
Albert ARIBAUD (8): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master' Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' cam_enc_4xx: fix CONFIG_SPL_MAX_SIZE semantics da850evm, da850_am18xxevm: fix CONFIG_SPL_MAX_SIZE semantics smdk5250, snow: fix CONFIG_SPL_MAX_SIZE semantics ARM: fix CONFIG_SPL_MAX_SIZE semantics ARM: Fix __bss_start and __bss_end in linker scripts
Alexandre Pereira da Silva (1): mx23_olinuxino: Fix netboot console
Andreas Bie??mann (6): omap3/cpu.h: add BCH support asm/omap_gpmc.h: consolidate common defines omap3/omap_gpmc.h: add ooblayout for BCH8 as in kernel omap_gpmc: change nandecc command omap_gpmc: add support for hw assisted BCH8 tricorder: enable hw assisted BCH8 in SPL and u-boot
Beno??t Th??baudeau (29): mx25pdk: Enable imxdi RTC nand: mxc: Prepare to add support for i.MX5 nand: mxc: Add support for i.MX5 imx: mx5: lowlevel_init: Simplify code imx: mx53ard: Add support for NAND Flash nand: mxc: Fix debug trace in mxc_nand_read_oob_syndrome() nand: mxc: Use appropriate page number in syndrome functions arm: start.S: Fix _TEXT_BASE for SPL arm: relocate_code() is no longer noreturn arm1136: Remove redundant relocate_code() return arm: relocate_code(): Remove useless relocation offset computation arm: relocate_code(): Use __image_copy_end for end of relocation arm: crt0.S: Remove bogus .globl autoconfig.mk: Make it possible to define configs from other configs Makefile: Change CONFIG_SPL_PAD_TO to image offset imx: Fix automatic make targets for imx images nand: mxc: Switch NAND SPL to generic SPL arm926ejs: Remove deprecated and now unused NAND SPL arm: Remove unused relocate_code() parameters Makefile: Move SHELL setup to config.mk .gitignore: Add /SPL imx: Add u-boot-with-spl.imx make target imx: Add u-boot-with-nand-spl.imx make target arm: Remove support for smdk6400 Revert "mkconfig: start deprecating Makefile config targets" arm: Remove support for unused s3c64xx arm: Remove deprecated and now unused NAND SPL arm1176: Remove unused MMU setup from start.S arm: Make all linker scripts compatible with per-symbol sections
Bin Liu (2): musb: am335x: disable bulk split-combine feature musb: set MUSB speed based on CONFIG
Che-Liang Chiou (1): Exynos: Add timer_get_us function
Dirk Behme (1): spi: mxc_spi: Fix ECSPI reset handling
Eric Nelson (2): i.MX6: Add hdmidet command to detect attached HDMI monitor i.MX6: mx6qsabrelite: discard override of CONFIG_ARP_TIMEOUT
Fabio Estevam (13): mxs: spl_mem_init: Align DDR2 init with FSL bootlets source configs: mx28evk: Use single-line comments mx28evk: Disable CONFIG_CMD_I2C Add initial support for Wandboard dual lite and solo. mx28evk: Introduce a new target for saving env vars to NAND mx6qsabrelite: README: No need to pass 'u-boot.imx' mx6: Fix get_board_rev() for the mx6 solo case wandboard: Remove duplicate 'mmc dev' mx6qsabrelite: Remove duplicate 'mmc dev' wandboard: Remove CONFIG_SYS_FSL_USDHC_NUM mtd: nand: Introduce CONFIG_SYS_NAND_BUSWIDTH_16BIT mtd: nand: mxc_nand: Fix is_16bit_nand() mx31pdk: Remove watchdog support
Gabe Black (3): Exynos: pwm: Fix two bugs in the exynos pwm configuration code Exynos: Avoid a divide by zero by specifying a non-zero period for pwm 4 Exynos: Tidy up the pwm_config function in the exynos pwm driver
Hunter, Jon (4): omap2420-h4: Fix DRAM initialisation omap2420-h4: Fix booting from NOR flash omap2420-h4: Add device tree support omap2420-h4: Fix get_timer() and CONFIG_SYS_HZ
Javier Martinez Canillas (1): i.MX6: mx6qsabrelite: README: don't pass chip-select to sf probe command
Jon Hunter (5): omap5912-osk: Fix DRAM initialisation omap5912-osk: Fix booting from NOR flash omap5912-osk: Fix device initialisation omap5912-osk: Increase flash partition for u-boot omap5912-osk: Fix get_timer() and CONFIG_SYS_HZ
Josh Wu (1): logo: update to the new logo for ATMEL
Knut Wohlrab (1): imx-common: timer: fix 32-bit overflow
Lars Poeschel (1): pcm051: Enable DDR PHY dynamic power down bit
Lokesh Vutla (1): arm: omap4: Fix SDRAM AUTO DETECTION
Lubomir Popov (2): OMAP: Fix copy-paste bug that did not enable UART4 clock OMAP4: Fix bug in omap4460_volts struct
Manfred Huber (1): omap3_beagle: Flush UART3 xmit on enable if TEMT is broken
Minkyu Kang (1): exynos: change indentation of defines in cpu.h
Nishanth Menon (1): omap5: Allow use of a plain text env file
Otavio Salvador (4): mx6qsabresd: Document the mapping of USDHC[2-4] mx6qsabresd: Fix card detection for invalid card id case mx6qsabre{sd,auto}: Add boot mode select mx23_olinuxino: Change definitions to use spaces instead of tabs
Padmavathi Venna (4): Exynos: Add peripherial id for pwm Exynos: clock: Add generic api to get the clk freq Exynos: clock: Correct pwm source clk selection Exynos: pwm: Use generic api to get pwm clk freq
Przemyslaw Marczak (1): spl:falcon:trats: Fix SPL image size computing.
Rajeshwari Shinde (1): EXYNOS5: Add L2 Cache Support.
SRICHARAN R (4): ARM: OMAP5: Rename omap5_evm to omap5_uevm ARM: OMAP5: Set fdt_high to enable booting with Device tree ARM: OMAP4/5: Change the default boot command to work with device tree ARM: OMAP4/5: Make bootz as the default boot command
Simon Glass (1): Exynos: Change get_timer() to work correctly
Stephen Warren (1): ARM: bcm2835: fix get_timer() to return ms
Tom Rini (8): am335x: Enable MMC1 clock doc/feature-removal-schedule.txt: Add CONFIG_SYS_(CLOCKS|PADS)_ENABLE_ALL OMAP3/4/5/AM33xx: Correct logic for checking FAT or RAW MMC omap5_uevm.h: Move uEVM-specific choices to omap5_uevm.h omap5_common.h: Use fallback CONFIG_SYS_BAUDRATE_TABLE am335x/ti814x: Correct MMC_BOOT_DEVICES_START/END am335x: Update timings for the beaglebone again omap5_uevm: Correct to 2MiB aligned partitions on eMMC
Vivek Gautam (2): SMDK5250: Fix compiler warning for non-dt systems spi: exynos: Fix compiler warnings for non-dt systems
.gitignore | 3 + MAINTAINERS | 5 +- Makefile | 40 +- README | 42 +- arch/arm/config.mk | 2 - arch/arm/cpu/arm1136/config.mk | 7 + arch/arm/cpu/arm1136/omap24xx/timer.c | 8 +- arch/arm/cpu/arm1136/start.S | 28 +- arch/arm/cpu/arm1136/u-boot-spl.lds | 2 +- arch/arm/cpu/arm1176/bcm2835/timer.c | 14 +- arch/arm/cpu/arm1176/s3c64xx/config.mk | 34 - arch/arm/cpu/arm1176/s3c64xx/cpu_init.S | 135 --- arch/arm/cpu/arm1176/s3c64xx/init.c | 26 - arch/arm/cpu/arm1176/s3c64xx/reset.S | 34 - arch/arm/cpu/arm1176/s3c64xx/speed.c | 145 ---- arch/arm/cpu/arm1176/s3c64xx/timer.c | 160 ---- arch/arm/cpu/arm1176/start.S | 127 +-- arch/arm/cpu/arm720t/start.S | 26 +- arch/arm/cpu/arm920t/ep93xx/u-boot.lds | 13 +- arch/arm/cpu/arm920t/start.S | 28 +- arch/arm/cpu/arm925t/start.S | 28 +- arch/arm/cpu/arm926ejs/config.mk | 8 +- arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 18 +- arch/arm/cpu/arm926ejs/mxs/start.S | 4 + arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds | 6 +- arch/arm/cpu/arm926ejs/omap/timer.c | 15 +- arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds | 6 +- arch/arm/cpu/arm926ejs/start.S | 40 +- arch/arm/cpu/arm946es/start.S | 28 +- arch/arm/cpu/arm_intcm/start.S | 30 +- arch/arm/cpu/armv7/am33xx/clock_am33xx.c | 5 + arch/arm/cpu/armv7/am33xx/elm.c | 2 +- arch/arm/cpu/armv7/config.mk | 6 + arch/arm/cpu/armv7/exynos/clock.c | 167 +++- arch/arm/cpu/armv7/exynos/soc.c | 36 + arch/arm/cpu/armv7/mx5/lowlevel_init.S | 8 +- arch/arm/cpu/armv7/mx6/soc.c | 12 + arch/arm/cpu/armv7/omap-common/clocks-common.c | 4 +- arch/arm/cpu/armv7/omap-common/emif-common.c | 29 +- arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 10 +- arch/arm/cpu/armv7/omap-common/u-boot-spl.lds | 2 +- arch/arm/cpu/armv7/omap3/board.c | 31 +- arch/arm/cpu/armv7/omap4/emif.c | 1 - arch/arm/cpu/armv7/omap4/hw_data.c | 8 +- arch/arm/cpu/armv7/omap5/emif.c | 1 - arch/arm/cpu/armv7/s5p-common/pwm.c | 42 +- arch/arm/cpu/armv7/s5p-common/timer.c | 117 ++- arch/arm/cpu/armv7/socfpga/u-boot-spl.lds | 2 +- arch/arm/cpu/armv7/start.S | 26 +- arch/arm/cpu/ixp/start.S | 28 +- arch/arm/cpu/ixp/u-boot.lds | 16 +- arch/arm/cpu/pxa/start.S | 26 +- arch/arm/cpu/s3c44b0/start.S | 28 +- arch/arm/cpu/sa1100/start.S | 28 +- arch/arm/cpu/u-boot-spl.lds | 19 +- arch/arm/cpu/u-boot.lds | 18 +- arch/arm/dts/exynos5250.dtsi | 13 + arch/arm/imx-common/Makefile | 18 + .../arm/imx-common/cmd_hdmidet.c | 32 +- arch/arm/imx-common/timer.c | 26 +- arch/arm/include/asm/arch-am33xx/ddr_defs.h | 20 +- arch/arm/include/asm/arch-am33xx/omap_gpmc.h | 58 +- arch/arm/include/asm/arch-am33xx/spl.h | 8 + arch/arm/include/asm/arch-am33xx/sys_proto.h | 2 +- arch/arm/include/asm/arch-bcm2835/timer.h | 2 + arch/arm/include/asm/arch-exynos/clk.h | 15 + arch/arm/include/asm/arch-exynos/cpu.h | 10 +- arch/arm/include/asm/arch-exynos/dp_info.h | 1 - arch/arm/include/asm/arch-exynos/periph.h | 5 + arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 3 + arch/arm/include/asm/arch-omap24xx/omap2420.h | 6 +- arch/arm/include/asm/arch-omap3/cpu.h | 6 + arch/arm/include/asm/arch-omap3/omap_gpmc.h | 68 +- arch/arm/include/asm/arch-omap3/spl.h | 3 + arch/arm/include/asm/arch-omap3/sys_proto.h | 2 +- arch/arm/include/asm/arch-omap4/omap.h | 1 - arch/arm/include/asm/arch-omap4/spl.h | 2 + arch/arm/include/asm/arch-omap5/omap.h | 1 - arch/arm/include/asm/arch-omap5/spl.h | 2 + arch/arm/include/asm/arch-s3c64xx/hardware.h | 63 -- arch/arm/include/asm/arch-s3c64xx/s3c6400.h | 895
arch/arm/include/asm/arch-s3c64xx/s3c64x0.h | 90 -- arch/arm/include/asm/emif.h | 1 - arch/arm/include/asm/mach-types.h | 13 - arch/arm/include/asm/omap_gpmc.h | 87 ++ arch/arm/lib/crt0.S | 52 +- board/actux1/u-boot.lds | 17 +- board/actux2/u-boot.lds | 17 +- board/actux3/u-boot.lds | 17 +- board/ait/cam_enc_4xx/u-boot-spl.lds | 4 +- board/boundary/nitrogen6x/nitrogen6x.c | 8 +- board/davinci/da8xxevm/u-boot-spl-da850evm.lds | 4 +- board/davinci/da8xxevm/u-boot-spl-hawk.lds | 9 +- board/dvlhost/u-boot.lds | 17 +- board/freescale/mx31ads/u-boot.lds | 32 +- board/freescale/mx31pdk/Makefile | 3 + board/freescale/mx31pdk/config.mk | 5 - board/freescale/mx31pdk/mx31pdk.c | 8 + board/freescale/mx53ard/mx53ard.c | 66 ++ board/freescale/mx6qsabreauto/mx6qsabreauto.c | 18 + board/freescale/mx6qsabrelite/README | 4 +- board/freescale/mx6qsabrelite/mx6qsabrelite.c | 8 +- board/freescale/mx6qsabresd/mx6qsabresd.c | 48 +- board/isee/igep00x0/igep00x0.c | 2 +- board/karo/tx25/Makefile | 4 +- board/karo/tx25/config.mk | 5 - board/karo/tx25/tx25.c | 8 + board/overo/overo.c | 2 +- board/phytec/pcm051/board.c | 3 +- board/samsung/dts/exynos5250-smdk5250.dts | 40 + board/samsung/smdk5250/clock_init.c | 22 +- board/samsung/smdk5250/setup.h | 2 +- board/samsung/smdk5250/smdk5250-uboot-spl.lds | 4 +- board/samsung/smdk5250/smdk5250.c | 19 +- board/samsung/smdk6400/.gitignore | 5 - board/samsung/smdk6400/Makefile | 48 -- board/samsung/smdk6400/config.mk | 30 - board/samsung/smdk6400/lowlevel_init.S | 323 ------- board/samsung/smdk6400/smdk6400.c | 134 --- board/samsung/smdk6400/smdk6400_nand_spl.c | 37 - board/samsung/smdk6400/u-boot-nand.lds | 86 -- board/samsung/trats/trats.c | 6 +- board/samsung/universal_c210/universal.c | 23 +- board/ti/am335x/board.c | 2 +- board/ti/omap2420h4/config.mk | 4 +- board/ti/omap2420h4/mem.c | 13 - board/ti/omap2420h4/omap2420h4.c | 24 +- board/ti/omap5912osk/config.mk | 12 +- board/ti/omap5912osk/lowlevel_init.S | 20 + board/ti/omap5912osk/omap5912osk.c | 23 +- board/ti/{omap5_evm => omap5_uevm}/Makefile | 0 board/ti/{omap5_evm => omap5_uevm}/evm.c | 0 board/ti/{omap5_evm => omap5_uevm}/mux_data.h | 0 board/vpac270/u-boot-spl.lds | 6 +- board/wandboard/Makefile | 29 + board/wandboard/README | 40 + board/wandboard/wandboard.c | 178 ++++ boards.cfg | 9 +- common/hash.c | 18 + config.mk | 7 + doc/README.arm-relocation | 14 +- doc/README.mx28evk | 18 + doc/README.omap3 | 28 + doc/README.scrapyard | 1 + doc/device-tree-bindings/video/exynos-dp.txt | 69 ++ doc/device-tree-bindings/video/exynos-fb.txt | 92 ++ doc/driver-model/UDM-serial.txt | 42 +- doc/feature-removal-schedule.txt | 32 +- .../arm1176/s3c64xx => drivers/crypto}/Makefile | 27 +- drivers/crypto/ace_sha.c | 126 +++ drivers/crypto/ace_sha.h | 325 +++++++ drivers/mmc/bcm2835_sdhci.c | 5 +- drivers/mmc/fsl_esdhc.c | 7 + drivers/mtd/nand/Makefile | 2 +- drivers/mtd/nand/mxc_nand.c | 260 +++--- drivers/mtd/nand/mxc_nand.h | 225 +++++ .../mtd/nand/mxc_nand_spl.c | 130 ++- drivers/mtd/nand/ndfc.c | 4 +- drivers/mtd/nand/omap_gpmc.c | 424 +++++++--- drivers/mtd/nand/s3c64xx.c | 295 ------- drivers/mtd/onenand/onenand_base.c | 4 - drivers/mtd/onenand/samsung.c | 60 +- drivers/serial/Makefile | 1 - drivers/serial/ns16550.c | 18 +- drivers/serial/s3c64xx.c | 187 ---- drivers/serial/serial.c | 2 - drivers/spi/exynos_spi.c | 2 + drivers/spi/mxc_spi.c | 8 +- drivers/usb/host/Makefile | 1 - drivers/usb/host/ohci-hcd.c | 1 - drivers/usb/musb-new/musb_core.c | 7 + drivers/usb/musb-new/musb_uboot.c | 2 +- drivers/video/exynos_dp.c | 76 +- drivers/video/exynos_dp_lowlevel.c | 69 +- drivers/video/exynos_dp_lowlevel.h | 1 + drivers/video/exynos_fb.c | 230 ++++- drivers/video/exynos_fimd.c | 44 +- include/common.h | 7 +- include/config_fallbacks.h | 16 + include/configs/MPC8313ERDB.h | 2 +- include/configs/am335x_evm.h | 1 + include/configs/cam_enc_4xx.h | 4 +- include/configs/da850evm.h | 4 +- include/configs/dra7xx_evm.h | 2 + include/configs/exynos5250-dt.h | 11 +- include/configs/igep00x0.h | 3 - include/configs/mx23_olinuxino.h | 162 ++-- include/configs/mx25pdk.h | 4 + include/configs/mx28evk.h | 92 +- include/configs/mx31pdk.h | 23 +- include/configs/mx53ard.h | 10 + include/configs/mx6qsabre_common.h | 2 + include/configs/mx6qsabrelite.h | 3 - include/configs/omap2420h4.h | 5 +- include/configs/omap4_common.h | 22 +- include/configs/omap5912osk.h | 15 +- include/configs/omap5_common.h | 51 +- include/configs/{omap5_evm.h => omap5_uevm.h} | 17 + include/configs/rpi_b.h | 2 +- include/configs/smdk6400.h | 296 ------- include/configs/trats.h | 1 + include/configs/tricorder.h | 13 +- include/configs/tx25.h | 22 +- include/configs/wandboard.h | 209 +++++ include/fdtdec.h | 2 + include/fsl_esdhc.h | 1 + include/fsl_nfc.h | 170 ---- include/hw_sha.h | 50 ++ include/lcd.h | 9 - include/onenand_uboot.h | 4 - lib/Makefile | 2 +- lib/fdtdec.c | 2 + mkconfig | 9 - nand_spl/board/freescale/mx31pdk/Makefile | 63 -- nand_spl/board/freescale/mx31pdk/u-boot.lds | 87 -- nand_spl/board/karo/tx25/Makefile | 84 -- nand_spl/board/karo/tx25/config.mk | 1 - nand_spl/board/karo/tx25/u-boot.lds | 85 -- nand_spl/board/samsung/smdk6400/Makefile | 117 --- nand_spl/board/samsung/smdk6400/config.mk | 40 - nand_spl/board/samsung/smdk6400/u-boot.lds | 80 -- tools/logos/atmel.bmp | Bin 26334 -> 15478 bytes tools/scripts/define2mk.sed | 2
- 223 files changed, 4011 insertions(+), 5347 deletions(-) delete mode
100644 arch/arm/cpu/arm1176/s3c64xx/config.mk delete mode 100644 arch/arm/cpu/arm1176/s3c64xx/cpu_init.S delete mode 100644 arch/arm/cpu/arm1176/s3c64xx/init.c delete mode 100644 arch/arm/cpu/arm1176/s3c64xx/reset.S delete mode 100644 arch/arm/cpu/arm1176/s3c64xx/speed.c delete mode 100644 arch/arm/cpu/arm1176/s3c64xx/timer.c rename drivers/usb/host/s3c64xx-hcd.c => arch/arm/imx-common/cmd_hdmidet.c (65%) delete mode 100644 arch/arm/include/asm/arch-s3c64xx/hardware.h delete mode 100644 arch/arm/include/asm/arch-s3c64xx/s3c6400.h delete mode 100644 arch/arm/include/asm/arch-s3c64xx/s3c64x0.h create mode 100644 arch/arm/include/asm/omap_gpmc.h delete mode 100644 board/freescale/mx31pdk/config.mk delete mode 100644 board/karo/tx25/config.mk delete mode 100644 board/samsung/smdk6400/.gitignore delete mode 100644 board/samsung/smdk6400/Makefile delete mode 100644 board/samsung/smdk6400/config.mk delete mode 100644 board/samsung/smdk6400/lowlevel_init.S delete mode 100644 board/samsung/smdk6400/smdk6400.c delete mode 100644 board/samsung/smdk6400/smdk6400_nand_spl.c delete mode 100644 board/samsung/smdk6400/u-boot-nand.lds rename board/ti/{omap5_evm => omap5_uevm}/Makefile (100%) rename board/ti/{omap5_evm => omap5_uevm}/evm.c (100%) rename board/ti/{omap5_evm => omap5_uevm}/mux_data.h (100%) create mode 100644 board/wandboard/Makefile create mode 100644 board/wandboard/README create mode 100644 board/wandboard/wandboard.c create mode 100644 doc/device-tree-bindings/video/exynos-dp.txt create mode 100644 doc/device-tree-bindings/video/exynos-fb.txt rename {arch/arm/cpu/arm1176/s3c64xx => drivers/crypto}/Makefile (69%) create mode 100644 drivers/crypto/ace_sha.c create mode 100644 drivers/crypto/ace_sha.h create mode 100644 drivers/mtd/nand/mxc_nand.h rename nand_spl/nand_boot_fsl_nfc.c => drivers/mtd/nand/mxc_nand_spl.c (65%) delete mode 100644 drivers/mtd/nand/s3c64xx.c delete mode 100644 drivers/serial/s3c64xx.c rename include/configs/{omap5_evm.h => omap5_uevm.h} (71%) delete mode 100644 include/configs/smdk6400.h create mode 100644 include/configs/wandboard.h delete mode 100644 include/fsl_nfc.h create mode 100644 include/hw_sha.h delete mode 100644 nand_spl/board/freescale/mx31pdk/Makefile delete mode 100644 nand_spl/board/freescale/mx31pdk/u-boot.lds delete mode 100644 nand_spl/board/karo/tx25/Makefile delete mode 100644 nand_spl/board/karo/tx25/config.mk delete mode 100644 nand_spl/board/karo/tx25/u-boot.lds delete mode 100644 nand_spl/board/samsung/smdk6400/Makefile delete mode 100644 nand_spl/board/samsung/smdk6400/config.mk delete mode 100644 nand_spl/board/samsung/smdk6400/u-boot.lds
For the archives, this has problems with HIDDEN not being available on older binutils and a PowerPC build issue, both of which are being worked actively. This request is rejected.
participants (3)
-
Albert ARIBAUD -
Benoît Thébaudeau -
Tom Rini