global: Migrate CONFIG_STACKBASE to CFG

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

diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h
index 98c8159..d1de356 100644 (file)
--- a/include/configs/bcmstb.h
+++ b/include/configs/bcmstb.h
@@ -65,7 +65,7 @@ extern phys_addr_t prior_stage_fdt_address;
  *            :        [~500 KiB in size, stripped]
  *      0xc000 0000    Top of RAM
  *
- * Setting gd->relocaddr to CONFIG_SYS_TEXT_BASE in dram_init_banksize
+ * Setting gd->relocaddr to CONFIG_TEXT_BASE in dram_init_banksize
  * prevents U-Boot from relocating itself when it is run as an ELF
  * program by the prior stage bootloader.
  *
@@ -81,36 +81,28 @@ extern phys_addr_t prior_stage_fdt_address;
  * MiB.  However, BOLT can be configured to allow loading larger
  * initramfs images, in which case this limitation is eliminated.
  */
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x100000
-#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_INIT_RAM_ADDR +     \
-                                        CONFIG_SYS_INIT_RAM_SIZE -     \
-                                        GENERATED_GBL_DATA_SIZE)
+#define CFG_SYS_SDRAM_BASE             0x00000000
+#define CFG_SYS_INIT_RAM_SIZE  0x100000
 
 /*
  * CONFIG_SYS_LOAD_ADDR - 1 MiB.
  */
-#define CONFIG_SYS_CBSIZE              512
-#define CONFIG_SYS_MAXARGS             32
 
 /*
  * Large kernel image bootm configuration.
  */
-#define CONFIG_SYS_BOOTM_LEN           SZ_64M
 
 /*
  * NS16550 configuration.
  */
 #define V_NS16550_CLK                  81000000
 
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE    (-4)
-#define CONFIG_SYS_NS16550_CLK         V_NS16550_CLK
+#define CFG_SYS_NS16550_CLK            V_NS16550_CLK
 
 /*
  * Serial console configuration.
  */
-#define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600, \
+#define CFG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \
                                         115200}
 
 /*
@@ -139,7 +131,7 @@ extern phys_addr_t prior_stage_fdt_address;
 /*
  * Enable in-place RFS with this initrd_high setting.
  */
-#define CONFIG_EXTRA_ENV_SETTINGS                                      \
+#define CFG_EXTRA_ENV_SETTINGS                                 \
        "fdtsaveaddr=" __stringify(CONFIG_SYS_FDT_SAVE_ADDRESS) "\0"    \
        "initrd_high=0xffffffff\0"                                      \
        "fdt_high=0xffffffff\0"