Skip to contentSkip to conversation

Add support for loading FPGA bitstream

PATCH New tien.fong.chee at intel.com 3 participants 14 messages May 7, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

v13 cover Add support for loading FPGA bitstream

From: Tien Fong Chee <[email protected]>

This version mainly resolved comments from Simon in [v12].

This series is working on top of u-boot.git http://git.denx.de/u-boot.git

[v12]: https://patchwork.ozlabs.org/cover/1058282/
[v11]: https://www.mail-archive.com/u-boot at lists.denx.de/msg318174.html [v10]: https://www.mail-archive.com/u-boot at lists.denx.de/msg318167.html [v9]: https://www.mail-archive.com/u-boot at lists.denx.de/msg316086.html [v8]: https://www.mail-archive.com/u-boot at lists.denx.de/msg316086.html [v7]: https://www.mail-archive.com/u-boot at lists.denx.de/msg314511.html

Tien Fong Chee (9):
ARM: socfpga: Description on FPGA bitstream type and file name for
Arria 10
ARM: socfpga: Add default FPGA bitstream fitImage for Arria10 SoCDK
ARM: socfpga: Cleaning up and ensuring consistent format messages in
driver
ARM: socfpga: Moving the watchdog reset to the for-loop status polling
ARM: socfpga: Add FPGA drivers for Arria 10 FPGA bitstream loading
ARM: socfpga: Add the configuration for FPGA SoCFPGA A10 SoCDK spl : socfpga: Implement fpga bitstream loading with socfpga loadfs
ARM: socfpga: Synchronize the configuration for A10 SoCDK
ARM: socfpga: Increase Malloc pool size to support FAT filesystem in
SPL

 arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts       |  17 +
 .../include/mach/fpga_manager_arria10.h            |  40 +-
 arch/arm/mach-socfpga/spl_a10.c                    |  31 +-
 board/altera/arria10-socdk/fit_spl_fpga.its        |  38 ++
 configs/socfpga_arria10_defconfig                  |  23 +-
 .../fpga/altera-socfpga-a10-fpga-mgr.txt           |  26 +-
 drivers/fpga/socfpga_arria10.c                     | 514 ++++++++++++++++++++-
 include/configs/socfpga_arria10_socdk.h            |   5 +-
 include/image.h                                    |   4 +
 9 files changed, 668 insertions(+), 30 deletions(-)
 create mode 100644 board/altera/arria10-socdk/fit_spl_fpga.its
Signature · 1 line
2.13.0
#1 lore raw

PATCH v13 1/9 ARM: socfpga: Description on FPGA bitstream type and file name for Arria 10

From: Tien Fong Chee <[email protected]>

This patch adds description on properties about file name used for both peripheral bitstream and core bitstream.

---

changes for v13
- No changes.

changes for v12
- No changes.

changes for v11
- No changes.

changes for v10
- No changes.

changes for v9
- No changes.

changes for v8
- Removed explanation about support for altr,bitstream-core

changes for v7
- Provided example of setting FPGA FIT image for both early IO release and full release FPGA configuration.

---
 .../fpga/altera-socfpga-a10-fpga-mgr.txt           | 26 +++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)
doc/device-tree-bindings/fpga/altera-socfpga-a10-fpga-mgr.txt +25 -1
index 2fd8e7a847..da210bfc86 100644
@@ -7,8 +7,31 @@ Required properties:
                - The second index is for writing FPGA configuration data.
 - resets     : Phandle and reset specifier for the device's reset.
 - clocks     : Clocks used by the device.
+- altr,bitstream : Fit image file name for both FPGA peripheral bitstream,
+		   FPGA core bitstream and full bitstream.
 
-Example:
+		   Full bitstream, consist of peripheral bitstream and core
+		   bitstream.
+
+		   FPGA peripheral bitstream is used to initialize FPGA IOs,
+		   PLL, IO48 and DDR. This bitstream is required to get DDR up
+		   running.
+
+		   FPGA core bitstream contains FPGA design which is used to
+		   program FPGA CRAM and ERAM.
+
+Example: Bundles both peripheral bitstream and core bitstream into FIT image
+	 called fit_spl_fpga.itb. This FIT image can be created through running
+	 this command: tools/mkimage
+		       -E -p 400
+		       -f board/altera/arria10-socdk/fit_spl_fpga.its
+		       fit_spl_fpga.itb
+
+	 For details of describing structure and contents of the FIT image,
+	 please refer board/altera/arria10-socdk/fit_spl_fpga.its
+
+- Examples for booting with full release or booting with early IO release, then
+  follow by entering early user mode:
 
 	fpga_mgr: fpga-mgr at ffd03000 {
 		compatible = "altr,socfpga-a10-fpga-mgr";
@@ -16,4 +39,5 @@ Example:
 		       0xffcfe400 0x20>;
 		clocks = <&l4_mp_clk>;
 		resets = <&rst FPGAMGR_RESET>;
+		altr,bitstream = "fit_spl_fpga.itb";
 	};
Signature · 1 line
2.13.0
#2 lore raw

PATCH v13 2/9 ARM: socfpga: Add default FPGA bitstream fitImage for Arria10 SoCDK

In reply to tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Add default fitImage file bundling FPGA bitstreams for Arria10.

---

changes for v13
- No changes.

changes for v12
- No changes.

changes for v11
- Replaced core image node "-2" with "-1",
the numeric associates the core and periph images in case where there are multiple.

changes for v10
- Replaced both image nodes "@1" and "@2" with "-1" and "-2" respectively.

changes for v9
- Reordered the images and fpga configurations.
- Removed the load property at core image.

changes for v8
- Changed the FPGA node name to fpga-core and fpga-periph for both core and periph bitstreams respectively.

changes for v7
- No changes.

---
 board/altera/arria10-socdk/fit_spl_fpga.its | 38 +++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 board/altera/arria10-socdk/fit_spl_fpga.its
board/altera/arria10-socdk/fit_spl_fpga.its new file +38 -0
new file mode 100644
index 0000000000..adae997213
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: GPL-2.0
+ /*
+ * Copyright (C) 2019 Intel Corporation <www.intel.com>
+ *
+ */
+
+/dts-v1/;
+
+/ {
+	description = "FIT image with FPGA bistream";
+	#address-cells = <1>;
+
+	images {
+		fpga-periph-1 {
+			description = "FPGA peripheral bitstream";
+			data = /incbin/("../../../ghrd_10as066n2.periph.rbf");
+			type = "fpga";
+			arch = "arm";
+			compression = "none";
+		};
+
+		fpga-core-1 {
+			description = "FPGA core bitstream";
+			data = /incbin/("../../../ghrd_10as066n2.core.rbf");
+			type = "fpga";
+			arch = "arm";
+			compression = "none";
+		};
+	};
+
+	configurations {
+		default = "config-1";
+		config-1 {
+			description = "Boot with FPGA early IO release config";
+			fpga = "fpga-periph-1", "fpga-core-1";
+		};
+	};
+};
Signature · 1 line
2.13.0
#3 lore raw

PATCH v13 3/9 ARM: socfpga: Cleaning up and ensuring consistent format messages in driver

In reply to tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Ensure all the debug messages are always prefix with "FPGA: " and comment beginning with uppercase letter.

---

changes for v13
- No changes.

changes for v12
- Improved the commit messages.

changes for v11
- No changes.

changes for v10
- This patch was split out from [PATCH v10 5/9]
ARM: socfpga: Add FPGA drivers for Arria 10 FPGA.

---
 drivers/fpga/socfpga_arria10.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/fpga/socfpga_arria10.c +7 -6
index 114dd910ab..b0abe1955c 100644
@@ -94,7 +94,7 @@ int fpgamgr_wait_early_user_mode(void)
 		i++;
 	}
 
-	debug("Additional %i sync word needed\n", i);
+	debug("FPGA: Additional %i sync word needed\n", i);
 
 	/* restoring original CDRATIO */
 	fpgamgr_set_cd_ratio(cd_ratio);
@@ -172,9 +172,10 @@ static int fpgamgr_set_cdratio_cdwidth(unsigned int cfg_width, u32 *rbf_data,
 	compress = (rbf_data[COMPRESSION_OFFSET] >> 1) & 1;
 	compress = !compress;
 
-	debug("header word %d = %08x\n", 69, rbf_data[69]);
-	debug("header word %d = %08x\n", 229, rbf_data[229]);
-	debug("read from rbf header: encrypt=%d compress=%d\n", encrypt, compress);
+	debug("FPGA: Header word %d = %08x.\n", 69, rbf_data[69]);
+	debug("FPGA: Header word %d = %08x.\n", 229, rbf_data[229]);
+	debug("FPGA: Read from rbf header: encrypt=%d compress=%d.\n", encrypt,
+	     compress);
 
 	/*
 	 * from the register map description of cdratio in imgcfg_ctrl_02:
@@ -455,10 +456,10 @@ int socfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size)
 {
 	int status;
 
-	/* disable all signals from hps peripheral controller to fpga */
+	/* Disable all signals from hps peripheral controller to fpga */
 	writel(0, &system_manager_base->fpgaintf_en_global);
 
-	/* disable all axi bridge (hps2fpga, lwhps2fpga & fpga2hps) */
+	/* Disable all axi bridge (hps2fpga, lwhps2fpga & fpga2hps) */
 	socfpga_bridges_reset();
 
 	/* Initialize the FPGA Manager */
Signature · 1 line
2.13.0
#4 lore raw

PATCH v13 4/9 ARM: socfpga: Moving the watchdog reset to the for-loop status polling

In reply to tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Current watchdog reset is misplaced after for-loop status polling, so this poses a risk that watchdog can't be reset timely if polling taking longer than watchdog timeout. This patch moving the watchdog reset into polling to ensure the watchdog can be reset timely.

---

changes for v13
- Improved the commit messages.

changes for v12
- Improved the commit messages.

changes for v11
- No changes.

changes for v10
- This patch was split out from [PATCH v10 5/9]
ARM: socfpga: Add FPGA drivers for Arria 10 FPGA.

---
 drivers/fpga/socfpga_arria10.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/fpga/socfpga_arria10.c +1 -1
index b0abe1955c..9499d1a014 100644
@@ -360,6 +360,7 @@ static int fpgamgr_program_poll_cd(void)
 			printf("nstatus == 0 while waiting for condone\n");
 			return -EPERM;
 		}
+		WATCHDOG_RESET();
 	}
 
 	if (i == FPGA_TIMEOUT_CNT)
@@ -433,7 +434,6 @@ int fpgamgr_program_finish(void)
 		printf("FPGA: Poll CD failed with error code %d\n", status);
 		return -EPERM;
 	}
-	WATCHDOG_RESET();
 
 	/* Ensure the FPGA entering user mode */
 	status = fpgamgr_program_poll_usermode();
Signature · 1 line
2.13.0
#5 lore raw

PATCH v13 5/9 ARM: socfpga: Add FPGA drivers for Arria 10 FPGA bitstream loading

In reply to tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Add FPGA driver to support program FPGA with FPGA bitstream loading from filesystem. The driver are designed based on generic firmware loader framework. The driver can handle FPGA program operation from loading FPGA bitstream in flash to memory and then to program FPGA.

---

Changes for v13
- Fixed the changes comment in v10

changes for v12
- No changes.

changes for v11
- No changes.

changes for v10
-Cleaned up the codes.
-Return -EPERM when programing core on non early IO release mode. -Using live function to get rid of gd->fdt_blob for FPGA manager. -Removed @0 for fs-loader node

changes for v9
- Support data offset
- Added default DDR load address
- Squashed the image.h
- Changed to phandle
- Ensure the DDR is fully up running by checking the gd->ram

changes for v8
- Added codes to discern bitstream type based on fpga node name.

changes for v7
- Restructure the FPGA driver to support both peripheral bitstream and core bitstream bundled into FIT image.
- Support loadable property for core bitstream. User can set loadable in DDR for better performance. This loading would be done in one large chunk instead of chunk by chunk loading with small memory buffer.

---
 arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts       |  17 +
 .../include/mach/fpga_manager_arria10.h            |  39 +-
 drivers/fpga/socfpga_arria10.c                     | 497 ++++++++++++++++++++-
 include/image.h                                    |   4 +
 4 files changed, 542 insertions(+), 15 deletions(-)
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +17 -0
index 998d811210..cc761967c7 100644
@@ -18,6 +18,23 @@
 /dts-v1/;
 #include "socfpga_arria10_socdk.dtsi"
 
+/ {
+	chosen {
+		firmware-loader = <&fs_loader0>;
+	};
+
+	fs_loader0: fs-loader {
+		u-boot,dm-pre-reloc;
+		compatible = "u-boot,fs-loader";
+		phandlepart = <&mmc 1>;
+	};
+};
+
+&fpga_mgr {
+	u-boot,dm-pre-reloc;
+	altr,bitstream = "fit_spl_fpga.itb";
+};
+
 &mmc {
 	u-boot,dm-pre-reloc;
 	status = "okay";
arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +37 -2
index 09d13f6fd3..c5f67714aa 100644
@@ -1,9 +1,13 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
- * Copyright (C) 2017 Intel Corporation <www.intel.com>
+ * Copyright (C) 2017-2019 Intel Corporation <www.intel.com>
  * All rights reserved.
  */
 
+#include <asm/cache.h>
+#include <altera.h>
+#include <image.h>
+
 #ifndef _FPGA_MANAGER_ARRIA10_H_
 #define _FPGA_MANAGER_ARRIA10_H_
 
@@ -51,6 +55,10 @@
 #define ALT_FPGAMGR_IMGCFG_CTL_02_CFGWIDTH_SET_MSK		BIT(24)
 #define ALT_FPGAMGR_IMGCFG_CTL_02_CDRATIO_LSB			16
 
+#define FPGA_SOCFPGA_A10_RBF_UNENCRYPTED	0xa65c
+#define FPGA_SOCFPGA_A10_RBF_ENCRYPTED		0xa65d
+#define FPGA_SOCFPGA_A10_RBF_PERIPH		0x0001
+#define FPGA_SOCFPGA_A10_RBF_CORE		0x8001
 #ifndef __ASSEMBLY__
 
 struct socfpga_fpga_manager {
@@ -88,12 +96,39 @@ struct socfpga_fpga_manager {
 	u32  imgcfg_fifo_status;
 };
 
+enum rbf_type {
+	unknown,
+	periph_section,
+	core_section
+};
+
+enum rbf_security {
+	invalid,
+	unencrypted,
+	encrypted
+};
+
+struct rbf_info {
+	enum rbf_type section;
+	enum rbf_security security;
+};
+
+struct fpga_loadfs_info {
+	fpga_fs_info *fpga_fsinfo;
+	u32 remaining;
+	u32 offset;
+	struct rbf_info rbfinfo;
+};
+
 /* Functions */
 int fpgamgr_program_init(u32 * rbf_data, size_t rbf_size);
 int fpgamgr_program_finish(void);
 int is_fpgamgr_user_mode(void);
 int fpgamgr_wait_early_user_mode(void);
-
+const char *get_fpga_filename(void);
+int socfpga_loadfs(fpga_fs_info *fpga_fsinfo, const void *buf, size_t bsize,
+		  u32 offset);
+void fpgamgr_program(const void *buf, size_t bsize, u32 offset);
 #endif /* __ASSEMBLY__ */
 
 #endif /* _FPGA_MANAGER_ARRIA10_H_ */
drivers/fpga/socfpga_arria10.c +484 -13

532 lines not on this page · raw message

include/image.h +4 -0
index 889305cbef..182f62d289 100644
@@ -1047,6 +1047,10 @@ int fit_check_format(const void *fit);
 
 int fit_conf_find_compat(const void *fit, const void *fdt);
 int fit_conf_get_node(const void *fit, const char *conf_uname);
+int fit_conf_get_prop_node_count(const void *fit, int noffset,
+		const char *prop_name);
+int fit_conf_get_prop_node_index(const void *fit, int noffset,
+		const char *prop_name, int index);
 
 /**
  * fit_conf_get_prop_node() - Get node refered to by a configuration
Signature · 1 line
2.13.0
#6 lore raw

PATCH v13 6/9 ARM: socfpga: Add the configuration for FPGA SoCFPGA A10 SoCDK

In reply to tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Update the default configuration file to enable the necessary functionality to get the SoCFPGA loadfs driver support. This would enable the implementation of programming bitstream into FPGA from MMC.

---

changes for v13
- No changes.

changes for v12
- No changes.

changes for v11
- No changes.

changes for v10
- No changes.

changes for v9
- No changes.

changes for v8
- Added FIT related configs

changes for v7
- Removed limit set for CONFIG_FS_FAT_MAX_CLUSTSIZE

---
 configs/socfpga_arria10_defconfig | 11 +++++++++++
 1 file changed, 11 insertions(+)
configs/socfpga_arria10_defconfig +11 -0
index 47fe1d9690..1931a1d153 100644
@@ -25,7 +25,18 @@ CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
 # CONFIG_EFI_PARTITION is not set
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria10_socdk_sdmmc"
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SPL_DM_MMC=y
+CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_SPL_EXT_SUPPORT=y
+CONFIG_SPL_FS_FAT=y
+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_FS_LOADER=y
+CONFIG_FPGA_SOCFPGA=y
+CONFIG_SPL_FIT=y
+CONFIG_FIT=y
 CONFIG_DM_GPIO=y
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_MMC=y
Signature · 1 line
2.13.0
#7 lore raw

PATCH v13 7/9 spl : socfpga: Implement fpga bitstream loading with socfpga loadfs

In reply to tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Add support for loading FPGA bitstream to get DDR up running before U-Boot is loaded into DDR. Boot device initialization, generic firmware loader and SPL FAT support are required for this whole mechanism to work.

---

changes for v13
- No changes.

changes for v12
- No changes.

changes for v11
- No changes.

changes for v10
- Removed the static so the function can be referred by other c file.

changes for v9
- Used ALLOC_CACHE_ALIGN_BUFFER
- De-duplicated the same chunks of codes

changes for v8
- No changes.

changes for v7
- Removed casting for get_fpga_filename
- Removed hard coding DDR address for loading core bistream, using loadable property from FIT.
- Added checking for config_pins, return if error.

---
 .../include/mach/fpga_manager_arria10.h            |  1 +
 arch/arm/mach-socfpga/spl_a10.c                    | 31 +++++++++++++++++++++-
 drivers/fpga/socfpga_arria10.c                     |  2 +-
 3 files changed, 32 insertions(+), 2 deletions(-)
arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +1 -0
index c5f67714aa..62249b3695 100644
@@ -126,6 +126,7 @@ int fpgamgr_program_finish(void);
 int is_fpgamgr_user_mode(void);
 int fpgamgr_wait_early_user_mode(void);
 const char *get_fpga_filename(void);
+int is_fpgamgr_early_user_mode(void);
 int socfpga_loadfs(fpga_fs_info *fpga_fsinfo, const void *buf, size_t bsize,
 		  u32 offset);
 void fpgamgr_program(const void *buf, size_t bsize, u32 offset);
arch/arm/mach-socfpga/spl_a10.c +30 -1
index c8e73d47c0..b466307f98 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- *  Copyright (C) 2012 Altera Corporation <www.altera.com>
+ *  Copyright (C) 2012-2019 Altera Corporation <www.altera.com>
  */
 
 #include <common.h>
@@ -23,6 +23,11 @@
 #include <fdtdec.h>
 #include <watchdog.h>
 #include <asm/arch/pinmux.h>
+#include <asm/arch/fpga_manager.h>
+#include <mmc.h>
+#include <memalign.h>
+
+#define FPGA_BUFSIZ	16 * 1024
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -68,11 +73,35 @@ u32 spl_boot_mode(const u32 boot_device)
 
 void spl_board_init(void)
 {
+	ALLOC_CACHE_ALIGN_BUFFER(char, buf, FPGA_BUFSIZ);
+
 	/* enable console uart printing */
 	preloader_console_init();
 	WATCHDOG_RESET();
 
 	arch_early_init_r();
+
+	/* If the full FPGA is already loaded, ie.from EPCQ, config fpga pins */
+	if (is_fpgamgr_user_mode()) {
+		int ret = config_pins(gd->fdt_blob, "shared");
+
+		if (ret)
+			return;
+
+		ret = config_pins(gd->fdt_blob, "fpga");
+		if (ret)
+			return;
+	} else if (!is_fpgamgr_early_user_mode()) {
+		/* Program IOSSM(early IO release) or full FPGA */
+		fpgamgr_program(buf, FPGA_BUFSIZ, 0);
+	}
+
+	/* If the IOSSM/full FPGA is already loaded, start DDR */
+	if (is_fpgamgr_early_user_mode() || is_fpgamgr_user_mode())
+		ddr_calibration_sequence();
+
+	if (!is_fpgamgr_user_mode())
+		fpgamgr_program(buf, FPGA_BUFSIZ, 0);
 }
 
 void board_init_f(ulong dummy)
drivers/fpga/socfpga_arria10.c +1 -1
index 9df2c430d7..285280e507 100644
@@ -69,7 +69,7 @@ static int wait_for_user_mode(void)
 		1, FPGA_TIMEOUT_MSEC, false);
 }
 
-static int is_fpgamgr_early_user_mode(void)
+int is_fpgamgr_early_user_mode(void)
 {
 	return (readl(&fpga_manager_base->imgcfg_stat) &
 		ALT_FPGAMGR_IMGCFG_STAT_F2S_EARLY_USERMODE_SET_MSK) != 0;
Signature · 1 line
2.13.0
#8 lore raw

PATCH v13 8/9 ARM: socfpga: Synchronize the configuration for A10 SoCDK

In reply to tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Update the default configuration file to enable the necessary functionality the get the kit working.

---

changes for v13
- No changes.

changes for v12
- No changes.

changes for v11
- No changes.

changes for v10
- No changes.

changes for v9
- No changes.

changes for v8
- Moved the FIT related configs to the patch of configuration for FPGA SoCFPGA A10 SoCDK.

changes for v7
- Keep minimal configs.

---
 configs/socfpga_arria10_defconfig | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
configs/socfpga_arria10_defconfig +9 -5
index 1931a1d153..09a018c97d 100644
@@ -6,12 +6,15 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"
 # CONFIG_USE_BOOTCOMMAND is not set
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_DEFAULT_FDT_FILE="socfpga_arria10_socdk_sdmmc.dtb"
+CONFIG_VERSION_VARIABLE=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_SPL_TEXT_BASE=0xFFE00000
 CONFIG_SPL_FPGA_SUPPORT=y
-CONFIG_SPL_SPI_LOAD=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
 # CONFIG_CMD_FLASH is not set
@@ -20,9 +23,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
-# CONFIG_SPL_DOS_PARTITION is not set
-# CONFIG_ISO_PARTITION is not set
-# CONFIG_EFI_PARTITION is not set
+CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dmas dma-names"
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria10_socdk_sdmmc"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SPL_ENV_SUPPORT=y
@@ -30,7 +31,6 @@ CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_DM_MMC=y
 CONFIG_SPL_MMC_SUPPORT=y
-CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_SPL_FS_FAT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_FS_LOADER=y
@@ -41,9 +41,13 @@ CONFIG_DM_GPIO=y
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_MTD_DEVICE=y
+CONFIG_MMC_DW=y
+CONFIG_PHY_MICREL=y
+CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
+CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_TIMER=y
 CONFIG_SPL_TIMER=y
Signature · 1 line
2.13.0
#9 lore raw

PATCH v13 9/9 ARM: socfpga: Increase Malloc pool size to support FAT filesystem in SPL

In reply to tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Increasing Malloc pool size up to 0x15000 is required to support FAT in SPL . The result of calculation is come from default max cluster(0x10000) + others(0x2000) + additional memory for headroom(0x3000).

---

Previous records of discussion about this patch can be checked from here
https://patchwork.ozlabs.org/cover/1034282/ .

changes for v13
- Fixed commit messages.
- Moved the A10 specific malloc size configuration to A10 SoCDK header.

changes for v12
- Improved the commit messages.

changes for v11
- No changes.

changes for v10
- No changes.

changes for v9
- No changes.

changes for v8
- Moved the FIT related configs to the patch of configuration for FPGA SoCFPGA A10 SoCDK.

changes for v7
- Keep minimal configs.

---
 include/configs/socfpga_arria10_socdk.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
include/configs/socfpga_arria10_socdk.h +4 -1
index 92630c5e6e..645e66e6b0 100644
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
- *  Copyright (C) 2015-2017 Altera Corporation <www.altera.com>
+ *  Copyright (C) 2015-2019 Altera Corporation <www.altera.com>
  */
 
 #ifndef __CONFIG_SOCFGPA_ARRIA10_H__
@@ -36,6 +36,9 @@
  */
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 
+/* SPL memory allocation configuration, this is for FAT implementation */
+#define CONFIG_SYS_SPL_MALLOC_SIZE	0x00015000
+
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>
 
Signature · 1 line
2.13.0
#10 lore raw

v13 cover Add support for loading FPGA bitstream

In reply to tien.fong.chee at intel.com
Quoted 4 lines · On Tue, May 7, 2019 at 11:42 AM <[email protected]> wrote:

From: Tien Fong Chee <[email protected]>

This version mainly resolved comments from Simon in [v12].

Thanks, looks ok to me now.

Regards,
Simon

Quoted 39 lines

This series is working on top of u-boot.git http://git.denx.de/u-boot.git

[v12]: https://patchwork.ozlabs.org/cover/1058282/
[v11]: https://www.mail-archive.com/u-boot at lists.denx.de/msg318174.html [v10]: https://www.mail-archive.com/u-boot at lists.denx.de/msg318167.html [v9]: https://www.mail-archive.com/u-boot at lists.denx.de/msg316086.html [v8]: https://www.mail-archive.com/u-boot at lists.denx.de/msg316086.html [v7]: https://www.mail-archive.com/u-boot at lists.denx.de/msg314511.html

Tien Fong Chee (9):
ARM: socfpga: Description on FPGA bitstream type and file name for
Arria 10
ARM: socfpga: Add default FPGA bitstream fitImage for Arria10 SoCDK
ARM: socfpga: Cleaning up and ensuring consistent format messages in
driver
ARM: socfpga: Moving the watchdog reset to the for-loop status polling
ARM: socfpga: Add FPGA drivers for Arria 10 FPGA bitstream loading
ARM: socfpga: Add the configuration for FPGA SoCFPGA A10 SoCDK spl : socfpga: Implement fpga bitstream loading with socfpga loadfs
ARM: socfpga: Synchronize the configuration for A10 SoCDK
ARM: socfpga: Increase Malloc pool size to support FAT filesystem in
SPL

 arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts       |  17 +
 .../include/mach/fpga_manager_arria10.h            |  40 +-
 arch/arm/mach-socfpga/spl_a10.c                    |  31 +-
 board/altera/arria10-socdk/fit_spl_fpga.its        |  38 ++
 configs/socfpga_arria10_defconfig                  |  23 +-
 .../fpga/altera-socfpga-a10-fpga-mgr.txt           |  26 +-
 drivers/fpga/socfpga_arria10.c                     | 514 ++++++++++++++++++++-
 include/configs/socfpga_arria10_socdk.h            |   5 +-
 include/image.h                                    |   4 +
 9 files changed, 668 insertions(+), 30 deletions(-)
 create mode 100644 board/altera/arria10-socdk/fit_spl_fpga.its

--
2.13.0

#11 lore raw

v13 cover Add support for loading FPGA bitstream

Quoted 8 lines · Simon Goldschmidt
Quoted 4 lines · On Tue, May 7, 2019 at 11:42 AM <[email protected]> wrote:

From: Tien Fong Chee <[email protected]>

This version mainly resolved comments from Simon in [v12].

Thanks, looks ok to me now.

So, apply ?

Signature · 2 lines
Best regards,
Marek Vasut
#12 lore raw

v13 cover Add support for loading FPGA bitstream

Marek Vasut <[email protected]> schrieb am Di., 7. Mai 2019, 15:24:

Quoted 12 lines · Simon Goldschmidt
Quoted 8 lines · On Tue, May 7, 2019 at 11:42 AM <[email protected]> wrote:
Quoted 4 lines

From: Tien Fong Chee <[email protected]>

This version mainly resolved comments from Simon in [v12].

Thanks, looks ok to me now.

So, apply ?

Yes, sorry, i meant just that. Do you take them or should I prepare a travis run?

Regards,
Simon

Applied
#13 lore raw

v13 cover Add support for loading FPGA bitstream

Quoted 20 lines · Simon Goldschmidt

Marek Vasut <marex at denx.de <mailto:[email protected]>> schrieb am Di., 7. Mai 2019, 15:24:

    On 5/7/19 1:51 PM, Simon Goldschmidt wrote:
    > On Tue, May 7, 2019 at 11:42 AM <[email protected]
    <mailto:[email protected]>> wrote:
    >>
    >> From: Tien Fong Chee <[email protected]
    <mailto:[email protected]>>
    >>
    >> This version mainly resolved comments from Simon in [v12].
    >
    > Thanks, looks ok to me now.
    >

    So, apply ?
Quoted 2 lines

Yes, sorry, i meant just that. Do you take them or should I prepare a travis run?

I picked them to -next , since -master has PR in flight.

Applied, thanks.

Signature · 2 lines
Best regards,
Marek Vasut