From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Mon, 26 Oct 2015 13:44:47 +0000 (+0100)
Subject: Merge branch 'tx28-devel' into karo-devel
X-Git-Tag: KARO-TX6UL-2015-11-30~14
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=6cb88168319aea95bb1e54692cd13edafa7665f1;hp=-c

Merge branch 'tx28-devel' into karo-devel
---

6cb88168319aea95bb1e54692cd13edafa7665f1
diff --combined board/karo/tx28/Kconfig
index f1dd7bbc4d,f9ba82a937..c09dea740e
--- a/board/karo/tx28/Kconfig
+++ b/board/karo/tx28/Kconfig
@@@ -22,6 -22,7 +22,7 @@@ config TX2
  	select APBH_DMA_BURST8
  	select CC_OPTIMIZE_LIBS_FOR_SPEED
  	select CMD_NAND_TRIMFFS if CMD_NAND
+ 	select CMD_ROMUPDATE
  	select FDT_FIXUP_PARTITIONS
  	select GET_FEC_MAC_ADDR_FROM_IIM if FEC_MXC
  	select LIB_RAND
@@@ -32,7 -33,6 +33,7 @@@
  	select NAND_MXS
  	select OF_BOARD_SETUP
  	select OF_LIBFDT
 +	select PHYLIB
  	select SYS_NAND_USE_FLASH_BBT
  
  config TARGET_TX28_40X2