From: Michal Simek <michal.simek@xilinx.com>
Date: Thu, 24 May 2018 10:29:45 +0000 (+0200)
Subject: arm: zynq: Remove spl fpga support
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce170a99b81c94b5acacf3b8447123d62544f81a;p=thirdparty%2Fu-boot.git

arm: zynq: Remove spl fpga support

This is not the way how this should be implemented.
Right now there is fit image format which should be extended to cover
this feature.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index 822a2255ee7..b57e0b04e46 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -15,9 +15,6 @@
 #include <errno.h>
 #include <mmc.h>
 #include <image.h>
-#include <fat.h>
-#include <fpga.h>
-#include <xilinx.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -235,36 +232,6 @@ static int mmc_load_image_raw_os(struct spl_image_info *spl_image,
 }
 #endif
 
-#ifdef CONFIG_SPL_FPGA_SUPPORT
-static int mmc_load_fpga_image_fat(struct spl_image_info *spl_image,
-				   struct mmc *mmc)
-{
-	int err;
-	int devnum = 0;
-	const fpga_desc *const desc = fpga_get_desc(devnum);
-	xilinx_desc *desc_xilinx = desc->devdesc;
-
-	err = spl_load_image_fat(spl_image, mmc_get_blk_desc(mmc),
-					CONFIG_SYS_MMCSD_FS_BOOT_PARTITION,
-					CONFIG_SPL_FPGA_LOAD_ARGS_NAME);
-
-	if (err) {
-#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
-		printf("spl: error reading image %s, err - %d\n",
-		       CONFIG_SPL_FPGA_LOAD_ARGS_NAME, err);
-#endif
-		return -1;
-	}
-#ifdef CONFIG_SPL_FPGA_BIT
-	return fpga_loadbitstream(devnum, (char *)spl_image->load_addr,
-				  desc_xilinx->size, BIT_FULL);
-#else
-	return fpga_load(devnum, (const void *)spl_image->load_addr,
-			 desc_xilinx->size, BIT_FULL);
-#endif
-}
-#endif
-
 #ifdef CONFIG_SYS_MMCSD_FS_BOOT_PARTITION
 static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image, struct mmc *mmc)
 {
@@ -384,10 +351,6 @@ int spl_mmc_load_image(struct spl_image_info *spl_image,
 	case MMCSD_MODE_FS:
 		debug("spl: mmc boot mode: fs\n");
 
-#ifdef CONFIG_SPL_FPGA_SUPPORT
-		mmc_load_fpga_image_fat(spl_image, mmc);
-#endif
-
 		err = spl_mmc_do_fs_boot(spl_image, mmc);
 		if (!err)
 			return err;
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index ee2a1c83504..25b0e2fc21e 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -366,16 +366,6 @@
 /* SPL part */
 #define CONFIG_SPL_FRAMEWORK
 
-/* FPGA support */
-#define CONFIG_SPL_FPGA_SUPPORT
-#define CONFIG_SPL_FPGA_LOAD_ADDR      0x1000000
-/* #define CONFIG_SPL_FPGA_BIT */
-#ifdef CONFIG_SPL_FPGA_BIT
-# define CONFIG_SPL_FPGA_LOAD_ARGS_NAME "download.bit"
-#else
-# define CONFIG_SPL_FPGA_LOAD_ARGS_NAME "fpga.bin"
-#endif
-
 /* MMC support */
 #ifdef CONFIG_MMC_SDHCI_ZYNQ
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1