Merge branch 'master' into next

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

diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h
index 9f51b9c..c928092 100644 (file)
--- a/include/configs/bcmstb.h
+++ b/include/configs/bcmstb.h
@@ -81,8 +81,8 @@ 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 CFG_SYS_SDRAM_BASE             0x00000000
+#define CFG_SYS_INIT_RAM_SIZE  0x100000
 
 /*
  * CONFIG_SYS_LOAD_ADDR - 1 MiB.
@@ -93,19 +93,6 @@ extern phys_addr_t prior_stage_fdt_address;
  */
 
 /*
- * NS16550 configuration.
- */
-#define V_NS16550_CLK                  81000000
-
-#define CFG_SYS_NS16550_CLK            V_NS16550_CLK
-
-/*
- * Serial console configuration.
- */
-#define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600, \
-                                        115200}
-
-/*
  * Informational display configuration.
  */
 
@@ -131,7 +118,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"