Introduce support for Conclusive WHLE-LS1088A Single Board Computer.

Co-developed-by: Jakub Klama <ja...@conclusive.pl>
Signed-off-by: Jakub Klama <ja...@conclusive.pl>
Signed-off-by: Artur Rojek <ar...@conclusive.pl>
---

v3: new patch

 arch/arm/Kconfig                              |  19 ++
 arch/arm/dts/Makefile                         |   1 +
 arch/arm/dts/fsl-ls1088a-whle-u-boot.dtsi     |   8 +
 arch/arm/dts/fsl-ls1088a-whle.dts             | 235 ++++++++++++++
 board/conclusive/whle-ls1088a/Kconfig         |  29 ++
 board/conclusive/whle-ls1088a/MAINTAINERS     |  11 +
 board/conclusive/whle-ls1088a/Makefile        |   7 +
 board/conclusive/whle-ls1088a/ddr.c           | 134 ++++++++
 board/conclusive/whle-ls1088a/ddr.h           |  47 +++
 board/conclusive/whle-ls1088a/eth.c           |  13 +
 board/conclusive/whle-ls1088a/whle-ls1088a.c  | 301 ++++++++++++++++++
 .../conclusive/whle-ls1088a/whle-ls1088a.env  |  13 +
 configs/whle_ls1088a_emmc_defconfig           |  84 +++++
 configs/whle_ls1088a_qspi_defconfig           |  84 +++++
 include/configs/whle_ls1088a.h                |  92 ++++++
 15 files changed, 1078 insertions(+)
 create mode 100644 arch/arm/dts/fsl-ls1088a-whle-u-boot.dtsi
 create mode 100644 arch/arm/dts/fsl-ls1088a-whle.dts
 create mode 100644 board/conclusive/whle-ls1088a/Kconfig
 create mode 100644 board/conclusive/whle-ls1088a/MAINTAINERS
 create mode 100644 board/conclusive/whle-ls1088a/Makefile
 create mode 100644 board/conclusive/whle-ls1088a/ddr.c
 create mode 100644 board/conclusive/whle-ls1088a/ddr.h
 create mode 100644 board/conclusive/whle-ls1088a/eth.c
 create mode 100644 board/conclusive/whle-ls1088a/whle-ls1088a.c
 create mode 100644 board/conclusive/whle-ls1088a/whle-ls1088a.env
 create mode 100644 configs/whle_ls1088a_emmc_defconfig
 create mode 100644 configs/whle_ls1088a_qspi_defconfig
 create mode 100644 include/configs/whle_ls1088a.h

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 609571e6e421..cd53fcaac883 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1869,6 +1869,24 @@ config TARGET_WHLE_LS1046A
          Layerscape Architecture processor:
          https://conclusive.tech/products/whle-ls1-sbc/
 
+config TARGET_WHLE_LS1088A
+       bool "Support Conclusive WHLE-LS1088A"
+       select ARCH_LS1088A
+       select ARM64
+       select ARMV8_MULTIENTRY
+       select ARCH_SUPPORT_TFABOOT
+       select BOARD_EARLY_INIT_F
+       select BOARD_LATE_INIT
+       select GPIO_EXTRA_HEADER
+       select DM_SPI_FLASH if DM_SPI
+       imply SCSI
+       help
+         Support for Conclusive WHLE-LS1088A platform.
+         The WHLE-LS1088A is a high-performance Single Board Computer with
+         extensive connectivity features that supports the QorIQ LS1088A
+         Layerscape Architecture processor:
+         https://conclusive.tech/products/whle-ls1-sbc/
+
 config TARGET_TEN64
        bool "Support ten64"
        select ARCH_LS1088A
@@ -2318,6 +2336,7 @@ source "board/broadcom/bcmns/Kconfig"
 source "board/broadcom/bcmns3/Kconfig"
 source "board/cavium/thunderx/Kconfig"
 source "board/conclusive/whle-ls1046a/Kconfig"
+source "board/conclusive/whle-ls1088a/Kconfig"
 source "board/eets/pdu001/Kconfig"
 source "board/emulation/qemu-arm/Kconfig"
 source "board/freescale/ls2080aqds/Kconfig"
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 8dcbf29df363..b0782b4f29bc 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -591,6 +591,7 @@ dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2080a-qds.dtb \
        fsl-ls1088a-qds.dtb \
        fsl-ls1088a-qds-21-x.dtb \
        fsl-ls1088a-qds-29-x.dtb \
+       fsl-ls1088a-whle.dtb \
        fsl-ls1028a-rdb.dtb \
        fsl-ls1028a-qds-duart.dtb \
        fsl-ls1028a-qds-lpuart.dtb \
diff --git a/arch/arm/dts/fsl-ls1088a-whle-u-boot.dtsi 
b/arch/arm/dts/fsl-ls1088a-whle-u-boot.dtsi
new file mode 100644
index 000000000000..bbe93a1d6e4f
--- /dev/null
+++ b/arch/arm/dts/fsl-ls1088a-whle-u-boot.dtsi
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
+/*
+ * Copyright 2020-2023 Conclusive Engineering Sp. z o. o.
+ */
+
+#include <config.h>
+
+#include "fsl-ls1088a-u-boot.dtsi"
diff --git a/arch/arm/dts/fsl-ls1088a-whle.dts 
b/arch/arm/dts/fsl-ls1088a-whle.dts
new file mode 100644
index 000000000000..76ef1c748059
--- /dev/null
+++ b/arch/arm/dts/fsl-ls1088a-whle.dts
@@ -0,0 +1,235 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
+/*
+ * Copyright 2020-2023 Conclusive Engineering Sp. z o. o.
+ */
+
+/dts-v1/;
+
+#include "fsl-ls1088a.dtsi"
+
+/ {
+       model = "Conclusive WHLE-LS1088A";
+       compatible = "conclusive,whle-ls1088a", "fsl,ls1088a";
+
+       chosen {
+               stdout-path = &duart0;
+       };
+
+       aliases {
+               spi0 = &qspi;
+       };
+};
+
+&dpmac1 {
+       status = "okay";
+       phy-connection-type = "10gbase-r";
+};
+
+&dpmac2 {
+       status = "okay";
+       phy-connection-type = "10gbase-r";
+};
+
+&dpmac3 {
+       status = "okay";
+       phy-handle = <&sgmii_phy3>;
+       phy-connection-type = "sgmii";
+};
+
+&dpmac4 {
+       status = "okay";
+       phy-handle = <&rgmii_phy0>;
+       phy-connection-type = "rgmii-id";
+};
+
+&dpmac5 {
+       status = "okay";
+       phy-handle = <&rgmii_phy1>;
+       phy-connection-type = "rgmii-id";
+};
+
+&dpmac6 {
+       status = "disabled";
+};
+
+&dpmac7 {
+       status = "okay";
+       phy-handle = <&sgmii_phy2>;
+       phy-connection-type = "sgmii";
+};
+
+&dpmac8 {
+       status = "disabled";
+};
+
+&dpmac9 {
+       status = "disabled";
+};
+
+&dpmac10 {
+       status = "disabled";
+};
+
+&emdio1 {
+       status = "okay";
+
+       rgmii_phy0: ethernet-phy@1 {
+               reg = <0x1>;
+       };
+
+       rgmii_phy1: ethernet-phy@2 {
+               reg = <0x2>;
+       };
+
+       sgmii_phy2: ethernet-phy@3 {
+               reg = <0x3>;
+       };
+
+       sgmii_phy3: ethernet-phy@4 {
+               reg = <0x4>;
+       };
+};
+
+&i2c0 {
+       status = "okay";
+
+       spd@50 {
+               compatible = "spd";
+               reg = <0x50>;
+               status = "okay";
+       };
+
+       eeprom@56 {
+               compatible = "atmel,24c64";
+               reg = <0x56>;
+               status = "okay";
+       };
+
+       eeprom@57 {
+               compatible = "24c01";
+               reg = <0x57>;
+               status = "okay";
+       };
+
+       leds@62 {
+               compatible = "nxp,pca9633";
+               reg = <0x62>;
+               status = "okay";
+       };
+
+       rtc@6f {
+               compatible = "microchip,mcp7941x";
+               reg = <0x6f>;
+               status = "okay";
+       };
+};
+
+&i2c2 {
+       status = "okay";
+
+       i2c-mux@70 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "nxp,pca9546";
+               reg = <0x70>;
+               status = "okay";
+
+               pcie0_i2c: i2c@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0>;
+               };
+
+               sfp0_i2c: i2c@1 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <1>;
+               };
+
+               sfp1_i2c: i2c@2 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <2>;
+               };
+
+               ext_i2c: i2c@3 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <3>;
+               };
+       };
+};
+
+&qspi {
+       status = "okay";
+
+       gd25lq128: flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               spi-max-frequency = <50000000>;
+               reg = <0>;
+
+               partitions {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       compatible = "fixed-partitions";
+
+                       partition@0 {
+                               label = "bl2";
+                               reg = <0 0x100000>;
+                       };
+
+                       partition@100000 {
+                               label = "fip1";
+                               reg = <0x100000 0x400000>;
+                       };
+
+                       partition@500000 {
+                               label = "fip2";
+                               reg = <0x500000 0x400000>;
+                       };
+
+                       partition@900000 {
+                               label = "uboot-env";
+                               reg = <0x900000 0x10000>;
+                       };
+
+                       partition@910000 {
+                               label = "mc-firmware";
+                               reg = <0x910000 0x200000>;
+                       };
+
+                       partition@b10000 {
+                               label = "dpc";
+                               reg = <0xb10000 0x10000>;
+                       };
+
+                       partition@b20000 {
+                               label = "dpl";
+                               reg = <0xb20000 0x10000>;
+                       };
+
+                       partition@b30000 {
+                               label = "dtb";
+                               reg = <0xb30000 0x10000>;
+                       };
+               };
+       };
+};
+
+&esdhc {
+       status = "okay";
+};
+
+&usb0 {
+       status = "okay";
+};
+
+&usb1 {
+       status = "okay";
+};
+
+&duart0 {
+       status = "okay";
+};
diff --git a/board/conclusive/whle-ls1088a/Kconfig 
b/board/conclusive/whle-ls1088a/Kconfig
new file mode 100644
index 000000000000..3111ccc84e0c
--- /dev/null
+++ b/board/conclusive/whle-ls1088a/Kconfig
@@ -0,0 +1,29 @@
+if TARGET_WHLE_LS1088A
+
+config SYS_BOARD
+       default "whle-ls1088a"
+
+config SYS_VENDOR
+       default "conclusive"
+
+config SYS_SOC
+       default "fsl-layerscape"
+
+config SYS_CONFIG_NAME
+       default "whle_ls1088a"
+
+if FSL_LS_PPA
+config SYS_LS_PPA_FW_ADDR
+        hex "PPA Firmware Addr"
+       default 0x20400000 if SYS_LS_PPA_FW_IN_XIP
+       default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND
+
+if CHAIN_OF_TRUST
+config SYS_LS_PPA_ESBC_ADDR
+       hex "PPA Firmware HDR Addr"
+       default 0x20680000 if SYS_LS_PPA_FW_IN_XIP
+       default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND
+endif
+endif
+
+endif
diff --git a/board/conclusive/whle-ls1088a/MAINTAINERS 
b/board/conclusive/whle-ls1088a/MAINTAINERS
new file mode 100644
index 000000000000..49a3c5616969
--- /dev/null
+++ b/board/conclusive/whle-ls1088a/MAINTAINERS
@@ -0,0 +1,11 @@
+WHLE-LS1088A Board
+M:     Jakub Klama <ja...@conclusive.pl>
+M:     Artur Rojek <ar...@conclusive.pl>
+S:     Maintained
+F:     board/conclusive/whle-ls1088a
+F:     include/configs/whle-ls1088a.h
+F:     configs/whle_ls1088a_emmc_defconfig
+F:     configs/whle_ls1088a_qspi_defconfig
+F:     arch/arm/dts/fsl-ls1088a-whle.dts
+F:     arch/arm/dts/fsl-ls1088a-whle-u-boot.dtsi
+
diff --git a/board/conclusive/whle-ls1088a/Makefile 
b/board/conclusive/whle-ls1088a/Makefile
new file mode 100644
index 000000000000..9c37d961c433
--- /dev/null
+++ b/board/conclusive/whle-ls1088a/Makefile
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (C) 2020-2023 Conclusive Engineering Sp. z o. o.
+
+obj-y += whle-ls1088a.o
+obj-y += eth.o
+obj-y += ddr.o
diff --git a/board/conclusive/whle-ls1088a/ddr.c 
b/board/conclusive/whle-ls1088a/ddr.c
new file mode 100644
index 000000000000..be0f9669177c
--- /dev/null
+++ b/board/conclusive/whle-ls1088a/ddr.c
@@ -0,0 +1,134 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2017 NXP
+ * Copyright (C) 2020-2023 Conclusive Engineering Sp. z o. o.
+ */
+
+#include <config.h>
+#include <fsl_ddr_sdram.h>
+#include <fsl_ddr_dimm_params.h>
+#include <log.h>
+#include <asm/arch/soc.h>
+#include <asm/arch/clock.h>
+#include <asm/global_data.h>
+#include "ddr.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#if defined(CONFIG_VID) && (!defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD))
+static void fsl_ddr_setup_0v9_volt(memctl_options_t *popts)
+{
+       int vdd;
+
+       vdd = get_core_volt_from_fuse();
+       if (vdd < 0)
+               return;
+
+       if (vdd == 900) {
+               popts->ddr_cdr1 |= DDR_CDR1_V0PT9_EN;
+               debug("VID: configure DDR to support 900 mV\n");
+       }
+}
+#endif
+
+void fsl_ddr_board_options(memctl_options_t *popts,
+                          dimm_params_t *pdimm,
+                          unsigned int ctrl_num)
+{
+       const struct board_specific_parameters *pbsp, *pbsp_highest = NULL;
+       ulong ddr_freq;
+
+       if (ctrl_num > 1) {
+               printf("Not supported controller number %d\n", ctrl_num);
+               return;
+       }
+       if (!pdimm->n_ranks)
+               return;
+
+       /*
+        * we use identical timing for all slots. If needed, change the code
+        * to pbsp = rdimms[ctrl_num] or pbsp = udimms[ctrl_num];
+        */
+       pbsp = udimms[0];
+
+       /* Get clk_adjust, wrlvl_start, wrlvl_ctl, according to the board ddr
+        * frequency and n_banks specified in board_specific_parameters table.
+        */
+       ddr_freq = get_ddr_freq(0) / 1000000;
+       while (pbsp->datarate_mhz_high) {
+               if (pbsp->n_ranks == pdimm->n_ranks) {
+                       if (ddr_freq <= pbsp->datarate_mhz_high) {
+                               popts->clk_adjust = pbsp->clk_adjust;
+                               popts->wrlvl_start = pbsp->wrlvl_start;
+                               popts->wrlvl_ctl_2 = pbsp->wrlvl_ctl_2;
+                               popts->wrlvl_ctl_3 = pbsp->wrlvl_ctl_3;
+                               goto found;
+                       }
+                       pbsp_highest = pbsp;
+               }
+               pbsp++;
+       }
+
+       if (!pbsp_highest)
+               panic("DIMM is not supported by this board");
+
+       printf("Error: board specific timing not found for %lu MT/s\n",
+              ddr_freq);
+       printf("Trying to use the highest speed (%u) parameters\n",
+              pbsp_highest->datarate_mhz_high);
+       popts->clk_adjust = pbsp_highest->clk_adjust;
+       popts->wrlvl_start = pbsp_highest->wrlvl_start;
+       popts->wrlvl_ctl_2 = pbsp->wrlvl_ctl_2;
+       popts->wrlvl_ctl_3 = pbsp->wrlvl_ctl_3;
+
+found:
+       debug("Found timing match: n_ranks %d, data rate %d, rank_gb %d\n"
+               "\tclk_adjust %d, wrlvl_start %d, wrlvl_ctrl_2 0x%x, 
wrlvl_ctrl_3 0x%x\n",
+               pbsp->n_ranks, pbsp->datarate_mhz_high, pbsp->rank_gb,
+               pbsp->clk_adjust, pbsp->wrlvl_start, pbsp->wrlvl_ctl_2,
+               pbsp->wrlvl_ctl_3);
+
+       popts->half_strength_driver_enable = 0;
+
+       /* Write leveling override */
+       popts->wrlvl_override = 1;
+       popts->wrlvl_sample = 0xf;
+
+       /* Enable ZQ calibration */
+       popts->zq_en = 1;
+
+       /* Enable DDR hashing */
+       popts->addr_hash = 1;
+
+       popts->ddr_cdr1 = DDR_CDR1_DHC_EN | DDR_CDR1_ODT(DDR_CDR_ODT_60ohm);
+#if defined(CONFIG_VID) && (!defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD))
+       fsl_ddr_setup_0v9_volt(popts);
+#endif
+
+       popts->ddr_cdr2 = DDR_CDR2_ODT(DDR_CDR_ODT_60ohm) |
+                         DDR_CDR2_VREF_TRAIN_EN | DDR_CDR2_VREF_RANGE_2;
+}
+
+#ifdef CONFIG_TFABOOT
+int fsl_initdram(void)
+{
+       gd->ram_size = tfa_get_dram_size();
+
+       if (!gd->ram_size)
+               gd->ram_size = fsl_ddr_sdram_size();
+
+       return 0;
+}
+#else
+int fsl_initdram(void)
+{
+       puts("Initializing DDR....using SPD\n");
+
+#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD)
+       gd->ram_size = fsl_ddr_sdram_size();
+#else
+       gd->ram_size = fsl_ddr_sdram();
+#endif
+       return 0;
+}
+#endif /* CONFIG_TFABOOT */
diff --git a/board/conclusive/whle-ls1088a/ddr.h 
b/board/conclusive/whle-ls1088a/ddr.h
new file mode 100644
index 000000000000..462c5cfe6b06
--- /dev/null
+++ b/board/conclusive/whle-ls1088a/ddr.h
@@ -0,0 +1,47 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2017 NXP
+ */
+
+#ifndef __LS1088A_DDR_H__
+#define __LS1088A_DDR_H__
+struct board_specific_parameters {
+       u32 n_ranks;
+       u32 datarate_mhz_high;
+       u32 rank_gb;
+       u32 clk_adjust;
+       u32 wrlvl_start;
+       u32 wrlvl_ctl_2;
+       u32 wrlvl_ctl_3;
+};
+
+/*
+ * These tables contain all valid speeds we want to override with board
+ * specific parameters. datarate_mhz_high values need to be in ascending order
+ * for each n_ranks group.
+ */
+
+static const struct board_specific_parameters udimm0[] = {
+       /*
+        * memory controller 0
+        *   num|  hi| rank|  clk| wrlvl |   wrlvl   |  wrlvl
+        * ranks| mhz| GB  |adjst| start |   ctl2    |  ctl3
+        */
+#if defined(CONFIG_TARGET_LS1088ARDB)
+       {2,  1666, 0, 8,     8, 0x090A0B0E, 0x0F10110D,},
+       {2,  1900, 0, 8,     9, 0x0A0B0C10, 0x1112140E,},
+       {2,  2300, 0, 8,     9, 0x0A0C0E11, 0x1214160F,},
+       {}
+#elif defined(CONFIG_TARGET_LS1088AQDS)
+       {2,  1666, 0, 8,     8, 0x0A0A0C0E, 0x0F10110C,},
+       {2,  1900, 0, 8,     9, 0x0A0B0C10, 0x1112140E,},
+       {2,  2300, 0, 4,     9, 0x0A0C0D11, 0x1214150E,},
+       {}
+
+#endif
+};
+
+static const struct board_specific_parameters *udimms[] = {
+       udimm0,
+};
+#endif
diff --git a/board/conclusive/whle-ls1088a/eth.c 
b/board/conclusive/whle-ls1088a/eth.c
new file mode 100644
index 000000000000..fb6f9c1a813f
--- /dev/null
+++ b/board/conclusive/whle-ls1088a/eth.c
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2017 NXP
+ */
+
+#include <fsl-mc/fsl_mc.h>
+
+#if defined(CONFIG_RESET_PHY_R)
+void reset_phy(void)
+{
+       mc_env_boot();
+}
+#endif /* CONFIG_RESET_PHY_R */
diff --git a/board/conclusive/whle-ls1088a/whle-ls1088a.c 
b/board/conclusive/whle-ls1088a/whle-ls1088a.c
new file mode 100644
index 000000000000..dab367f85145
--- /dev/null
+++ b/board/conclusive/whle-ls1088a/whle-ls1088a.c
@@ -0,0 +1,301 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * whle-ls1088a.c - Board init file for Conclusive WHLE-LS1088A board
+ * Copyright (C) 2020-2023 Conclusive Engineering Sp. z o. o.
+ */
+
+#include <config.h>
+#include <display_options.h>
+#include <env.h>
+#include <i2c.h>
+#include <init.h>
+#include <log.h>
+#include <malloc.h>
+#include <errno.h>
+#include <netdev.h>
+#include <fsl_ifc.h>
+#include <fsl_ddr.h>
+#include <fsl_sec.h>
+#include <asm/global_data.h>
+#include <asm/io.h>
+#include <fdt_support.h>
+#include <linux/delay.h>
+#include <linux/libfdt.h>
+#include <fsl-mc/fsl_mc.h>
+#include <env_internal.h>
+#include <asm/arch-fsl-layerscape/soc.h>
+#include <hwconfig.h>
+#include <asm/arch/fsl_serdes.h>
+#include <asm/arch/soc.h>
+#include <asm/arch-fsl-layerscape/fsl_icid.h>
+#include <fsl_immap.h>
+
+#define        BOARD_REV_MASK  0x0f
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int board_early_init_f(void)
+{
+       fsl_lsch3_early_init_f();
+       return 0;
+}
+
+static inline uint8_t get_board_version(void)
+{
+       struct ccsr_gur __iomem *gur = (void *)(CFG_SYS_FSL_GUTS_ADDR);
+
+       return in_be32(&gur->gpporcr1) & BOARD_REV_MASK;
+}
+
+static int settings_r(void)
+{
+       serial_read_from_eeprom(0);
+
+       return 0;
+}
+EVENT_SPY_SIMPLE(EVT_SETTINGS_R, settings_r);
+
+#if defined(CONFIG_DISPLAY_BOARDINFO_LATE)
+int checkboard(void)
+{
+       const char *serial_number = env_get("serial#");
+
+       printf("Board: WHLE-LS1088A, Rev: %s\n",
+              get_board_version() == 0x00 ? "0" : "unknown");
+
+       if (!serial_number)
+               printf("Warning: unknown serial number.\n");
+       else
+               printf("S/N:   %s\n", serial_number);
+
+       return 0;
+}
+#endif
+
+unsigned long get_board_sys_clk(void)
+{
+       return CONFIG_SYS_CLK_FREQ;
+}
+
+unsigned long get_board_ddr_clk(void)
+{
+       return CONFIG_DDR_CLK_FREQ;
+}
+
+#ifdef CONFIG_MISC_INIT_R
+int misc_init_r(void)
+{
+       return 0;
+}
+#endif
+
+#if !defined(CONFIG_SPL_BUILD)
+int board_init(void)
+{
+#ifdef CONFIG_FSL_CAAM
+       sec_init();
+#endif
+
+#if !defined(CONFIG_SYS_EARLY_PCI_INIT)
+       pci_init();
+#endif
+
+       return 0;
+}
+
+void detail_board_ddr_info(void)
+{
+       puts("\nDDR:   ");
+       print_size(gd->bd->bi_dram[0].size + gd->bd->bi_dram[1].size, "");
+       print_ddr_info(0);
+}
+
+#ifdef CONFIG_FSL_MC_ENET
+void board_quiesce_devices(void)
+{
+       fsl_mc_ldpaa_exit(gd->bd);
+}
+
+void fdt_fixup_board_enet(void *fdt)
+{
+       int offset;
+
+       offset = fdt_path_offset(fdt, "/fsl-mc");
+
+       if (offset < 0)
+               offset = fdt_path_offset(fdt, "/soc/fsl-mc");
+
+       if (offset < 0) {
+               printf("%s: ERROR: fsl-mc node not found in device tree (error 
%d)\n",
+                      __func__, offset);
+               return;
+       }
+
+       if (get_mc_boot_status() == 0 &&
+           (is_lazy_dpl_addr_valid() || get_dpl_apply_status() == 0))
+               fdt_status_okay(fdt, offset);
+       else
+               fdt_status_fail(fdt, offset);
+}
+#endif
+
+#ifdef CONFIG_OF_BOARD_SETUP
+void fsl_fdt_fixup_flash(void *fdt)
+{
+       int offset;
+#ifdef CONFIG_TFABOOT
+       u32 __iomem *dcfg_ccsr = (u32 __iomem *)DCFG_BASE;
+       u32 val;
+#endif
+
+/*
+ * IFC-NOR and QSPI are muxed on SoC.
+ * So disable IFC node in dts if QSPI is enabled or
+ * disable QSPI node in dts in case QSPI is not enabled.
+ */
+
+#ifdef CONFIG_TFABOOT
+       enum boot_src src = get_boot_src();
+       bool disable_ifc = false;
+
+       switch (src) {
+       case BOOT_SOURCE_IFC_NOR:
+               disable_ifc = false;
+               break;
+       case BOOT_SOURCE_QSPI_NOR:
+               disable_ifc = true;
+               break;
+       default:
+               val = in_le32(dcfg_ccsr + DCFG_RCWSR15 / 4);
+               if (DCFG_RCWSR15_IFCGRPABASE_QSPI == (val & 0x3))
+                       disable_ifc = true;
+               break;
+       }
+
+       if (disable_ifc) {
+               offset = fdt_path_offset(fdt, "/soc/ifc/nor");
+
+               if (offset < 0)
+                       offset = fdt_path_offset(fdt, "/ifc/nor");
+       } else {
+               offset = fdt_path_offset(fdt, "/soc/quadspi");
+
+               if (offset < 0)
+                       offset = fdt_path_offset(fdt, "/quadspi");
+       }
+
+#else
+#ifdef CONFIG_FSL_QSPI
+       offset = fdt_path_offset(fdt, "/soc/ifc/nor");
+
+       if (offset < 0)
+               offset = fdt_path_offset(fdt, "/ifc/nor");
+#else
+       offset = fdt_path_offset(fdt, "/soc/quadspi");
+
+       if (offset < 0)
+               offset = fdt_path_offset(fdt, "/quadspi");
+#endif
+#endif
+       if (offset < 0)
+               return;
+
+       fdt_status_disabled(fdt, offset);
+}
+
+int ft_board_setup(void *blob, struct bd_info *bd)
+{
+       u16 total_memory_banks, mc_memory_bank = 0;
+       u64 *base, *size, mc_memory_base = 0, mc_memory_size = 0;
+       int i;
+
+       ft_cpu_setup(blob, bd);
+
+       fdt_fixup_mc_ddr(&mc_memory_base, &mc_memory_size);
+
+       if (mc_memory_base != 0)
+               mc_memory_bank++;
+
+       total_memory_banks = CONFIG_NR_DRAM_BANKS + mc_memory_bank;
+
+       base = calloc(total_memory_banks, sizeof(u64));
+       size = calloc(total_memory_banks, sizeof(u64));
+
+       /* fixup DT for the two GPP DDR banks */
+       for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
+               base[i] = gd->bd->bi_dram[i].start;
+               size[i] = gd->bd->bi_dram[i].size;
+       }
+
+#ifdef CONFIG_RESV_RAM
+       /* reduce size if reserved memory is within this bank */
+       if (gd->arch.resv_ram >= base[0] &&
+           gd->arch.resv_ram < base[0] + size[0])
+               size[0] = gd->arch.resv_ram - base[0];
+       else if (gd->arch.resv_ram >= base[1] &&
+                gd->arch.resv_ram < base[1] + size[1])
+               size[1] = gd->arch.resv_ram - base[1];
+#endif
+
+       if (mc_memory_base != 0) {
+               for (i = 0; i <= total_memory_banks; i++) {
+                       if (base[i] == 0 && size[i] == 0) {
+                               base[i] = mc_memory_base;
+                               size[i] = mc_memory_size;
+                               break;
+                       }
+               }
+       }
+
+       fdt_fixup_memory_banks(blob, base, size, total_memory_banks);
+
+       fdt_fsl_mc_fixup_iommu_map_entry(blob);
+
+       fsl_fdt_fixup_flash(blob);
+
+#ifdef CONFIG_FSL_MC_ENET
+       fdt_fixup_board_enet(blob);
+#endif
+
+       fdt_fixup_icid(blob);
+
+       return 0;
+}
+#endif
+#endif /* !defined(CONFIG_SPL_BUILD) */
+
+#ifdef CONFIG_TFABOOT
+#ifdef CONFIG_MTD_NOR_FLASH
+int is_flash_available(void)
+{
+       char *env_hwconfig = env_get("hwconfig");
+       enum boot_src src = get_boot_src();
+       int is_nor_flash_available = 1;
+
+       switch (src) {
+       case BOOT_SOURCE_IFC_NOR:
+               is_nor_flash_available = 1;
+               break;
+       case BOOT_SOURCE_QSPI_NOR:
+               is_nor_flash_available = 0;
+               break;
+       /*
+        * In Case of SD boot,if qspi is defined in env_hwconfig
+        * disable nor flash probe.
+        */
+       default:
+               if (hwconfig_f("qspi", env_hwconfig))
+                       is_nor_flash_available = 0;
+               break;
+       }
+       return is_nor_flash_available;
+}
+#endif
+
+#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
+void *env_sf_get_env_addr(void)
+{
+       return (void *)(CFG_SYS_FSL_QSPI_BASE + CONFIG_ENV_OFFSET);
+}
+#endif
+#endif
diff --git a/board/conclusive/whle-ls1088a/whle-ls1088a.env 
b/board/conclusive/whle-ls1088a/whle-ls1088a.env
new file mode 100644
index 000000000000..f48d4800f3a0
--- /dev/null
+++ b/board/conclusive/whle-ls1088a/whle-ls1088a.env
@@ -0,0 +1,13 @@
+hwconfig=fsl_ddr:bank_intlv=auto
+kernel_addr_r=0x81000000
+kernel_size=0x07000000
+kernel_comp_addr_r=0x88000000
+kernel_comp_size=0x04000000
+ramdisk_addr_r=0x90000000
+ramdisk_size=0x08000000
+fdt_addr_r=0x98000000
+pxefile_addr_r=0x99000000
+scriptaddr=0x9a000000
+fdtfile=fsl-ls1088a-whle.dtb
+console=ttyS0,115200
+mcmemsize=0x70000000
diff --git a/configs/whle_ls1088a_emmc_defconfig 
b/configs/whle_ls1088a_emmc_defconfig
new file mode 100644
index 000000000000..a7b2744b8639
--- /dev/null
+++ b/configs/whle_ls1088a_emmc_defconfig
@@ -0,0 +1,84 @@
+CONFIG_ARM=y
+CONFIG_TARGET_WHLE_LS1088A=y
+CONFIG_TFABOOT=y
+CONFIG_TEXT_BASE=0x82000000
+CONFIG_SYS_MALLOC_LEN=0x202000
+CONFIG_SYS_MALLOC_F_LEN=0x6000
+CONFIG_NR_DRAM_BANKS=2
+CONFIG_ENV_SIZE=0x2000
+CONFIG_DM_GPIO=y
+CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-whle"
+CONFIG_QSPI_AHB_INIT=y
+CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
+CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
+CONFIG_PCI=y
+CONFIG_AHCI=y
+CONFIG_REMAKE_ELF=y
+CONFIG_MP=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_BOOTSTD_FULL=y
+CONFIG_BOOTSTD_DEFAULTS=y
+CONFIG_BOOTSTD_BOOTCOMMAND=y
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_BOOTDELAY=10
+CONFIG_OF_BOARD_SETUP=y
+CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mmcblk0p1 
earlycon=uart8250,mmio,0x21c0500"
+# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_MISC_INIT_R=y
+CONFIG_RESET_PHY_R=y
+CONFIG_CMD_TLV_EEPROM=y
+CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5
+CONFIG_CMD_DM=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_MTD=y
+CONFIG_CMD_PCI=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_CACHE=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_EXT4=y
+CONFIG_ENV_EXT4_INTERFACE="mmc"
+CONFIG_ENV_EXT4_DEVICE_AND_PART="0:1"
+CONFIG_ENV_EXT4_FILE="/boot/uboot.env"
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_USE_ETHPRIME=y
+CONFIG_ETHPRIME="DPMAC4@rgmii-id"
+CONFIG_FSL_CAAM=y
+CONFIG_DDR_ECC=y
+CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
+CONFIG_MPC8XXX_GPIO=y
+CONFIG_DM_I2C=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_PCA954x=y
+CONFIG_I2C_EEPROM=y
+CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
+CONFIG_DM_MTD=y
+CONFIG_MTD_SPI_NAND=y
+CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_FLASH_MTD=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_REALTEK=y
+CONFIG_SYS_MEMAC_LITTLE_ENDIAN=y
+CONFIG_DM_MDIO_MUX=y
+CONFIG_PHY_GIGE=y
+CONFIG_E1000=y
+CONFIG_MII=y
+CONFIG_MDIO_MUX_I2CREG=y
+CONFIG_NVME_PCI=y
+CONFIG_DM_PCI_COMPAT=y
+CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_DM_SCSI=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
+CONFIG_SYS_NS16550=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_FSL_QSPI=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
diff --git a/configs/whle_ls1088a_qspi_defconfig 
b/configs/whle_ls1088a_qspi_defconfig
new file mode 100644
index 000000000000..cfde387a4068
--- /dev/null
+++ b/configs/whle_ls1088a_qspi_defconfig
@@ -0,0 +1,84 @@
+CONFIG_ARM=y
+CONFIG_TARGET_WHLE_LS1088A=y
+CONFIG_TFABOOT=y
+CONFIG_TEXT_BASE=0x82000000
+CONFIG_NR_DRAM_BANKS=2
+CONFIG_ENV_SIZE=0x10000
+CONFIG_ENV_OFFSET=0x900000
+CONFIG_ENV_SECT_SIZE=0x1000
+CONFIG_DM_GPIO=y
+CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-whle"
+CONFIG_QSPI_AHB_INIT=y
+CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
+CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
+CONFIG_PCI=y
+CONFIG_AHCI=y
+CONFIG_REMAKE_ELF=y
+CONFIG_MP=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_BOOTSTD_FULL=y
+CONFIG_BOOTSTD_DEFAULTS=y
+CONFIG_BOOTSTD_BOOTCOMMAND=y
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_BOOTDELAY=10
+CONFIG_OF_BOARD_SETUP=y
+CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mmcblk0p1 
earlycon=uart8250,mmio,0x21c0500"
+CONFIG_BOOTCOMMAND="sf probe; mtd read dtb $fdt_addr_r; bootflow scan -lb"
+# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_MISC_INIT_R=y
+CONFIG_RESET_PHY_R=y
+CONFIG_CMD_TLV_EEPROM=y
+CONFIG_CMD_BOOTMENU=y
+CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5
+CONFIG_CMD_DM=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_MTD=y
+CONFIG_CMD_PCI=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_CACHE=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_ENV_SECT_SIZE_AUTO=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_USE_ETHPRIME=y
+CONFIG_ETHPRIME="DPMAC4@rgmii-id"
+CONFIG_FSL_CAAM=y
+CONFIG_DDR_ECC=y
+CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
+CONFIG_MPC8XXX_GPIO=y
+CONFIG_DM_I2C=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_PCA954x=y
+CONFIG_I2C_EEPROM=y
+CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
+CONFIG_DM_MTD=y
+CONFIG_MTD_SPI_NAND=y
+CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_FLASH_MTD=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_REALTEK=y
+CONFIG_SYS_MEMAC_LITTLE_ENDIAN=y
+CONFIG_DM_MDIO_MUX=y
+CONFIG_PHY_GIGE=y
+CONFIG_E1000=y
+CONFIG_MII=y
+CONFIG_NVME_PCI=y
+CONFIG_DM_PCI_COMPAT=y
+CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_DM_SCSI=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
+CONFIG_SYS_NS16550=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_FSL_QSPI=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
diff --git a/include/configs/whle_ls1088a.h b/include/configs/whle_ls1088a.h
new file mode 100644
index 000000000000..260643b4447d
--- /dev/null
+++ b/include/configs/whle_ls1088a.h
@@ -0,0 +1,92 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2020-2023 Conclusive Engineering Sp. z o. o.
+ */
+
+#ifndef __WHLE_LS1088A_H__
+#define __WHLE_LS1088A_H__
+
+#include <asm/arch/stream_id_lsch3.h>
+#include <asm/arch/config.h>
+#include <asm/arch/soc.h>
+
+/* Link Definitions */
+#define CFG_SYS_FSL_QSPI_BASE          0x20000000
+
+#define CFG_SYS_DDR_SDRAM_BASE         0x80000000UL
+#define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
+#define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
+#define CFG_SYS_DDR_BLOCK2_BASE                0x8080000000ULL
+#define CFG_SYS_FSL_DDR_MAIN_NUM_CTRLS 1
+
+/* SMP Definitinos */
+#define CPU_RELEASE_ADDR               secondary_boot_addr
+
+#define COUNTER_FREQUENCY_REAL         25000000        /* 25MHz */
+#define SPD_EEPROM_ADDRESS             0x50
+#define CFG_SYS_LS_MC_BOOT_TIMEOUT_MS  5000
+#define PWM_CHANNEL0                    0x0
+
+#define CFG_SYS_FLASH_BASE             0x580000000ULL
+#define CFG_SYS_FLASH_BASE_PHYS                0x80000000
+#define CFG_SYS_FLASH_BASE_PHYS_EARLY  0x00000000
+
+/* Serial Port */
+#define CFG_SYS_NS16550_CLK          (get_bus_freq(0) / 2)
+
+#define HWCONFIG_BUFFER_SIZE           128
+
+/* RTC configuration */
+#ifndef SPL_NO_RTC
+#define RTC
+#define CFG_SYS_I2C_RTC_ADDR         0x51  /* Channel 3*/
+#endif
+
+/* TF-A */
+#define QSPI_NOR_BOOTCOMMAND   CONFIG_BOOTCOMMAND
+#define QSPI_NAND_BOOTCOMMAND  CONFIG_BOOTCOMMAND
+#define SD_BOOTCOMMAND         CONFIG_BOOTCOMMAND
+
+/*
+ * Carve out a DDR region which will not be used by u-boot/Linux
+ *
+ * It will be used by MC and Debug Server. The MC region must be
+ * 512MB aligned, so the min size to hide is 512MB.
+ */
+
+#ifdef CONFIG_FSL_MC_ENET
+#define CFG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE              (128UL * 1024 * 1024)
+#endif
+
+/* MC firmware */
+#define CFG_SYS_LS_MC_DPC_MAX_LENGTH           0x20000
+#define CFG_SYS_LS_MC_DRAM_DPC_OFFSET          0x00F00000
+#define CFG_SYS_LS_MC_DPL_MAX_LENGTH           0x20000
+#define CFG_SYS_LS_MC_DRAM_DPL_OFFSET          0x00F20000
+#define CFG_SYS_LS_MC_AIOP_IMG_MAX_LENGTH      0x200000
+#define CFG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET     0x07000000
+#define CFG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE      (128UL * 1024 * 1024)
+
+#define RESERVED_MC_INIT_CMD                           \
+       "fsl_mc start mc 0x83000000 0x84000000 && "     \
+       "fsl_mc lazyapply DPL 0x85000000\0"
+
+#define QSPI_MC_INIT_CMD                               \
+       "sf probe; "                                    \
+       "mtd read mc-firmware 0x83000000; "             \
+       "mtd read dpc 0x84000000; "                     \
+       "mtd read dpl 0x85000000; "                     \
+       "fsl_mc start mc 0x83000000 0x84000000 && "     \
+       "fsl_mc lazyapply DPL 0x85000000\0"
+
+#define SD_MC_INIT_CMD                                 \
+       "mmcinfo;"                                      \
+       "mmc read 0x83000000 0x5000 0x2000 && "         \
+       "mmc read 0x84000000 0x7000 0x100 && "          \
+       "mmc read 0x85000000 0x6800 0x100 && "          \
+       "fsl_mc start mc 0x83000000 0x84000000 && "     \
+       "fsl_mc lazyapply DPL 0x85000000\0"
+
+#include <asm/fsl_secure_boot.h>
+
+#endif /* __WHLE_LS1088A_H__ */
-- 
2.43.0

Reply via email to