Changes in Makefile

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

Wed, 02 Sep 2015 14:39:28 +0000

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

78506c2f8618732b59eba68cd56d20a55c087006 - udoo: Switch to SPL support

Mon, 03 Aug 2015 10:49:05 +0000

udoo: Switch to SPL supportCurrently we need to build one U-boot image for each of the udoovariants: quad and dual-lite.By switching to SPL we can support all two variants with a single binary.Based on the SPL for wandboard.Tested with OpenELEC (Open Embedded Linux Entertainment Center)on both boards.Signed-off-by: Peter Vicman Cc: Fabio Estevam Cc: Stefano Babic Acked-by: Stefano Babic Signed-off-by: Peter Vicman Acked-by: Fabio Estevam List of files: /rk3399_rockchip-uboot/board/udoo/Makefile

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/udoo/Makefile

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/udoo/Makefile

0c5e26678b18e136c1514bf769a16060ae1b5ff8 - udoo: Add initial support for mx6q udoo board

Fri, 27 Sep 2013 01:59:25 +0000

udoo: Add initial support for mx6q udoo boardAdd basic support for mx6q udoo board.For further information about Udoo board:http://www.udoo.org/Tested booting a mainline device tree kernel and a Yocto rootfs from mmc.Signed-off-by: Fabio Estevam List of files: /rk3399_rockchip-uboot/board/udoo/Makefile