Changes in Makefile

e1cc4d31f889428a4ca73120951389c756404184 - Merge remote-tracking branch 'u-boot/master' into 'u-boot-arm/master'

Tue, 24 Feb 2015 06:59:38 +0000

Merge remote-tracking branch 'u-boot/master' into 'u-boot-arm/master' List of files: /rk3399_rockchip-uboot/board/compulab/common/Makefile

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

Tue, 10 Feb 2015 15:40:43 +0000

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

f82eb2fa5df86b7180ea355a3cb98482f7c27269 - common: convert compulab splash load code to common code

Wed, 14 Jan 2015 08:42:54 +0000

common: convert compulab splash load code to common codeMove board/compulab/common/splash.c code tocommon/splash_source.c to make it available for everybody. This moverenames cl_splash_screen_prepare() to splash_source_load(), andthe compilation of this code is conditional on CONFIG_SPLASH_SOURCE.splash_source features:* Provide a standardized way for declaring board specific splash screen locations* Provide existing routines for auto loading the splash image from the locations as declared by the board* Introduce the "splashsource" environment variable, which makes it possible to select the splash image source.cm-t35 and cm-fx6 are updated to use the modified version.Signed-off-by: Nikita Kiryanov Cc: Stefano Babic Cc: Tom Rini Cc: Igor Grinberg Cc: Anatolij Gustschin Reviewed-by: Tom Rini Acked-by: Igor Grinberg List of files: /rk3399_rockchip-uboot/board/compulab/common/Makefile

cfa1bd0774eafcba4791bad4d66f01b8f0dc6f94 - Merge git://git.denx.de/u-boot-ti

Fri, 07 Nov 2014 21:18:35 +0000

Merge git://git.denx.de/u-boot-ti List of files: /rk3399_rockchip-uboot/board/compulab/common/Makefile

9886c3d7a803f639b975f63397cc24a3307fa7b6 - omap3: cm-t35: move the SMC911x code

Mon, 03 Nov 2014 09:32:21 +0000

omap3: cm-t35: move the SMC911x codeExtract the SMC911x initialization code to a common location where itcan be reused by other compulab omap3 based boards.Signed-off-by: Igor Grinberg Reviewed-by: Tom Rini List of files: /rk3399_rockchip-uboot/board/compulab/common/Makefile

f4a40f05f504407a036e2beee88ce17930d5d45c - omap3: cm-t35: extract the splash code from board

Mon, 03 Nov 2014 09:32:20 +0000

omap3: cm-t35: extract the splash code from boardThe splash screen loading code can be reused by other compulab boards.For now extract it to a common location for further reuse.This also switches the splash code dependency from CONFIG_LCD toCONFIG_SPLASH_SCREEN as it should normally be.In addition this patch fixes the accidental dependency of theget_board_mem_timings() function on CONFIG_LCD, by just moving thesplash code and leaving the above function intact.Signed-off-by: Igor Grinberg Reviewed-by: Tom Rini List of files: /rk3399_rockchip-uboot/board/compulab/common/Makefile

a937fd1682625b1f87b555e2af9117fcb2999d7c - compulab: refactor board revision handling

Mon, 03 Nov 2014 09:32:18 +0000

compulab: refactor board revision handlingMove board revision handling code to a common locationfor further reuse.Signed-off-by: Igor Grinberg Reviewed-by: Tom Rini List of files: /rk3399_rockchip-uboot/board/compulab/common/Makefile

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

Sat, 24 May 2014 10:34:08 +0000

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

33144ea443c298ac9d6f04926a02881a5bae91a3 - Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

Sat, 24 May 2014 07:50:00 +0000

Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' List of files: /rk3399_rockchip-uboot/board/compulab/common/Makefile

39338a30fab2ce7d80dfe0d457071573727f499f - compulab: eeprom: enable any i2c driver

Wed, 16 Apr 2014 10:48:26 +0000

compulab: eeprom: enable any i2c driverMake the common eeprom library available for any I2C driver.Signed-off-by: Ilya Ledvich Signed-off-by: Igor Grinberg List of files: /rk3399_rockchip-uboot/board/compulab/common/Makefile

f15ea6e1d67782a1626d4a4922b6c20e380085e5 - Merge branch 'u-boot/master' into 'u-boot-arm/master'

Tue, 10 Dec 2013 13:31:56 +0000

Merge branch 'u-boot/master' into 'u-boot-arm/master'Conflicts: arch/arm/cpu/armv7/rmobile/Makefile doc/README.scrapyardNeeded manual fix: arch/arm/cpu/armv7/omap-common/Makefile board/compulab/cm_t335/u-boot.lds List of files: /rk3399_rockchip-uboot/board/compulab/common/Makefile

6789e84ecaa8f45d053084e08c381284a04abff7 - i2c, omap24xx: convert driver to new mutlibus/mutliadapter framework

Tue, 22 Oct 2013 09:03:18 +0000

i2c, omap24xx: convert driver to new mutlibus/mutliadapter framework- add omap24xx driver to new multibus/multiadpater support- adapted all config files, which uses this driverTested on the am335x based siemens boards rut, dxr2 and pxm2posted here:http://patchwork.ozlabs.org/patch/263211/Signed-off-by: Heiko Schocher Tested-by: Tom Rini Cc: Lars Poeschel Cc: Steve Sakoman Cc: Thomas Weber Cc: Tom Rix Cc: Grazvydas Ignotas Cc: Enric Balletbo i Serra Cc: Luca Ceresoli Cc: Igor Grinberg Cc: Ilya Yanok Cc: Stefano Babic Cc: Nishanth Menon Cc: Pali Rohár Cc: Peter Barada Cc: Nagendra T S Cc: Michael Jones Cc: Raphael Assenat Acked-by: Igor Grinberg Acked-by: Stefano Babic List of files: /rk3399_rockchip-uboot/board/compulab/common/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/compulab/common/Makefile

e1e55c13c965c1c2316cd1540c3e46e1c07fc4ee - cm-t35: move the display code to common place

Mon, 16 Sep 2013 18:49:59 +0000

cm-t35: move the display code to common placeCompulab OMAP3 boards use the same display initialization code.Move the display initialization code to live under board/compulab/commondirectory.Signed-off-by: Igor Grinberg Tested-by: Nikita Kiryanov List of files: /rk3399_rockchip-uboot/board/compulab/common/Makefile

689be5f83c17af6221764ab3a3890510af3c9022 - cm-t35: move the eeprom code to common place

Mon, 16 Sep 2013 18:49:58 +0000

cm-t35: move the eeprom code to common placeCompulab boards use the same eeprom code, so move the eeprom relatedcode to live under board/compulab/common directory.Also make several adjustments to eeprom functions namespace, so it willbe generic for compulab boards.Signed-off-by: Igor Grinberg Tested-by: Nikita Kiryanov List of files: /rk3399_rockchip-uboot/board/compulab/common/Makefile