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

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

diff --git a/include/configs/tx51.h b/include/configs/tx51.h
index 19bb7c49865b84d9ffe19697e451c8aaa37824b0..74a9076bab72cb3144c10efbf10c094a7896bcb4 100644 (file)
--- a/include/configs/tx51.h
+++ b/include/configs/tx51.h
@@ -10,7 +10,7 @@
 
 #define CONFIG_MX51                    /* must be set before including imx-regs.h */
 
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
 
 /*
@@ -43,7 +43,7 @@
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_IPUV3_CLK               133000000
 #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 */
@@ -81,13 +81,10 @@
 #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
-#define CONFIG_OF_BOARD_SETUP
 
 /*
  * Boot Linux
@@ -110,7 +107,6 @@
 #define CONFIG_SYS_LOAD_ADDR           _pfx(0x, CONFIG_LOADADDR)
 #define CONFIG_SYS_FDT_ADDR            _pfx(0x, CONFIG_FDTADDR)
 #define CONFIG_U_BOOT_IMG_SIZE         SZ_1M
-#define CONFIG_HW_WATCHDOG
 
 /*
  * Extra Environment Settings
@@ -154,19 +150,11 @@
 
 #define MTD_NAME                       "mxc_nand"
 #define MTDIDS_DEFAULT                 "nand0=" MTD_NAME
-#define CONFIG_FDT_FIXUP_PARTITIONS
 
 /*
  * 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
@@ -181,18 +169,10 @@
 /*
  * Ethernet Driver
  */
-#define CONFIG_FEC_MXC
 #ifdef CONFIG_FEC_MXC
 #define IMX_FEC_BASE                   FEC_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR         0x1f
-#define CONFIG_PHYLIB
-#define CONFIG_PHY_SMSC
-#define CONFIG_MII
 #define CONFIG_FEC_XCV_TYPE            MII100
-#define CONFIG_GET_FEC_MAC_ADDR_FROM_IIM
 #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
@@ -203,17 +183,12 @@
  * NAND flash driver
  */
 #ifdef CONFIG_CMD_NAND
-#define CONFIG_MTD_DEVICE
-#define CONFIG_ENV_IS_IN_NAND
-#define CONFIG_NAND_MXC
 #define CONFIG_MXC_NAND_REGS_BASE      NFC_BASE_ADDR_AXI
 #define CONFIG_MXC_NAND_IP_REGS_BASE   NFC_BASE_ADDR
 #define CONFIG_MXC_NAND_HWECC
-#define CONFIG_CMD_NAND_TRIMFFS
 #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
 #ifdef CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_ENV_OFFSET              CONFIG_U_BOOT_IMG_SIZE
@@ -221,7 +196,6 @@
 #define CONFIG_ENV_RANGE               0x60000
 #endif
 #define CONFIG_SYS_NAND_BASE           0x00000000
-#define CONFIG_CMD_ROMUPDATE
 #endif /* CONFIG_CMD_NAND */
 
 /*
@@ -229,11 +203,7 @@
  */
 #ifdef CONFIG_CMD_MMC
 #ifndef CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_IS_IN_MMC
 #endif
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
 #define CONFIG_DOS_PARTITION