config: cadence_spi: Remove defines read from DT

[u-boot] / include / configs / colibri_vf.h

diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index c7f174839f0ff7dbcd37a5b672f1a06889c86b36..c7a34c2c7652b6a1587041cb875f2323fc3f5e28 100644 (file)
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -20,7 +20,6 @@
 
 #define CONFIG_SKIP_LOWLEVEL_INIT
 
-#define CONFIG_CMD_FUSE
 #ifdef CONFIG_CMD_FUSE
 #define CONFIG_MXC_OCOTP
 #endif
@@ -44,37 +43,23 @@
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 
 /* NAND support */
-#define CONFIG_CMD_NAND
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_BASE           NFC_BASE_ADDR
 
 /* Dynamic MTD partition support */
-#define CONFIG_CMD_MTDPARTS    /* Enable 'mtdparts' command line support */
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE      /* needed for mtdparts commands */
-#define MTDIDS_DEFAULT         "nand0=vf610_nfc"
-#define MTDPARTS_DEFAULT       "mtdparts=vf610_nfc:"           \
-                               "128k(vf-bcb)ro,"               \
-                               "1408k(u-boot)ro,"              \
-                               "512k(u-boot-env),"             \
-                               "-(ubi)"
 
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_ESDHC_NUM       1
 
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_CMD_UBIFS       /* increases size by almost 60 KB */
-
 #define CONFIG_FEC_MXC
 #define CONFIG_MII
 #define IMX_FEC_BASE                   ENET1_BASE_ADDR
 #define CONFIG_FEC_XCV_TYPE            RMII
 #define CONFIG_FEC_MXC_PHYADDR          0
-#define CONFIG_PHYLIB
-#define CONFIG_PHY_MICREL
 
 #define CONFIG_IPADDR          192.168.10.2
 #define CONFIG_NETMASK         255.255.255.0
@@ -84,8 +69,8 @@
 #define CONFIG_FDTADDR                 0x84000000
 
 /* We boot from the gfxRAM area of the OCRAM. */
-#define CONFIG_SYS_TEXT_BASE           0x3f408000
-#define CONFIG_BOARD_SIZE_LIMIT                524288
+#define CONFIG_SYS_TEXT_BASE           0x3f401000
+#define CONFIG_BOARD_SIZE_LIMIT                520192
 
 #define SD_BOOTCMD \
        "sdargs=root=/dev/mmcblk0p2 rw rootwait\0"      \
@@ -138,7 +123,7 @@
        "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \
        "source ${loadaddr}\0" \
        "setupdate=run setsdupdate || run setusbupdate\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \
        "video-mode=dcufb:640x480-16@60,monitor=lcd\0" \
        "splashpos=m,m\0" \
@@ -150,9 +135,6 @@
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
 #undef CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE              1024    /* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE              \
-                       (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS             16      /* max number of command args */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
 #define CONFIG_SYS_MEMTEST_START       0x80010000
@@ -191,7 +173,6 @@
 #endif
 
 /* USB Host Support */
-#define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_VF
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET