Changes in README

57dc53a72460e8e301fa1cc7951b41db8e731485 - Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

Mon, 08 Feb 2016 14:48:04 +0000

Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging List of files: /rk3399_rockchip-uboot/board/wandboard/README

a187559e3d586891c917279044c5386d1b2adc6e - Use correct spelling of "U-Boot"

Sat, 06 Feb 2016 03:30:11 +0000

Use correct spelling of "U-Boot"Correct spelling of "U-Boot" shall be used in all written text(documentation, comments in source files etc.).Signed-off-by: Bin Meng Reviewed-by: Heiko Schocher Reviewed-by: Simon Glass Reviewed-by: Minkyu Kang List of files: /rk3399_rockchip-uboot/board/wandboard/README

9bea236b3402a262772b66d055ec6431cbd3ba87 - Merge branch 'master' of git://www.denx.de/git/u-boot-imx

Tue, 26 May 2015 14:38:01 +0000

Merge branch 'master' of git://www.denx.de/git/u-boot-imx List of files: /rk3399_rockchip-uboot/board/wandboard/README

0d1ea05210f3221667f8085cf167f23f336ca0c0 - wandboard: Switch to SPL support

Mon, 11 May 2015 23:50:22 +0000

wandboard: Switch to SPL supportCurrently we need to build one U-boot image for each of the wandboardvariants: quad, dual-lite and solo.By switching to SPL we can support all these variants with a single binary,which is very convenient.Based on the work from Richard Hu.Tested kernel booting on the three boards.Signed-off-by: Richard Hu Signed-off-by: Fabio Estevam Tested-by: Vagrant Cascadian Reviewed-by: Stefano Babic List of files: /rk3399_rockchip-uboot/board/wandboard/README

85b8c5c4bf80025de4632ae6c9a8a606e51508a4 - Merge branch 'iu-boot/master' into 'u-boot-arm/master'

Sat, 09 Nov 2013 11:51:47 +0000

Merge branch 'iu-boot/master' into 'u-boot-arm/master'Conflicts: arch/arm/cpu/arm926ejs/mxs/Makefile board/compulab/cm_t35/Makefile board/corscience/tricorder/Makefile board/ppcag/bg0900/Makefile drivers/bootcount/Makefile include/configs/omap4_common.h include/configs/pdnb3.hMakefile conflicts are due to additions/removals ofobject files on the ARM branch vs KBuild introductionon the main branch. Resolution consists in adjustingthe list of object files in the main branch version.This also applies to two files which are not listedas conflicting but had to be modified: board/compulab/common/Makefile board/udoo/Makefileinclude/configs/omap4_common.h conflicts are due tothe OMAP4 conversion to ti_armv7_common.h on the ARMside, and CONFIG_SYS_HZ removal on the main side.Resolution is to convert as this icludes removal ofCONFIG_SYS_HZ.include/configs/pdnb3.h is due to a removal on ARM side.Trivial resolution is to remove the file.Note: 'git show' will also list two files just becausethey are new: include/configs/am335x_igep0033.h include/configs/omap3_igep00x0.h List of files: /rk3399_rockchip-uboot/board/wandboard/README

3285d4ca197928a048d3dda86751b5d26e6e0e86 - Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Thu, 07 Nov 2013 08:32:16 +0000

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' List of files: /rk3399_rockchip-uboot/board/wandboard/README

c93addb5635630847e8a33f6dba4afef78a6d180 - wandboard: README: Include the quad version

Fri, 27 Sep 2013 02:10:56 +0000

wandboard: README: Include the quad versionWandboard quad was not ported into U-boot at the time of writing the README.Add it to the list of Wandboard variants.Signed-off-by: Fabio Estevam List of files: /rk3399_rockchip-uboot/board/wandboard/README

fbbbc86e8ebac4f42f4ca39ceba80cea27c983bc - Merge branch 'master' of git://git.denx.de/u-boot-arm

Fri, 12 Jul 2013 14:36:48 +0000

Merge branch 'master' of git://git.denx.de/u-boot-armFix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio andserial.Conflicts: arch/arm/dts/exynos5250.dtsiSigned-off-by: Tom Rini List of files: /rk3399_rockchip-uboot/board/wandboard/README

e6c7f86f03b0ad25e9ef70df3ee1989b6b789d7c - Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Fri, 28 Jun 2013 15:51:13 +0000

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' List of files: /rk3399_rockchip-uboot/board/wandboard/README

491f2947a1abf12aa119f9412aa259c0b128f859 - Add support for Wandboard Quad

Wed, 26 Jun 2013 09:51:49 +0000

Add support for Wandboard QuadAdd support for the Quad version of Wandboard; fix compile warning resultingfrom having 2G of memory.Signed-off-by: Tapani Utriainen Signed-off-by: Otavio Salvador Acked-by: Stefano Babic List of files: /rk3399_rockchip-uboot/board/wandboard/README

41341221d12341a2ecfb280142d6478071738fc2 - Merge branch 'master' of git://git.denx.de/u-boot-arm

Thu, 13 Jun 2013 19:16:15 +0000

Merge branch 'master' of git://git.denx.de/u-boot-armSmall conflict over DRA7XX updates and adding SRAM_SCRATCH_SPACE_ADDRConflicts: arch/arm/include/asm/arch-omap5/omap.hSigned-off-by: Tom Rini List of files: /rk3399_rockchip-uboot/board/wandboard/README

10e167329b029890a4c704f094822da5f259b886 - Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Sat, 08 Jun 2013 12:35:10 +0000

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'Conflicts: drivers/serial/Makefile List of files: /rk3399_rockchip-uboot/board/wandboard/README

8c4983779ed50090b74d56498be17cde31892a64 - wandboard: fix typo in README

Sun, 12 May 2013 14:22:38 +0000

wandboard: fix typo in READMEFix typo in wandboard README file.Signed-off-by: Luka Perkov List of files: /rk3399_rockchip-uboot/board/wandboard/README

17059f972fa6768ebf15a575c00083b3a431b79a - Merge branch 'master' of git://git.denx.de/u-boot-arm

Mon, 15 Apr 2013 11:46:11 +0000

Merge branch 'master' of git://git.denx.de/u-boot-arm List of files: /rk3399_rockchip-uboot/board/wandboard/README

be08abc2429c2e9cbce3d0abc1d315171d683520 - Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Thu, 04 Apr 2013 09:49:32 +0000

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' List of files: /rk3399_rockchip-uboot/board/wandboard/README

e2d282a1b468559c5f7e847db75eeca99644148a - Add initial support for Wandboard dual lite and solo.

Fri, 15 Mar 2013 10:43:48 +0000

Add initial support for Wandboard dual lite and solo.Wandboard is a development board that has two variants: one version basedon mx6 dual lite and another one based on mx6 solo.For more details about Wandboard, please refer to: http://www.wandboard.org/Signed-off-by: Fabio Estevam List of files: /rk3399_rockchip-uboot/board/wandboard/README