| Message ID | 9f258943f37c20efd993e54c14a7f7b1960811aa.1531911692.git.michal.simek@xilinx.com |
|---|---|
| State | Accepted |
| Commit | bb8920ed77ecc19fcbe55fbd7504775d7f7b51eb |
| Delegated to: | Michal Simek |
| Headers | show |
| Series | [U-Boot] arm: zynq: Setup ENV_SIZE via Kconfig | expand |
On 18.7.2018 13:01, Michal Simek wrote: > Simplify zynq_cse config by setting up ENV_SIZE via Kconfig. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > --- > > Based on: > https://lists.denx.de/pipermail/u-boot/2018-July/335126.html > > --- > configs/zynq_cse_nand_defconfig | 1 + > configs/zynq_cse_nor_defconfig | 1 + > configs/zynq_cse_qspi_defconfig | 1 + > include/configs/zynq_cse.h | 2 -- > 4 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/configs/zynq_cse_nand_defconfig b/configs/zynq_cse_nand_defconfig > index dcd4eda3ca3a..eb7e574040af 100644 > --- a/configs/zynq_cse_nand_defconfig > +++ b/configs/zynq_cse_nand_defconfig > @@ -2,6 +2,7 @@ CONFIG_ARM=y > CONFIG_SYS_CONFIG_NAME="zynq_cse" > CONFIG_ARCH_ZYNQ=y > CONFIG_SYS_TEXT_BASE=0x100000 > +CONFIG_ENV_SIZE=0x190 > CONFIG_SPL=y > CONFIG_SPL_STACK_R_ADDR=0x200000 > CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nand" > diff --git a/configs/zynq_cse_nor_defconfig b/configs/zynq_cse_nor_defconfig > index 9e2546b19785..95b31a0be66f 100644 > --- a/configs/zynq_cse_nor_defconfig > +++ b/configs/zynq_cse_nor_defconfig > @@ -2,6 +2,7 @@ CONFIG_ARM=y > CONFIG_SYS_CONFIG_NAME="zynq_cse" > CONFIG_ARCH_ZYNQ=y > CONFIG_SYS_TEXT_BASE=0xFFFC0000 > +CONFIG_ENV_SIZE=0x190 > CONFIG_SPL=y > CONFIG_SPL_STACK_R_ADDR=0x200000 > CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nor" > diff --git a/configs/zynq_cse_qspi_defconfig b/configs/zynq_cse_qspi_defconfig > index df6ebdc03a28..c094a5e7de48 100644 > --- a/configs/zynq_cse_qspi_defconfig > +++ b/configs/zynq_cse_qspi_defconfig > @@ -2,6 +2,7 @@ CONFIG_ARM=y > CONFIG_SYS_CONFIG_NAME="zynq_cse" > CONFIG_ARCH_ZYNQ=y > CONFIG_SYS_TEXT_BASE=0xFFFC0000 > +CONFIG_ENV_SIZE=0x190 > CONFIG_SPL=y > CONFIG_DEBUG_UART_BASE=0x0 > CONFIG_DEBUG_UART_CLOCK=0 > diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h > index adc02f0a4a3b..36fbe0eb5e2d 100644 > --- a/include/configs/zynq_cse.h > +++ b/include/configs/zynq_cse.h > @@ -18,7 +18,6 @@ > /* Undef unneeded configs */ > #undef CONFIG_EXTRA_ENV_SETTINGS > #undef CONFIG_BOARD_LATE_INIT > -#undef CONFIG_ENV_SIZE > #undef CONFIG_ZLIB > #undef CONFIG_GZIP > > @@ -28,7 +27,6 @@ > > #define CONFIG_SYS_CBSIZE 1024 > > -#define CONFIG_ENV_SIZE 400 > #undef CONFIG_SYS_INIT_RAM_ADDR > #undef CONFIG_SYS_INIT_RAM_SIZE > #define CONFIG_SYS_INIT_RAM_ADDR 0xFFFDE000 > Applied. M
diff --git a/configs/zynq_cse_nand_defconfig b/configs/zynq_cse_nand_defconfig index dcd4eda3ca3a..eb7e574040af 100644 --- a/configs/zynq_cse_nand_defconfig +++ b/configs/zynq_cse_nand_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_CONFIG_NAME="zynq_cse" CONFIG_ARCH_ZYNQ=y CONFIG_SYS_TEXT_BASE=0x100000 +CONFIG_ENV_SIZE=0x190 CONFIG_SPL=y CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nand" diff --git a/configs/zynq_cse_nor_defconfig b/configs/zynq_cse_nor_defconfig index 9e2546b19785..95b31a0be66f 100644 --- a/configs/zynq_cse_nor_defconfig +++ b/configs/zynq_cse_nor_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_CONFIG_NAME="zynq_cse" CONFIG_ARCH_ZYNQ=y CONFIG_SYS_TEXT_BASE=0xFFFC0000 +CONFIG_ENV_SIZE=0x190 CONFIG_SPL=y CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nor" diff --git a/configs/zynq_cse_qspi_defconfig b/configs/zynq_cse_qspi_defconfig index df6ebdc03a28..c094a5e7de48 100644 --- a/configs/zynq_cse_qspi_defconfig +++ b/configs/zynq_cse_qspi_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_CONFIG_NAME="zynq_cse" CONFIG_ARCH_ZYNQ=y CONFIG_SYS_TEXT_BASE=0xFFFC0000 +CONFIG_ENV_SIZE=0x190 CONFIG_SPL=y CONFIG_DEBUG_UART_BASE=0x0 CONFIG_DEBUG_UART_CLOCK=0 diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h index adc02f0a4a3b..36fbe0eb5e2d 100644 --- a/include/configs/zynq_cse.h +++ b/include/configs/zynq_cse.h @@ -18,7 +18,6 @@ /* Undef unneeded configs */ #undef CONFIG_EXTRA_ENV_SETTINGS #undef CONFIG_BOARD_LATE_INIT -#undef CONFIG_ENV_SIZE #undef CONFIG_ZLIB #undef CONFIG_GZIP @@ -28,7 +27,6 @@ #define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_ENV_SIZE 400 #undef CONFIG_SYS_INIT_RAM_ADDR #undef CONFIG_SYS_INIT_RAM_SIZE #define CONFIG_SYS_INIT_RAM_ADDR 0xFFFDE000
Simplify zynq_cse config by setting up ENV_SIZE via Kconfig. Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- Based on: https://lists.denx.de/pipermail/u-boot/2018-July/335126.html --- configs/zynq_cse_nand_defconfig | 1 + configs/zynq_cse_nor_defconfig | 1 + configs/zynq_cse_qspi_defconfig | 1 + include/configs/zynq_cse.h | 2 -- 4 files changed, 3 insertions(+), 2 deletions(-)