On Wed, Jul 18, 2018 at 04:04:37PM +0200, Michal Simek wrote: > On 18.7.2018 14:28, Maxime Ripard wrote: > > 1;5202;0c > > On Wed, Jul 18, 2018 at 09:11:35AM +0200, Michal Simek wrote: > >> From: Vipul Kumar <[email protected]> > >> > >> This patch added support to enable CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET > >> and CONFIG_ENV_SECT_SIZE through Kconfig for Zynq and Zynqmp. > >> > >> Signed-off-by: Vipul Kumar <[email protected]> > >> Signed-off-by: Michal Simek <[email protected]> > >> --- > >> > >> Changes in v3: > >> - Fix also bitmain config which was failing > >> > >> Changes in v2: > >> - Changed if condition of ENV_SIZE for Zynqmp > >> - Changed if condition for ENV_SECT_SIZE > >> > >> configs/bitmain_antminer_s9_defconfig | 1 + > >> env/Kconfig | 28 ++++++++++++++++++++++++++++ > >> include/configs/bitmain_antminer_s9.h | 3 --- > >> include/configs/xilinx_zynqmp.h | 3 --- > >> include/configs/zynq-common.h | 13 ------------- > >> 5 files changed, 29 insertions(+), 19 deletions(-) > >> > >> diff --git a/configs/bitmain_antminer_s9_defconfig > >> b/configs/bitmain_antminer_s9_defconfig > >> index 40bce4e37482..f59c767242f1 100644 > >> --- a/configs/bitmain_antminer_s9_defconfig > >> +++ b/configs/bitmain_antminer_s9_defconfig > >> @@ -4,6 +4,7 @@ CONFIG_SYS_BOARD="antminer_s9" > >> CONFIG_SYS_CONFIG_NAME="bitmain_antminer_s9" > >> CONFIG_ARCH_ZYNQ=y > >> CONFIG_SYS_TEXT_BASE=0x4000000 > >> +CONFIG_ENV_OFFSET=0x300000 > >> CONFIG_SPL=y > >> CONFIG_DEBUG_UART_BASE=0xe0001000 > >> CONFIG_DEBUG_UART_CLOCK=50000000 > >> diff --git a/env/Kconfig b/env/Kconfig > >> index 8618376f252f..b37dcd78eb75 100644 > >> --- a/env/Kconfig > >> +++ b/env/Kconfig > >> @@ -480,6 +480,34 @@ config ENV_SIZE > >> > >> endif > >> > >> +if ARCH_ZYNQMP || ARCH_ZYNQ > >> + > >> +config ENV_OFFSET > >> + hex "Environment Offset" > >> + depends on !ENV_IS_NOWHERE > >> + default 0x1E00000 if ARCH_ZYNQMP > >> + default 0xE0000 if ARCH_ZYNQ > >> + 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 0x8000 if ARCH_ZYNQMP > >> + default 0x20000 if ARCH_ZYNQ > >> + help > >> + Size of the environment storage area. > > > > These two are already defined in Kconfig, you can probably just add a > > default <value> if ARCH_ZYNQ* there. > > we just follow the same style which SUNXI and ROCKCHIP are using.
We should definitely merge these two yeah. > I am happy to create a patch on the top of this one to merge these 3 > together because it will require some testing. I have already some > patches depends on this one. But that can also happen as a second step, you're right. Maxime -- Maxime Ripard, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
signature.asc
Description: PGP signature
_______________________________________________ U-Boot mailing list [email protected] https://lists.denx.de/listinfo/u-boot
