karo: merge with Ka-Ro specific tree for secure boot support

[karo-tx-uboot.git] / include / configs / tx28.h

diff --git a/include/configs/tx28.h b/include/configs/tx28.h
index ac7f3d94e3a09d087aaa331e707a1142e57e0c5f..fe7cd1916e9e568f8540e82a7b4e1131f154b012 100644 (file)
--- a/include/configs/tx28.h
+++ b/include/configs/tx28.h
@@ -10,7 +10,7 @@
 
 #define CONFIG_MX28                    /* must be defined before including regs-base.h */
 
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/arch/regs-base.h>
 
 /*
@@ -44,7 +44,7 @@
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_VIDEO_MXS
 #define CONFIG_LCD_LOGO
-#define LCD_BPP                                LCD_COLOR24
+#define LCD_BPP                                LCD_COLOR32
 #define CONFIG_CMD_BMP
 #define CONFIG_VIDEO_BMP_RLE8
 #endif /* CONFIG_LCD */
@@ -77,15 +77,11 @@
 #define CONFIG_CMDLINE_EDITING         /* Command history etc */
 
 #define CONFIG_SYS_64BIT_VSPRINTF
-#define CONFIG_SYS_NO_FLASH
 
 /*
  * Flattened Device Tree (FDT) support
 */
-#define CONFIG_OF_LIBFDT
 #ifdef CONFIG_OF_LIBFDT
-#define CONFIG_FDT_FIXUP_PARTITIONS
-#define CONFIG_OF_BOARD_SETUP
 #endif
 
 /*
@@ -166,13 +162,6 @@
  * U-Boot Commands
  */
 #include <config_cmd_default.h>
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_MTDPARTS
-#define CONFIG_CMD_BOOTCE
-#define CONFIG_CMD_TIME
-#define CONFIG_CMD_MEMTEST
 
 /*
  * Serial Driver
@@ -190,28 +179,19 @@
 /*
  * Ethernet Driver
  */
-#define CONFIG_FEC_MXC
 #ifdef CONFIG_FEC_MXC
 /* This is required for the FEC driver to work with cache enabled */
 #define CONFIG_SYS_ARM_CACHE_WRITETHROUGH
 #define CONFIG_SYS_CACHELINE_SIZE      32
 
 #ifndef CONFIG_TX28_S
-#define CONFIG_FEC_MXC_MULTI
 #else
 #define IMX_FEC_BASE                   MXS_ENET0_BASE
-#define CONFIG_FEC_MXC_PHYADDR         0x00
 #endif
 
-#define CONFIG_PHY_SMSC
-#define CONFIG_PHYLIB
-#define CONFIG_MII
 #define CONFIG_FEC_XCV_TYPE            RMII
-#define CONFIG_GET_FEC_MAC_ADDR_FROM_IIM
 #define CONFIG_NET_MULTI
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_PING
 /* Add for working with "strict" DHCP server */
 #define CONFIG_BOOTP_SUBNETMASK
 #define CONFIG_BOOTP_GATEWAY
@@ -221,10 +201,7 @@
 
 #ifndef CONFIG_ENV_IS_NOWHERE
 /* define one of the following options:
-#define CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_IS_IN_MMC
 */
-#define CONFIG_ENV_IS_IN_NAND
 #endif
 #define CONFIG_ENV_OVERWRITE
 
@@ -233,20 +210,16 @@
  */
 #ifdef CONFIG_CMD_NAND
 #define CONFIG_SYS_NAND_BLOCK_SIZE     SZ_128K
-#define CONFIG_MTD_DEVICE
 #define CONFIG_NAND_MXS
 #define CONFIG_APBH_DMA
 #define CONFIG_APBH_DMA_BURST
 #define CONFIG_APBH_DMA_BURST8
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    CONFIG_SYS_NAND_BLOCK_SIZE
-#define CONFIG_CMD_NAND_TRIMFFS
 #define CONFIG_SYS_MXS_DMA_CHANNEL     4
 #define CONFIG_SYS_NAND_MAX_CHIPS      0x1
 #define CONFIG_SYS_MAX_NAND_DEVICE     0x1
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
-#define CONFIG_SYS_NAND_USE_FLASH_BBT
 #define CONFIG_SYS_NAND_BASE           0x00000000
-#define CONFIG_CMD_ROMUPDATE
 #else
 #undef CONFIG_ENV_IS_IN_NAND
 #endif /* CONFIG_CMD_NAND */
@@ -273,8 +246,6 @@
  * MMC Driver
  */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_MXS_MMC
 #define CONFIG_BOUNCE_BUFFER