From 7932d5fa95a2c246b57a05f4f3da60a7d7b97783 Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Mon, 13 Feb 2023 23:10:28 +0300 Subject: u-boot: Disable environment storage U-Boot can be configured via environment variables which can be saved to various storage devices. This usually defaults to MMC or SPI depending on where it boots from, but assumes the device's layout is controlled by U-Boot. We should store the environment in SPI flash, but we also need to configure coreboot FMAPs to reserve the area U-Boot would use as its environment storage. For now, disable environment storage by setting ENV_IS_NOWHERE=y to avoid overwriting random regions of SPI or MMC if someone tries to save the variables. Signed-off-by: Alper Nebi Yasak --- resources/u-boot/gru_bob/config/default | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'resources/u-boot/gru_bob/config/default') diff --git a/resources/u-boot/gru_bob/config/default b/resources/u-boot/gru_bob/config/default index c326f25e..64f5274f 100644 --- a/resources/u-boot/gru_bob/config/default +++ b/resources/u-boot/gru_bob/config/default @@ -184,7 +184,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SPL_LDSCRIPT="arch/arm/cpu/armv8/u-boot-spl.lds" CONFIG_ENV_SIZE=0x8000 -CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DM_GPIO=y CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="rk3399-gru-bob" @@ -977,12 +976,12 @@ CONFIG_SAVEENV=y # CONFIG_ENV_OVERWRITE is not set CONFIG_ENV_MIN_ENTRIES=64 CONFIG_ENV_MAX_ENTRIES=512 -# CONFIG_ENV_IS_NOWHERE is not set +CONFIG_ENV_IS_NOWHERE=y # CONFIG_ENV_IS_IN_EEPROM is not set # CONFIG_ENV_IS_IN_FAT is not set # CONFIG_ENV_IS_IN_EXT4 is not set # CONFIG_ENV_IS_IN_FLASH is not set -CONFIG_ENV_IS_IN_MMC=y +# CONFIG_ENV_IS_IN_MMC is not set # CONFIG_ENV_IS_IN_NAND is not set # CONFIG_ENV_IS_IN_NVRAM is not set # CONFIG_ENV_IS_IN_ONENAND is not set @@ -990,8 +989,6 @@ CONFIG_ENV_IS_IN_MMC=y # CONFIG_ENV_IS_IN_SPI_FLASH is not set # CONFIG_SYS_REDUNDAND_ENVIRONMENT is not set CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_SYS_MMC_ENV_DEV=0 -CONFIG_SYS_MMC_ENV_PART=0 # CONFIG_USE_DEFAULT_ENV_FILE is not set # CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG is not set # CONFIG_ENV_IMPORT_FDT is not set -- cgit v1.2.1