summaryrefslogtreecommitdiff
path: root/include/configs/at91-sama5_common.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-07-10 10:40:14 -0400
committerTom Rini <trini@konsulko.com>2019-07-10 13:18:54 -0400
commita52f1fe4081a485254850cc2944e8e7dfbc3f66c (patch)
tree83609ad72433e0091ce4f567b1cf8075f8cfe974 /include/configs/at91-sama5_common.h
parentb4944e25744aa42dc23c6912e1cd4ccad270c4e0 (diff)
parenta2257d378ea8b2c2fa7dbf01b4703a53be431819 (diff)
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-ubi
[trini: Migrate sama5d27_som1_ek_qspiflash/sama5d2_xplained_qspiflash for CONFIG_ENV_SECT_SIZE] Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/at91-sama5_common.h')
-rw-r--r--include/configs/at91-sama5_common.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index fc46540a10..1b8373fbc6 100644
--- 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; " \
@@ -75,7 +70,6 @@
#elif CONFIG_QSPI_BOOT
#define CONFIG_ENV_OFFSET 0x140000
#define CONFIG_ENV_SIZE 0x20000
-#define CONFIG_ENV_SECT_SIZE 0x1000
#define CONFIG_BOOTCOMMAND "sf probe 0; " \
"sf read 0x21000000 0x180000 0x80000; " \
"sf read 0x22000000 0x200000 0x600000; " \