Skip to contentSkip to conversation

armv8: ls1028a: move FSL_LAYERSCAPE to kconfig

PATCH Superseded Michael Walle 1 participant 2 messages May 6, 2020 Arm (32-bit)

v1 of 9 Superseded Latest is v9 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 armv8: ls1028a: move FSL_LAYERSCAPE to kconfig

CONFIG_FSL_LAYERSCAPE is available in kconfig. There is no need to define it per board; the ls1028a_common.h is really board dependent and only fits to the NXP eval boards. Instead select CONFIG_FSL_LAYERSCAPE when ARCH_LS1028A is selected.

---
 arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 1 +
 include/configs/ls1028a_common.h          | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
arch/arm/cpu/armv8/fsl-layerscape/Kconfig +1 -0
index 2f75b2cdd3..116b6b0617 100644
@@ -23,6 +23,7 @@ config ARCH_LS1012A
 config ARCH_LS1028A
 	bool
 	select ARMV8_SET_SMPEN
+	select FSL_LAYERSCAPE
 	select FSL_LSCH3
 	select NXP_LSCH3_2
 	select SYS_FSL_HAS_CCI400
include/configs/ls1028a_common.h +0 -1
index 6905694d10..971288f86e 100644
@@ -7,7 +7,6 @@
 #define __L1028A_COMMON_H
 
 #define CONFIG_REMAKE_ELF
-#define CONFIG_FSL_LAYERSCAPE
 #define CONFIG_MP
 
 #include <asm/arch/stream_id_lsch3.h>
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 board: kontron: add sl28 support

Add basic support for the Kontron SMARC-sAL28 board. This includes just the bare minimum to be able to bring up the board and boot linux.

Also only one board variant is supported for now. That is the Single PHY variant. Other variants will fall back to this one.

In particular, there is no watchdog support for now. This means that you have to disable the default watchdog, otherwise you'll end up in the recovery bootloader. See the boards README.md for details.

---

This is part 1 of the basic board support. Part 2 depends on the Atheros RGMII PHY device tree bindings which are still pending.

 arch/arm/Kconfig                              |  10 ++
 arch/arm/dts/Makefile                         |   2 +
 .../arm/dts/fsl-ls1028a-kontron-sl28-var3.dts |  14 ++
 arch/arm/dts/fsl-ls1028a-kontron-sl28.dts     | 130 ++++++++++++++++++
 board/kontron/sl28/Kconfig                    |  18 +++
 board/kontron/sl28/MAINTAINERS                |   6 +
 board/kontron/sl28/Makefile                   |   8 ++
 board/kontron/sl28/README                     |  63 +++++++++
 board/kontron/sl28/common.c                   |  10 ++
 board/kontron/sl28/ddr.c                      |  98 +++++++++++++
 board/kontron/sl28/sl28.c                     |  90 ++++++++++++
 board/kontron/sl28/spl.c                      |   9 ++
 configs/kontron_sl28_defconfig                | 102 ++++++++++++++
 include/configs/kontron_sl28.h                |  85 ++++++++++++
 14 files changed, 645 insertions(+)
 create mode 100644 arch/arm/dts/fsl-ls1028a-kontron-sl28-var3.dts
 create mode 100644 arch/arm/dts/fsl-ls1028a-kontron-sl28.dts
 create mode 100644 board/kontron/sl28/Kconfig
 create mode 100644 board/kontron/sl28/MAINTAINERS
 create mode 100644 board/kontron/sl28/Makefile
 create mode 100644 board/kontron/sl28/README
 create mode 100644 board/kontron/sl28/common.c
 create mode 100644 board/kontron/sl28/ddr.c
 create mode 100644 board/kontron/sl28/sl28.c
 create mode 100644 board/kontron/sl28/spl.c
 create mode 100644 configs/kontron_sl28_defconfig
 create mode 100644 include/configs/kontron_sl28.h
arch/arm/Kconfig +10 -0
index b494bcae95..7201905c50 100644
@@ -1563,6 +1563,15 @@ config TARGET_LS1046AFRWY
 	  development platform that supports the QorIQ LS1046A
 	  Layerscape Architecture processor.
 
+config TARGET_SL28
+	bool "Support sl28"
+	select ARCH_LS1028A
+	select ARM64
+	select ARMV8_MULTIENTRY
+	select SUPPORT_SPL
+	help
+	  Support for Kontron SMARC-sAL28 board.
+
 config TARGET_COLIBRI_PXA270
 	bool "Support colibri_pxa270"
 	select CPU_PXA
@@ -1893,6 +1902,7 @@ source "board/hisilicon/hikey/Kconfig"
 source "board/hisilicon/hikey960/Kconfig"
 source "board/hisilicon/poplar/Kconfig"
 source "board/isee/igep003x/Kconfig"
+source "board/kontron/sl28/Kconfig"
 source "board/phytec/pcm051/Kconfig"
 source "board/silica/pengwyn/Kconfig"
 source "board/spear/spear300/Kconfig"
arch/arm/dts/Makefile +2 -0
index 559d3ab6a7..97e439a87f 100644
@@ -379,6 +379,8 @@ dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2080a-qds.dtb \
 	fsl-ls2088a-rdb-qspi.dtb \
 	fsl-ls1088a-rdb.dtb \
 	fsl-ls1088a-qds.dtb \
+	fsl-ls1028a-kontron-sl28.dtb \
+	fsl-ls1028a-kontron-sl28-var3.dtb \
 	fsl-ls1028a-rdb.dtb \
 	fsl-ls1028a-qds-duart.dtb \
 	fsl-ls1028a-qds-lpuart.dtb \
arch/arm/dts/fsl-ls1028a-kontron-sl28-var3.dts new file +14 -0
new file mode 100644
index 0000000000..23f89eadb3
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Kontron SMARC-sAL28 device tree source (Single PHY version)
+ */
+
+/dts-v1/;
+
+#include "fsl-ls1028a-kontron-sl28.dts"
+
+/ {
+	u-boot,dm-pre-reloc;
+	model = "Kontron SMARC-sAL28 Board (Single PHY)";
+	compatible = "kontron,sl28-var3", "kontron,sl28", "fsl,ls1028a";
+};
arch/arm/dts/fsl-ls1028a-kontron-sl28.dts new file +130 -0

130 lines not on this page · raw message

board/kontron/sl28/Kconfig new file +18 -0
new file mode 100644
index 0000000000..cdec39be01
@@ -0,0 +1,18 @@
+if TARGET_SL28
+
+config SYS_BOARD
+	default "sl28"
+
+config SYS_VENDOR
+	default "kontron"
+
+config SYS_SOC
+	default "fsl-layerscape"
+
+config SYS_CONFIG_NAME
+	default "kontron_sl28"
+
+config SYS_TEXT_BASE
+	default 0x96000000
+
+endif
board/kontron/sl28/MAINTAINERS new file +6 -0
new file mode 100644
index 0000000000..047a057646
@@ -0,0 +1,6 @@
+Kontron SMARC-sAL28 board
+M:	Michael Walle <[email protected]>
+S:	Maintained
+F:	board/kontron/sl28/
+F:	include/configs/kontron_sl28.h
+F:	configs/kontron_sl28_defconfig
board/kontron/sl28/Makefile new file +8 -0
new file mode 100644
index 0000000000..0f1866c874
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier:	GPL-2.0+
+
+ifndef CONFIG_SPL_BUILD
+obj-y += sl28.o
+endif
+
+obj-y += common.o ddr.o
+obj-$(CONFIG_SPL_BUILD) += spl.o
board/kontron/sl28/README new file +63 -0

63 lines not on this page · raw message

board/kontron/sl28/common.c new file +10 -0
new file mode 100644
index 0000000000..14704f7051
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include <common.h>
+#include <asm/arch-fsl-layerscape/soc.h>
+
+int board_early_init_f(void)
+{
+	fsl_lsch3_early_init_f();
+	return 0;
+}
board/kontron/sl28/ddr.c new file +98 -0

98 lines not on this page · raw message

board/kontron/sl28/sl28.c new file +90 -0

90 lines not on this page · raw message

board/kontron/sl28/spl.c new file +9 -0
new file mode 100644
index 0000000000..eb6d2dc909
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include <common.h>
+#include <asm/spl.h>
+
+void board_boot_order(u32 *spl_boot_list)
+{
+	spl_boot_list[0] = BOOT_DEVICE_SPI;
+}
configs/kontron_sl28_defconfig new file +102 -0

102 lines not on this page · raw message

include/configs/kontron_sl28.h new file +85 -0

85 lines not on this page · raw message

Signature · 1 line
2.20.1