Merge branch 'master' into next

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

diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index 266b2ae..e794638 100644 (file)
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -49,7 +49,7 @@
 #define NANDARGS ""
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        DEFAULT_LINUX_BOOT_ENV \
        "boot_fdt=try\0" \
        "bootpart=0:2\0" \
@@ -181,21 +181,18 @@
        /*DFUARGS*/
 
 /* NS16550 Configuration */
-#define CONFIG_SYS_NS16550_COM1                0x44e09000      /* Base EVM has UART0 */
-#define CONFIG_SYS_NS16550_COM2                0x48022000      /* UART1 */
-#define CONFIG_SYS_NS16550_COM3                0x48024000      /* UART2 */
-#define CONFIG_SYS_NS16550_COM4                0x481a6000      /* UART3 */
-#define CONFIG_SYS_NS16550_COM5                0x481a8000      /* UART4 */
-#define CONFIG_SYS_NS16550_COM6                0x481aa000      /* UART5 */
-
-/* PMIC support */
-#define CONFIG_POWER_TPS65910
+#define CFG_SYS_NS16550_COM1           0x44e09000      /* Base EVM has UART0 */
+#define CFG_SYS_NS16550_COM2           0x48022000      /* UART1 */
+#define CFG_SYS_NS16550_COM3           0x48024000      /* UART2 */
+#define CFG_SYS_NS16550_COM4           0x481a6000      /* UART3 */
+#define CFG_SYS_NS16550_COM5           0x481a8000      /* UART4 */
+#define CFG_SYS_NS16550_COM6           0x481aa000      /* UART5 */
 
 /* SPL */
 #ifndef CONFIG_NOR_BOOT
 
 #ifdef CONFIG_MTD_RAW_NAND
-#define CONFIG_SYS_NAND_ECCPOS         { 2, 3, 4, 5, 6, 7, 8, 9, \
+#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, \
@@ -203,9 +200,9 @@
                                         42, 43, 44, 45, 46, 47, 48, 49, \
                                         50, 51, 52, 53, 54, 55, 56, 57, }
 
-#define CONFIG_SYS_NAND_ECCSIZE                512
-#define CONFIG_SYS_NAND_ECCBYTES       14
-#define CONFIG_SYS_NAND_U_BOOT_START   CONFIG_SYS_TEXT_BASE
+#define CFG_SYS_NAND_ECCSIZE           512
+#define CFG_SYS_NAND_ECCBYTES  14
+#define CFG_SYS_NAND_U_BOOT_START      CONFIG_TEXT_BASE
 #endif
 #endif