global: Migrate CONFIG_MXC_USB_FLAGS et al to CFG

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

diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 16f8858..2b028e3 100644 (file)
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -8,11 +8,7 @@
 #ifndef __MX6SABRESD_CONFIG_H
 #define __MX6SABRESD_CONFIG_H
 
-#ifdef CONFIG_SPL
-#include "imx6_spl.h"
-#endif
-
-#define CONFIG_MXC_UART_BASE   UART1_BASE
+#define CFG_MXC_UART_BASE      UART1_BASE
 #define CONSOLE_DEV            "ttymxc0"
 
 #include "mx6sabre_common.h"
@@ -21,7 +17,7 @@
 
 /* Falcon Mode - MMC support: args@1MB kernel@2MB */
 
-#define CONFIG_SYS_FSL_USDHC_NUM       3
+#define CFG_SYS_FSL_USDHC_NUM  3
 
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCIE_IMX_PERST_GPIO     IMX_GPIO_NR(7, 12)
@@ -29,13 +25,12 @@
 #endif
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS           0
+#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS              0
 #endif
 
 #endif                         /* __MX6SABRESD_CONFIG_H */