karo: tx28: replace SETUP_IOMUX_PAD macro with mxs_iomux_setup_pad() call

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

diff --git a/include/configs/tx28.h b/include/configs/tx28.h
index fe7cd1916e9e568f8540e82a7b4e1131f154b012..c63ec182082f487d5c7a819bad7aa1945f0400d1 100644 (file)
--- a/include/configs/tx28.h
+++ b/include/configs/tx28.h
@@ -8,8 +8,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_MX28                    /* must be defined before including regs-base.h */
-
 #include <linux/sizes.h>
 #include <asm/arch/regs-base.h>
 
@@ -36,9 +34,9 @@
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_BOARD_LATE_INIT
 #define CONFIG_BOARD_EARLY_INIT_F
+#define CONFIG_SYS_GENERIC_BOARD
 
 /* LCD Logo and Splash screen support */
-#define CONFIG_LCD
 #ifdef CONFIG_LCD
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
@@ -158,11 +156,6 @@
 #define MTD_NAME                       "gpmi-nand"
 #define MTDIDS_DEFAULT                 "nand0=" MTD_NAME
 
-/*
- * U-Boot Commands
- */
-#include <config_cmd_default.h>
-
 /*
  * Serial Driver
  */
@@ -184,19 +177,11 @@
 #define CONFIG_SYS_ARM_CACHE_WRITETHROUGH
 #define CONFIG_SYS_CACHELINE_SIZE      32
 
-#ifndef CONFIG_TX28_S
-#else
+#ifdef CONFIG_FEC_MXC_PHYADDR
 #define IMX_FEC_BASE                   MXS_ENET0_BASE
 #endif
 
 #define CONFIG_FEC_XCV_TYPE            RMII
-#define CONFIG_NET_MULTI
-#define CONFIG_CMD_MII
-/* Add for working with "strict" DHCP server */
-#define CONFIG_BOOTP_SUBNETMASK
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_DNS
-#define CONFIG_BOOTP_RANDOM_ID
 #endif
 
 #ifndef CONFIG_ENV_IS_NOWHERE
@@ -208,12 +193,8 @@
 /*
  * NAND flash driver
  */
-#ifdef CONFIG_CMD_NAND
+#ifdef CONFIG_NAND
 #define CONFIG_SYS_NAND_BLOCK_SIZE     SZ_128K
-#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_SYS_MXS_DMA_CHANNEL     4
 #define CONFIG_SYS_NAND_MAX_CHIPS      0x1
@@ -246,10 +227,8 @@
  * MMC Driver
  */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_MXS_MMC
 #define CONFIG_BOUNCE_BUFFER
 
-#define CONFIG_DOS_PARTITION
 #define CONFIG_CMD_FAT
 #define CONFIG_FAT_WRITE
 #define CONFIG_CMD_EXT2
@@ -285,7 +264,6 @@
                                        GENERATED_GBL_DATA_SIZE)
 
 /* Defines for SPL */
-#define CONFIG_SPL
 #define CONFIG_SPL_START_S_PATH                "arch/arm/cpu/arm926ejs/mxs"
 #define CONFIG_SPL_LDSCRIPT            "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds"
 #define CONFIG_SPL_LIBCOMMON_SUPPORT