global: Migrate CONFIG_EXTRA_ENV_SETTINGS to CFG

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

diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index eb015e1..aa17c9c 100644 (file)
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -9,22 +9,18 @@
 #define __CONFIG_CM_T43_H
 
 #define CONFIG_MAX_RAM_BANK_SIZE       (2048 << 20)    /* 2GB */
-#define CONFIG_SYS_TIMERBASE           0x48040000      /* Use Timer2 */
+#define CFG_SYS_TIMERBASE              0x48040000      /* Use Timer2 */
 
 #include <asm/arch/omap.h>
 
 /* Serial support */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_CLK         48000000
-#define CONFIG_SYS_NS16550_COM1                0x44e09000
-#if !defined(CONFIG_SPL_DM) || !defined(CONFIG_DM_SERIAL)
-#define CONFIG_SYS_NS16550_REG_SIZE    (-4)
-#endif
+#define CFG_SYS_NS16550_CLK            48000000
+#define CFG_SYS_NS16550_COM1           0x44e09000
 
 /* NAND support */
-#define CONFIG_SYS_NAND_ECCSIZE                512
-#define CONFIG_SYS_NAND_ECCBYTES       14
-#define CONFIG_SYS_NAND_ECCPOS         { 2, 3, 4, 5, 6, 7, 8, 9, \
+#define CFG_SYS_NAND_ECCSIZE           512
+#define CFG_SYS_NAND_ECCBYTES  14
+#define CFG_SYS_NAND_ECCPOS            { 2, 3, 4, 5, 6, 7, 8, 9, \
                                         10, 11, 12, 13, 14, 15, 16, 17, \
                                         18, 19, 20, 21, 22, 23, 24, 25, \
                                         26, 27, 28, 29, 30, 31, 32, 33, \
@@ -32,31 +28,23 @@
                                         42, 43, 44, 45, 46, 47, 48, 49, \
                                         50, 51, 52, 53, 54, 55, 56, 57, }
 
-/* Power */
-#define CONFIG_POWER_TPS65218
-
 /* Enabling L2 Cache */
-#define CONFIG_SYS_L2_PL310
-#define CONFIG_SYS_PL310_BASE          0x48242000
+#define CFG_SYS_PL310_BASE             0x48242000
 
 /*
  * Since SPL did pll and ddr initialization for us,
  * we don't need to do it twice.
  */
 
-#define CONFIG_HSMMC2_8BIT
-
 #include <configs/ti_armv7_omap.h>
-#undef CONFIG_SYS_MONITOR_LEN
 
 #define V_OSCK                         24000000  /* Clock output from T2 */
 #define V_SCLK                         (V_OSCK)
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        "loadaddr=0x80200000\0" \
        "fdtaddr=0x81200000\0" \
        "bootm_size=0x8000000\0" \
-       "autoload=no\0" \
        "console=ttyO0,115200n8\0" \
        "fdtfile=am437x-sb-som-t43.dtb\0" \
        "kernel=zImage-cm-t43\0" \
@@ -76,8 +64,6 @@
                "bootz ${loadaddr} - ${fdtaddr}\0"
 
 /* SPL defines. */
-#define CONFIG_SYS_SPL_ARGS_ADDR       (CONFIG_SYS_SDRAM_BASE + (128 << 20))
-#define CONFIG_SYS_MONITOR_LEN         (512 * 1024)
 
 /* EEPROM */