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 f29729d..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" \
@@ -188,9 +188,6 @@
 #define CFG_SYS_NS16550_COM5           0x481a8000      /* UART4 */
 #define CFG_SYS_NS16550_COM6           0x481aa000      /* UART5 */
 
-/* PMIC support */
-#define CONFIG_POWER_TPS65910
-
 /* SPL */
 #ifndef CONFIG_NOR_BOOT