aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>2019-02-13 14:28:54 +0530
committerTom Rini <trini@konsulko.com>2019-02-19 08:55:43 -0500
commit362d00dfff049603ada5e0257943f0d74aeb8854 (patch)
treec7a04d2d1b6cdd61752292bf153a8aa027d51d51
parent7374b15522b94d39108da6233b60ffbf30632678 (diff)
downloadu-boot-362d00dfff049603ada5e0257943f0d74aeb8854.zip
u-boot-362d00dfff049603ada5e0257943f0d74aeb8854.tar.gz
u-boot-362d00dfff049603ada5e0257943f0d74aeb8854.tar.bz2
hikey: Allow environment to store in eMMC and increase bootdelay
Current Hikey configuration allows us to store u-boot environment on uSD card. But this will be useless if uSD card is not inserted, hence use the onboard eMMC memory for storing environment at Boot1 partition. While we are at it, let's increase the boot delay to 10s also. Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-rw-r--r--configs/hikey_defconfig5
-rw-r--r--include/configs/hikey.h4
2 files changed, 5 insertions, 4 deletions
diff --git a/configs/hikey_defconfig b/configs/hikey_defconfig
index e9a9857..659c0e3 100644
--- a/configs/hikey_defconfig
+++ b/configs/hikey_defconfig
@@ -15,9 +15,8 @@ CONFIG_CMD_MMC=y
CONFIG_CMD_USB=y
CONFIG_CMD_CACHE=y
CONFIG_DEFAULT_DEVICE_TREE="hi6220-hikey"
-CONFIG_ENV_IS_IN_FAT=y
-CONFIG_ENV_FAT_INTERFACE="mmc"
-CONFIG_ENV_FAT_DEVICE_AND_PART="1:1"
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_BOOTDELAY=10
CONFIG_DM_MMC=y
CONFIG_MMC_DW=y
CONFIG_MMC_DW_K3=y
diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index 003cd75..60c6bde 100644
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -81,8 +81,10 @@
"initrd_high=0xffffffffffffffff\0" \
BOOTENV
-/* Preserve environment on sd card */
+/* Preserve environment on eMMC */
#define CONFIG_ENV_SIZE 0x1000
+#define CONFIG_SYS_MMC_ENV_DEV 0 /* Use eMMC */
+#define CONFIG_SYS_MMC_ENV_PART 2 /* Use Boot1 partition */
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */