Merge branch 'master' into next

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

diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index 631eefd..45a3102 100644 (file)
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -15,7 +15,7 @@
  * Clocks
  */
 
-#define CONFIG_SYS_TIMERBASE   OMAP34XX_GPT2
+#define CFG_SYS_TIMERBASE      OMAP34XX_GPT2
 
 #define V_NS16550_CLK          48000000
 #define V_OSCK                 26000000
@@ -32,15 +32,13 @@
  * Memory
  */
 
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
-#define CONFIG_SYS_INIT_SP_ADDR                (NON_SECURE_SRAM_END - \
-                                        GENERATED_GBL_DATA_SIZE)
+#define CFG_SYS_SDRAM_BASE             0x80000000
 
 /*
  * I2C
  */
 
-#define CONFIG_I2C_MULTI_BUS
+#define CFG_I2C_MULTI_BUS
 
 /*
  * Input
@@ -50,32 +48,21 @@
  * SPL
  */
 
-#define CONFIG_SPL_BSS_START_ADDR      0x80000000
-#define CONFIG_SPL_BSS_MAX_SIZE                (512 * 1024)
-#define CONFIG_SYS_SPL_MALLOC_START    0x80208000
-#define CONFIG_SYS_SPL_MALLOC_SIZE     (1024 * 1024)
-#define CONFIG_SPL_STACK               LOW_LEVEL_SRAM_STACK
-
 /*
  * Serial
  */
 
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE    (-4)
-#endif
-
-#define CONFIG_SYS_NS16550_CLK         V_NS16550_CLK
-#define CONFIG_SYS_NS16550_COM3                OMAP34XX_UART3
+#define CFG_SYS_NS16550_CLK            V_NS16550_CLK
+#define CFG_SYS_NS16550_COM3           OMAP34XX_UART3
 
-#define CONFIG_SYS_BAUDRATE_TABLE      { 4800, 9600, 19200, 38400, 57600, \
+#define CFG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, \
                                          115200 }
 
 /*
  * Environment
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        "kernel_addr_r=0x82000000\0" \
        "loadaddr=0x82000000\0" \
        "fdt_addr_r=0x88000000\0" \