global: Migrate CONFIG_MXC_UART_BASE to CFG

[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 588d4c1..7db72a1 100644 (file)
--- a/include/configs/stm32mp15_common.h
+++ b/include/configs/stm32mp15_common.h
@@ -13,41 +13,21 @@
 /*
  * Configuration of the external SRAM memory used by U-Boot
  */
-#define CONFIG_SYS_SDRAM_BASE                  STM32_DDR_BASE
-
-/*
- * Console I/O buffer size
- */
+#define CFG_SYS_SDRAM_BASE                     STM32_DDR_BASE
 
 /*
  * For booting Linux, use the first 256 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CONFIG_SYS_BOOTMAPSZ           SZ_256M
-
-/* Extend size of kernel image for uncompression */
-#define CONFIG_SYS_BOOTM_LEN           SZ_32M
-
-/* SPL support */
-#ifdef CONFIG_SPL
-/* SPL use DDR */
-#define CONFIG_SYS_SPL_MALLOC_START    0xC0300000
-#define CONFIG_SYS_SPL_MALLOC_SIZE     0x01D00000
-
-/* Restrict SPL to fit within SYSRAM */
-#define STM32_SYSRAM_END               (STM32_SYSRAM_BASE + STM32_SYSRAM_SIZE)
-#endif /* #ifdef CONFIG_SPL */
-/*MMC SD*/
-#define CONFIG_SYS_MMC_MAX_DEVICE      3
+#define CFG_SYS_BOOTMAPSZ              SZ_256M
 
 /* NAND support */
-#define CONFIG_SYS_MAX_NAND_DEVICE     1
 
 /* Ethernet need */
-#ifdef CONFIG_DWC_ETH_QOS
-#define CONFIG_SERVERIP                 192.168.1.1
-#define CONFIG_SYS_AUTOLOAD            "no"
-#endif
+
+#define STM32MP_FIP_IMAGE_GUID \
+       EFI_GUID(0x19d5df83, 0x11b0, 0x457b, 0xbe, 0x2c, \
+                0x75, 0x59, 0xc1, 0x31, 0x42, 0xa5)
 
 /*****************************************************************************/
 #ifdef CONFIG_DISTRO_DEFAULTS
@@ -72,7 +52,7 @@
 #endif
 
 #ifdef CONFIG_CMD_UBIFS
-#define BOOT_TARGET_UBIFS(func)        func(UBIFS, ubifs, 0)
+#define BOOT_TARGET_UBIFS(func)        func(UBIFS, ubifs, 0, UBI, boot)
 #else
 #define BOOT_TARGET_UBIFS(func)
 #endif
@@ -92,7 +72,7 @@
        BOOT_TARGET_PXE(func)
 
 /*
- * default bootcmd for stm32mp1:
+ * default bootcmd for stm32mp15:
  * for serial/usb: execute the stm32prog command
  * for mmc boot (eMMC, SD card), distro boot on the same mmc device
  * for nand or spi-nand boot, distro boot with ubifs on UBI partition
@@ -155,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 \