Merge tag 'u-boot-rockchip-20200501' of https://gitlab.denx.de/u-boot/custodians...

[platform/kernel/u-boot.git] / include / configs / am335x_igep003x.h

diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h
index 55b511c..95ba949 100644 (file)
--- a/include/configs/am335x_igep003x.h
+++ b/include/configs/am335x_igep003x.h
@@ -14,21 +14,12 @@
 #ifndef __CONFIG_IGEP003X_H
 #define __CONFIG_IGEP003X_H
 
-#define CONFIG_NAND
 #include <configs/ti_am335x_common.h>
 
 /* Clock defines */
 #define V_OSCK                         24000000  /* Clock output from T2 */
 #define V_SCLK                         (V_OSCK)
 
-#define CONFIG_ENV_SIZE                        (96 << 10)      /*  96 KiB */
-
-/* Make the verbose messages from UBI stop printing */
-#define CONFIG_UBI_SILENCE_MSG
-#define CONFIG_UBIFS_SILENCE_MSG
-
-#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS \
        DEFAULT_LINUX_BOOT_ENV \
@@ -64,8 +55,8 @@
                                "bootz ${loadaddr} - ${fdtaddr};" \
                        "fi;" \
                "fi;\0" \
-       "mtdids=" MTDIDS_DEFAULT "\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "nandroot=ubi0:rootfs rw ubi.mtd=1\0" \
        "nandrootfstype=ubifs rootwait\0" \
        "nandload=ubi part UBI; " \
@@ -108,47 +99,12 @@
 
 /* NS16550 Configuration */
 #define CONFIG_SYS_NS16550_COM1                0x44e09000      /* UART0 */
-#define CONFIG_CONS_INDEX              1
 
 /* Ethernet support */
-#define CONFIG_PHYLIB
-#define CONFIG_PHY_SMSC
 
 /* NAND support */
-#define CONFIG_NAND_OMAP_ELM
 #define CONFIG_SYS_NAND_ONFI_DETECTION 1
 
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-
-#define MTDIDS_DEFAULT                 "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT               "mtdparts=omap2-nand.0:512k(SPL),-(UBI)"
-
-/* SPL */
-#define CONFIG_SPL_LDSCRIPT            "arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
-
-/* UBI configuration */
-#define CONFIG_SPL_UBI                 1
-#define CONFIG_SPL_UBI_MAX_VOL_LEBS    256
-#define CONFIG_SPL_UBI_MAX_PEB_SIZE    (256*1024)
-#define CONFIG_SPL_UBI_MAX_PEBS                4096
-#define CONFIG_SPL_UBI_VOL_IDS         8
-#define CONFIG_SPL_UBI_LOAD_MONITOR_ID 0
-#define CONFIG_SPL_UBI_LOAD_KERNEL_ID  3
-#define CONFIG_SPL_UBI_LOAD_ARGS_ID    4
-#define CONFIG_SPL_UBI_PEB_OFFSET      4
-#define CONFIG_SPL_UBI_VID_OFFSET      512
-#define CONFIG_SPL_UBI_LEB_START       2048
-#define CONFIG_SPL_UBI_INFO_ADDR       0x88080000
-
-/* environment organization */
-#define CONFIG_ENV_IS_IN_UBI           1
-#define CONFIG_ENV_UBI_PART            "UBI"
-#define CONFIG_ENV_UBI_VOLUME          "config"
-#define CONFIG_ENV_UBI_VOLUME_REDUND   "config_r"
-
 /* NAND config */
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_PAGE_COUNT     (CONFIG_SYS_NAND_BLOCK_SIZE / \