Skip to contentSkip to conversation

ls1088ardb_pb: Add support for ls1088ardb_pb board.

PATCH Superseded Pramod Kumar 2 participants 4 messages Aug 21, 2018 – Sep 24, 2018 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ls1088ardb_pb: Add support for ls1088ardb_pb board.

ls1088ardb-pb is another varinat of the ls1088ardb. This board support two m.2 x2 gen 3 pcie card slot. There is no support of sata, pcie standard slot, miniPCIE slot and TDM in this board.

---
Changes in v2:
- Fix the compilation issue when building u-boot for SD boot.

 arch/arm/Kconfig                              |  14 +++
 arch/arm/cpu/armv8/Kconfig                    |   1 +
 board/freescale/ls1088a/Kconfig               |  43 +++++++
 board/freescale/ls1088a/MAINTAINERS           |  18 +++
 board/freescale/ls1088a/Makefile              |   1 +
 board/freescale/ls1088a/ddr.h                 |   6 +-
 board/freescale/ls1088a/ls1088a.c             |  25 +++-
 ... ls1088ardb_pb_qspi_SECURE_BOOT_defconfig} |   2 +-
 ...defconfig => ls1088ardb_pb_qspi_defconfig} |   2 +-
 ...ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig} |   2 +-
 ...ig => ls1088ardb_pb_sdcard_qspi_defconfig} |   2 +-
 include/configs/ls1088ardb_pb.h               | 113 ++++++++++++++++++
 12 files changed, 219 insertions(+), 10 deletions(-)
 copy configs/{ls1088ardb_qspi_SECURE_BOOT_defconfig => ls1088ardb_pb_qspi_SECURE_BOOT_defconfig} (97%)
 copy configs/{ls1088ardb_qspi_defconfig => ls1088ardb_pb_qspi_defconfig} (97%)
 copy configs/{ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig => ls1088ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig} (98%)
 copy configs/{ls1088ardb_sdcard_qspi_defconfig => ls1088ardb_pb_sdcard_qspi_defconfig} (98%)
 create mode 100644 include/configs/ls1088ardb_pb.h
arch/arm/Kconfig +14 -0
index 63ec02403a..a653823934 100644
@@ -1120,6 +1120,20 @@ config TARGET_LS1088ARDB
 	  development platform that supports the QorIQ LS1088A
 	  Layerscape Architecture processor.
 
+config TARGET_LS1088ARDB_PB
+        bool "Support ls1088ardb_pb"
+        select ARCH_LS1088A
+        select ARM64
+        select ARMV8_MULTIENTRY
+        select ARCH_MISC_INIT
+        select BOARD_LATE_INIT
+        select SUPPORT_SPL
+        help
+          Support for NXP LS1088ARDB_PB platform.
+          The LS1088A Reference design board (RDB_PB) is a high-performance
+          development platform that supports the QorIQ LS1088A
+          Layerscape Architecture processor.
+
 config TARGET_LS1021AQDS
 	bool "Support ls1021aqds"
 	select ARCH_LS1021A
arch/arm/cpu/armv8/Kconfig +1 -0
index c8bebabdf6..8ede276b65 100644
@@ -100,6 +100,7 @@ config PSCI_RESET
 		   !TARGET_LS2080A_SIMU && !TARGET_LS2080AQDS && \
 		   !TARGET_LS2080ARDB && !TARGET_LS2080A_EMU && \
 		   !TARGET_LS1088ARDB && !TARGET_LS1088AQDS && \
+		   !TARGET_LS1088ARDB_PB && \
 		   !TARGET_LS1012ARDB && !TARGET_LS1012AFRDM && \
 		   !TARGET_LS1012A2G5RDB && !TARGET_LS1012AQDS && \
 		   !TARGET_LS1012AFRWY && \
board/freescale/ls1088a/Kconfig +43 -0

46 lines not on this page · raw message

board/freescale/ls1088a/MAINTAINERS +18 -0
index 4d804d9447..5d841076bc 100644
@@ -7,6 +7,14 @@ F:	include/configs/ls1088ardb.h
 F:	configs/ls1088ardb_qspi_defconfig
 F:	configs/ls1088ardb_sdcard_qspi_defconfig
 
+LS1088ARDB_PB BOARD
+M:	Pramod Kumar <[email protected]>
+S:	Maintained
+F:	board/freescale/ls1088a/
+F:	include/configs/ls1088ardb_pb.h
+F:	configs/ls1088ardb_pb_qspi_defconfig
+F:	configs/ls1088ardb_pb_sdcard_qspi_defconfig
+
 LS1088AQDS BOARD
 M:	Prabhakar Kushwaha <[email protected]>
 M:	Ashish Kumar <[email protected]>
@@ -34,3 +42,13 @@ LS1088ARDB_SD_SECURE_BOOT BOARD
 M:	Sumit Garg <[email protected]>
 S:	Maintained
 F:	configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
+
+LS1088ARDB_PB_QSPI_SECURE_BOOT BOARD
+M:	Udit Agarwal <[email protected]>
+S:	Maintained
+F:	configs/ls1088ardb_pb_qspi_SECURE_BOOT_defconfig
+
+LS1088ARDB_PB_SD_SECURE_BOOT BOARD
+M:	Udit Agarwal <[email protected]>
+S:	Maintained
+F:	configs/ls1088ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig
board/freescale/ls1088a/Makefile +1 -0
index c2b0e7dc0f..dd5f365378 100644
@@ -6,5 +6,6 @@ obj-y += ls1088a.o
 obj-y += ddr.o
 ifndef CONFIG_SPL_BUILD
 obj-$(CONFIG_TARGET_LS1088ARDB) += eth_ls1088ardb.o
+obj-$(CONFIG_TARGET_LS1088ARDB_PB) += eth_ls1088ardb.o
 obj-$(CONFIG_TARGET_LS1088AQDS) += eth_ls1088aqds.o
 endif
board/freescale/ls1088a/ddr.h +4 -2
index b35c4ae2da..7a76f6bd50 100644
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright 2017 NXP
+ * Copyright 2017-2018 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __LS1088A_DDR_H__
@@ -27,7 +29,7 @@ static const struct board_specific_parameters udimm0[] = {
 	 *   num|  hi| rank|  clk| wrlvl |   wrlvl   |  wrlvl
 	 * ranks| mhz| GB  |adjst| start |   ctl2    |  ctl3
 	 */
-#if defined(CONFIG_TARGET_LS1088ARDB)
+#if defined(CONFIG_TARGET_LS1088ARDB) || defined(CONFIG_TARGET_LS1088ARDB_PB)
 
 	{2,  1666, 0, 8,     8, 0x090A0B0E, 0x0F10110D,},
 	{2,  1900, 0, 8,     9, 0x0A0B0C10, 0x1112140E,},
board/freescale/ls1088a/ls1088a.c +21 -4
index a0dab6fc2e..f69d71b1dd 100644
@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright 2017 NXP
+ * Copyright 2017-2018 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
 #include <i2c.h>
@@ -28,6 +30,15 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#ifdef CONFIG_TARGET_LS1088ARDB_PB
+int fixup_ls1088ardb_pb_banner(void *fdt)
+{
+	fdt_setprop_string(fdt, 0, "model", "LS1088ARDB-PB Board");
+
+	return 0;
+}
+#endif
+
 int board_early_init_f(void)
 {
 #if defined(CONFIG_SYS_I2C_EARLY_INIT) && defined(CONFIG_TARGET_LS1088AQDS)
@@ -78,6 +89,9 @@ int checkboard(void)
 
 #ifdef CONFIG_TARGET_LS1088AQDS
 	printf("Board: LS1088A-QDS, ");
+
+#elif CONFIG_TARGET_LS1088ARDB_PB
+	printf("Board: LS1088ARDB-PB, ");
 #else
 	printf("Board: LS1088A-RDB, ");
 #endif
@@ -327,7 +341,7 @@ void board_retimer_init(void)
 #ifdef CONFIG_MISC_INIT_R
 int misc_init_r(void)
 {
-#ifdef CONFIG_TARGET_LS1088ARDB
+#if defined(CONFIG_TARGET_LS1088ARDB) || defined(CONFIG_TARGET_LS1088ARDB_PB)
 	u8 brdcfg5;
 
 	if (hwconfig("esdhc-force-sd")) {
@@ -459,7 +473,7 @@ exit:
 int board_init(void)
 {
 	init_final_memctl_regs();
-#if defined(CONFIG_TARGET_LS1088ARDB) && defined(CONFIG_FSL_MC_ENET)
+#if defined(CONFIG_TARGET_LS1088ARDB) || defined(CONFIG_TARGET_LS1088ARDB_PB) && defined(CONFIG_FSL_MC_ENET)
 	u32 __iomem *irq_ccsr = (u32 __iomem *)ISC_BASE;
 #endif
 
@@ -470,7 +484,7 @@ int board_init(void)
 	gd->env_addr = (ulong)&default_environment[0];
 #endif
 
-#if defined(CONFIG_TARGET_LS1088ARDB) && defined(CONFIG_FSL_MC_ENET)
+#if defined(CONFIG_TARGET_LS1088ARDB) || defined(CONFIG_TARGET_LS1088ARDB_PB) && defined(CONFIG_FSL_MC_ENET)
 	/* invert AQR105 IRQ pins polarity */
 	out_le32(irq_ccsr + IRQCR_OFFSET / 4, AQR105_IRQ_MASK);
 #endif
@@ -584,6 +598,9 @@ int ft_board_setup(void *blob, bd_t *bd)
 		return err;
 #endif
 
+#ifdef CONFIG_TARGET_LS1088ARDB_PB
+fixup_ls1088ardb_pb_banner(blob);
+#endif
 	return 0;
 }
 #endif
configs/ls1088ardb_pb_qspi_SECURE_BOOT_defconfig renamed from configs/ls1088ardb_qspi_SECURE_BOOT_defconfig +1 -1
similarity index 97%
copy from configs/ls1088ardb_qspi_SECURE_BOOT_defconfig
copy to configs/ls1088ardb_pb_qspi_SECURE_BOOT_defconfig
index d0334a239f..d2faf25f39 100644
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TARGET_LS1088ARDB=y
+CONFIG_TARGET_LS1088ARDB_PB=y
 CONFIG_SYS_TEXT_BASE=0x20100000
 CONFIG_SECURE_BOOT=y
 CONFIG_FSL_LS_PPA=y
configs/ls1088ardb_pb_qspi_defconfig renamed from configs/ls1088ardb_qspi_defconfig +1 -1
similarity index 97%
copy from configs/ls1088ardb_qspi_defconfig
copy to configs/ls1088ardb_pb_qspi_defconfig
index d806966540..cb9eac88a9 100644
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TARGET_LS1088ARDB=y
+CONFIG_TARGET_LS1088ARDB_PB=y
 CONFIG_SYS_TEXT_BASE=0x20100000
 CONFIG_FSL_LS_PPA=y
 CONFIG_QSPI_AHB_INIT=y
configs/ls1088ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig renamed from configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig +1 -1
similarity index 98%
copy from configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
copy to configs/ls1088ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig
index 08b9caeb34..0216974ca7 100644
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TARGET_LS1088ARDB=y
+CONFIG_TARGET_LS1088ARDB_PB=y
 CONFIG_SYS_TEXT_BASE=0x80400000
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
configs/ls1088ardb_pb_sdcard_qspi_defconfig renamed from configs/ls1088ardb_sdcard_qspi_defconfig +1 -1
similarity index 98%
copy from configs/ls1088ardb_sdcard_qspi_defconfig
copy to configs/ls1088ardb_pb_sdcard_qspi_defconfig
index bf1c0a2d7b..c501795ef0 100644
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_TARGET_LS1088ARDB=y
+CONFIG_TARGET_LS1088ARDB_PB=y
 CONFIG_SYS_TEXT_BASE=0x80400000
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
include/configs/ls1088ardb_pb.h new file +113 -0

113 lines not on this page · raw message

Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/1 ls1088ardb_pb: Add support for ls1088ardb_pb board.

Quoted 20 lines · Pramod Kumar

ls1088ardb-pb is another varinat of the ls1088ardb. This board support two m.2 x2 gen 3 pcie card slot. There is no support of sata, pcie standard slot, miniPCIE slot and TDM in this board.

---
Changes in v2:
- Fix the compilation issue when building u-boot for SD boot.

 arch/arm/Kconfig                              |  14 +++
 arch/arm/cpu/armv8/Kconfig                    |   1 +
 board/freescale/ls1088a/Kconfig               |  43 +++++++
 board/freescale/ls1088a/MAINTAINERS           |  18 +++
 board/freescale/ls1088a/Makefile              |   1 +
 board/freescale/ls1088a/ddr.h                 |   6 +-
 board/freescale/ls1088a/ls1088a.c             |  25 +++-
 ... ls1088ardb_pb_qspi_SECURE_BOOT_defconfig} |   2 +-
 ...defconfig => ls1088ardb_pb_qspi_defconfig} |   2 +-
 ...ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig} |   2 +-
Quoted 9 lines
 ...ig => ls1088ardb_pb_sdcard_qspi_defconfig} |   2 +-
 include/configs/ls1088ardb_pb.h               | 113 ++++++++++++++++++
 12 files changed, 219 insertions(+), 10 deletions(-)
 copy configs/{ls1088ardb_qspi_SECURE_BOOT_defconfig => ls1088ardb_pb_qspi_SECURE_BOOT_defconfig} (97%)
 copy configs/{ls1088ardb_qspi_defconfig => ls1088ardb_pb_qspi_defconfig} (97%)
 copy configs/{ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig => ls1088ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig} (98%)
 copy configs/{ls1088ardb_sdcard_qspi_defconfig => ls1088ardb_pb_sdcard_qspi_defconfig} (98%)
 create mode 100644 include/configs/ls1088ardb_pb.h

Is it possible to reuse ls1088ardb and detect the board at runtime?

<snip>

board/freescale/ls1088a/ddr.h line 5

Quoted 11 lines
board/freescale/ls1088a/ddr.h +3 -1
index b35c4ae2da..7a76f6bd50 100644
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright 2017 NXP
+ * Copyright 2017-2018 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+

Do not add another SPDX line.

York

#2 lore raw

PATCH v2 1/1 ls1088ardb_pb: Add support for ls1088ardb_pb board.

Quoted 44 lines

-----Original Message-----
From: York Sun
Sent: Friday, September 21, 2018 8:20 PM
To: Pramod Kumar <[email protected]>
Cc: u-boot at lists.denx.de
Subject: Re: [PATCH v2] ls1088ardb_pb: Add support for ls1088ardb_pb board.

Quoted 23 lines · Pramod Kumar

ls1088ardb-pb is another varinat of the ls1088ardb.
This board support two m.2 x2 gen 3 pcie card slot.
There is no support of sata, pcie standard slot, miniPCIE slot and TDM in this board.

---
Changes in v2:
- Fix the compilation issue when building u-boot for SD boot.

 arch/arm/Kconfig                              |  14 +++
 arch/arm/cpu/armv8/Kconfig                    |   1 +
 board/freescale/ls1088a/Kconfig               |  43 +++++++
 board/freescale/ls1088a/MAINTAINERS           |  18 +++
 board/freescale/ls1088a/Makefile              |   1 +
 board/freescale/ls1088a/ddr.h                 |   6 +-
 board/freescale/ls1088a/ls1088a.c             |  25 +++-
 ... ls1088ardb_pb_qspi_SECURE_BOOT_defconfig} |   2 +-
 ...defconfig => ls1088ardb_pb_qspi_defconfig} |   2 +-
 ...ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig} |   2 +-
 ...ig => ls1088ardb_pb_sdcard_qspi_defconfig} |   2 +-
 include/configs/ls1088ardb_pb.h               | 113 ++++++++++++++++++
 12 files changed, 219 insertions(+), 10 deletions(-)  copy
Quoted 9 lines

configs/{ls1088ardb_qspi_SECURE_BOOT_defconfig => ls1088ardb_pb_qspi_SECURE_BOOT_defconfig} (97%) copy configs/{ls1088ardb_qspi_defconfig => ls1088ardb_pb_qspi_defconfig} (97%) copy configs/{ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig => ls1088ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig} (98%) copy configs/{ls1088ardb_sdcard_qspi_defconfig => ls1088ardb_pb_sdcard_qspi_defconfig} (98%) create mode 100644 include/configs/ls1088ardb_pb.h

Quoted 4 lines

Is it possible to reuse ls1088ardb and detect the board at runtime?

Quoted 3 lines

For distro boot we need diffrent board variable for ls1088ardb and ls1088ardb_pb, which can only be achieved by using config tagets CONFIG_TARGET_LS1088ARDB and CONFIG_TARGET_LS1088ARDB_PB respectively

f>> or both the boards.

Quoted 18 lines

<snip>

board/freescale/ls1088a/ddr.h line 5

Quoted 11 lines
(quoted diff) +0 -0

b/board/freescale/ls1088a/ddr.h index b35c4ae2da..7a76f6bd50 100644

board/freescale/ls1088a/ddr.h +3 -1
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright 2017 NXP
+ * Copyright 2017-2018 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+

Do not add another SPDX line.

Quoted 1 line

Will fix and send patch again.

York

#3 lore raw

PATCH v2 1/1 ls1088ardb_pb: Add support for ls1088ardb_pb board.

Quoted 44 lines · Pramod Kumar
Quoted 44 lines

-----Original Message-----
From: York Sun
Sent: Friday, September 21, 2018 8:20 PM
To: Pramod Kumar <[email protected]>
Cc: u-boot at lists.denx.de
Subject: Re: [PATCH v2] ls1088ardb_pb: Add support for ls1088ardb_pb board.

Quoted 32 lines · Pramod Kumar

ls1088ardb-pb is another varinat of the ls1088ardb.
This board support two m.2 x2 gen 3 pcie card slot.
There is no support of sata, pcie standard slot, miniPCIE slot and TDM in this board.

---
Changes in v2:
- Fix the compilation issue when building u-boot for SD boot.

 arch/arm/Kconfig                              |  14 +++
 arch/arm/cpu/armv8/Kconfig                    |   1 +
 board/freescale/ls1088a/Kconfig               |  43 +++++++
 board/freescale/ls1088a/MAINTAINERS           |  18 +++
 board/freescale/ls1088a/Makefile              |   1 +
 board/freescale/ls1088a/ddr.h                 |   6 +-
 board/freescale/ls1088a/ls1088a.c             |  25 +++-
 ... ls1088ardb_pb_qspi_SECURE_BOOT_defconfig} |   2 +-
 ...defconfig => ls1088ardb_pb_qspi_defconfig} |   2 +-
 ...ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig} |   2 +-
 ...ig => ls1088ardb_pb_sdcard_qspi_defconfig} |   2 +-
 include/configs/ls1088ardb_pb.h               | 113 ++++++++++++++++++
 12 files changed, 219 insertions(+), 10 deletions(-)  copy

configs/{ls1088ardb_qspi_SECURE_BOOT_defconfig => ls1088ardb_pb_qspi_SECURE_BOOT_defconfig} (97%) copy configs/{ls1088ardb_qspi_defconfig => ls1088ardb_pb_qspi_defconfig} (97%) copy configs/{ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig => ls1088ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig} (98%) copy configs/{ls1088ardb_sdcard_qspi_defconfig => ls1088ardb_pb_sdcard_qspi_defconfig} (98%) create mode 100644 include/configs/ls1088ardb_pb.h

Quoted 5 lines
Quoted 4 lines

Is it possible to reuse ls1088ardb and detect the board at runtime?

Quoted 3 lines

For distro boot we need diffrent board variable for ls1088ardb and ls1088ardb_pb, which can only be achieved by using config tagets CONFIG_TARGET_LS1088ARDB and CONFIG_TARGET_LS1088ARDB_PB respectively

f>> or both the boards.

First, please use proper prefix for quotation and reply. It makes reading easier.

If your only concern is default variable for distroboot, you can update the default variable at runtime.

York