From: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Date: Fri, 14 Mar 2014 11:05:38 +0000 (+0530)
Subject: fpga: Guard the LOADMK functionality with config
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2688c19c39e94c213687e371cb936332eb5cce5;p=thirdparty%2Fu-boot.git

fpga: Guard the LOADMK functionality with config

Guard the LOADMK functionality with config to provide
an option to enable or disable it.
This will require to enable this option for all configs
in mainline.

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

diff --git a/common/cmd_fpga.c b/common/cmd_fpga.c
index 4d5caa041e7..d8d2401299c 100644
--- a/common/cmd_fpga.c
+++ b/common/cmd_fpga.c
@@ -184,6 +184,7 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 		rc = fpga_fsload(dev, fpga_data, data_size, &fpga_fsinfo);
 		break;
 #endif
+#ifdef CONFIG_FPGA_LOADMK
 	case FPGA_LOADMK:
 		switch (genimg_get_format(fpga_data)) {
 		case IMAGE_FORMAT_LEGACY:
@@ -262,7 +263,7 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 			break;
 		}
 		break;
-
+#endif
 	case FPGA_DUMP:
 		rc = fpga_dump(dev, fpga_data, data_size);
 		break;