Merge branch '2021-12-27-CONFIG-migrations' into next

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

diff --git a/include/configs/trats.h b/include/configs/trats.h
index f39a7c7..5217400 100644 (file)
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -15,7 +15,6 @@
 
 #define CONFIG_TIZEN                   /* TIZEN lib */
 
-#define CONFIG_SYS_L2CACHE_OFF
 #ifndef CONFIG_SYS_L2CACHE_OFF
 #define CONFIG_SYS_L2_PL310
 #define CONFIG_SYS_PL310_BASE  0x10502000
@@ -26,16 +25,6 @@
 #define PHYS_SDRAM_1                   CONFIG_SYS_SDRAM_BASE
 #define SDRAM_BANK_SIZE                        (256 << 20)     /* 256 MB */
 
-/* memtest works on */
-#define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 0x4800000)
-
-/* select serial console configuration */
-
-#define CONFIG_MACH_TYPE               MACH_TYPE_TRATS
-
-#define CONFIG_BOOTCOMMAND             "run autoboot"
-#define CONFIG_DEFAULT_CONSOLE         "console=ttySAC2,115200n8\0"
-
 #define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_LOAD_ADDR \
                                        - GENERATED_GBL_DATA_SIZE)
 
@@ -43,13 +32,6 @@
 
 #define CONFIG_SYS_MONITOR_BASE        0x00000000
 
-#define CONFIG_BOOTBLOCK               "10"
-#define CONFIG_ENV_COMMON_BOOT         "${console} ${meminfo}"
-
-#define CONFIG_SYS_MMC_ENV_DEV         CONFIG_MMC_DEFAULT_DEV
-
-#define CONFIG_ENV_OVERWRITE
-
 /* Tizen - partitions definitions */
 #define PARTS_CSA              "csa-mmc"
 #define PARTS_BOOT             "boot"
@@ -101,7 +83,7 @@
                "setenv 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=" \
                "setenv bootargs root=/dev/ram0 rw rootfstype=ext2 " \
@@ -116,10 +98,10 @@
        "mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \
        "verify=n\0" \
        "rootfstype=ext4\0" \
-       "console=" CONFIG_DEFAULT_CONSOLE \
+       "console=console=ttySAC2,115200n8\0" \
        "meminfo=crashkernel=32M@0x50000000\0" \
        "nfsroot=/nfsroot/arm\0" \
-       "bootblock=" CONFIG_BOOTBLOCK "\0" \
+       "bootblock=10\0" \
        "loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x40007FC0 uImage\0" \
        "loaddtb=ext4load mmc ${mmcdev}:${mmcbootpart} ${fdtaddr} " \
                "${fdtfile}\0" \
@@ -148,7 +130,7 @@
                   "setenv spl_imgsize;" \
                   "setenv spl_imgaddr;" \
                   "setenv spl_addr_tmp;\0" \
-       CONFIG_EXTRA_ENV_ITB \
+       ENV_ITB \
        "fdtaddr=40800000\0" \
 
 /* Falcon mode definitions */
@@ -182,10 +164,8 @@
 #define LCD_BPP                        LCD_COLOR16
 
 /* LCD */
-#define CONFIG_BMP_16BPP
 #define CONFIG_FB_ADDR         0x52504000
 #define CONFIG_EXYNOS_MIPI_DSIM
-#define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE  ((500 * 160 * 4) + 54)
 
 #endif /* __CONFIG_H */