From e39bc6a271064a5fe466e5cdf7d61eeb74d1b2e5 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Thu, 12 Nov 2020 12:49:53 +0100 Subject: [PATCH] board: amlogic: add proper boot device detection for params.bin load Detect eMMC/SD card boot and report proper MMC device to the environment loading code. This requires to use an empty device part in CONFIG_ENV_FAT_DEVICE_AND_PART to let the code update the device to the value returned by mmc_get_env_dev() function. Signed-off-by: Marek Szyprowski Change-Id: I4ff26f3be631a018a3707b58b6ffaf15fd717001 --- board/amlogic/w400/w400.c | 9 +++++++++ configs/khadas-vim3_defconfig | 4 +--- configs/odroid-c4_defconfig | 4 +--- configs/odroid-n2_defconfig | 4 +--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/board/amlogic/w400/w400.c b/board/amlogic/w400/w400.c index b37a4acbfd..8aa79aa37f 100644 --- a/board/amlogic/w400/w400.c +++ b/board/amlogic/w400/w400.c @@ -10,8 +10,17 @@ #include #include #include +#include #include +int mmc_get_env_dev(void) +{ + if (meson_get_boot_device() == BOOT_DEVICE_EMMC) + return 1; + + return 0; +} + int misc_init_r(void) { meson_generate_serial_ethaddr(); diff --git a/configs/khadas-vim3_defconfig b/configs/khadas-vim3_defconfig index 1d61f9490b..1bb916fa69 100644 --- a/configs/khadas-vim3_defconfig +++ b/configs/khadas-vim3_defconfig @@ -34,11 +34,9 @@ CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_REGULATOR=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_FAT=y -CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" +CONFIG_ENV_FAT_DEVICE_AND_PART=":1" CONFIG_ENV_FAT_FILE="vim3/params.bin" CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_SYS_MMC_ENV_DEV=1 -CONFIG_SYS_MMC_ENV_PART=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DFU_MMC=y diff --git a/configs/odroid-c4_defconfig b/configs/odroid-c4_defconfig index f77e513236..033e089822 100644 --- a/configs/odroid-c4_defconfig +++ b/configs/odroid-c4_defconfig @@ -29,11 +29,9 @@ CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_REGULATOR=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_FAT=y -CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" +CONFIG_ENV_FAT_DEVICE_AND_PART=":1" CONFIG_ENV_FAT_FILE="odroid-c4/params.bin" CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_SYS_MMC_ENV_DEV=1 -CONFIG_SYS_MMC_ENV_PART=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DFU_MMC=y diff --git a/configs/odroid-n2_defconfig b/configs/odroid-n2_defconfig index 493466e098..50ae7c517e 100644 --- a/configs/odroid-n2_defconfig +++ b/configs/odroid-n2_defconfig @@ -30,11 +30,9 @@ CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_REGULATOR=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_FAT=y -CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" +CONFIG_ENV_FAT_DEVICE_AND_PART=":1" CONFIG_ENV_FAT_FILE="odroid-n2/params.bin" CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_SYS_MMC_ENV_DEV=1 -CONFIG_SYS_MMC_ENV_PART=1 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DFU_MMC=y CONFIG_SET_DFU_ALT_INFO=y -- 2.34.1