summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--resources/u-boot/daisy_snow/config/default13
-rw-r--r--resources/u-boot/daisy_spring/config/default13
-rw-r--r--resources/u-boot/gru_bob/config/default7
-rw-r--r--resources/u-boot/gru_kevin/config/default7
-rw-r--r--resources/u-boot/nyan_big/config/default7
-rw-r--r--resources/u-boot/nyan_blaze/config/default7
-rw-r--r--resources/u-boot/peach_pi/config/default13
-rw-r--r--resources/u-boot/peach_pit/config/default13
-rw-r--r--resources/u-boot/qemu_arm64_12mb/config/default6
9 files changed, 18 insertions, 68 deletions
diff --git a/resources/u-boot/daisy_snow/config/default b/resources/u-boot/daisy_snow/config/default
index bf262c24..df2a4a12 100644
--- a/resources/u-boot/daisy_snow/config/default
+++ b/resources/u-boot/daisy_snow/config/default
@@ -200,8 +200,6 @@ CONFIG_EXYNOS_TMU=y
CONFIG_NR_DRAM_BANKS=8
CONFIG_SPL_LDSCRIPT="board/samsung/common/exynos-uboot-spl.lds"
CONFIG_ENV_SIZE=0x4000
-CONFIG_ENV_OFFSET=0x3FC000
-CONFIG_ENV_SECT_SIZE=0x4000
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="exynos5250-snow"
CONFIG_SPL_TEXT_BASE=0x02023400
@@ -236,7 +234,6 @@ CONFIG_IMX_DCD_ADDR=0x00910000
CONFIG_IMX_CONTAINER_CFG=""
CONFIG_SYS_MEM_TOP_HIDE=0x0
CONFIG_SYS_LOAD_ADDR=0x43e00000
-CONFIG_ENV_ADDR=0x0
#
# ARM debug
@@ -890,7 +887,7 @@ CONFIG_SAVEENV=y
CONFIG_ENV_OVERWRITE=y
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
@@ -900,13 +897,7 @@ CONFIG_ENV_MAX_ENTRIES=512
# CONFIG_ENV_IS_IN_NVRAM is not set
# CONFIG_ENV_IS_IN_ONENAND is not set
# CONFIG_ENV_IS_IN_REMOTE is not set
-CONFIG_ENV_IS_IN_SPI_FLASH=y
-# CONFIG_ENV_SECT_SIZE_AUTO is not set
-CONFIG_ENV_SPI_BUS=1
-CONFIG_ENV_SPI_CS=0
-CONFIG_ENV_SPI_MAX_HZ=50000000
-CONFIG_ENV_SPI_MODE=0x0
-# CONFIG_ENV_SPI_EARLY is not set
+# CONFIG_ENV_IS_IN_SPI_FLASH is not set
# CONFIG_SYS_REDUNDAND_ENVIRONMENT is not set
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
# CONFIG_USE_DEFAULT_ENV_FILE is not set
diff --git a/resources/u-boot/daisy_spring/config/default b/resources/u-boot/daisy_spring/config/default
index c41de3be..85b45f44 100644
--- a/resources/u-boot/daisy_spring/config/default
+++ b/resources/u-boot/daisy_spring/config/default
@@ -200,8 +200,6 @@ CONFIG_EXYNOS_TMU=y
CONFIG_NR_DRAM_BANKS=8
CONFIG_SPL_LDSCRIPT="board/samsung/common/exynos-uboot-spl.lds"
CONFIG_ENV_SIZE=0x4000
-CONFIG_ENV_OFFSET=0x3FC000
-CONFIG_ENV_SECT_SIZE=0x4000
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="exynos5250-spring"
CONFIG_SPL_TEXT_BASE=0x02023400
@@ -236,7 +234,6 @@ CONFIG_IMX_DCD_ADDR=0x00910000
CONFIG_IMX_CONTAINER_CFG=""
CONFIG_SYS_MEM_TOP_HIDE=0x0
CONFIG_SYS_LOAD_ADDR=0x43e00000
-CONFIG_ENV_ADDR=0x0
#
# ARM debug
@@ -890,7 +887,7 @@ CONFIG_SAVEENV=y
CONFIG_ENV_OVERWRITE=y
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
@@ -900,13 +897,7 @@ CONFIG_ENV_MAX_ENTRIES=512
# CONFIG_ENV_IS_IN_NVRAM is not set
# CONFIG_ENV_IS_IN_ONENAND is not set
# CONFIG_ENV_IS_IN_REMOTE is not set
-CONFIG_ENV_IS_IN_SPI_FLASH=y
-# CONFIG_ENV_SECT_SIZE_AUTO is not set
-CONFIG_ENV_SPI_BUS=1
-CONFIG_ENV_SPI_CS=0
-CONFIG_ENV_SPI_MAX_HZ=50000000
-CONFIG_ENV_SPI_MODE=0x0
-# CONFIG_ENV_SPI_EARLY is not set
+# CONFIG_ENV_IS_IN_SPI_FLASH is not set
# CONFIG_SYS_REDUNDAND_ENVIRONMENT is not set
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
# CONFIG_USE_DEFAULT_ENV_FILE is not set
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
diff --git a/resources/u-boot/gru_kevin/config/default b/resources/u-boot/gru_kevin/config/default
index d6e8369d..eabaf9c6 100644
--- a/resources/u-boot/gru_kevin/config/default
+++ b/resources/u-boot/gru_kevin/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-kevin"
@@ -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
diff --git a/resources/u-boot/nyan_big/config/default b/resources/u-boot/nyan_big/config/default
index 6697eef1..9016804f 100644
--- a/resources/u-boot/nyan_big/config/default
+++ b/resources/u-boot/nyan_big/config/default
@@ -183,7 +183,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_NR_DRAM_BANKS=2
CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds"
CONFIG_ENV_SIZE=0x2000
-CONFIG_ENV_OFFSET=0xFFFFE000
CONFIG_DM_GPIO=y
# CONFIG_SPL_DM_SPI is not set
CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big"
@@ -914,12 +913,12 @@ CONFIG_SAVEENV=y
CONFIG_ENV_OVERWRITE=y
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
@@ -927,8 +926,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=2
# CONFIG_USE_DEFAULT_ENV_FILE is not set
# CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG is not set
# CONFIG_ENV_IMPORT_FDT is not set
diff --git a/resources/u-boot/nyan_blaze/config/default b/resources/u-boot/nyan_blaze/config/default
index 6697eef1..9016804f 100644
--- a/resources/u-boot/nyan_blaze/config/default
+++ b/resources/u-boot/nyan_blaze/config/default
@@ -183,7 +183,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_NR_DRAM_BANKS=2
CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds"
CONFIG_ENV_SIZE=0x2000
-CONFIG_ENV_OFFSET=0xFFFFE000
CONFIG_DM_GPIO=y
# CONFIG_SPL_DM_SPI is not set
CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big"
@@ -914,12 +913,12 @@ CONFIG_SAVEENV=y
CONFIG_ENV_OVERWRITE=y
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
@@ -927,8 +926,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=2
# CONFIG_USE_DEFAULT_ENV_FILE is not set
# CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG is not set
# CONFIG_ENV_IMPORT_FDT is not set
diff --git a/resources/u-boot/peach_pi/config/default b/resources/u-boot/peach_pi/config/default
index 65031e08..7fa1b4c0 100644
--- a/resources/u-boot/peach_pi/config/default
+++ b/resources/u-boot/peach_pi/config/default
@@ -200,8 +200,6 @@ CONFIG_EXYNOS_TMU=y
CONFIG_NR_DRAM_BANKS=7
CONFIG_SPL_LDSCRIPT="board/samsung/common/exynos-uboot-spl.lds"
CONFIG_ENV_SIZE=0x4000
-CONFIG_ENV_OFFSET=0x3FC000
-CONFIG_ENV_SECT_SIZE=0x4000
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="exynos5800-peach-pi"
CONFIG_SPL_TEXT_BASE=0x02024410
@@ -233,7 +231,6 @@ CONFIG_IMX_DCD_ADDR=0x00910000
CONFIG_IMX_CONTAINER_CFG=""
CONFIG_SYS_MEM_TOP_HIDE=0x0
CONFIG_SYS_LOAD_ADDR=0x23e00000
-CONFIG_ENV_ADDR=0x0
#
# ARM debug
@@ -887,7 +884,7 @@ CONFIG_SAVEENV=y
CONFIG_ENV_OVERWRITE=y
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
@@ -897,13 +894,7 @@ CONFIG_ENV_MAX_ENTRIES=512
# CONFIG_ENV_IS_IN_NVRAM is not set
# CONFIG_ENV_IS_IN_ONENAND is not set
# CONFIG_ENV_IS_IN_REMOTE is not set
-CONFIG_ENV_IS_IN_SPI_FLASH=y
-# CONFIG_ENV_SECT_SIZE_AUTO is not set
-CONFIG_ENV_SPI_BUS=1
-CONFIG_ENV_SPI_CS=0
-CONFIG_ENV_SPI_MAX_HZ=50000000
-CONFIG_ENV_SPI_MODE=0x0
-# CONFIG_ENV_SPI_EARLY is not set
+# CONFIG_ENV_IS_IN_SPI_FLASH is not set
# CONFIG_SYS_REDUNDAND_ENVIRONMENT is not set
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
# CONFIG_USE_DEFAULT_ENV_FILE is not set
diff --git a/resources/u-boot/peach_pit/config/default b/resources/u-boot/peach_pit/config/default
index 724d143a..b71c2c44 100644
--- a/resources/u-boot/peach_pit/config/default
+++ b/resources/u-boot/peach_pit/config/default
@@ -200,8 +200,6 @@ CONFIG_EXYNOS_TMU=y
CONFIG_NR_DRAM_BANKS=4
CONFIG_SPL_LDSCRIPT="board/samsung/common/exynos-uboot-spl.lds"
CONFIG_ENV_SIZE=0x4000
-CONFIG_ENV_OFFSET=0x3FC000
-CONFIG_ENV_SECT_SIZE=0x4000
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="exynos5420-peach-pit"
CONFIG_SPL_TEXT_BASE=0x02024410
@@ -233,7 +231,6 @@ CONFIG_IMX_DCD_ADDR=0x00910000
CONFIG_IMX_CONTAINER_CFG=""
CONFIG_SYS_MEM_TOP_HIDE=0x0
CONFIG_SYS_LOAD_ADDR=0x23e00000
-CONFIG_ENV_ADDR=0x0
#
# ARM debug
@@ -887,7 +884,7 @@ CONFIG_SAVEENV=y
CONFIG_ENV_OVERWRITE=y
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
@@ -897,13 +894,7 @@ CONFIG_ENV_MAX_ENTRIES=512
# CONFIG_ENV_IS_IN_NVRAM is not set
# CONFIG_ENV_IS_IN_ONENAND is not set
# CONFIG_ENV_IS_IN_REMOTE is not set
-CONFIG_ENV_IS_IN_SPI_FLASH=y
-# CONFIG_ENV_SECT_SIZE_AUTO is not set
-CONFIG_ENV_SPI_BUS=1
-CONFIG_ENV_SPI_CS=0
-CONFIG_ENV_SPI_MAX_HZ=50000000
-CONFIG_ENV_SPI_MODE=0x0
-# CONFIG_ENV_SPI_EARLY is not set
+# CONFIG_ENV_IS_IN_SPI_FLASH is not set
# CONFIG_SYS_REDUNDAND_ENVIRONMENT is not set
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
# CONFIG_USE_DEFAULT_ENV_FILE is not set
diff --git a/resources/u-boot/qemu_arm64_12mb/config/default b/resources/u-boot/qemu_arm64_12mb/config/default
index d8e53f90..b870bcb8 100644
--- a/resources/u-boot/qemu_arm64_12mb/config/default
+++ b/resources/u-boot/qemu_arm64_12mb/config/default
@@ -170,7 +170,6 @@ CONFIG_SYS_MALLOC_LEN=0x1000000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x40000
-CONFIG_ENV_SECT_SIZE=0x40000
# CONFIG_DM_GPIO is not set
CONFIG_DEFAULT_DEVICE_TREE="qemu-arm64"
CONFIG_BOARD_SPECIFIC_OPTIONS=y
@@ -208,7 +207,6 @@ CONFIG_ARMV8_CE_SHA256=y
CONFIG_IMX_DCD_ADDR=0x00910000
CONFIG_SYS_MEM_TOP_HIDE=0x0
CONFIG_SYS_LOAD_ADDR=0x40200000
-CONFIG_ENV_ADDR=0x4000000
CONFIG_MTDPARTS_NOR0="64m(u-boot)"
CONFIG_MTDPARTS_NOR1="64m(u-boot-env)"
@@ -766,11 +764,11 @@ 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=y
+# CONFIG_ENV_IS_IN_FLASH 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