Complete migration of MTDPARTS_DEFAULT / MTDIDS_DEFAULT, include in environment

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

diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 999bdd1..ab4fe6b 100644 (file)
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -11,10 +11,7 @@
 
 #include <configs/exynos4-common.h>
 
-#define CONFIG_TIZEN                   /* TIZEN lib */
-
 /* Keep L2 Cache Disabled */
-#define CONFIG_SYS_L2CACHE_OFF         1
 
 /* Universal has 2 banks of DRAM */
 #define CONFIG_SYS_SDRAM_BASE          0x40000000
@@ -22,25 +19,6 @@
 
 #define SDRAM_BANK_SIZE                        (256 << 20)     /* 256 MB */
 
-/* select serial console configuration */
-
-/* Console configuration */
-
-#define CONFIG_BOOTCOMMAND             "run mmcboot"
-#define CONFIG_DEFAULT_CONSOLE         "ttySAC1,115200n8"
-
-#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_LOAD_ADDR \
-                                       - GENERATED_GBL_DATA_SIZE)
-
-#define CONFIG_SYS_MEM_TOP_HIDE        (1 << 20)       /* ram console */
-
-#define CONFIG_SYS_MONITOR_BASE        0x00000000
-
-/* memtest works on */
-#define CONFIG_SYS_MEMTEST_START       CONFIG_SYS_SDRAM_BASE
-#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_SDRAM_BASE + 0x5000000)
-#define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 0x4800000)
-
 /* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */
 
 #define NORMAL_MTDPARTS_DEFAULT CONFIG_MTDPARTS_DEFAULT
@@ -51,20 +29,6 @@
                                ",100M(swap)"\
                                ",-(UMS)\0"
 
-#define CONFIG_ENV_UBI_MTD     " ubi.mtd=${ubiblock} ubi.mtd=4 ubi.mtd=7"
-#define CONFIG_BOOTBLOCK       "10"
-#define CONFIG_UBIBLOCK                "9"
-
-#define CONFIG_SYS_MMC_ENV_DEV         CONFIG_MMC_DEFAULT_DEV
-#define CONFIG_ENV_SIZE                        4096
-#define CONFIG_ENV_OFFSET              ((32 - 4) << 10) /* 32KiB - 4KiB */
-
-#define CONFIG_ENV_UBIFS_OPTION        " rootflags=bulk_read,no_chk_data_crc "
-#define CONFIG_ENV_FLASHBOOT   CONFIG_ENV_UBI_MTD CONFIG_ENV_UBIFS_OPTION \
-                               "${mtdparts}"
-
-#define CONFIG_ENV_COMMON_BOOT "${console} ${meminfo}"
-
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "updateb=" \
                "onenand erase 0x0 0x100000;" \
@@ -82,18 +46,20 @@
        "lpj=lpj=3981312\0" \
        "ubifsboot=" \
                "set bootargs root=ubi0!rootfs rootfstype=ubifs ${lpj} " \
-               CONFIG_ENV_FLASHBOOT " ${opts} ${lcdinfo} " \
-               CONFIG_ENV_COMMON_BOOT "; run bootk\0" \
+               "ubi.mtd=${ubiblock} ubi.mtd=4 ubi.mtd=7 " \
+               "rootflags=bulk_read,no_chk_data_crc ${mtdparts} ${opts} " \
+               "${lcdinfo} ${console} ${meminfo}; run bootk\0" \
        "tftpboot=" \
                "set bootargs root=ubi0!rootfs rootfstype=ubifs " \
-               CONFIG_ENV_FLASHBOOT " ${opts} ${lcdinfo} " \
-               CONFIG_ENV_COMMON_BOOT \
+               "ubi.mtd=${ubiblock} ubi.mtd=4 ubi.mtd=7 " \
+               "rootflags=bulk_read,no_chk_data_crc ${mtdparts} ${opts} " \
+               "${lcdinfo} ${console} ${meminfo}" \
                "; tftp 0x40007FC0 uImage; bootm 0x40007FC0\0" \
        "nfsboot=" \
                "set bootargs root=/dev/nfs rw " \
                "nfsroot=${nfsroot},nolock,tcp " \
                "ip=${ipaddr}:${serverip}:${gatewayip}:" \
-               "${netmask}:generic:usb0:off " CONFIG_ENV_COMMON_BOOT \
+               "${netmask}:generic:usb0:off ${console} ${meminfo}" \
                "; run bootk\0" \
        "ramfsboot=" \
                "set bootargs root=/dev/ram0 rw rootfstype=ext2 " \
@@ -108,13 +74,12 @@
        "mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \
        "verify=n\0" \
        "rootfstype=ext4\0" \
-       "console=" CONFIG_DEFAULT_CONSOLE "\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT \
+       "console=console=ttySAC1,115200n8\0" \
        "mbrparts=" MBRPARTS_DEFAULT \
        "meminfo=crashkernel=32M@0x50000000\0" \
        "nfsroot=/nfsroot/arm\0" \
-       "bootblock=" CONFIG_BOOTBLOCK "\0" \
-       "ubiblock=" CONFIG_UBIBLOCK" \0" \
+       "bootblock=10\0" \
+       "ubiblock=9\0" \
        "ubi=enabled\0" \
        "loaduimage=fatload mmc ${mmcdev}:${mmcbootpart} 0x40007FC0 uImage\0" \
        "mmcdev=0\0" \
@@ -128,11 +93,6 @@
 
 #define CONFIG_USB_GADGET_DWC2_OTG_PHY
 
-/*
- * SPI Settings
- */
-#define CONFIG_SOFT_SPI
-
 #ifndef        __ASSEMBLY__
 void universal_spi_scl(int bit);
 void universal_spi_sda(int bit);
@@ -164,9 +124,7 @@ int universal_spi_read(void);
 /*
  * LCD Settings
  */
-#define CONFIG_BMP_16BPP
 #define CONFIG_LD9040
-#define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((500 * 160 * 4) + 54)
 
 #endif /* __CONFIG_H */