Merge branch 'master' into next

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

diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h
index c9cfadd..7db72a1 100644 (file)
--- a/include/configs/stm32mp15_common.h
+++ b/include/configs/stm32mp15_common.h
@@ -24,9 +24,6 @@
 /* NAND support */
 
 /* Ethernet need */
-#ifdef CONFIG_DWC_ETH_QOS
-#define CONFIG_SERVERIP                 192.168.1.1
-#endif
 
 #define STM32MP_FIP_IMAGE_GUID \
        EFI_GUID(0x19d5df83, 0x11b0, 0x457b, 0xbe, 0x2c, \
@@ -138,7 +135,7 @@
        "fdtoverlay_addr_r=" __FDTOVERLAY_ADDR_R "\0" \
        "ramdisk_addr_r=" __RAMDISK_ADDR_R "\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        STM32MP_MEM_LAYOUT \
        STM32MP_BOOTCMD \
        STM32MP_PARTS_DEFAULT \