Parcourir la source

arm64: zynqmp: Setup ENV_SIZE via Kconfig for mini targets

Mini targets are using different ENV_SIZE then standard one that's why
defconfigs should be updated to simplify config files.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Michal Simek il y a 5 ans
Parent
commit
a133b3ac32

+ 1 - 0
configs/xilinx_zynqmp_mini_emmc0_defconfig

@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_emmc"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_TEXT_BASE=0x10000
+CONFIG_ENV_SIZE=0x10000
 # CONFIG_CMD_ZYNQMP is not set
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-emmc0"
 CONFIG_ENV_VARS_UBOOT_CONFIG=y

+ 1 - 0
configs/xilinx_zynqmp_mini_emmc1_defconfig

@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_emmc"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_TEXT_BASE=0x10000
+CONFIG_ENV_SIZE=0x10000
 # CONFIG_CMD_ZYNQMP is not set
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-emmc1"
 CONFIG_ENV_VARS_UBOOT_CONFIG=y

+ 1 - 0
configs/xilinx_zynqmp_mini_nand_defconfig

@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_nand"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_TEXT_BASE=0x10000
+CONFIG_ENV_SIZE=0x10000
 # CONFIG_CMD_ZYNQMP is not set
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-nand"
 CONFIG_ENV_VARS_UBOOT_CONFIG=y

+ 1 - 0
configs/xilinx_zynqmp_mini_qspi_defconfig

@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_qspi"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_TEXT_BASE=0xFFFC0000
+CONFIG_ENV_SIZE=0x578
 CONFIG_SYS_MEM_RSVD_FOR_MMU=y
 CONFIG_ZYNQMP_NO_DDR=y
 # CONFIG_CMD_ZYNQMP is not set

+ 0 - 1
include/configs/xilinx_zynqmp_mini.h

@@ -17,7 +17,6 @@
 /* Undef unneeded configs */
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #undef CONFIG_SYS_MALLOC_LEN
-#undef CONFIG_ENV_SIZE
 #undef CONFIG_ZLIB
 #undef CONFIG_GZIP
 #undef CONFIG_CMD_ENV

+ 0 - 1
include/configs/xilinx_zynqmp_mini_emmc.h

@@ -14,7 +14,6 @@
 
 #define CONFIG_SYS_ICACHE_OFF
 #define CONFIG_NR_DRAM_BANKS	1
-#define CONFIG_ENV_SIZE		0x10000
 #define CONFIG_SYS_INIT_SP_ADDR	CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MALLOC_LEN	0x800000
 

+ 0 - 1
include/configs/xilinx_zynqmp_mini_nand.h

@@ -16,7 +16,6 @@
 #define CONFIG_NR_DRAM_BANKS	1
 #define CONFIG_SYS_SDRAM_SIZE	0x1000000
 #define CONFIG_SYS_SDRAM_BASE	0x0
-#define CONFIG_ENV_SIZE		0x10000
 #define CONFIG_SYS_INIT_SP_ADDR	(CONFIG_SYS_SDRAM_BASE + 0x40000)
 #define CONFIG_SYS_MALLOC_LEN		0x800000
 

+ 0 - 1
include/configs/xilinx_zynqmp_mini_qspi.h

@@ -14,7 +14,6 @@
 
 #define CONFIG_SYS_ICACHE_OFF
 #define CONFIG_NR_DRAM_BANKS	1
-#define CONFIG_ENV_SIZE		1400
 #define CONFIG_SYS_INIT_SP_ADDR	(CONFIG_SYS_TEXT_BASE + 0x20000)
 #define CONFIG_SYS_MALLOC_LEN	0x2000