Skip to contentSkip to conversation

configs: defconfig: Enable UBI and UBIFS for Agilex and Stratix10

PATCH New Jit Loon Lim 1 participant 4 messages Dec 11, 2022 Arm (32-bit)

lore
Share & tools
lore
#1 lore raw

PATCH 2/4 configs: defconfig: Update default NAND MTD partition for Agilex and Stratix 10

In reply to Jit Loon Lim

From: Sin Hui Kho <[email protected]>

Change default MTD partition scheme for NAND flash after implementation of UBI and UBIFS. "u-boot" partition remain for raw u-boot image, but "root" partition is use for UBI image containing all other components.

---
 configs/socfpga_agilex_nand_atf_defconfig    | 2 +-
 configs/socfpga_agilex_nand_defconfig        | 2 +-
 configs/socfpga_stratix10_nand_atf_defconfig | 2 +-
 configs/socfpga_stratix10_nand_defconfig     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
configs/socfpga_agilex_nand_atf_defconfig +1 -1
index 16509d868b..eeaaacff7a 100644
@@ -52,7 +52,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_MTDIDS_DEFAULT="nand0=ffb90000.nand.0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=ffb90000.nand.0:2m(u-boot),256k(env),256k(dtb),32m(kernel),32m(misc),-(rootfs)"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ffb90000.nand.0:2m(u-boot),-(root)"
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_ALTERA_SDRAM=y
configs/socfpga_agilex_nand_defconfig +1 -1
index 7ba5016c2e..50c17bd8af 100644
@@ -45,7 +45,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_MTDIDS_DEFAULT="nand0=ffb90000.nand.0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=ffb90000.nand.0:2m(u-boot),256k(env),256k(dtb),32m(kernel),32m(misc),-(rootfs)"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ffb90000.nand.0:2m(u-boot),-(root)"
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_ALTERA_SDRAM=y
configs/socfpga_stratix10_nand_atf_defconfig +1 -1
index 4a4b426b99..443f057219 100644
@@ -52,7 +52,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_MTDIDS_DEFAULT="nand0=ffb90000.nand.0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=ffb90000.nand.0:2m(u-boot),256k(env),256k(dtb),32m(kernel),32m(misc),-(rootfs)"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ffb90000.nand.0:2m(u-boot),-(root)"
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_ALTERA_SDRAM=y
configs/socfpga_stratix10_nand_defconfig +1 -1
index a148eac83f..db2dd17dff 100644
@@ -45,7 +45,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_MTDIDS_DEFAULT="nand0=ffb90000.nand.0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=ffb90000.nand.0:2m(u-boot),256k(env),256k(dtb),32m(kernel),32m(misc),-(rootfs)"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ffb90000.nand.0:2m(u-boot),-(root)"
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_ALTERA_SDRAM=y
Signature · 1 line
2.26.2
#3 lore raw

PATCH 4/4 arm: socfpga: soc64: Load and boot for NAND flash with UBI and UBIFS in enviroment

In reply to Jit Loon Lim

From: Sin Hui Kho <[email protected]>

Load kernel and device tree from UBI volume. Set root file system type for NAND boot as UBIFS located at UBI volume on MTD partition 1 or namely "root".

---
 include/configs/socfpga_soc64_common.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
include/configs/socfpga_soc64_common.h +7 -2
index 5939f13231..5b1d243153 100644
@@ -92,10 +92,15 @@
 	"scriptfile=u-boot.scr\0" \
 	"fatscript=if fatload mmc 0:1 ${scriptaddr} ${scriptfile};" \
 		   "then source ${scriptaddr}:script; fi\0" \
+	"nandroot=ubi0:rootfs\0" \
+	"nandload=ubi part root; ubi readvol ${loadaddr} kernel; ubi readvol ${fdt_addr} dtb\0" \
+	"nandboot=setenv bootargs " CONFIG_BOOTARGS \
+			" root=${nandroot} rw rootwait rootfstype=ubifs ubi.mtd=1; " \
+			"booti ${loadaddr} - ${fdt_addr}\0" \
 	"nandfitboot=setenv bootargs " CONFIG_BOOTARGS \
-			" root=${nandroot} rw rootwait rootfstype=jffs2; " \
+			" root=${nandroot} rw rootwait rootfstype=ubifs ubi.mtd=1; " \
 			"bootm ${loadaddr}\0" \
-	"nandfitload=nand read ${loadaddr} kernel\0" \
+	"nandfitload=ubi part root; ubi readvol ${loadaddr} kernel\0" \
 	"socfpga_legacy_reset_compat=1\0" \
 	"rsu_status=rsu dtb; rsu display_dcmf_version; "\
 		"rsu display_dcmf_status; rsu display_max_retry\0" \
Signature · 1 line
2.26.2
#0 lore raw

PATCH 1/4 configs: defconfig: Enable UBI and UBIFS for Agilex and Stratix10

From: Sin Hui Kho <[email protected]>

Enabling configs required for UBI and UBIFS commands. Set environment in a UBI volume. So, remove CONFIG_ENV_IS_IN_NAND as the environment is now in UBI volume.

---
 configs/socfpga_agilex_nand_atf_defconfig    | 11 +++++++++--
 configs/socfpga_agilex_nand_defconfig        | 11 +++++++++--
 configs/socfpga_stratix10_nand_atf_defconfig | 11 +++++++++--
 configs/socfpga_stratix10_nand_defconfig     | 11 +++++++++--
 4 files changed, 36 insertions(+), 8 deletions(-)
configs/socfpga_agilex_nand_atf_defconfig +9 -2
index bfc893fd39..16509d868b 100644
@@ -53,7 +53,6 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_MTDIDS_DEFAULT="nand0=ffb90000.nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ffb90000.nand.0:2m(u-boot),256k(env),256k(dtb),32m(kernel),32m(misc),-(rootfs)"
-CONFIG_ENV_IS_IN_NAND=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_ALTERA_SDRAM=y
@@ -90,4 +89,12 @@ CONFIG_USB_STORAGE=y
 CONFIG_DESIGNWARE_WATCHDOG=y
 CONFIG_WDT=y
 # CONFIG_SPL_USE_TINY_PRINTF is not set
-# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
\ No newline at end of file
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+CONFIG_ENV_IS_IN_UBI=y
+CONFIG_ENV_UBI_PART="root"
+CONFIG_ENV_UBI_VOLUME="env"
\ No newline at end of file
configs/socfpga_agilex_nand_defconfig +9 -2
index 3f95aac147..7ba5016c2e 100644
@@ -46,7 +46,6 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_MTDIDS_DEFAULT="nand0=ffb90000.nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ffb90000.nand.0:2m(u-boot),256k(env),256k(dtb),32m(kernel),32m(misc),-(rootfs)"
-CONFIG_ENV_IS_IN_NAND=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_ALTERA_SDRAM=y
@@ -83,4 +82,12 @@ CONFIG_USB_STORAGE=y
 CONFIG_DESIGNWARE_WATCHDOG=y
 CONFIG_WDT=y
 # CONFIG_SPL_USE_TINY_PRINTF is not set
-# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
\ No newline at end of file
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+CONFIG_ENV_IS_IN_UBI=y
+CONFIG_ENV_UBI_PART="root"
+CONFIG_ENV_UBI_VOLUME="env"
\ No newline at end of file
configs/socfpga_stratix10_nand_atf_defconfig +9 -2
index a9abd85e68..4a4b426b99 100644
@@ -53,7 +53,6 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_MTDIDS_DEFAULT="nand0=ffb90000.nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ffb90000.nand.0:2m(u-boot),256k(env),256k(dtb),32m(kernel),32m(misc),-(rootfs)"
-CONFIG_ENV_IS_IN_NAND=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_ALTERA_SDRAM=y
@@ -91,4 +90,12 @@ CONFIG_DESIGNWARE_WATCHDOG=y
 CONFIG_WDT=y
 # CONFIG_SPL_USE_TINY_PRINTF is not set
 CONFIG_PANIC_HANG=y
-# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
\ No newline at end of file
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+CONFIG_ENV_IS_IN_UBI=y
+CONFIG_ENV_UBI_PART="root"
+CONFIG_ENV_UBI_VOLUME="env"
\ No newline at end of file
configs/socfpga_stratix10_nand_defconfig +9 -2
index 48c20e5b11..a148eac83f 100644
@@ -46,7 +46,6 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_MTDIDS_DEFAULT="nand0=ffb90000.nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ffb90000.nand.0:2m(u-boot),256k(env),256k(dtb),32m(kernel),32m(misc),-(rootfs)"
-CONFIG_ENV_IS_IN_NAND=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_ALTERA_SDRAM=y
@@ -84,4 +83,12 @@ CONFIG_DESIGNWARE_WATCHDOG=y
 CONFIG_WDT=y
 # CONFIG_SPL_USE_TINY_PRINTF is not set
 CONFIG_PANIC_HANG=y
-# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
\ No newline at end of file
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+CONFIG_ENV_IS_IN_UBI=y
+CONFIG_ENV_UBI_PART="root"
+CONFIG_ENV_UBI_VOLUME="env"
\ No newline at end of file
Signature · 1 line
2.26.2
#2 lore raw

PATCH 3/4 arm: dts: Update NAND MTD partition for Agilex and Stratix 10

From: Sin Hui Kho <[email protected]>

Change NAND flash MTD partition in device tree after implementation of UBI and UBIFS. "u-boot" partition remain for raw u-boot image, but "root" partition is use for UBI image containing all other components.

---
 arch/arm/dts/socfpga_agilex_socdk_nand.dts    |  55 ++++++
 arch/arm/dts/socfpga_stratix10_socdk_nand.dts | 167 ++++++++++++++++++
 2 files changed, 222 insertions(+)
 create mode 100755 arch/arm/dts/socfpga_agilex_socdk_nand.dts
 create mode 100755 arch/arm/dts/socfpga_stratix10_socdk_nand.dts
arch/arm/dts/socfpga_agilex_socdk_nand.dts new file +55 -0
new file mode 100755
index 0000000000..3237e34c99
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2019 Intel Corporation
+ */
+#include "socfpga_agilex_socdk.dts"
+#include "socfpga_agilex_socdk-u-boot.dtsi"
+&gmac0 {
+	status = "disabled";
+};
+&gmac2 {
+	status = "okay";
+	phy-mode = "rgmii";
+	phy-handle = <&phy0>;
+	max-frame-size = <3800>;
+	mdio2 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "snps,dwmac-mdio";
+		phy2: ethernet-phy@2 {
+			reg = <4>;
+			txd0-skew-ps = <0>; /* -420ps */
+			txd1-skew-ps = <0>; /* -420ps */
+			txd2-skew-ps = <0>; /* -420ps */
+			txd3-skew-ps = <0>; /* -420ps */
+			rxd0-skew-ps = <420>; /* 0ps */
+			rxd1-skew-ps = <420>; /* 0ps */
+			rxd2-skew-ps = <420>; /* 0ps */
+			rxd3-skew-ps = <420>; /* 0ps */
+			txen-skew-ps = <0>; /* -420ps */
+			txc-skew-ps = <1860>; /* 960ps */
+			rxdv-skew-ps = <420>; /* 0ps */
+			rxc-skew-ps = <1680>; /* 780ps */
+		};
+	};
+};
+&mmc {
+	status = "disabled";
+};
+&nand {
+	flash@0 {
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+			partition@0 {
+				label = "u-boot";
+				reg = <0 0x200000>;
+			};
+			partition@200000 {
+				label = "root";
+				reg = <0x200000 0x3fe00000>;
+			};
+		};
+	};
+};
\ No newline at end of file
arch/arm/dts/socfpga_stratix10_socdk_nand.dts new file +167 -0

168 lines not on this page · raw message

Signature · 1 line
2.26.2