Changes in Makefile

4180b3dba25c2c28cc4502f1c9f1cbad2a9972b8 - Merge remote-tracking branch 'u-boot/master' into test

Wed, 14 May 2014 22:20:54 +0000

Merge remote-tracking branch 'u-boot/master' into test List of files: /rk3399_rockchip-uboot/board/silica/pengwyn/Makefile

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

Fri, 09 May 2014 15:18:45 +0000

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

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

Tue, 29 Apr 2014 15:41:19 +0000

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

c9aab0f9dd23fddcebf5984dc19e62b514e759a7 - Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

Mon, 21 Apr 2014 19:01:35 +0000

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

d0e6d34d7cca00cb61707826b52837cc7c43da46 - am335x: Switch to CONFIG_SKIP_LOWLEVEL_INIT from guarding SPL or NOR_BOOT

Wed, 09 Apr 2014 12:25:57 +0000

am335x: Switch to CONFIG_SKIP_LOWLEVEL_INIT from guarding SPL or NOR_BOOTIn the case of SPL or NOR_BOOT (no SPL involved) we need to includecertain code in the build. Use !CONFIG_SKIP_LOWLEVEL_INIT rather thanCONFIG_SPL_BUILD || CONFIG_NOR_BOOT to make the code clearer, and tomake supporting XIP QSPI boot clearer in the code.Signed-off-by: Tom Rini Reviewed-by: Wolfgang Denk List of files: /rk3399_rockchip-uboot/board/silica/pengwyn/Makefile

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

Wed, 05 Mar 2014 11:51:26 +0000

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

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

Wed, 26 Feb 2014 21:49:58 +0000

Merge branch 'master' of git://git.denx.de/u-boot-armConflicts: arch/arm/cpu/armv7/config.mk board/ti/am43xx/mux.c include/configs/am43xx_evm.hSigned-off-by: Tom Rini List of files: /rk3399_rockchip-uboot/board/silica/pengwyn/Makefile

fae56934a0744a4dd6981323ba8a966646fd7ca5 - Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

Mon, 24 Feb 2014 09:29:59 +0000

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

da4105dfcd27c20e5cf4eb750f88938f56620d37 - am335x: Initial support for Silica Pengwyn board

Fri, 31 Jan 2014 16:34:14 +0000

am335x: Initial support for Silica Pengwyn boardThis patch add support for the Silica Pengwyn board [1]The board is based on a TI AM3354 CPU [2]All jumpers removed it will boot from the SDcard, the console is onUART1 accessible via the FDTI -> USB. The on board NAND flash issupported and can act as boot medium, depending on jumper settings.USB Host, USB Device and Ethernet are also provided but untested.[1]http://www.silica.com/product/silica-pengwyn-board.html[2]http://www.ti.com/product/am3354Signed-off-by: Lothar Felten [trini: Move CONFIG_BOARD_LATE_INIT into am335x_evm.h, drop unusedspi0_pin_mux from Pengwyn support]Signed-off-by: Tom Rini List of files: /rk3399_rockchip-uboot/board/silica/pengwyn/Makefile