Convert CONFIG_SPL_STACK to Kconfig

[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 46a92a0..588d4c1 100644 (file)
--- a/include/configs/stm32mp15_common.h
+++ b/include/configs/stm32mp15_common.h
@@ -10,22 +10,14 @@
 #include <linux/sizes.h>
 #include <asm/arch/stm32.h>
 
-#ifndef CONFIG_TFABOOT
-/* PSCI support */
-#define CONFIG_ARMV7_SECURE_BASE               STM32_SYSRAM_BASE
-#define CONFIG_ARMV7_SECURE_MAX_SIZE           STM32_SYSRAM_SIZE
-#endif
-
 /*
  * Configuration of the external SRAM memory used by U-Boot
  */
 #define CONFIG_SYS_SDRAM_BASE                  STM32_DDR_BASE
-#define CONFIG_SYS_INIT_SP_ADDR                        CONFIG_SYS_TEXT_BASE
 
 /*
  * Console I/O buffer size
  */
-#define CONFIG_SYS_CBSIZE                      SZ_1K
 
 /*
  * For booting Linux, use the first 256 MB of memory, since this is
@@ -44,9 +36,6 @@
 
 /* Restrict SPL to fit within SYSRAM */
 #define STM32_SYSRAM_END               (STM32_SYSRAM_BASE + STM32_SYSRAM_SIZE)
-#define CONFIG_SPL_MAX_FOOTPRINT       (STM32_SYSRAM_END - CONFIG_SPL_TEXT_BASE)
-#define CONFIG_SPL_STACK               (STM32_SYSRAM_BASE + \
-                                        STM32_SYSRAM_SIZE)
 #endif /* #ifdef CONFIG_SPL */
 /*MMC SD*/
 #define CONFIG_SYS_MMC_MAX_DEVICE      3
@@ -57,7 +46,6 @@
 /* Ethernet need */
 #ifdef CONFIG_DWC_ETH_QOS
 #define CONFIG_SERVERIP                 192.168.1.1
-#define CONFIG_BOOTP_SERVERIP
 #define CONFIG_SYS_AUTOLOAD            "no"
 #endif
 
@@ -138,10 +126,13 @@
 #endif
 
 #define STM32MP_EXTRA \
-       "altbootcmd=run bootcmd\0" \
        "env_check=if env info -p -d -q; then env save; fi\0" \
        "boot_net_usb_start=true\0"
 
+#ifndef STM32MP_BOARD_EXTRA_ENV
+#define STM32MP_BOARD_EXTRA_ENV
+#endif
+
 #include <config_distro_bootcmd.h>
 
 /*
@@ -169,7 +160,8 @@
        STM32MP_BOOTCMD \
        STM32MP_PARTS_DEFAULT \
        BOOTENV \
-       STM32MP_EXTRA
+       STM32MP_EXTRA \
+       STM32MP_BOARD_EXTRA_ENV
 
 #endif /* ifndef CONFIG_SPL_BUILD */
 #endif /* ifdef CONFIG_DISTRO_DEFAULTS*/