at91, omap2plus: configs: migrate CONFIG_ENV_ to defconfigs

author Markus Klotzbuecher <markus.klotzbuecher@kistler.com>

Wed, 15 May 2019 13:15:54 +0000 (15:15 +0200)

committer Heiko Schocher <hs@denx.de>

Tue, 9 Jul 2019 05:00:21 +0000 (07:00 +0200)
author Markus Klotzbuecher <markus.klotzbuecher@kistler.com>
Wed, 15 May 2019 13:15:54 +0000 (15:15 +0200)
committer Heiko Schocher <hs@denx.de>
Tue, 9 Jul 2019 05:00:21 +0000 (07:00 +0200)
diff --git a/configs/am335x_guardian_defconfig b/configs/am335x_guardian_defconfig

index 3a57946..df91615 100644 (file)
--- a/configs/am335x_guardian_defconfig
+++ b/configs/am335x_guardian_defconfig
@@ -8,6 +8,8 @@ CONFIG_TARGET_AM335X_GUARDIAN=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_ENV_SIZE=0x040000
+CONFIG_ENV_OFFSET=0x300000
  CONFIG_SPL=y
  CONFIG_BOOTSTAGE_STASH_ADDR=0x0
  CONFIG_SPL_LIBDISK_SUPPORT=y
diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig

index ea2a68f..f44fb09 100644 (file)
--- a/configs/am335x_igep003x_defconfig
+++ b/configs/am335x_igep003x_defconfig
@@ -8,6 +8,7 @@ CONFIG_AM33XX=y
  CONFIG_TARGET_AM335X_IGEP003X=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x18000
  CONFIG_SPL=y
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
@@ -42,6 +43,9 @@ CONFIG_CMD_UBI=y
  CONFIG_OF_CONTROL=y
  CONFIG_DEFAULT_DEVICE_TREE="am335x-base0033"
  CONFIG_ENV_IS_IN_UBI=y
+CONFIG_ENV_UBI_PART="UBI"
+CONFIG_ENV_UBI_VOLUME="config"
+CONFIG_ENV_UBI_VOLUME_REDUND="config_r"
  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
  CONFIG_DM_MMC=y
  CONFIG_MMC_OMAP_HS=y
diff --git a/configs/am335x_pdu001_defconfig b/configs/am335x_pdu001_defconfig

index a0a4aba..4fa08e1 100644 (file)
--- a/configs/am335x_pdu001_defconfig
+++ b/configs/am335x_pdu001_defconfig
@@ -6,6 +6,7 @@ CONFIG_AM33XX=y
  CONFIG_TARGET_PDU001=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x4000
  CONFIG_SPL=y
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
diff --git a/configs/am335x_shc_defconfig b/configs/am335x_shc_defconfig

index 98efb6f..aa4caf6 100644 (file)
--- a/configs/am335x_shc_defconfig
+++ b/configs/am335x_shc_defconfig
@@ -7,6 +7,8 @@ CONFIG_AM33XX=y
  CONFIG_TARGET_AM335X_SHC=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x1000
+CONFIG_ENV_OFFSET=0x7000
  CONFIG_SPL=y
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
diff --git a/configs/am335x_shc_ict_defconfig b/configs/am335x_shc_ict_defconfig

index 94672f6..2083857 100644 (file)
--- a/configs/am335x_shc_ict_defconfig
+++ b/configs/am335x_shc_ict_defconfig
@@ -7,6 +7,8 @@ CONFIG_AM33XX=y
  CONFIG_TARGET_AM335X_SHC=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x1000
+CONFIG_ENV_OFFSET=0x7000
  CONFIG_SPL=y
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
diff --git a/configs/am335x_shc_netboot_defconfig b/configs/am335x_shc_netboot_defconfig

index ab7afdd..fdb22af 100644 (file)
--- a/configs/am335x_shc_netboot_defconfig
+++ b/configs/am335x_shc_netboot_defconfig
@@ -7,6 +7,8 @@ CONFIG_AM33XX=y
  CONFIG_TARGET_AM335X_SHC=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x1000
+CONFIG_ENV_OFFSET=0x7000
  CONFIG_SPL=y
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
diff --git a/configs/am335x_shc_sdboot_defconfig b/configs/am335x_shc_sdboot_defconfig

index ea77f4e..1bbd85f 100644 (file)
--- a/configs/am335x_shc_sdboot_defconfig
+++ b/configs/am335x_shc_sdboot_defconfig
@@ -7,6 +7,8 @@ CONFIG_AM33XX=y
  CONFIG_TARGET_AM335X_SHC=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x1000
+CONFIG_ENV_OFFSET=0x7000
  CONFIG_SPL=y
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig

index 678ead9..b10d045 100644 (file)
--- a/configs/am335x_sl50_defconfig
+++ b/configs/am335x_sl50_defconfig
@@ -7,6 +7,7 @@ CONFIG_AM33XX=y
  CONFIG_TARGET_AM335X_SL50=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_OFFSET=0x0
  CONFIG_SPL=y
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig

index 526dda2..4bb5dfe 100644 (file)
--- a/configs/am43xx_evm_defconfig
+++ b/configs/am43xx_evm_defconfig
@@ -4,6 +4,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_AM43XX=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_ENV_SIZE=0x10000
  CONFIG_SPL=y
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig

index b644273..56881f2 100644 (file)
--- a/configs/am43xx_evm_qspiboot_defconfig
+++ b/configs/am43xx_evm_qspiboot_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARM=y
  CONFIG_ARCH_OMAP2PLUS=y
  CONFIG_SYS_TEXT_BASE=0x30000000
  CONFIG_AM43XX=y
+CONFIG_ENV_SIZE=0x10000
+CONFIG_ENV_OFFSET=0x110000
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,QSPI,QSPI_BOOT"
  CONFIG_QSPI_BOOT=y
@@ -29,6 +31,7 @@ CONFIG_OF_LIST="am4372-generic am437x-sk-evm am437x-idk-evm"
  CONFIG_DTB_RESELECT=y
  CONFIG_MULTI_DTB_FIT=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
  CONFIG_DM=y
  # CONFIG_BLK is not set
diff --git a/configs/am43xx_evm_rtconly_defconfig b/configs/am43xx_evm_rtconly_defconfig

index c855705..1af908a 100644 (file)
--- a/configs/am43xx_evm_rtconly_defconfig
+++ b/configs/am43xx_evm_rtconly_defconfig
@@ -4,6 +4,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_AM43XX=y
  CONFIG_SPL_RTC_DDR_SUPPORT=y
+CONFIG_ENV_SIZE=0x10000
  CONFIG_SPL=y
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig

index 6a47c66..fc474aa 100644 (file)
--- a/configs/am43xx_evm_usbhost_boot_defconfig
+++ b/configs/am43xx_evm_usbhost_boot_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_OMAP2PLUS=y
  CONFIG_ISW_ENTRY_ADDR=0x40300350
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_AM43XX=y
+CONFIG_ENV_SIZE=0x10000
  CONFIG_SPL=y
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SPL_LOAD_FIT=y
diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig

index ff7f815..fad564d 100644 (file)
--- a/configs/am43xx_hs_evm_defconfig
+++ b/configs/am43xx_hs_evm_defconfig
@@ -8,6 +8,7 @@ CONFIG_AM43XX=y
  CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000
  CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
  CONFIG_TI_SECURE_EMIF_PROTECTED_REGION_SIZE=0x01c00000
+CONFIG_ENV_SIZE=0x10000
  CONFIG_SPL=y
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT_IMAGE_POST_PROCESS=y
diff --git a/configs/at91rm9200ek_defconfig b/configs/at91rm9200ek_defconfig

index 7ebbdac..5eb6da0 100644 (file)
--- a/configs/at91rm9200ek_defconfig
+++ b/configs/at91rm9200ek_defconfig
@@ -2,6 +2,8 @@ CONFIG_ARM=y
  CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x10000000
  CONFIG_TARGET_AT91RM9200EK=y
+CONFIG_ENV_SIZE=0x10000
+CONFIG_ENV_OFFSET=0x40000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_BOOTDELAY=3
  # CONFIG_DISPLAY_CPUINFO is not set
@@ -18,6 +20,7 @@ CONFIG_CMD_MII=y
  CONFIG_CMD_PING=y
  CONFIG_CMD_FAT=y
  CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_ENV_SECT_SIZE=0x10000
  # CONFIG_MMC is not set
  CONFIG_MTD_NOR_FLASH=y
  CONFIG_FLASH_CFI_DRIVER=y
diff --git a/configs/at91rm9200ek_ram_defconfig b/configs/at91rm9200ek_ram_defconfig

index 87fd7a3..f99b17b 100644 (file)
--- a/configs/at91rm9200ek_ram_defconfig
+++ b/configs/at91rm9200ek_ram_defconfig
@@ -2,6 +2,8 @@ CONFIG_ARM=y
  CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x20100000
  CONFIG_TARGET_AT91RM9200EK=y
+CONFIG_ENV_SIZE=0x10000
+CONFIG_ENV_OFFSET=0x40000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT"
  CONFIG_BOOTDELAY=3
@@ -19,6 +21,7 @@ CONFIG_CMD_MII=y
  CONFIG_CMD_PING=y
  CONFIG_CMD_FAT=y
  CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_ENV_SECT_SIZE=0x10000
  # CONFIG_MMC is not set
  CONFIG_MTD_NOR_FLASH=y
  CONFIG_FLASH_CFI_DRIVER=y
diff --git a/configs/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig

index 137ecd9..633b0a3 100644 (file)
--- a/configs/at91sam9260ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs0_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x21f00000
  CONFIG_TARGET_AT91SAM9260EK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x4200
+CONFIG_ENV_OFFSET=0x4200
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
@@ -31,6 +33,7 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=15000000
+CONFIG_ENV_SECT_SIZE=0x210
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_CLK_AT91=y
diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig

index 2547f2d..2e47f43 100644 (file)
--- a/configs/at91sam9260ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs1_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x21f00000
  CONFIG_TARGET_AT91SAM9260EK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x4200
+CONFIG_ENV_OFFSET=0x4200
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
@@ -31,6 +33,7 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=15000000
+CONFIG_ENV_SECT_SIZE=0x210
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_CLK_AT91=y
diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig

index 8eab764..82bf9ee 100644 (file)
--- a/configs/at91sam9261ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs0_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x21f00000
  CONFIG_TARGET_AT91SAM9261EK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x4200
+CONFIG_ENV_OFFSET=0x4200
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
@@ -32,6 +34,7 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=15000000
+CONFIG_ENV_SECT_SIZE=0x210
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_CLK_AT91=y
diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig

index dfafdfa..7e4e493 100644 (file)
--- a/configs/at91sam9261ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs3_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x21f00000
  CONFIG_TARGET_AT91SAM9261EK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x4200
+CONFIG_ENV_OFFSET=0x4200
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
@@ -32,6 +34,7 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=15000000
+CONFIG_ENV_SECT_SIZE=0x210
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_CLK_AT91=y
diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig

index b768a32..c26a128 100644 (file)
--- a/configs/at91sam9263ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9263ek_dataflash_cs0_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x21F00000
  CONFIG_TARGET_AT91SAM9263EK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x4200
+CONFIG_ENV_OFFSET=0x4200
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xffffee00
@@ -35,6 +37,7 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=15000000
+CONFIG_ENV_SECT_SIZE=0x210
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_CLK_AT91=y
diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig

index b768a32..c26a128 100644 (file)
--- a/configs/at91sam9263ek_dataflash_defconfig
+++ b/configs/at91sam9263ek_dataflash_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x21F00000
  CONFIG_TARGET_AT91SAM9263EK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x4200
+CONFIG_ENV_OFFSET=0x4200
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xffffee00
@@ -35,6 +37,7 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=15000000
+CONFIG_ENV_SECT_SIZE=0x210
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_CLK_AT91=y
diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig

index 270d2e6..a40e072 100644 (file)
--- a/configs/at91sam9263ek_norflash_boot_defconfig
+++ b/configs/at91sam9263ek_norflash_boot_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x0000000
  CONFIG_TARGET_AT91SAM9263EK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x10000
+CONFIG_ENV_OFFSET=0x7e0000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xffffee00
@@ -31,6 +33,7 @@ CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
  CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_CLK_AT91=y
diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig

index ad86956..b7d4491 100644 (file)
--- a/configs/at91sam9263ek_norflash_defconfig
+++ b/configs/at91sam9263ek_norflash_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x21F00000
  CONFIG_TARGET_AT91SAM9263EK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x10000
+CONFIG_ENV_OFFSET=0x7e0000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xffffee00
@@ -31,6 +33,7 @@ CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
  CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_CLK_AT91=y
diff --git a/configs/at91sam9g10ek_dataflash_cs0_defconfig b/configs/at91sam9g10ek_dataflash_cs0_defconfig

index a20f461..87796dd 100644 (file)
--- a/configs/at91sam9g10ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x21f00000
  CONFIG_TARGET_AT91SAM9261EK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x4200
+CONFIG_ENV_OFFSET=0x4200
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
@@ -32,6 +34,7 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=15000000
+CONFIG_ENV_SECT_SIZE=0x210
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_CLK_AT91=y
diff --git a/configs/at91sam9g10ek_dataflash_cs3_defconfig b/configs/at91sam9g10ek_dataflash_cs3_defconfig

index 5ea03c5..9ee0cbb 100644 (file)
--- a/configs/at91sam9g10ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x21f00000
  CONFIG_TARGET_AT91SAM9261EK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x4200
+CONFIG_ENV_OFFSET=0x4200
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
@@ -32,6 +34,7 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=15000000
+CONFIG_ENV_SECT_SIZE=0x210
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_CLK_AT91=y
diff --git a/configs/at91sam9g20ek_2mmc_defconfig b/configs/at91sam9g20ek_2mmc_defconfig

index abc7661..dde8343 100644 (file)
--- a/configs/at91sam9g20ek_2mmc_defconfig
+++ b/configs/at91sam9g20ek_2mmc_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x21f00000
  CONFIG_TARGET_AT91SAM9260EK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x1000
+CONFIG_ENV_OFFSET=0x2000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
diff --git a/configs/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig

index 73146fd..bd2d548 100644 (file)
--- a/configs/at91sam9g20ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x21f00000
  CONFIG_TARGET_AT91SAM9260EK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x4200
+CONFIG_ENV_OFFSET=0x4200
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
@@ -31,6 +33,7 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=15000000
+CONFIG_ENV_SECT_SIZE=0x210
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_CLK_AT91=y
diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig

index 127e3ad..88bffdb 100644 (file)
--- a/configs/at91sam9g20ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x21f00000
  CONFIG_TARGET_AT91SAM9260EK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x4200
+CONFIG_ENV_OFFSET=0x4200
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
@@ -31,6 +33,7 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=15000000
+CONFIG_ENV_SECT_SIZE=0x210
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_CLK_AT91=y
diff --git a/configs/at91sam9m10g45ek_mmc_defconfig b/configs/at91sam9m10g45ek_mmc_defconfig

index 039f4c1..dc1dedd 100644 (file)
--- a/configs/at91sam9m10g45ek_mmc_defconfig
+++ b/configs/at91sam9m10g45ek_mmc_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x73f00000
  CONFIG_TARGET_AT91SAM9M10G45EK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x4000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xffffee00
diff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig

index a20f575..ce3603b 100644 (file)
--- a/configs/at91sam9n12ek_mmc_defconfig
+++ b/configs/at91sam9n12ek_mmc_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x26f00000
  CONFIG_TARGET_AT91SAM9N12EK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x4000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig

index a1caaeb..7470c78 100644 (file)
--- a/configs/at91sam9n12ek_spiflash_defconfig
+++ b/configs/at91sam9n12ek_spiflash_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x26f00000
  CONFIG_TARGET_AT91SAM9N12EK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x3000
+CONFIG_ENV_OFFSET=0x5000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
@@ -32,6 +34,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256
  CONFIG_OF_CONTROL=y
  CONFIG_DEFAULT_DEVICE_TREE="at91sam9n12ek"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_CLK_AT91=y
diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig

index 4f2818f..4d2926e 100644 (file)
--- a/configs/at91sam9rlek_dataflash_defconfig
+++ b/configs/at91sam9rlek_dataflash_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x21F00000
  CONFIG_TARGET_AT91SAM9RLEK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x4200
+CONFIG_ENV_OFFSET=0x4200
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
@@ -32,6 +34,7 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9rlek"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=15000000
+CONFIG_ENV_SECT_SIZE=0x210
  # CONFIG_NET is not set
  CONFIG_DM=y
  CONFIG_CLK=y
diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig

index 807a47b..80a5b8d 100644 (file)
--- a/configs/at91sam9rlek_mmc_defconfig
+++ b/configs/at91sam9rlek_mmc_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x21F00000
  CONFIG_TARGET_AT91SAM9RLEK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x4000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig

index c45970b..d8b5712 100644 (file)
--- a/configs/at91sam9x5ek_dataflash_defconfig
+++ b/configs/at91sam9x5ek_dataflash_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x26f00000
  CONFIG_TARGET_AT91SAM9X5EK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x4200
+CONFIG_ENV_OFFSET=0x4200
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
@@ -34,6 +36,7 @@ CONFIG_CMD_UBI=y
  CONFIG_OF_CONTROL=y
  CONFIG_DEFAULT_DEVICE_TREE="at91sam9g35ek"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_ENV_SECT_SIZE=0x210
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_CLK_AT91=y
diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig

index 63ddf75..3fd4a81 100644 (file)
--- a/configs/at91sam9x5ek_mmc_defconfig
+++ b/configs/at91sam9x5ek_mmc_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x26f00000
  CONFIG_TARGET_AT91SAM9X5EK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x4000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig

index 65f3175..f328257 100644 (file)
--- a/configs/at91sam9x5ek_spiflash_defconfig
+++ b/configs/at91sam9x5ek_spiflash_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x26f00000
  CONFIG_TARGET_AT91SAM9X5EK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x3000
+CONFIG_ENV_OFFSET=0x5000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
@@ -34,6 +36,7 @@ CONFIG_CMD_UBI=y
  CONFIG_OF_CONTROL=y
  CONFIG_DEFAULT_DEVICE_TREE="at91sam9g35ek"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_CLK_AT91=y
diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig

index 80cbb9e..f550ad4 100644 (file)
--- a/configs/at91sam9xeek_dataflash_cs0_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs0_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x21f00000
  CONFIG_TARGET_AT91SAM9260EK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x4200
+CONFIG_ENV_OFFSET=0x4200
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
@@ -31,6 +33,7 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=15000000
+CONFIG_ENV_SECT_SIZE=0x210
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_CLK_AT91=y
diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig

index 4f19edc..5d69ac5 100644 (file)
--- a/configs/at91sam9xeek_dataflash_cs1_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs1_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x21f00000
  CONFIG_TARGET_AT91SAM9260EK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x4200
+CONFIG_ENV_OFFSET=0x4200
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
@@ -31,6 +33,7 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=15000000
+CONFIG_ENV_SECT_SIZE=0x210
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_CLK_AT91=y
diff --git a/configs/axm_defconfig b/configs/axm_defconfig

index 73febdf..bb27b72 100644 (file)
--- a/configs/axm_defconfig
+++ b/configs/axm_defconfig
@@ -11,6 +11,7 @@ CONFIG_SPL_GPIO_SUPPORT=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_OFFSET=0x100000
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig

index b5d7b7c..5487e55 100644 (file)
--- a/configs/brppt1_mmc_defconfig
+++ b/configs/brppt1_mmc_defconfig
@@ -8,6 +8,8 @@ CONFIG_AM33XX=y
  CONFIG_TARGET_BRPPT1=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x10000
+CONFIG_ENV_OFFSET=0x40000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_TPL_SYS_MALLOC_F_LEN=0x0
diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig

index 2d93c89..5ab3f92 100644 (file)
--- a/configs/brppt1_nand_defconfig
+++ b/configs/brppt1_nand_defconfig
@@ -7,6 +7,8 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_AM33XX=y
  CONFIG_TARGET_BRPPT1=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x10000
+CONFIG_ENV_OFFSET=0x60000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_TPL_SYS_MALLOC_F_LEN=0x0
diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig

index 28856ab..ce7c852 100644 (file)
--- a/configs/brppt1_spi_defconfig
+++ b/configs/brppt1_spi_defconfig
@@ -7,6 +7,8 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000
  CONFIG_AM33XX=y
  CONFIG_TARGET_BRPPT1=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x10000
+CONFIG_ENV_OFFSET=0x20000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
@@ -68,6 +70,7 @@ CONFIG_SPL_OF_CONTROL=y
  CONFIG_DEFAULT_DEVICE_TREE="am335x-brppt1-spi"
  CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clocks clock-names interrupt-parent interrupt-controller interrupt-cells dma-names dmas "
  CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_DM=y
  CONFIG_SPL_DM=y
diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig

index c35c73f..f2f10ba 100644 (file)
--- a/configs/brxre1_defconfig
+++ b/configs/brxre1_defconfig
@@ -9,6 +9,8 @@ CONFIG_SYS_MPUCLK=1000
  CONFIG_TARGET_BRXRE1=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x10000
+CONFIG_ENV_OFFSET=0x40000
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x4000
  CONFIG_SPL=y
  CONFIG_TPL_SYS_MALLOC_F_LEN=0x0
diff --git a/configs/chiliboard_defconfig b/configs/chiliboard_defconfig

index 944dd0d..e208a21 100644 (file)
--- a/configs/chiliboard_defconfig
+++ b/configs/chiliboard_defconfig
@@ -6,6 +6,8 @@ CONFIG_AM33XX=y
  CONFIG_TARGET_CHILIBOARD=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x2000
+CONFIG_ENV_OFFSET=0x20000
  CONFIG_SPL=y
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig

index 3df94d2..550ee2b 100644 (file)
--- a/configs/cm_t335_defconfig
+++ b/configs/cm_t335_defconfig
@@ -7,6 +7,8 @@ CONFIG_AM33XX=y
  CONFIG_TARGET_CM_T335=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x4000
+CONFIG_ENV_OFFSET=0x300000
  CONFIG_SPL=y
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig

index f363914..44b66a4 100644 (file)
--- a/configs/cm_t35_defconfig
+++ b/configs/cm_t35_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARM=y
  CONFIG_ARCH_OMAP2PLUS=y
  CONFIG_SYS_TEXT_BASE=0x80008000
  CONFIG_TARGET_CM_T35=y
+CONFIG_ENV_SIZE=0x4000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_BOOTDELAY=3
diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig

index 72b7d36..be94b84 100644 (file)
--- a/configs/cm_t43_defconfig
+++ b/configs/cm_t43_defconfig
@@ -6,6 +6,8 @@ CONFIG_AM43XX=y
  CONFIG_TARGET_CM_T43=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x4000
+CONFIG_ENV_OFFSET=0xc0000
  CONFIG_SPL=y
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
@@ -44,6 +46,7 @@ CONFIG_CMD_USB=y
  CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_MTDPARTS=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
  CONFIG_DM=y
  CONFIG_DM_GPIO=y
diff --git a/configs/cm_t54_defconfig b/configs/cm_t54_defconfig

index dedc8b5..8b04f33 100644 (file)
--- a/configs/cm_t54_defconfig
+++ b/configs/cm_t54_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_OMAP2PLUS=y
  CONFIG_OMAP54XX=y
  CONFIG_TARGET_CM_T54=y
  CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC=16296
+CONFIG_ENV_SIZE=0x4000
+CONFIG_ENV_OFFSET=0xc0000
  CONFIG_SPL=y
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig

index 68c7bec..3894d19 100644 (file)
--- a/configs/corvus_defconfig
+++ b/configs/corvus_defconfig
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_SYS_MALLOC_F_LEN=0x800
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_OFFSET=0x100000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,MACH_TYPE=2066,SYS_USE_NANDFLASH"
diff --git a/configs/draco_defconfig b/configs/draco_defconfig

index 5f9e84a..d23ca8a 100644 (file)
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -10,6 +10,7 @@ CONFIG_SYS_MPUCLK=300
  CONFIG_TARGET_DRACO=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x2000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_SPL_FS_FAT=y
diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig

index 8996858..aded18f 100644 (file)
--- a/configs/etamin_defconfig
+++ b/configs/etamin_defconfig
@@ -10,6 +10,8 @@ CONFIG_SYS_MPUCLK=300
  CONFIG_TARGET_ETAMIN=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x2000
+CONFIG_ENV_OFFSET=0x980000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_SPL_FS_FAT=y
diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig

index 2ec3aae..99cccdb 100644 (file)
--- a/configs/ethernut5_defconfig
+++ b/configs/ethernut5_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x27000000
  CONFIG_TARGET_ETHERNUT5=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x21000
+CONFIG_ENV_OFFSET=0x3DE000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE"
  CONFIG_BOOTDELAY=3
@@ -47,6 +49,7 @@ CONFIG_DEFAULT_DEVICE_TREE="ethernut5"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=15000000
+CONFIG_ENV_SECT_SIZE=0x21000
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_CLK_AT91=y
diff --git a/configs/gardena-smart-gateway-at91sam_defconfig b/configs/gardena-smart-gateway-at91sam_defconfig

index a25d378..e0df5f4 100644 (file)
--- a/configs/gardena-smart-gateway-at91sam_defconfig
+++ b/configs/gardena-smart-gateway-at91sam_defconfig
@@ -8,6 +8,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x10000
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
@@ -52,6 +53,9 @@ CONFIG_SPL_OF_CONTROL=y
  CONFIG_DEFAULT_DEVICE_TREE="at91sam9g25-gardena-smart-gateway"
  CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clocks clock-names interrupts interrupt-parent interrupts-extended dmas dma-names"
  CONFIG_ENV_IS_IN_UBI=y
+CONFIG_ENV_UBI_PART="ubi"
+CONFIG_ENV_UBI_VOLUME="env"
+CONFIG_ENV_UBI_VOLUME_REDUND="env_r"
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_DM=y
  CONFIG_SPL_DM=y
diff --git a/configs/gurnard_defconfig b/configs/gurnard_defconfig

index d19f485..5001385 100644 (file)
--- a/configs/gurnard_defconfig
+++ b/configs/gurnard_defconfig
@@ -2,6 +2,8 @@ CONFIG_ARM=y
  CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x73f00000
  CONFIG_TARGET_GURNARD=y
+CONFIG_ENV_SIZE=0x40000
+CONFIG_ENV_OFFSET=0x80000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_FIT=y
  CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G45"
diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig

index bc77069..927d7f0 100644 (file)
--- a/configs/igep00x0_defconfig
+++ b/configs/igep00x0_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
  CONFIG_ARCH_OMAP2PLUS=y
  CONFIG_TI_COMMON_CMD_OPTIONS=y
  CONFIG_TARGET_OMAP3_IGEP00X0=y
+CONFIG_ENV_SIZE=0x8000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_SPL=y
  CONFIG_DISTRO_DEFAULTS=y
@@ -29,6 +30,10 @@ CONFIG_CMD_UBI=y
  # CONFIG_CMD_UBIFS is not set
  CONFIG_OF_CONTROL=y
  CONFIG_DEFAULT_DEVICE_TREE="omap3-igep0020"
+CONFIG_ENV_IS_IN_UBI=y
+CONFIG_ENV_UBI_PART="UBI"
+CONFIG_ENV_UBI_VOLUME="config"
+CONFIG_ENV_UBI_VOLUME_REDUND="config_r"
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_DM_MMC=y
  CONFIG_MMC_OMAP_HS=y
diff --git a/configs/meesc_dataflash_defconfig b/configs/meesc_dataflash_defconfig

index 476700c..0bef67e 100644 (file)
--- a/configs/meesc_dataflash_defconfig
+++ b/configs/meesc_dataflash_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x21F00000
  CONFIG_TARGET_MEESC=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x4200
+CONFIG_ENV_OFFSET=0x4200
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_FIT=y
  CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
@@ -22,6 +24,7 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=15000000
+CONFIG_ENV_SECT_SIZE=0x210
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_CLK_AT91=y
diff --git a/configs/meesc_defconfig b/configs/meesc_defconfig

index 0e49d82..970e8b8 100644 (file)
--- a/configs/meesc_defconfig
+++ b/configs/meesc_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x21F00000
  CONFIG_TARGET_MEESC=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_OFFSET=0xC0000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_FIT=y
  CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH"
diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig

index ff968b3..5986791 100644 (file)
--- a/configs/omap3_overo_defconfig
+++ b/configs/omap3_overo_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
  CONFIG_ARCH_OMAP2PLUS=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_TARGET_OMAP3_OVERO=y
+CONFIG_ENV_OFFSET=0x240000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_SPL=y
  CONFIG_DISTRO_DEFAULTS=y
diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig

index 1d7f21a..7f251ac 100644 (file)
--- a/configs/omap4_sdp4430_defconfig
+++ b/configs/omap4_sdp4430_defconfig
@@ -5,6 +5,7 @@ CONFIG_ARCH_OMAP2PLUS=y
  CONFIG_OMAP44XX=y
  CONFIG_TARGET_OMAP4_SDP4430=y
  CONFIG_CMD_BAT=y
+CONFIG_ENV_OFFSET=0xE0000
  CONFIG_SPL=y
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd"
diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig

index b0c0520..c4539e9 100644 (file)
--- a/configs/pengwyn_defconfig
+++ b/configs/pengwyn_defconfig
@@ -7,6 +7,7 @@ CONFIG_AM33XX=y
  CONFIG_TARGET_PENGWYN=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x4000
  CONFIG_SPL=y
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
diff --git a/configs/picosam9g45_defconfig b/configs/picosam9g45_defconfig

index 6a087b4..abae023 100644 (file)
--- a/configs/picosam9g45_defconfig
+++ b/configs/picosam9g45_defconfig
@@ -8,6 +8,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x4000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_SPL=y
  CONFIG_SPL_FS_FAT=y
diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig

index d2c4c25..4a74932 100644 (file)
--- a/configs/pm9261_defconfig
+++ b/configs/pm9261_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0
  CONFIG_TARGET_PM9261=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x10000
+CONFIG_ENV_OFFSET=0x40000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261"
  CONFIG_BOOTDELAY=3
@@ -29,6 +31,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=physmap-flash.0:256k(u-boot)ro,64k(u-boot-env)
  CONFIG_OF_CONTROL=y
  CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek"
  CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_CLK_AT91=y
diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig

index ceb7efe..1c948b2 100644 (file)
--- a/configs/pm9263_defconfig
+++ b/configs/pm9263_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0
  CONFIG_TARGET_PM9263=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x10000
+CONFIG_ENV_OFFSET=0x40000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263"
  CONFIG_BOOTDELAY=3
@@ -29,6 +31,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=physmap-flash.0:256k(u-boot)ro,64k(u-boot-env)
  CONFIG_OF_CONTROL=y
  CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
  CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_CLK_AT91=y
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig

index 1a5955a..31f5888 100644 (file)
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -10,6 +10,7 @@ CONFIG_SYS_MPUCLK=720
  CONFIG_TARGET_PXM2=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x2000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_SPL_FS_FAT=y
diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig

index e5052bb..efd6e49 100644 (file)
--- a/configs/rastaban_defconfig
+++ b/configs/rastaban_defconfig
@@ -10,6 +10,7 @@ CONFIG_SYS_MPUCLK=300
  CONFIG_TARGET_RASTABAN=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x2000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_SPL_FS_FAT=y
diff --git a/configs/rut_defconfig b/configs/rut_defconfig

index 50387d5..330f7e2 100644 (file)
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -10,6 +10,7 @@ CONFIG_SYS_MPUCLK=600
  CONFIG_TARGET_RUT=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x2000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_SPL_FS_FAT=y
diff --git a/configs/sama5d27_som1_ek_mmc1_defconfig b/configs/sama5d27_som1_ek_mmc1_defconfig

index 205a439..ff611f4 100644 (file)
--- a/configs/sama5d27_som1_ek_mmc1_defconfig
+++ b/configs/sama5d27_som1_ek_mmc1_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_ENV_SIZE=0x4000
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xf8020000
diff --git a/configs/sama5d27_som1_ek_mmc_defconfig b/configs/sama5d27_som1_ek_mmc_defconfig

index 0a07800..d8845b3 100644 (file)
--- a/configs/sama5d27_som1_ek_mmc_defconfig
+++ b/configs/sama5d27_som1_ek_mmc_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_ENV_SIZE=0x4000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BOARD_INIT=y
diff --git a/configs/sama5d2_icp_mmc_defconfig b/configs/sama5d2_icp_mmc_defconfig

index e047108..dce4809 100644 (file)
--- a/configs/sama5d2_icp_mmc_defconfig
+++ b/configs/sama5d2_icp_mmc_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_ENV_SIZE=0x4000
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xf801c000
diff --git a/configs/sama5d2_ptc_ek_mmc_defconfig b/configs/sama5d2_ptc_ek_mmc_defconfig

index 25b3aaf..266c6d2 100644 (file)
--- a/configs/sama5d2_ptc_ek_mmc_defconfig
+++ b/configs/sama5d2_ptc_ek_mmc_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x26f00000
  CONFIG_TARGET_SAMA5D2_PTC_EK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x4000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xf801c000
diff --git a/configs/sama5d2_xplained_emmc_defconfig b/configs/sama5d2_xplained_emmc_defconfig

index f643b5a..6b7c47c 100644 (file)
--- a/configs/sama5d2_xplained_emmc_defconfig
+++ b/configs/sama5d2_xplained_emmc_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_ENV_SIZE=0x4000
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xf8020000
diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig

index c25d67b..7c0d14a 100644 (file)
--- a/configs/sama5d2_xplained_mmc_defconfig
+++ b/configs/sama5d2_xplained_mmc_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_ENV_SIZE=0x4000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BOARD_INIT=y
diff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig

index ac5ae51..267806c 100644 (file)
--- a/configs/sama5d2_xplained_spiflash_defconfig
+++ b/configs/sama5d2_xplained_spiflash_defconfig
@@ -8,6 +8,8 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_ENV_SIZE=0x2000
+CONFIG_ENV_OFFSET=0x6000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BOARD_INIT=y
@@ -43,6 +45,7 @@ CONFIG_SPL_OF_CONTROL=y
  CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_xplained"
  CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dmas dma-names"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_DM=y
  CONFIG_SPL_DM=y
  CONFIG_SPL_DM_SEQ_ALIAS=y
diff --git a/configs/sama5d36ek_cmp_mmc_defconfig b/configs/sama5d36ek_cmp_mmc_defconfig

index e61f897..bc20f17 100644 (file)
--- a/configs/sama5d36ek_cmp_mmc_defconfig
+++ b/configs/sama5d36ek_cmp_mmc_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x26f00000
  CONFIG_TARGET_SAMA5D3XEK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x4000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xffffee00
diff --git a/configs/sama5d36ek_cmp_spiflash_defconfig b/configs/sama5d36ek_cmp_spiflash_defconfig

index 4a876e3..eddeead 100644 (file)
--- a/configs/sama5d36ek_cmp_spiflash_defconfig
+++ b/configs/sama5d36ek_cmp_spiflash_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x26f00000
  CONFIG_TARGET_SAMA5D3XEK=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x2000
+CONFIG_ENV_OFFSET=0x6000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xffffee00
@@ -32,6 +34,7 @@ CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_DEFAULT_DEVICE_TREE="sama5d36ek_cmp"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
  CONFIG_DM=y
  CONFIG_CLK=y
diff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig

index d5021eb..6e9d65c 100644 (file)
--- a/configs/sama5d3_xplained_mmc_defconfig
+++ b/configs/sama5d3_xplained_mmc_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_ENV_SIZE=0x4000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BOARD_INIT=y
diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig

index b770ac4..ea565ec 100644 (file)
--- a/configs/sama5d3xek_mmc_defconfig
+++ b/configs/sama5d3xek_mmc_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_ENV_SIZE=0x4000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BOARD_INIT=y
diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig

index 84bbf9c..9bf9e4f 100644 (file)
--- a/configs/sama5d3xek_spiflash_defconfig
+++ b/configs/sama5d3xek_spiflash_defconfig
@@ -8,6 +8,8 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_ENV_SIZE=0x2000
+CONFIG_ENV_OFFSET=0x6000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BOARD_INIT=y
@@ -44,6 +46,7 @@ CONFIG_SPL_OF_CONTROL=y
  CONFIG_DEFAULT_DEVICE_TREE="sama5d36ek"
  CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dmas dma-names"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
  CONFIG_DM=y
  CONFIG_SPL_DM=y
diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig

index 0504b4e..755ff0b 100644 (file)
--- a/configs/sama5d4_xplained_mmc_defconfig
+++ b/configs/sama5d4_xplained_mmc_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_ENV_SIZE=0x4000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BOARD_INIT=y
diff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig

index f108689..b12c476 100644 (file)
--- a/configs/sama5d4_xplained_spiflash_defconfig
+++ b/configs/sama5d4_xplained_spiflash_defconfig
@@ -8,6 +8,8 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_ENV_SIZE=0x2000
+CONFIG_ENV_OFFSET=0x6000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BOARD_INIT=y
@@ -42,6 +44,7 @@ CONFIG_SPL_OF_CONTROL=y
  CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4_xplained"
  CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dma-names dmas"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_DM=y
  CONFIG_SPL_DM=y
  CONFIG_SPL_DM_SEQ_ALIAS=y
diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig

index d7e1701..2dd75c3 100644 (file)
--- a/configs/sama5d4ek_mmc_defconfig
+++ b/configs/sama5d4ek_mmc_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_ENV_SIZE=0x4000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BOARD_INIT=y
diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig

index 8db517d..1b6c19f 100644 (file)
--- a/configs/sama5d4ek_spiflash_defconfig
+++ b/configs/sama5d4ek_spiflash_defconfig
@@ -8,6 +8,8 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_ENV_SIZE=0x2000
+CONFIG_ENV_OFFSET=0x6000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_DEBUG_UART_BOARD_INIT=y
@@ -42,6 +44,7 @@ CONFIG_SPL_OF_CONTROL=y
  CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4ek"
  CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dma-names dmas"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_DM=y
  CONFIG_SPL_DM=y
  CONFIG_SPL_DM_SEQ_ALIAS=y
diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig

index 656188f..e8d846f 100644 (file)
--- a/configs/smartweb_defconfig
+++ b/configs/smartweb_defconfig
@@ -11,6 +11,7 @@ CONFIG_SPL_GPIO_SUPPORT=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_OFFSET=0x100000
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x400
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig

index 7ce29bf..be71dc8 100644 (file)
--- a/configs/snapper9260_defconfig
+++ b/configs/snapper9260_defconfig
@@ -2,6 +2,8 @@ CONFIG_ARM=y
  CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x21f00000
  CONFIG_TARGET_SNAPPER9260=y
+CONFIG_ENV_SIZE=0x40000
+CONFIG_ENV_OFFSET=0x80000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_FIT=y
  CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260"
diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig

index 2773c6b..aca456e 100644 (file)
--- a/configs/snapper9g20_defconfig
+++ b/configs/snapper9g20_defconfig
@@ -2,6 +2,8 @@ CONFIG_ARM=y
  CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x21f00000
  CONFIG_TARGET_SNAPPER9260=y
+CONFIG_ENV_SIZE=0x40000
+CONFIG_ENV_OFFSET=0x80000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_FIT=y
  CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20"
diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig

index ee21811..403c0b6 100644 (file)
--- a/configs/taurus_defconfig
+++ b/configs/taurus_defconfig
@@ -13,6 +13,7 @@ CONFIG_SPL_GPIO_SUPPORT=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_OFFSET=0x100000
  CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig

index 67012f8..68ce230 100644 (file)
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -10,6 +10,7 @@ CONFIG_SYS_MPUCLK=300
  CONFIG_TARGET_THUBAN=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x2000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_SPL_FS_FAT=y
diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig

index bf877f5..19519f8 100644 (file)
--- a/configs/ti816x_evm_defconfig
+++ b/configs/ti816x_evm_defconfig
@@ -7,6 +7,8 @@ CONFIG_TI816X=y
  CONFIG_TARGET_TI816X_EVM=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_SIZE=0x2000
+CONFIG_ENV_OFFSET=0x001c0000
  CONFIG_SPL=y
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig

index 973c5ac..53e8256 100644 (file)
--- a/configs/tricorder_defconfig
+++ b/configs/tricorder_defconfig
@@ -2,6 +2,8 @@ CONFIG_ARM=y
  CONFIG_ARCH_OMAP2PLUS=y
  CONFIG_SYS_TEXT_BASE=0x80100000
  CONFIG_TARGET_TRICORDER=y
+CONFIG_ENV_SIZE=0x4000
+CONFIG_ENV_OFFSET=0x120000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_SPL=y
  CONFIG_BOOTDELAY=0
diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig

index 1dc2992..85ff2bf 100644 (file)
--- a/configs/tricorder_flash_defconfig
+++ b/configs/tricorder_flash_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
  CONFIG_ARCH_OMAP2PLUS=y
  CONFIG_SYS_TEXT_BASE=0x80100000
  CONFIG_TARGET_TRICORDER=y
+CONFIG_ENV_SIZE=0x4000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_SPL=y
  CONFIG_SYS_EXTRA_OPTIONS="FLASHCARD"
diff --git a/configs/usb_a9263_dataflash_defconfig b/configs/usb_a9263_dataflash_defconfig

index 3b9e4a5..5d19809 100644 (file)
--- a/configs/usb_a9263_dataflash_defconfig
+++ b/configs/usb_a9263_dataflash_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x23f00000
  CONFIG_TARGET_USB_A9263=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x2000
+CONFIG_ENV_OFFSET=0x2000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
  CONFIG_BOOTDELAY=3
@@ -27,6 +29,7 @@ CONFIG_DEFAULT_DEVICE_TREE="usb_a9263"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=15000000
+CONFIG_ENV_SECT_SIZE=0x2000
  CONFIG_DM=y
  CONFIG_CLK=y
  CONFIG_CLK_AT91=y
diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig

index 745aa85..92fdc93 100644 (file)
--- a/configs/vinco_defconfig
+++ b/configs/vinco_defconfig
@@ -2,6 +2,8 @@ CONFIG_ARM=y
  CONFIG_ARCH_AT91=y
  CONFIG_SYS_TEXT_BASE=0x20f00000
  CONFIG_TARGET_VINCO=y
+CONFIG_ENV_SIZE=0x10000
+CONFIG_ENV_OFFSET=0x10000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
  CONFIG_SPI_BOOT=y
@@ -27,6 +29,7 @@ CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_DEFAULT_DEVICE_TREE="at91-vinco"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_SPI_FLASH=y
  CONFIG_SF_DEFAULT_MODE=0
diff --git a/configs/wb45n_defconfig b/configs/wb45n_defconfig

index 8da284a..16fb444 100644 (file)
--- a/configs/wb45n_defconfig
+++ b/configs/wb45n_defconfig
@@ -7,6 +7,7 @@ CONFIG_SPL_GPIO_SUPPORT=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_OFFSET=0xa0000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_FIT=y
diff --git a/configs/wb50n_defconfig b/configs/wb50n_defconfig

index 71a95b3..417eda3 100644 (file)
--- a/configs/wb50n_defconfig
+++ b/configs/wb50n_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_GPIO_SUPPORT=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_ENV_OFFSET=0xA0000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_SPL=y
  CONFIG_FIT=y
diff --git a/env/Kconfig b/env/Kconfig

index b8bdfb0..06ab4bc 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -464,7 +464,7 @@ config ENV_EXT4_FILE
           It's a string of the EXT4 file name. This file use to store the
           environment (explicit path to the file)
  
-if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARC || ARCH_STM32MP
+if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARC || ARCH_STM32MP || ARCH_OMAP2PLUS || ARCH_AT91
  
  config ENV_OFFSET
         hex "Environment Offset"
@@ -475,23 +475,26 @@ config ENV_OFFSET
         default 0xE0000 if ARCH_ZYNQ
         default 0x1E00000 if ARCH_ZYNQMP
         default 0 if ARC
+       default 0x140000 if ARCH_AT91
+       default 0x260000 if ARCH_OMAP2PLUS
         help
           Offset from the start of the device (or partition)
  
  config ENV_SIZE
         hex "Environment Size"
         default 0x40000 if ENV_IS_IN_SPI_FLASH && ARCH_ZYNQMP
-       default 0x20000 if ARCH_SUNXI || ARCH_ZYNQ
+       default 0x20000 if ARCH_SUNXI || ARCH_ZYNQ || ARCH_OMAP2PLUS || ARCH_AT91
         default 0x8000 if ARCH_ROCKCHIP || ARCH_ZYNQMP || ARCH_VERSAL
         default 0x4000 if ARC
+       default 0x1f000
         help
           Size of the environment storage area
  
  config ENV_SECT_SIZE
         hex "Environment Sector-Size"
-       depends on !ENV_IS_NOWHERE && (ARCH_ZYNQ || ARCH_ZYNQMP)
+       depends on !ENV_IS_NOWHERE && (ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_OMAP2PLUS || ARCH_AT91)
         default 0x40000 if ARCH_ZYNQMP
-       default 0x20000 if ARCH_ZYNQ
+       default 0x20000 if ARCH_ZYNQ || ARCH_OMAP2PLUS || ARCH_AT91
         help
           Size of the sector containing the environment.
  
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h

index b5fba0a..1885ac8 100644 (file)
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -31,9 +31,6 @@
  #define V_OSCK                         24000000  /* Clock output from T2 */
  #define V_SCLK                         (V_OSCK)
  
-/* Always 128 KiB env size */
-#define CONFIG_ENV_SIZE                        SZ_128K
-
  #ifdef CONFIG_NAND
  #define NANDARGS \
         "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h

index 5fe7565..5131cd3 100644 (file)
--- a/include/configs/am335x_igep003x.h
+++ b/include/configs/am335x_igep003x.h
@@ -20,8 +20,6 @@
  #define V_OSCK                         24000000  /* Clock output from T2 */
  #define V_SCLK                         (V_OSCK)
  
-#define CONFIG_ENV_SIZE                        (96 << 10)      /*  96 KiB */
-
  #ifndef CONFIG_SPL_BUILD
  #define CONFIG_EXTRA_ENV_SETTINGS \
         DEFAULT_LINUX_BOOT_ENV \
@@ -124,11 +122,6 @@
  #define CONFIG_SPL_UBI_LEB_START       2048
  #define CONFIG_SPL_UBI_INFO_ADDR       0x88080000
  
-/* environment organization */
-#define CONFIG_ENV_UBI_PART            "UBI"
-#define CONFIG_ENV_UBI_VOLUME          "config"
-#define CONFIG_ENV_UBI_VOLUME_REDUND   "config_r"
-
  /* NAND config */
  #define CONFIG_SYS_NAND_5_ADDR_CYCLE
  #define CONFIG_SYS_NAND_PAGE_COUNT     (CONFIG_SYS_NAND_BLOCK_SIZE / \
diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h

index 381c75e..a08e6bf 100644 (file)
--- a/include/configs/am335x_sl50.h
+++ b/include/configs/am335x_sl50.h
@@ -22,9 +22,6 @@
  #define V_OSCK                         24000000  /* Clock output from T2 */
  #define V_SCLK                         (V_OSCK)
  
-/* Always 128 KiB env size */
-#define CONFIG_ENV_SIZE                        (128 << 10)
-
  #ifndef CONFIG_SPL_BUILD
  
  #define MEM_LAYOUT_ENV_SETTINGS \
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h

index 2c51026..cacd799 100644 (file)
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -31,7 +31,6 @@
  /*
   * Size of malloc() pool
   */
-#define CONFIG_ENV_SIZE                        (128 << 10)     /* 128 KiB sector */
  #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + (128 << 10))
                                                 /* initial data */
  /*
@@ -192,7 +191,6 @@
  #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_FLASH_BASE
  
  #define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)     /* 128 KiB sector */
-#define CONFIG_ENV_OFFSET              0x260000
  #define CONFIG_ENV_ADDR                        0x260000
  
  /*-----------------------------------------------------------------------
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h

index 9475e99..e0521ab 100644 (file)
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -184,8 +184,6 @@
  #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_FLASH_BASE
  
  #define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)     /* 128 KiB */
-#define CONFIG_ENV_SIZE                        CONFIG_SYS_ENV_SECT_SIZE
-#define CONFIG_ENV_OFFSET              0x260000
  #define CONFIG_ENV_ADDR                        0x260000
  
  /* Defines for SPL */
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h

index ef85cd2..b0d9559 100644 (file)
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -59,9 +59,6 @@
  /* Now bring in the rest of the common code. */
  #include <configs/ti_armv7_omap.h>
  
-/* Always 64 KiB env size */
-#define CONFIG_ENV_SIZE                        (64 << 10)
-
  /* Clock Defines */
  #define V_OSCK                         24000000  /* Clock output from T2 */
  #define V_SCLK                         (V_OSCK)
@@ -114,8 +111,6 @@
  
  #ifdef CONFIG_QSPI_BOOT
  #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-#define CONFIG_ENV_SECT_SIZE           (64 << 10) /* 64 KB sectors */
-#define CONFIG_ENV_OFFSET              0x110000
  #define CONFIG_ENV_OFFSET_REDUND       0x120000
  #endif
  
diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h

index 2c651aa..e69e800 100644 (file)
--- a/include/configs/am57xx_evm.h
+++ b/include/configs/am57xx_evm.h
@@ -19,8 +19,6 @@
  /* MMC ENV related defines */
  #define CONFIG_SYS_MMC_ENV_DEV         1               /* eMMC */
  #define CONFIG_SYS_MMC_ENV_PART                0
-#define CONFIG_ENV_SIZE                        SZ_128K
-#define CONFIG_ENV_OFFSET              0x260000
  #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
  #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
  
diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h

index 30c6cd4..b9c6a27 100644 (file)
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -57,17 +57,12 @@
  
  #ifdef CONFIG_NAND_BOOT
  /* u-boot env in nand flash */
-#define CONFIG_ENV_OFFSET              0x140000
  #define CONFIG_ENV_OFFSET_REDUND       0x100000
-#define CONFIG_ENV_SIZE                        0x20000
  #define CONFIG_BOOTCOMMAND             "nand read 0x21000000 0x180000 0x80000;"        \
                                         "nand read 0x22000000 0x200000 0x600000;"       \
                                         "bootz 0x22000000 - 0x21000000"
  #elif CONFIG_SPI_BOOT
  /* u-boot env in serial flash, by default is bus 0 and cs 0 */
-#define CONFIG_ENV_OFFSET              0x6000
-#define CONFIG_ENV_SIZE                        0x2000
-#define CONFIG_ENV_SECT_SIZE           0x1000
  #define CONFIG_BOOTCOMMAND             "sf probe 0; "                          \
                                         "sf read 0x21000000 0x60000 0xc000; "   \
                                         "sf read 0x22000000 0x6c000 0x394000; " \
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h

index e2a2f3b..8bfba35 100644 (file)
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -145,7 +145,7 @@
   */
  #define CONFIG_ENV_ADDR                        \
                 (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN)
-#define CONFIG_ENV_SIZE                        SZ_64K /* sectors are 64K here */
+
  /* The following #defines are needed to get flash environment right */
  #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_FLASH_BASE
  #define CONFIG_SYS_MONITOR_LEN         SZ_256K
diff --git a/include/configs/baltos.h b/include/configs/baltos.h

index fbf657f..a9b14c5 100644 (file)
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -25,9 +25,6 @@
  #define V_OSCK                         24000000  /* Clock output from T2 */
  #define V_SCLK                         (V_OSCK)
  
-/* Always 128 KiB env size */
-#define CONFIG_ENV_SIZE                        (128 << 10)
-
  /* FIT support */
  #define CONFIG_SYS_BOOTM_LEN         SZ_64M
  
diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h

index 0525efa..bfa9fc9 100644 (file)
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -31,9 +31,6 @@
  #define V_OSCK                         24000000  /* Clock output from T2 */
  #define V_SCLK                         (V_OSCK)
  
-/* Always 128 KiB env size */
-#define CONFIG_ENV_SIZE                        (128 << 10)
-
  #ifdef CONFIG_NAND
  #define NANDARGS \
         "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h

index 82f3f1a..5a40f3a 100644 (file)
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -59,9 +59,6 @@
  #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x80000
  #endif /* CONFIG_NAND */
  
-/* Always 64 KiB env size */
-#define CONFIG_ENV_SIZE                        (64 << 10)
-
  #ifdef CONFIG_NAND
  #define NANDTGTS \
  "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
@@ -187,8 +184,6 @@ NANDTGTS \
  #define CONFIG_SYS_SPI_U_BOOT_OFFS             0x40000
  /* Environment */
  #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-#define CONFIG_ENV_SECT_SIZE                   CONFIG_ENV_SIZE
-#define CONFIG_ENV_OFFSET                      0x20000
  #define CONFIG_ENV_OFFSET_REDUND               (CONFIG_ENV_OFFSET + \
                                                  CONFIG_ENV_SECT_SIZE)
  #elif defined(CONFIG_ENV_IS_IN_MMC)
diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h

index db990fc..13c15bd 100644 (file)
--- a/include/configs/chiliboard.h
+++ b/include/configs/chiliboard.h
@@ -161,15 +161,11 @@
  #endif
  
  #if defined(CONFIG_ENV_IS_IN_NAND)
-#define CONFIG_ENV_OFFSET              0x001c0000
  #define CONFIG_ENV_OFFSET_REDUND       0x001e0000
-#define CONFIG_ENV_SIZE                        SZ_128K
  #define CONFIG_SYS_ENV_SECT_SIZE       CONFIG_SYS_NAND_BLOCK_SIZE
  #else
  #define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_ENV_OFFSET              SZ_128K
  #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
-#define CONFIG_ENV_SIZE                        SZ_8K
  #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
  #endif
  
diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h

index 740bbd4..54f2cea 100644 (file)
--- a/include/configs/cm_t335.h
+++ b/include/configs/cm_t335.h
@@ -23,8 +23,6 @@
  #define V_OSCK                         25000000  /* Clock output from T2 */
  #define V_SCLK                         (V_OSCK)
  
-#define CONFIG_ENV_SIZE                        (16 << 10)      /* 16 KiB */
-
  #ifndef CONFIG_SPL_BUILD
  #define MMCARGS \
         "mmcdev=0\0" \
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h

index fd693cf..f9a6444 100644 (file)
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -39,7 +39,6 @@
  /*
   * Size of malloc() pool
   */
-#define CONFIG_ENV_SIZE                (16 << 10)      /* 16 KiB */
                                         /* Sector */
  #define CONFIG_SYS_MALLOC_LEN  (CONFIG_ENV_SIZE + (128 << 10))
  
@@ -179,7 +178,6 @@
  #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_FLASH_BASE
  #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 2 sectors */
  
-#define CONFIG_ENV_OFFSET              0x260000
  #define CONFIG_ENV_ADDR                        0x260000
  
  /* additions for new relocation code, must be added to all boards */
diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h

index bd40989..b2c1300 100644 (file)
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -75,14 +75,9 @@
  #include <configs/ti_armv7_omap.h>
  #undef CONFIG_SYS_MONITOR_LEN
  
-#define CONFIG_ENV_SIZE                        (16 * 1024)
-
  #define V_OSCK                         24000000  /* Clock output from T2 */
  #define V_SCLK                         (V_OSCK)
  
-#define CONFIG_ENV_SECT_SIZE           (64 * 1024)
-#define CONFIG_ENV_OFFSET              (768 * 1024)
-
  #define CONFIG_EXTRA_ENV_SETTINGS \
         "loadaddr=0x80200000\0" \
         "fdtaddr=0x81200000\0" \
diff --git a/include/configs/corvus.h b/include/configs/corvus.h

index f1b0374..f2df66e 100644 (file)
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -88,9 +88,7 @@
  #define CONFIG_SYS_LOAD_ADDR   ATMEL_BASE_CS6
  
  /* bootstrap + u-boot + env in nandflash */
-#define CONFIG_ENV_OFFSET              0x100000
  #define CONFIG_ENV_OFFSET_REDUND       0x180000
-#define CONFIG_ENV_SIZE                        SZ_128K
  
  #define CONFIG_BOOTCOMMAND                                             \
         "nand read 0x70000000 0x200000 0x300000;"                       \
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h

index 2eb658d..baf1a73 100644 (file)
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -37,8 +37,6 @@
  #define CONFIG_REVISION_TAG            1
  
  /* Size of malloc() pool */
-#define CONFIG_ENV_SIZE                        (128 << 10)     /* 128 KiB */
-                                               /* Sector */
  #undef CONFIG_SYS_MALLOC_LEN
  #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + (128 << 10))
  
@@ -144,10 +142,6 @@
  #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + \
                                         0x01000000) /* 16MB */
  
-/* NAND and environment organization  */
-
-#define CONFIG_ENV_OFFSET              0x260000
-
  /* SRAM config */
  #define CONFIG_SYS_SRAM_START              0x40200000
  #define CONFIG_SYS_SRAM_SIZE               0x10000
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h

index aec70ee..9c8141d 100644 (file)
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -21,8 +21,6 @@
  #ifndef CONFIG_QSPI_BOOT
  /* MMC ENV related defines */
  #define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1) */
-#define CONFIG_ENV_SIZE                        (128 << 10)
-#define CONFIG_ENV_OFFSET              0x260000
  #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
  #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
  #endif
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h

index b86b542..24aaae5 100644 (file)
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -52,8 +52,6 @@
  
  /* bootstrap + u-boot + env + linux in dataflash on CS0 */
  #define CONFIG_ENV_OFFSET      0x3DE000
-#define CONFIG_ENV_SIZE                (132 << 10)
-#define CONFIG_ENV_SECT_SIZE   CONFIG_ENV_SIZE
  
  /* NAND flash */
  #ifdef CONFIG_CMD_NAND
diff --git a/include/configs/gardena-smart-gateway-at91sam.h b/include/configs/gardena-smart-gateway-at91sam.h

index 02bf4d1..482e471 100644 (file)
--- a/include/configs/gardena-smart-gateway-at91sam.h
+++ b/include/configs/gardena-smart-gateway-at91sam.h
@@ -43,12 +43,6 @@
  
  #define CONFIG_SYS_LOAD_ADDR           0x22000000      /* load address */
  
-/* environment organization */
-#define CONFIG_ENV_UBI_PART            "ubi"
-#define CONFIG_ENV_UBI_VOLUME          "env"
-#define CONFIG_ENV_UBI_VOLUME_REDUND   "env_r"
-#define CONFIG_ENV_SIZE                        (64 << 10)
-
  /* SPL */
  #define CONFIG_SPL_MAX_SIZE            0x7000
  #define CONFIG_SPL_STACK               0x308000
diff --git a/include/configs/kc1.h b/include/configs/kc1.h

index 59814b5..e3a219c 100644 (file)
--- a/include/configs/kc1.h
+++ b/include/configs/kc1.h
@@ -103,8 +103,6 @@
   * Environment
   */
  
-#define CONFIG_ENV_SIZE                (128 * 1024)
-
  #define CONFIG_ENV_OVERWRITE
  
  #define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h

index 453dd32..d9f4bdc 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -50,7 +50,6 @@
  /*
   * Size of malloc() pool
   */
-#define CONFIG_ENV_SIZE                        (128 << 10)
  #define CONFIG_UBI_SIZE                        (512 << 10)
  #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + CONFIG_UBI_SIZE + \
                                         (128 << 10))
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h

index f0c8c99..a2a6be7 100644 (file)
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -40,7 +40,6 @@
  #define CONFIG_NAND_OMAP_ECCSCHEME      OMAP_ECC_BCH8_CODE_HW_DETECTION_SW
  #define CONFIG_SYS_NAND_U_BOOT_OFFS     0x80000
  #define CONFIG_SYS_ENV_SECT_SIZE        SZ_128K
-#define CONFIG_ENV_OFFSET               0x260000
  #define CONFIG_ENV_ADDR                 0x260000
  #define CONFIG_ENV_OVERWRITE
  /* NAND: SPL falcon mode configs */
@@ -59,9 +58,6 @@
  
  /* TWL4030 LED Support */
  
-/* Environment */
-#define CONFIG_ENV_SIZE                 SZ_128K
-
  #define CONFIG_PREBOOT                  "usb start"
  
  #define MEM_LAYOUT_ENV_SETTINGS \
diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h

index ef69b24..9e2b752 100644 (file)
--- a/include/configs/omap3_cairo.h
+++ b/include/configs/omap3_cairo.h
@@ -160,11 +160,7 @@
  #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_FLASH_BASE
  #define CONFIG_SYS_ONENAND_BASE                ONENAND_MAP
  
-#define CONFIG_ENV_SIZE                        (128 << 10)     /* 128 KiB */
-#define ONENAND_ENV_OFFSET             0x260000 /* environment starts here */
-
  #define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)     /* 128 KiB */
-#define CONFIG_ENV_OFFSET              0x260000
  #define CONFIG_ENV_ADDR                        0x260000
  
  /* Defines for SPL */
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h

index 5b9d8a5..4ab172c 100644 (file)
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -44,7 +44,6 @@
  #define CONFIG_SYS_NAND_ECCBYTES        3
  #define CONFIG_NAND_OMAP_ECCSCHEME      OMAP_ECC_BCH8_CODE_HW_DETECTION_SW
  #define CONFIG_SYS_ENV_SECT_SIZE        SZ_128K
-#define CONFIG_ENV_OFFSET               0x260000
  #define CONFIG_ENV_ADDR                 0x260000
  #define CONFIG_ENV_OVERWRITE
  /* NAND: SPL falcon mode configs */
@@ -54,8 +53,6 @@
  #endif /* CONFIG_NAND */
  
  /* Environment */
-#define CONFIG_ENV_SIZE                 SZ_128K
-
  #define CONFIG_PREBOOT                  "usb start"
  
  #define MEM_LAYOUT_ENV_SETTINGS \
diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h

index 23d12c6..a95a9cc 100644 (file)
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -110,10 +110,4 @@
  #define CONFIG_SPL_UBI_LEB_START       2048
  #define CONFIG_SPL_UBI_INFO_ADDR       0x88080000
  
-/* environment organization */
-#define CONFIG_ENV_UBI_PART            "UBI"
-#define CONFIG_ENV_UBI_VOLUME          "config"
-#define CONFIG_ENV_UBI_VOLUME_REDUND   "config_r"
-#define CONFIG_ENV_SIZE                        (32*1024)
-
  #endif /* __IGEP00X0_H */
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h

index e318a9f..6b7104d 100644 (file)
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -194,10 +194,7 @@
  /* Monitor at start of flash */
  #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_FLASH_BASE
  
-#define CONFIG_ENV_SIZE                        (128 << 10)     /* 128 KiB */
-
  #define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)     /* 128 KiB */
-#define CONFIG_ENV_OFFSET              0x260000
  #define CONFIG_ENV_ADDR                        0x260000
  
  /* Defines for SPL */
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h

index ea941db..38a10e2 100644 (file)
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -19,7 +19,6 @@
  
  /* override size of malloc() pool */
  #undef CONFIG_SYS_MALLOC_LEN
-#define CONFIG_ENV_SIZE                (128 << 10)     /* 128 KiB sector */
  /* Shift 128 << 15 provides 4 MiB heap to support UBI commands.
   * Shift 128 << 10 provides 128 KiB heap for limited-memory devices. */
  #define CONFIG_SYS_MALLOC_LEN  (CONFIG_ENV_SIZE + (128 << 15))
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h

index 82c66c4..98f243f 100644 (file)
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -15,8 +15,6 @@
  
  #define CONFIG_REVISION_TAG            1
  
-#define CONFIG_ENV_SIZE                        (128 << 10)     /* 128 KiB */
-
  #define CONFIG_SYS_DEVICE_NULLDEV      1
  
  /*
@@ -63,7 +61,6 @@
  
  
  #define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)     /* 128 KiB */
-#define CONFIG_ENV_OFFSET              0x260000
  #define CONFIG_ENV_ADDR                        0x260000
  
  #endif                         /* __CONFIG_H */
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h

index 0a02ecd..4dc22a7 100644 (file)
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -23,8 +23,6 @@
  
  #define CONFIG_REVISION_TAG            1
  
-#define CONFIG_ENV_SIZE                        (128 << 10)     /* 128 KiB */
-
  /*
   * Hardware drivers
   */
@@ -132,7 +130,6 @@
  #define ONENAND_ENV_OFFSET             0x260000 /* environment starts here */
  
  #define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)     /* 128 KiB */
-#define CONFIG_ENV_OFFSET              0x260000
  #define CONFIG_ENV_ADDR                        0x260000
  
  #endif                         /* __CONFIG_H */
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h

index 0d8f945..27e4732 100644 (file)
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -32,8 +32,6 @@
  
  /* MMC ENV related defines */
  #define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1) */
-#define CONFIG_ENV_SIZE                        (128 << 10)
-#define CONFIG_ENV_OFFSET              0x260000
  #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
  #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
  
diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h

index 8cde12e..153e567 100644 (file)
--- a/include/configs/pcm051.h
+++ b/include/configs/pcm051.h
@@ -21,7 +21,6 @@
  
  #include <configs/ti_am335x_common.h>
  
-#define CONFIG_ENV_SIZE                        (128 << 10)     /* 128 KiB */
  #define CONFIG_MACH_TYPE               MACH_TYPE_PCM051
  
  /* set to negative value for no autoboot */
diff --git a/include/configs/pepper.h b/include/configs/pepper.h

index ef662d7..662fce3 100644 (file)
--- a/include/configs/pepper.h
+++ b/include/configs/pepper.h
@@ -17,8 +17,6 @@
  /* Mach type */
  #define CONFIG_MACH_TYPE               MACH_TYPE_PEPPER
  
-#define CONFIG_ENV_SIZE                        (128 << 10)     /* 128 KiB */
-
  #define CONFIG_EXTRA_ENV_SETTINGS \
         DEFAULT_LINUX_BOOT_ENV \
         "bootdir=/boot\0" \
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h

index 1281955..c07814f 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -18,7 +18,6 @@
  #define CONFIG_DMA_COHERENT
  #define CONFIG_DMA_COHERENT_SIZE       (1 << 20)
  
-#define CONFIG_ENV_SIZE                        (0x2000)
  #define CONFIG_SYS_MALLOC_LEN          (16 * 1024 * 1024)
  #ifdef CONFIG_SIEMENS_MACH_TYPE
  #define CONFIG_MACH_TYPE               CONFIG_SIEMENS_MACH_TYPE
@@ -461,7 +460,6 @@
  #define CONFIG_SYS_MAX_NAND_DEVICE     1               /* Max number of NAND
                                                            devices */
  #if !defined(CONFIG_SPI_BOOT)
-#define CONFIG_ENV_OFFSET              0x260000 /* environment starts here */
  #define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)     /* 128 KiB */
  #endif
  #endif
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h

index 776d7d7..c1a43a5 100644 (file)
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -144,10 +144,8 @@
  /*
   * The NAND Flash partitions:
   */
-#define CONFIG_ENV_OFFSET              (0x100000)
  #define CONFIG_ENV_OFFSET_REDUND       (0x180000)
  #define CONFIG_ENV_RANGE               (SZ_512K)
-#define CONFIG_ENV_SIZE                        (SZ_128K)
  
  /*
   * Predefined environment variables.
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h

index f212d15..7c2c5fb 100644 (file)
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -111,8 +111,6 @@
  #define CONFIG_BOOTP_BOOTFILESIZE
  
  /* Environment settings */
-#define CONFIG_ENV_OFFSET              (512 << 10)
-#define CONFIG_ENV_SIZE                        (256 << 10)
  #define CONFIG_ENV_OVERWRITE
  
  /* Console settings */
diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h

index dac2e65..ffcfdca 100644 (file)
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -74,8 +74,6 @@
  #define CONFIG_BOOTP_BOOTFILESIZE
  
  /* Environment settings */
-#define CONFIG_ENV_OFFSET              (512 << 10)
-#define CONFIG_ENV_SIZE                        (256 << 10)
  #define CONFIG_ENV_OVERWRITE
  
  #define        CONFIG_EXTRA_ENV_SETTINGS       \
diff --git a/include/configs/sniper.h b/include/configs/sniper.h

index 540ea77..0e2fcc3 100644 (file)
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -96,8 +96,6 @@
   * Environment
   */
  
-#define CONFIG_ENV_SIZE                (128 * 1024)
-
  #define CONFIG_ENV_OVERWRITE
  
  #define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h

index e7bab72..121de2b 100644 (file)
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -28,7 +28,6 @@
  /*
   * Size of malloc() pool
   */
-#define CONFIG_ENV_SIZE                        (128 << 10)     /* 128 KiB sector */
  #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + (128 << 10) + \
                                         2 * 1024 * 1024)
  /*
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h

index a95cbed..c34e785 100644 (file)
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -32,7 +32,6 @@
   * Size of malloc() pool
   */
  #define CONFIG_SYS_MALLOC_LEN          (4 << 20)
-#define CONFIG_ENV_SIZE                        (128 << 10)     /* 128 KiB sector */
  
  /*
   * Hardware drivers
@@ -170,7 +169,6 @@
  #define ONENAND_ENV_OFFSET             0x260000 /* environment starts here */
  
  #define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)
-#define CONFIG_ENV_OFFSET              0x260000
  #define CONFIG_ENV_ADDR                        CONFIG_ENV_OFFSET
  
  #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
diff --git a/include/configs/taurus.h b/include/configs/taurus.h

index dbb01af..36a41ff 100644 (file)
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -110,9 +110,7 @@
  #define CONFIG_SYS_LOAD_ADDR                   0x22000000
  
  /* bootstrap in spi flash , u-boot + env + linux in nandflash */
-#define CONFIG_ENV_OFFSET              0x100000
  #define CONFIG_ENV_OFFSET_REDUND       0x180000
-#define CONFIG_ENV_SIZE                (SZ_128K)       /* 1 sector = 128 kB */
  
  #ifndef CONFIG_SPL_BUILD
  #if defined(CONFIG_BOARD_AXM)
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h

index 512386e..90b424f 100644 (file)
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -18,7 +18,6 @@
  
  #include <asm/arch/omap.h>
  
-#define CONFIG_ENV_SIZE                        (128 << 10)     /* 128 KiB */
  #define CONFIG_SYS_MALLOC_LEN          (1024 << 10)
  #define CONFIG_MACH_TYPE               MACH_TYPE_TI8148EVM
  
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h

index fc59aba..1e31622 100644 (file)
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -23,11 +23,6 @@
  /* Use General purpose timer 1 */
  #define CONFIG_SYS_TIMERBASE           GPT2_BASE
  
-/*
- * Total Size Environment - 128k
- */
-#define CONFIG_ENV_SIZE                        (128 << 10)
-
  /*
   * For the DDR timing information we can either dynamically determine
   * the timings to use or use pre-determined timings (based on using the
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h

index 683375a..2106f4e 100644 (file)
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -78,9 +78,7 @@
  
  /* environment placement (for NAND), is different for FLASHCARD but does not
   * harm there */
-#define CONFIG_ENV_OFFSET              0x120000    /* env start */
  #define CONFIG_ENV_OFFSET_REDUND       0x2A0000    /* redundant env start */
-#define CONFIG_ENV_SIZE                        (16 << 10)  /* use 16KiB for env */
  #define CONFIG_ENV_RANGE               (384 << 10) /* allow badblocks in env */
  
  /* the loadaddr is the same as CONFIG_SYS_LOAD_ADDR, unfortunately the defiend
diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h

index fa38274..ee72354 100644 (file)
--- a/include/configs/usb_a9263.h
+++ b/include/configs/usb_a9263.h
@@ -79,9 +79,6 @@
  #define CONFIG_SYS_MEMTEST_END                 0x23e00000
  
  /* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CONFIG_ENV_OFFSET      0x2000
-#define CONFIG_ENV_SIZE                0x2000
-#define CONFIG_ENV_SECT_SIZE   CONFIG_ENV_SIZE
  #define CONFIG_BOOTCOMMAND     "nboot 21000000 0"
  #define CONFIG_EXTRA_ENV_SETTINGS \
         "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
diff --git a/include/configs/wb50n.h b/include/configs/wb50n.h

index e3973d0..81d30a6 100644 (file)
--- a/include/configs/wb50n.h
+++ b/include/configs/wb50n.h
@@ -74,9 +74,7 @@
      "autostart=no\0"
  
  /* bootstrap + u-boot + env in nandflash */
-#define CONFIG_ENV_OFFSET           0xA0000
  #define CONFIG_ENV_OFFSET_REDUND    0xC0000
-#define CONFIG_ENV_SIZE             0x20000
  #define CONFIG_BOOTCOMMAND \
      "nand read 0x22000000 0x000e0000 0x500000; " \
      "bootm"
author	Markus Klotzbuecher <markus.klotzbuecher@kistler.com>
	Wed, 15 May 2019 13:15:54 +0000 (15:15 +0200)
committer	Heiko Schocher <hs@denx.de>
	Tue, 9 Jul 2019 05:00:21 +0000 (07:00 +0200)
configs/am335x_guardian_defconfig		patch \| blob \| history
configs/am335x_igep003x_defconfig		patch \| blob \| history
configs/am335x_pdu001_defconfig		patch \| blob \| history
configs/am335x_shc_defconfig		patch \| blob \| history
configs/am335x_shc_ict_defconfig		patch \| blob \| history
configs/am335x_shc_netboot_defconfig		patch \| blob \| history
configs/am335x_shc_sdboot_defconfig		patch \| blob \| history
configs/am335x_sl50_defconfig		patch \| blob \| history
configs/am43xx_evm_defconfig		patch \| blob \| history
configs/am43xx_evm_qspiboot_defconfig		patch \| blob \| history
configs/am43xx_evm_rtconly_defconfig		patch \| blob \| history
configs/am43xx_evm_usbhost_boot_defconfig		patch \| blob \| history
configs/am43xx_hs_evm_defconfig		patch \| blob \| history
configs/at91rm9200ek_defconfig		patch \| blob \| history
configs/at91rm9200ek_ram_defconfig		patch \| blob \| history
configs/at91sam9260ek_dataflash_cs0_defconfig		patch \| blob \| history
configs/at91sam9260ek_dataflash_cs1_defconfig		patch \| blob \| history
configs/at91sam9261ek_dataflash_cs0_defconfig		patch \| blob \| history
configs/at91sam9261ek_dataflash_cs3_defconfig		patch \| blob \| history
configs/at91sam9263ek_dataflash_cs0_defconfig		patch \| blob \| history
configs/at91sam9263ek_dataflash_defconfig		patch \| blob \| history
configs/at91sam9263ek_norflash_boot_defconfig		patch \| blob \| history
configs/at91sam9263ek_norflash_defconfig		patch \| blob \| history
configs/at91sam9g10ek_dataflash_cs0_defconfig		patch \| blob \| history
configs/at91sam9g10ek_dataflash_cs3_defconfig		patch \| blob \| history
configs/at91sam9g20ek_2mmc_defconfig		patch \| blob \| history
configs/at91sam9g20ek_dataflash_cs0_defconfig		patch \| blob \| history
configs/at91sam9g20ek_dataflash_cs1_defconfig		patch \| blob \| history
configs/at91sam9m10g45ek_mmc_defconfig		patch \| blob \| history
configs/at91sam9n12ek_mmc_defconfig		patch \| blob \| history
configs/at91sam9n12ek_spiflash_defconfig		patch \| blob \| history
configs/at91sam9rlek_dataflash_defconfig		patch \| blob \| history
configs/at91sam9rlek_mmc_defconfig		patch \| blob \| history
configs/at91sam9x5ek_dataflash_defconfig		patch \| blob \| history
configs/at91sam9x5ek_mmc_defconfig		patch \| blob \| history
configs/at91sam9x5ek_spiflash_defconfig		patch \| blob \| history
configs/at91sam9xeek_dataflash_cs0_defconfig		patch \| blob \| history
configs/at91sam9xeek_dataflash_cs1_defconfig		patch \| blob \| history
configs/axm_defconfig		patch \| blob \| history
configs/brppt1_mmc_defconfig		patch \| blob \| history
configs/brppt1_nand_defconfig		patch \| blob \| history
configs/brppt1_spi_defconfig		patch \| blob \| history
configs/brxre1_defconfig		patch \| blob \| history
configs/chiliboard_defconfig		patch \| blob \| history
configs/cm_t335_defconfig		patch \| blob \| history
configs/cm_t35_defconfig		patch \| blob \| history
configs/cm_t43_defconfig		patch \| blob \| history
configs/cm_t54_defconfig		patch \| blob \| history
configs/corvus_defconfig		patch \| blob \| history
configs/draco_defconfig		patch \| blob \| history
configs/etamin_defconfig		patch \| blob \| history
configs/ethernut5_defconfig		patch \| blob \| history
configs/gardena-smart-gateway-at91sam_defconfig		patch \| blob \| history
configs/gurnard_defconfig		patch \| blob \| history
configs/igep00x0_defconfig		patch \| blob \| history
configs/meesc_dataflash_defconfig		patch \| blob \| history
configs/meesc_defconfig		patch \| blob \| history
configs/omap3_overo_defconfig		patch \| blob \| history
configs/omap4_sdp4430_defconfig		patch \| blob \| history
configs/pengwyn_defconfig		patch \| blob \| history
configs/picosam9g45_defconfig		patch \| blob \| history
configs/pm9261_defconfig		patch \| blob \| history
configs/pm9263_defconfig		patch \| blob \| history
configs/pxm2_defconfig		patch \| blob \| history
configs/rastaban_defconfig		patch \| blob \| history
configs/rut_defconfig		patch \| blob \| history
configs/sama5d27_som1_ek_mmc1_defconfig		patch \| blob \| history
configs/sama5d27_som1_ek_mmc_defconfig		patch \| blob \| history
configs/sama5d2_icp_mmc_defconfig		patch \| blob \| history
configs/sama5d2_ptc_ek_mmc_defconfig		patch \| blob \| history
configs/sama5d2_xplained_emmc_defconfig		patch \| blob \| history
configs/sama5d2_xplained_mmc_defconfig		patch \| blob \| history
configs/sama5d2_xplained_spiflash_defconfig		patch \| blob \| history
configs/sama5d36ek_cmp_mmc_defconfig		patch \| blob \| history
configs/sama5d36ek_cmp_spiflash_defconfig		patch \| blob \| history
configs/sama5d3_xplained_mmc_defconfig		patch \| blob \| history
configs/sama5d3xek_mmc_defconfig		patch \| blob \| history
configs/sama5d3xek_spiflash_defconfig		patch \| blob \| history
configs/sama5d4_xplained_mmc_defconfig		patch \| blob \| history
configs/sama5d4_xplained_spiflash_defconfig		patch \| blob \| history
configs/sama5d4ek_mmc_defconfig		patch \| blob \| history
configs/sama5d4ek_spiflash_defconfig		patch \| blob \| history
configs/smartweb_defconfig		patch \| blob \| history
configs/snapper9260_defconfig		patch \| blob \| history
configs/snapper9g20_defconfig		patch \| blob \| history
configs/taurus_defconfig		patch \| blob \| history
configs/thuban_defconfig		patch \| blob \| history
configs/ti816x_evm_defconfig		patch \| blob \| history
configs/tricorder_defconfig		patch \| blob \| history
configs/tricorder_flash_defconfig		patch \| blob \| history
configs/usb_a9263_dataflash_defconfig		patch \| blob \| history
configs/vinco_defconfig		patch \| blob \| history
configs/wb45n_defconfig		patch \| blob \| history
configs/wb50n_defconfig		patch \| blob \| history
env/Kconfig		patch \| blob \| history
include/configs/am335x_evm.h		patch \| blob \| history
include/configs/am335x_igep003x.h		patch \| blob \| history
include/configs/am335x_sl50.h		patch \| blob \| history
include/configs/am3517_crane.h		patch \| blob \| history
include/configs/am3517_evm.h		patch \| blob \| history
include/configs/am43xx_evm.h		patch \| blob \| history
include/configs/am57xx_evm.h		patch \| blob \| history
include/configs/at91-sama5_common.h		patch \| blob \| history
include/configs/at91rm9200ek.h		patch \| blob \| history
include/configs/baltos.h		patch \| blob \| history
include/configs/bav335x.h		patch \| blob \| history
include/configs/brppt1.h		patch \| blob \| history
include/configs/chiliboard.h		patch \| blob \| history
include/configs/cm_t335.h		patch \| blob \| history
include/configs/cm_t35.h		patch \| blob \| history
include/configs/cm_t43.h		patch \| blob \| history
include/configs/corvus.h		patch \| blob \| history
include/configs/devkit8000.h		patch \| blob \| history
include/configs/dra7xx_evm.h		patch \| blob \| history
include/configs/ethernut5.h		patch \| blob \| history
include/configs/gardena-smart-gateway-at91sam.h		patch \| blob \| history
include/configs/kc1.h		patch \| blob \| history
include/configs/nokia_rx51.h		patch \| blob \| history
include/configs/omap3_beagle.h		patch \| blob \| history
include/configs/omap3_cairo.h		patch \| blob \| history
include/configs/omap3_evm.h		patch \| blob \| history
include/configs/omap3_igep00x0.h		patch \| blob \| history
include/configs/omap3_logic.h		patch \| blob \| history
include/configs/omap3_overo.h		patch \| blob \| history
include/configs/omap3_pandora.h		patch \| blob \| history
include/configs/omap3_zoom1.h		patch \| blob \| history
include/configs/omap5_uevm.h		patch \| blob \| history
include/configs/pcm051.h		patch \| blob \| history
include/configs/pepper.h		patch \| blob \| history
include/configs/siemens-am33x-common.h		patch \| blob \| history
include/configs/smartweb.h		patch \| blob \| history
include/configs/snapper9260.h		patch \| blob \| history
include/configs/snapper9g45.h		patch \| blob \| history
include/configs/sniper.h		patch \| blob \| history
include/configs/tam3517-common.h		patch \| blob \| history
include/configs/tao3530.h		patch \| blob \| history
include/configs/taurus.h		patch \| blob \| history
include/configs/ti814x_evm.h		patch \| blob \| history
include/configs/ti_omap4_common.h		patch \| blob \| history
include/configs/tricorder.h		patch \| blob \| history
include/configs/usb_a9263.h		patch \| blob \| history
include/configs/wb50n.h		patch \| blob \| history