From 3da9630b8c4c7dc61090ef43b7be4aaadf7e735b Mon Sep 17 00:00:00 2001
From: Niel Fourie <lusus@denx.de>
Date: Mon, 22 Mar 2021 14:05:11 +0100
Subject: [PATCH] ARM: pcm058: Match mainline Linux NAND ECC layout/behaviour
Enabled "fsl,legacy-bch-geometry" in U-Boot device tree overlay
to match the legacy BCH geometry layout, which mainline Linux
applies when "fsl,use-minimum-ecc" is not specified in the device
tree.
Reinstated SYS_NAND_ONFI_DETECTION, which when disabled, masked
the mismatch on SOMs with Winbond NAND flash chips.
Signed-off-by: Niel Fourie <lusus@denx.de>
---
arch/arm/dts/imx6q-phytec-mira-rdk-nand-u-boot.dtsi | 4 ++++
include/configs/pcm058.h | 1 +
2 files changed, 5 insertions(+)
diff --git a/arch/arm/dts/imx6q-phytec-mira-rdk-nand-u-boot.dtsi b/arch/arm/dts/imx6q-phytec-mira-rdk-nand-u-boot.dtsi
index 8555be1696..5a64f86b11 100644
--- a/arch/arm/dts/imx6q-phytec-mira-rdk-nand-u-boot.dtsi
+++ b/arch/arm/dts/imx6q-phytec-mira-rdk-nand-u-boot.dtsi
@@ -40,3 +40,7 @@
&m25p80 {
u-boot,dm-spl;
};
+
+&gpmi {
+ fsl,legacy-bch-geometry;
+};
diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
index 4f03699117..bc48e80949 100644
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -19,6 +19,7 @@
/* Enable NAND support */
#define CONFIG_SYS_MAX_NAND_DEVICE 1
+#define CONFIG_SYS_NAND_ONFI_DETECTION
/* Physical Memory Map */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
--
2.39.5