summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrice Chotard <patrice.chotard@st.com>2018-08-03 11:46:20 +0200
committerTom Rini <trini@konsulko.com>2018-08-13 14:03:57 -0400
commit82ec63a5a17872e03aa303bbcfa1e7cac04a69c6 (patch)
treeef19f90309cce278948f33e4838270fc0064a0a1
parent20fc114314051237d50beffa02d1ecd94eaad1e6 (diff)
configs: stm32f469-discovery: Add DISTRO_DEFAULT support
Add DISTRO_DEFAULT support to be able to boot on mmc by default on boot. Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
-rw-r--r--configs/stm32f469-discovery_defconfig11
-rw-r--r--include/configs/stm32f469-discovery.h19
2 files changed, 18 insertions, 12 deletions
diff --git a/configs/stm32f469-discovery_defconfig b/configs/stm32f469-discovery_defconfig
index a55476f2f32..7353c51f7a8 100644
--- a/configs/stm32f469-discovery_defconfig
+++ b/configs/stm32f469-discovery_defconfig
@@ -5,25 +5,22 @@ CONFIG_SYS_MALLOC_F_LEN=0xF00
CONFIG_STM32F4=y
CONFIG_TARGET_STM32F469_DISCOVERY=y
CONFIG_DEFAULT_DEVICE_TREE="stm32f469-disco"
-CONFIG_ENV_VARS_UBOOT_CONFIG=y
+CONFIG_DISTRO_DEFAULTS=y
CONFIG_BOOTDELAY=3
+# CONFIG_USE_BOOTCOMMAND is not set
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y
-CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="U-Boot > "
-CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
CONFIG_CMD_IMLS=y
CONFIG_CMD_GPT=y
# CONFIG_RANDOM_UUID is not set
CONFIG_CMD_MMC=y
# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MII is not set
CONFIG_CMD_CACHE=y
CONFIG_CMD_TIMER=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
+# CONFIG_ISO_PARTITION is not set
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_DM_MMC=y
diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h
index 3e4e89bc407..c95f3f7de45 100644
--- a/include/configs/stm32f469-discovery.h
+++ b/include/configs/stm32f469-discovery.h
@@ -40,11 +40,20 @@
#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024)
-#define CONFIG_BOOTCOMMAND \
- "run boot_sd"
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
- "boot_sd=mmc dev 0;fatload mmc 0 0x00700000 stm32f469-disco.dtb; fatload mmc 0 0x00008000 zImage; bootz 0x00008000 - 0x00700000"
+#define BOOT_TARGET_DEVICES(func) \
+ func(MMC, mmc, 0)
+
+#include <config_distro_bootcmd.h>
+#define CONFIG_EXTRA_ENV_SETTINGS \
+ "kernel_addr_r=0x00008000\0" \
+ "fdtfile=stm32f469-disco.dtb\0" \
+ "fdt_addr_r=0x00700000\0" \
+ "scriptaddr=0x00800000\0" \
+ "pxefile_addr_r=0x00800000\0" \
+ "fdt_high=0xffffffffffffffff\0" \
+ "initrd_high=0xffffffffffffffff\0" \
+ "ramdisk_addr_r=0x00900000\0" \
+ BOOTENV
/*
* Command line configuration.