summaryrefslogtreecommitdiff
path: root/include/configs/at91-sama5_common.h
diff options
context:
space:
mode:
authorTudor Ambarus <tudor.ambarus@microchip.com>2019-09-20 13:52:58 +0300
committerEugen Hristev <eugen.hristev@microchip.com>2019-09-30 09:15:23 +0300
commit27a5d628275f9cdd2ca221f560a19d3dea4753f3 (patch)
tree8e793cd126c71da836a465534adb99c34f7547d9 /include/configs/at91-sama5_common.h
parente074d0f79b2e2893e5c1752b2c302bb4aa5a491e (diff)
downloadu-boot-27a5d628275f9cdd2ca221f560a19d3dea4753f3.tar.xz
at91: configs: Drop duplication of defconfig macros
'commit a9221f3ebd6d ("at91, omap2plus: configs: migrate CONFIG_ENV_ to defconfigs")' migrated CONFIG_ENV_ macros to defconfigs but did not remove the identical redefinition of these macros in include/configs/. Since the duplicated macros have the same value as the ones in defconfigs, no "redefined" warnings were raised. Remove duplicated macros for all sama5 and sam9x5ek boards. While verifying that the removal of the macros from include/configs did not change the same macros in defconfigs, overwrite the old defconfig by saving them with the output from "make arch=ARM savedefconfig". This resulted in the movement of some macros in the defconfig files. Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Diffstat (limited to 'include/configs/at91-sama5_common.h')
-rw-r--r--include/configs/at91-sama5_common.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index 7af6b8b843..6131277367 100644
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -35,13 +35,7 @@
#ifdef CONFIG_SD_BOOT
#ifdef CONFIG_ENV_IS_IN_MMC
-/* Use raw reserved sectors to save environment */
-#define CONFIG_ENV_OFFSET 0x2000
-#define CONFIG_ENV_SIZE 0x1000
#define CONFIG_SYS_MMC_ENV_DEV 0
-#else
-/* u-boot env in sd/mmc card */
-#define CONFIG_ENV_SIZE 0x4000
#endif
#define CONFIG_BOOTCOMMAND "if test ! -n ${dtb_name}; then " \
@@ -66,8 +60,6 @@
"sf read 0x22000000 0x6c000 0x394000; " \
"bootz 0x22000000 - 0x21000000"
#elif CONFIG_QSPI_BOOT
-#define CONFIG_ENV_OFFSET 0x140000
-#define CONFIG_ENV_SIZE 0x20000
#define CONFIG_BOOTCOMMAND "sf probe 0; " \
"sf read 0x21000000 0x180000 0x80000; " \
"sf read 0x22000000 0x200000 0x600000; " \