diff options
| author | Tom Rini <trini@konsulko.com> | 2018-04-23 10:50:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-04-23 10:50:38 -0400 |
| commit | ff719a73d93196d6f1d9456bdc40f48be4f91484 (patch) | |
| tree | 70eaed09edece71194090bcbeb47e51f49512fd1 /include/configs | |
| parent | f6549c85410668e73503221ce6147d049cc6251d (diff) | |
| parent | ebc675b98d92f7b8264ca84e65cc896d95f9868b (diff) | |
| download | u-boot-ff719a73d93196d6f1d9456bdc40f48be4f91484.tar.gz u-boot-ff719a73d93196d6f1d9456bdc40f48be4f91484.tar.xz u-boot-ff719a73d93196d6f1d9456bdc40f48be4f91484.zip | |
Merge tag 'xilinx-for-v2018.05-rc3' of git://git.denx.de/u-boot-microblaze
Xilinx fixes for v2018.05-rc3
- Fix nand initialization
- Runtime ddr detection for static DDR setting
- Enable rewriting env locations
- Sync defconfig for zc770 xm011
- Remove useless ioremap in watchdog
- Check return value from soc_clk_dump()
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/zynq-common.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index ae82a7aa96..baad8db62f 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -127,7 +127,9 @@ #endif /* Total Size of Environment Sector */ -#define CONFIG_ENV_SIZE (128 << 10) +#ifndef CONFIG_ENV_SIZE +# define CONFIG_ENV_SIZE (128 << 10) +#endif /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE @@ -135,7 +137,9 @@ /* Environment */ #ifndef CONFIG_ENV_IS_NOWHERE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE -# define CONFIG_ENV_OFFSET 0xE0000 +# ifndef CONFIG_ENV_OFFSET +# define CONFIG_ENV_OFFSET 0xE0000 +# endif #endif /* enable preboot to be loaded before CONFIG_BOOTDELAY */ |