[PATCH 3/3] ARM: CCMX51: Add support for 16-bit memory module variants

[Alexander Shiyan]

Modules can have memory chips with a bus width of 16 bits.
Let's separate the binaries for initializing different types.

Signed-off-by: Alexander Shiyan <eagle.alexander923 at gmail.com>
---
 .../boards/ccxmx51/flash-header-x16.imxcfg    | 61 +++++++++++++++++++
 ...-header.imxcfg => flash-header-x32.imxcfg} |  1 -
 arch/arm/boards/ccxmx51/lowlevel.c            | 12 +++-
 images/Makefile.imx                           | 10 +--
 4 files changed, 78 insertions(+), 6 deletions(-)
 create mode 100644 arch/arm/boards/ccxmx51/flash-header-x16.imxcfg
 rename arch/arm/boards/ccxmx51/{flash-header.imxcfg => flash-header-x32.imxcfg} (99%)

diff --git a/arch/arm/boards/ccxmx51/flash-header-x16.imxcfg b/arch/arm/boards/ccxmx51/flash-header-x16.imxcfg
new file mode 100644
index 0000000000..6d77324fc8
--- /dev/null
+++ b/arch/arm/boards/ccxmx51/flash-header-x16.imxcfg
@@ -0,0 +1,61 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+soc imx51
+loadaddr 0x90000000
+ivtofs 0x400
+wm 32 0x73fa88a0 0x00000200
+wm 32 0x73fa850c 0x000020c5
+wm 32 0x73fa8510 0x000020c5
+wm 32 0x73fa883c 0x00000002
+wm 32 0x73fa8848 0x00000002
+wm 32 0x73fa84b8 0x000000e7
+wm 32 0x73fa84bc 0x00000045
+wm 32 0x73fa84c0 0x00000045
+wm 32 0x73fa84c4 0x00000045
+wm 32 0x73fa84c8 0x00000045
+wm 32 0x73fa8820 0x00000000
+wm 32 0x73fa84a4 0x00000003
+wm 32 0x73fa84a8 0x00000003
+wm 32 0x73fa84ac 0x000000e3
+wm 32 0x73fa84b0 0x000000e3
+wm 32 0x73fa84b4 0x000000e3
+wm 32 0x73fa84cc 0x000000e3
+wm 32 0x73fa84d0 0x000000e2
+wm 32 0x73fa882c 0x00000004
+wm 32 0x73fa88a4 0x00000004
+wm 32 0x73fa88ac 0x00000004
+wm 32 0x73fa88b8 0x00000004
+wm 32 0x83fd9000 0x82a10000
+wm 32 0x83fd9008 0x82a10000
+wm 32 0x83fd9010 0x000ad0d0
+wm 32 0x83fd9004 0x3f3584ab
+wm 32 0x83fd900c 0x3f3584ab
+wm 32 0x83fd9014 0x04008008
+wm 32 0x83fd9014 0x0000801a
+wm 32 0x83fd9014 0x0000801b
+wm 32 0x83fd9014 0x00448019
+wm 32 0x83fd9014 0x07328018
+wm 32 0x83fd9014 0x04008008
+wm 32 0x83fd9014 0x00008010
+wm 32 0x83fd9014 0x00008010
+wm 32 0x83fd9014 0x06328018
+wm 32 0x83fd9014 0x03808019
+wm 32 0x83fd9014 0x00408019
+wm 32 0x83fd9014 0x00008000
+wm 32 0x83fd9014 0x0400800c
+wm 32 0x83fd9014 0x0000801e
+wm 32 0x83fd9014 0x0000801f
+wm 32 0x83fd9014 0x0000801d
+wm 32 0x83fd9014 0x0732801c
+wm 32 0x83fd9014 0x0400800c
+wm 32 0x83fd9014 0x00008014
+wm 32 0x83fd9014 0x00008014
+wm 32 0x83fd9014 0x0632801c
+wm 32 0x83fd9014 0x0380801d
+wm 32 0x83fd9014 0x0040801d
+wm 32 0x83fd9014 0x00008004
+wm 32 0x83fd9000 0xb2a10000
+wm 32 0x83fd9008 0xb2a10000
+wm 32 0x83fd9010 0x000ad6d0
+wm 32 0x83fd9034 0x90000000
+wm 32 0x83fd9014 0x00000000
diff --git a/arch/arm/boards/ccxmx51/flash-header.imxcfg b/arch/arm/boards/ccxmx51/flash-header-x32.imxcfg
similarity index 99%
rename from arch/arm/boards/ccxmx51/flash-header.imxcfg
rename to arch/arm/boards/ccxmx51/flash-header-x32.imxcfg
index 185a48fe18..6480aa590e 100644
--- a/arch/arm/boards/ccxmx51/flash-header.imxcfg
+++ b/arch/arm/boards/ccxmx51/flash-header-x32.imxcfg
@@ -59,4 +59,3 @@ wm 32 0x83fd9008 0xb2a20000
 wm 32 0x83fd9010 0x000ad6d0
 wm 32 0x83fd9034 0x90000000
 wm 32 0x83fd9014 0x00000000
-
diff --git a/arch/arm/boards/ccxmx51/lowlevel.c b/arch/arm/boards/ccxmx51/lowlevel.c
index 367925e398..49bc7bfe32 100644
--- a/arch/arm/boards/ccxmx51/lowlevel.c
+++ b/arch/arm/boards/ccxmx51/lowlevel.c
@@ -33,7 +33,7 @@ static inline void setup_uart(void)
 	putc_ll('>');
 }
 
-ENTRY_FUNCTION(start_ccxmx51, r0, r1, r2)
+static inline void start_ccxmx51(void)
 {
 	extern char __dtb_imx51_ccxmx51_start[];
 	void *fdt;
@@ -49,3 +49,13 @@ ENTRY_FUNCTION(start_ccxmx51, r0, r1, r2)
 
 	barebox_arm_entry(MX51_CSD0_BASE_ADDR, SZ_128M, fdt);
 }
+
+ENTRY_FUNCTION(start_ccxmx51_x16, r0, r1, r2)
+{
+	start_ccxmx51();
+}
+
+ENTRY_FUNCTION(start_ccxmx51_x32, r0, r1, r2)
+{
+	start_ccxmx51();
+}
diff --git a/images/Makefile.imx b/images/Makefile.imx
index 18cabbf041..8cc20b1137 100644
--- a/images/Makefile.imx
+++ b/images/Makefile.imx
@@ -88,10 +88,12 @@ FILE_barebox-kindle-ey21.img = start_imx50_kindle_ey21.pblb.imximg
 image-$(CONFIG_MACH_KINDLE_MX50) += barebox-kindle-ey21.img
 
 # ----------------------- i.MX51 based boards ---------------------------
-pblb-$(CONFIG_MACH_CCMX51) += start_ccxmx51
-CFG_start_ccxmx51.pblb.imximg = $(board)/ccxmx51/flash-header.imxcfg
-FILE_barebox-imx51-ccxmx51.img = start_ccxmx51.pblb.imximg
-image-$(CONFIG_MACH_CCMX51) += barebox-imx51-ccxmx51.img
+pblb-$(CONFIG_MACH_CCMX51) += start_ccxmx51_x16 start_ccxmx51_x32
+CFG_start_ccxmx51_x16.pblb.imximg = $(board)/ccxmx51/flash-header-x16.imxcfg
+CFG_start_ccxmx51_x32.pblb.imximg = $(board)/ccxmx51/flash-header-x32.imxcfg
+FILE_barebox-imx51-ccxmx51-x16.img = start_ccxmx51_x16.pblb.imximg
+FILE_barebox-imx51-ccxmx51-x32.img = start_ccxmx51_x32.pblb.imximg
+image-$(CONFIG_MACH_CCMX51) += barebox-imx51-ccxmx51-x16.img barebox-imx51-ccxmx51-x32.img
 
 pblb-$(CONFIG_MACH_FREESCALE_MX51_PDK) += start_imx51_babbage
 CFG_start_imx51_babbage.pblb.imximg = $(board)/freescale-mx51-babbage/flash-header-imx51-babbage.imxcfg
-- 
2.32.0