Convert CONFIG_SYS_NAND_ONFI_DETECTION to Kconfig

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

diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h
index 863b652..06cd153 100644 (file)
--- a/include/configs/stm32mp1.h
+++ b/include/configs/stm32mp1.h
@@ -28,17 +28,6 @@
 #define CONFIG_SYS_CBSIZE                      SZ_1K
 
 /*
- * default load address used for command tftp,  bootm , loadb, ...
- */
-#define CONFIG_LOADADDR                        0xc2000000
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
-/* ATAGs */
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-
-/*
  * For booting Linux, use the first 256 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
@@ -50,13 +39,12 @@
 /* SPL support */
 #ifdef CONFIG_SPL
 /* SPL use DDR */
-#define CONFIG_SPL_BSS_START_ADDR      0xC0200000
-#define CONFIG_SPL_BSS_MAX_SIZE                0x00100000
 #define CONFIG_SYS_SPL_MALLOC_START    0xC0300000
-#define CONFIG_SYS_SPL_MALLOC_SIZE     0x00100000
+#define CONFIG_SYS_SPL_MALLOC_SIZE     0x01D00000
 
-/* limit SYSRAM usage to first 128 KB */
-#define CONFIG_SPL_MAX_SIZE            0x00020000
+/* 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 */
@@ -64,7 +52,6 @@
 #define CONFIG_SYS_MMC_MAX_DEVICE      3
 
 /* NAND support */
-#define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 
 /* Ethernet need */
@@ -102,11 +89,18 @@
 #define BOOT_TARGET_UBIFS(func)
 #endif
 
+#ifdef CONFIG_CMD_USB
+#define BOOT_TARGET_USB(func)  func(USB, usb, 0)
+#else
+#define BOOT_TARGET_USB(func)
+#endif
+
 #define BOOT_TARGET_DEVICES(func)      \
        BOOT_TARGET_MMC1(func)          \
        BOOT_TARGET_UBIFS(func)         \
        BOOT_TARGET_MMC0(func)          \
        BOOT_TARGET_MMC2(func)          \
+       BOOT_TARGET_USB(func)           \
        BOOT_TARGET_PXE(func)
 
 /*
@@ -132,24 +126,37 @@
                "run distro_bootcmd;" \
        "fi;\0"
 
+#ifdef CONFIG_FASTBOOT_CMD_OEM_FORMAT
+/* eMMC default partitions for fastboot command: oem format */
+#define PARTS_DEFAULT \
+       "partitions=" \
+       "name=ssbl,size=2M;" \
+       "name=bootfs,size=64MB,bootable;" \
+       "name=vendorfs,size=16M;" \
+       "name=rootfs,size=746M;" \
+       "name=userfs,size=-\0"
+#else
+#define PARTS_DEFAULT
+#endif
+
 #include <config_distro_bootcmd.h>
 
 /*
  * memory layout for 32M uncompressed/compressed kernel,
- * 1M fdt, 1M script, 1M pxe and 1M for splashimage
+ * 1M fdt, 1M script, 1M pxe and 1M for overlay
  * and the ramdisk at the end.
  */
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "bootdelay=1\0" \
        "kernel_addr_r=0xc2000000\0" \
        "fdt_addr_r=0xc4000000\0" \
        "scriptaddr=0xc4100000\0" \
        "pxefile_addr_r=0xc4200000\0" \
-       "splashimage=0xc4300000\0"  \
+       "fdtoverlay_addr_r=0xc4300000\0" \
        "ramdisk_addr_r=0xc4400000\0" \
        "altbootcmd=run bootcmd\0" \
        "env_check=if env info -p -d -q; then env save; fi\0" \
        STM32MP_BOOTCMD \
+       PARTS_DEFAULT \
        BOOTENV \
        "boot_net_usb_start=true\0"