Merge branch 'master' into next

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

diff --git a/include/configs/novena.h b/include/configs/novena.h
index 3ffb44a..39d3afd 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -41,20 +41,20 @@
 
 /* PCI express */
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCIE_IMX_PERST_GPIO     IMX_GPIO_NR(3, 29)
-#define CONFIG_PCIE_IMX_POWER_GPIO     IMX_GPIO_NR(7, 12)
+#define CFG_PCIE_IMX_PERST_GPIO        IMX_GPIO_NR(3, 29)
+#define CFG_PCIE_IMX_POWER_GPIO        IMX_GPIO_NR(7, 12)
 #endif
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
+#define CFG_POWER_PFUZE100_I2C_ADDR    0x08
 
 /* UART */
-#define CONFIG_MXC_UART_BASE           UART2_BASE
+#define CFG_MXC_UART_BASE              UART2_BASE
 
 /* 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
 
 /* Extra U-Boot environment. */