ARM64: zynqmp: Changes to fix broken zynqmp mini qspi

Decrease the zynqmp mini uboot size to get it working
on latest master.
common/Makefile will be solved in next upgrade when CMD_FDT config
option is introduced.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/common/Makefile b/common/Makefile
index f84d5b5cdb43587de496ca1dc1e38856035914dd..9be6006c4d33e94fae223e1ae0467a35d674f095 100644 (file)
--- a/common/Makefile
+++ b/common/Makefile
@@ -98,7 +98,11 @@ obj-$(CONFIG_CMD_EXT4) += cmd_ext4.o
 obj-$(CONFIG_CMD_EXT2) += cmd_ext2.o
 obj-$(CONFIG_CMD_FAT) += cmd_fat.o
 obj-$(CONFIG_CMD_FDC) += cmd_fdc.o
+ifdef CONFIG_TARGET_ZYNQMP_MINI
+obj-$(CONFIG_OF_LIBFDT) += fdt_support.o
+else
 obj-$(CONFIG_OF_LIBFDT) += cmd_fdt.o fdt_support.o
+endif
 obj-$(CONFIG_CMD_FITUPD) += cmd_fitupd.o
 obj-$(CONFIG_CMD_FLASH) += cmd_flash.o
 ifdef CONFIG_FPGA

diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig
index b42a0d35880abd16d1192f82ac80131da8b582ae..3db7a26fdc6f818b5c010e5547988bb6886d9536 100644 (file)
--- a/configs/xilinx_zynqmp_mini_qspi_defconfig
+++ b/configs/xilinx_zynqmp_mini_qspi_defconfig
@@ -4,13 +4,13 @@ CONFIG_TARGET_ZYNQMP_MINI=y
 CONFIG_ZYNQMP_QSPI=y
 CONFIG_SYS_TEXT_BASE=0xFFFC0000
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-qspi"
-CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="MINI_QSPI"
 CONFIG_SYS_PROMPT="ZynqMP> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_BOOTD is not set
 # CONFIG_CMD_BOOTM is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_GO is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_IMI is not set
@@ -33,6 +33,7 @@ CONFIG_SYS_PROMPT="ZynqMP> "
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_OF_EMBED=y
 # CONFIG_DM_WARN is not set
 # CONFIG_DM_DEVICE_REMOVE is not set

diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h
index 8b777321764cd436b6645b2e0bdeb504ac7b07e1..94110b435d7c9b24efeada3dedf4aaea46d72fd8 100644 (file)
--- a/include/configs/xilinx_zynqmp_mini.h
+++ b/include/configs/xilinx_zynqmp_mini.h
@@ -53,7 +53,14 @@
 #undef CONFIG_SYS_INIT_SP_ADDR
 #undef CONFIG_SYS_LONGHELP
 #undef CONFIG_CMD_CACHE
-
+#undef CONFIG_FPGA_ZYNQMPPL
+#undef CONFIG_FPGA_XILINX
+#undef CONFIG_FPGA
+#undef CONFIG_CMD_SF_TEST
+#undef CONFIG_CMD_GPIO
+#undef CONFIG_CMD_SPI
+#undef CONFIG_FIT_VERBOSE
+#undef CONFIG_ZYNQ_SERIAL
 #undef CONFIG_CMD_MII
 
 /* BOOTP options */