From d7b551a6ed052e4cb4c60d83abf708fadf5a680b Mon Sep 17 00:00:00 2001 From: Siva Durga Prasad Paladugu Date: Thu, 31 Mar 2016 17:36:00 +0530 Subject: [PATCH] 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 Signed-off-by: Michal Simek --- common/Makefile | 4 ++++ configs/xilinx_zynqmp_mini_qspi_defconfig | 3 ++- include/configs/xilinx_zynqmp_mini.h | 9 ++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/common/Makefile b/common/Makefile index f84d5b5cdb4..9be6006c4d3 100644 --- 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 b42a0d35880..3db7a26fdc6 100644 --- 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 8b777321764..94110b435d7 100644 --- 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 */ -- 2.47.3