scarthgap (branch required)

conf/layer.conf

@@ -8,7 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "solidrun-arm-imx8"
 BBFILE_PATTERN_solidrun-arm-imx8= "^${LAYERDIR}/"
 BBFILE_PRIORITY_solidrun-arm-imx8 = "10"
-LAYERSERIES_COMPAT_solidrun-arm-imx8 = "kirkstone"
+LAYERSERIES_COMPAT_solidrun-arm-imx8 = "scarthgap"
 
-BBMASK += "meta-bsp/recipes-kernel/linux-firmware/.*\.bbappend"
+BBMASK += "meta-imx-bsp/recipes-kernel/linux-firmware/.*\.bbappend"
 BBMASK += "meta-imx/meta-bsp/recipes-support/opencv/"

conf/machine/imx8mpsolidrun.conf

@@ -27,7 +27,6 @@ KERNEL_DEVICETREE ?= "freescale/imx8mp-cubox-m.dtb \
 WKS_FILE_DEPENDS:append:imx8mp-solidrun = " imx-m7-demos"
 IMAGE_BOOT_FILES:append:imx8mp-solidrun = " \
     imx8mp_m7_TCM_hello_world.bin \
-    imx8mp_m7_TCM_low_power_voice.bin \
     imx8mp_m7_TCM_low_power_wakeword.bin \
     imx8mp_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
     imx8mp_m7_TCM_rpmsg_lite_str_echo_rtos.bin \
@@ -72,12 +71,12 @@ IMX_BOOT_SEEK = "32"
 OPTEE_BIN_EXT = "8mp"
 TEE_LOAD_ADDR = "0x56000000"
 
-PREFERRED_VERSION_u-boot-imx = "2022.04"
-PREFERRED_VERSION_u-boot-fslc = "2022.04"
+PREFERRED_VERSION_u-boot-imx = "2024.04"
+PREFERRED_VERSION_u-boot-fslc = "2024.04"
 
 # Add additional firmware
-MACHINE_FIRMWARE:append = " linux-firmware-bcm43455-sr"
-MACHINE_FIRMWARE:append:mx8mp = " firmware-imx-xcvr-imx8mp linux-firmware-bcm43455-sr"
+MACHINE_FIRMWARE:append = " firmware-nxp-wifi-bcm43455-sr"
+MACHINE_FIRMWARE:append:mx8mp = " firmware-imx-xcvr-imx8mp firmware-nxp-wifi-bcm43455-sr"
 IMAGE_BOOT_FILES:append = " extlinux.conf;extlinux/extlinux.conf"
 UBOOT_EXTLINUX = "1"
 UBOOT_EXTLINUX_DEFAULT_LABEL = "Linux Default"

conf/machine/solidsensen8.conf

@@ -128,5 +128,5 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS:append:solidsensen8 = " \
     kernel-module-rtc-abx80x \
     kernel-module-secvio \
     kernel-module-usb-wwan \
-    linux-firmware-bcm43455-sr \
+    firmware-nxp-wifi-bcm43455-sr \
 "

recipes-bsp/firmware-nxp-wifi/firmware-nxp-wifi_%.bbappend

@@ -0,0 +1,39 @@
+# Copyright 2017-2021 NXP
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+PACKAGES =+ " ${PN}-bcm43455-sr"
+
+S = "${WORKDIR}/git"
+
+do_install:append () {
+    install -d ${D}${nonarch_base_libdir}/firmware/brcm
+
+    install -m 0644 ${S}/cyw-wifi-bt/1MW_CYW43455/brcmfmac43455-sdio.bin ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.fsl,imx8mp-sr-som.bin
+    install -m 0644 ${S}/cyw-wifi-bt/1MW_CYW43455/brcmfmac43455-sdio.bin ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.solidrun,solidsense-n8-compact.bin
+    install -m 0644 ${S}/cyw-wifi-bt/1MW_CYW43455/brcmfmac43455-sdio.clm_blob ${D}${nonarch_base_libdir}/firmware/brcm
+    install -m 0644 ${S}/cyw-wifi-bt/1MW_CYW43455/brcmfmac43455-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.fsl,imx8mp-sr-som.txt
+    install -m 0644 ${S}/cyw-wifi-bt/1MW_CYW43455/brcmfmac43455-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.solidrun,solidsense-n8-compact.txt
+    install -m 0644 ${S}/cyw-wifi-bt/1MW_CYW43455/BCM4345C0.1MW.hcd ${D}${nonarch_base_libdir}/firmware/brcm/BCM4345C0.hcd
+}
+
+FILES:${PN}-bcm43455:append = " \
+       ${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.fsl,imx8mp-sr-som.bin \
+       ${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.solidrun,solidsense-n8-compact.bin \
+       ${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.clm_blob \
+       ${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.fsl,imx8mp-sr-som.txt \
+       ${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.solidrun,solidsense-n8-compact.txt \
+       ${nonarch_base_libdir}/firmware/brcm/BCM4345C0.hcd \
+"
+
+FILES:${PN}-bcm43455-sr = " \
+       ${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.fsl,imx8mp-sr-som.bin \
+       ${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.solidrun,solidsense-n8-compact.bin \
+       ${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.clm_blob \
+       ${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.fsl,imx8mp-sr-som.txt \
+       ${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.solidrun,solidsense-n8-compact.txt \
+       ${nonarch_base_libdir}/firmware/brcm/BCM4345C0.hcd \
+"
+
+RCONFLICTS:${PN}-bcm43455 = "${PN}-bcm43455-sr"
+RCONFLICTS:${PN}-bcm43455-sr = "${PN}-bcm43455"

recipes-bsp/imx-atf/imx-atf-2.6/0001-changed-the-RDC-for-imx8mn-uart4.patch → recipes-bsp/imx-atf/imx-atf-2.10/0001-changed-the-RDC-for-imx8mn-uart4.patch

@@ -1,4 +1,4 @@
-From 15a48b9d8cd0cfe0a6138c468dc19958e46c3369 Mon Sep 17 00:00:00 2001
+From 5e7b6286171ebd8c45efdc715a8bdbc78ba64c19 Mon Sep 17 00:00:00 2001
 From: Yazan Shhady <[email protected]>
 Date: Mon, 26 Apr 2021 17:40:02 +0300
 Subject: [PATCH] changed the RDC for imx8mn uart4
@@ -8,10 +8,10 @@ Subject: [PATCH] changed the RDC for imx8mn uart4
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
-index c87748a18..e9be22aae 100644
+index 312eb32d1..704d001f0 100644
 --- a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
 +++ b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
-@@ -105,7 +105,7 @@ static const struct imx_rdc_cfg rdc[] = {
+@@ -109,7 +109,7 @@ static const struct imx_rdc_cfg rdc[] = {
  	RDC_MDAn(RDC_MDA_M7, DID1),
 
  	/* peripherals domain permission */

recipes-bsp/imx-atf/imx-atf_2.6.bbappend → recipes-bsp/imx-atf/imx-atf_2.10.bbappend

@@ -1,7 +1,7 @@
 ###############################################################
-# BEGIN: Changes to imx-atf_2.6.bb
+# BEGIN: Changes to imx-atf_2.10.bb
 
-FILESEXTRAPATHS:prepend:solidsensen8 := "${THISDIR}/${PN}-2.6:"
+FILESEXTRAPATHS:prepend:solidsensen8 := "${THISDIR}/${PN}-2.10:"
 
 SRC_URI:append:solidsensen8 = " \
 file://0001-changed-the-RDC-for-imx8mn-uart4.patch \

recipes-bsp/u-boot/u-boot-imx/0001-Add-imx8mp-solidrun-support-for-lf_v2022.04.patch

@@ -1,7 +1,7 @@
-From d9e1c94c3aa342cc359630181a96dd70fb8a07dd Mon Sep 17 00:00:00 2001
+From 7991f787da2d8a2f51806a1096fa519570febe04 Mon Sep 17 00:00:00 2001
 From: TalPilo <[email protected]>
 Date: Wed, 30 Sep 2020 11:38:11 +0300
-Subject: [PATCH 01/21] Add imx8mp solidrun support for lf_v2022.04
+Subject: [PATCH] Add imx8mp solidrun support for lf_v2022.04
 
 This adds the SolidRun board support and unified device-tree
 that supports booting our iMX8MP based HummingBoard Pulse and
@@ -12,13 +12,11 @@ Signed-off-by: Rabeeh Khoury <[email protected]>
 Signed-off-by: Yazan Shhady <[email protected]>
 Signed-off-by: Josua Mayer <[email protected]>
 Signed-off-by: Jon Nettleton <[email protected]>
-
-%% original patch: 0001-Add-imx8mp-solidrun-support-for-lf_v2022.04.patch
 ---
  arch/arm/dts/Makefile                         |    1 +
  arch/arm/dts/imx8mp-solidrun-u-boot.dtsi      |  227 ++
  arch/arm/dts/imx8mp-solidrun.dts              |  609 ++++++
- arch/arm/mach-imx/imx8m/Kconfig               |   12 +
+ arch/arm/mach-imx/imx8m/Kconfig               |   11 +
  board/solidrun/imx8mp_solidrun/Kconfig        |   17 +
  board/solidrun/imx8mp_solidrun/MAINTAINERS    |    6 +
  board/solidrun/imx8mp_solidrun/Makefile       |   12 +
@@ -30,7 +28,7 @@ Signed-off-by: Jon Nettleton <[email protected]>
  board/solidrun/imx8mp_solidrun/spl.c          |  204 ++
  configs/imx8mp_solidrun_defconfig             |  192 ++
  include/configs/imx8mp_solidrun.h             |  207 ++
- 15 files changed, 5613 insertions(+)
+ 15 files changed, 5612 insertions(+)
  create mode 100644 arch/arm/dts/imx8mp-solidrun-u-boot.dtsi
  create mode 100644 arch/arm/dts/imx8mp-solidrun.dts
  create mode 100644 board/solidrun/imx8mp_solidrun/Kconfig
@@ -46,20 +44,20 @@ Signed-off-by: Jon Nettleton <[email protected]>
  create mode 100644 include/configs/imx8mp_solidrun.h
 
 diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index 709fdaecd7..f02a60ea3f 100644
+index e494d16ffce..7e767c572d7 100644
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
-@@ -999,6 +999,7 @@ dtb-$(CONFIG_ARCH_IMX8M) += \
- 	imx8mq-mnt-reform2.dtb \
- 	imx8mq-phanbell.dtb \
+@@ -1167,6 +1167,7 @@ dtb-$(CONFIG_ARCH_IMX8M) += \
+ 	imx8mp-dhcom-pdk3.dtb \
+ 	imx8mp-dhcom-pdk3-overlay-rev100.dtbo \
  	imx8mp-ddr4-evk.dtb \
 +	imx8mp-solidrun.dtb \
  	imx8mp-evk.dtb \
- 	imx8mp-phyboard-pollux-rdk.dtb \
- 	imx8mp-verdin.dtb \
+ 	imx8mp-icore-mx8mp-edimm2.2.dtb \
+ 	imx8mp-msc-sm2s.dtb \
 diff --git a/arch/arm/dts/imx8mp-solidrun-u-boot.dtsi b/arch/arm/dts/imx8mp-solidrun-u-boot.dtsi
 new file mode 100644
-index 0000000000..f2e6031997
+index 00000000000..f2e6031997e
 --- /dev/null
 +++ b/arch/arm/dts/imx8mp-solidrun-u-boot.dtsi
 @@ -0,0 +1,227 @@
@@ -292,7 +290,7 @@ index 0000000000..f2e6031997
 +};
 diff --git a/arch/arm/dts/imx8mp-solidrun.dts b/arch/arm/dts/imx8mp-solidrun.dts
 new file mode 100644
-index 0000000000..b92c856930
+index 00000000000..b92c8569302
 --- /dev/null
 +++ b/arch/arm/dts/imx8mp-solidrun.dts
 @@ -0,0 +1,609 @@
@@ -906,16 +904,15 @@ index 0000000000..b92c856930
 +	};
 +};
 diff --git a/arch/arm/mach-imx/imx8m/Kconfig b/arch/arm/mach-imx/imx8m/Kconfig
-index a225a9784f..1674dd4706 100644
+index 473cfa8e5e3..272a47be7f9 100644
 --- a/arch/arm/mach-imx/imx8m/Kconfig
 +++ b/arch/arm/mach-imx/imx8m/Kconfig
-@@ -251,6 +251,17 @@ config TARGET_IMX8MP_DDR4_EVK
+@@ -336,6 +336,16 @@ config TARGET_IMX8MP_DDR4_EVK
  	select ARCH_MISC_INIT
  	select SPL_CRYPTO if SPL
 
 +config TARGET_IMX8MP_SOLIDRUN
 +	bool "SolidRun MX8M Plus SOM based products"
-+
 +	select IMX8MP
 +	select SUPPORT_SPL
 +	select IMX8M_LPDDR4
@@ -926,18 +923,18 @@ index a225a9784f..1674dd4706 100644
 +
  config TARGET_PICO_IMX8MQ
  	bool "Support Technexion Pico iMX8MQ"
- 	select BINMAN
-@@ -362,6 +373,7 @@ source "board/kontron/sl-mx8mm/Kconfig"
- source "board/phytec/phycore_imx8mm/Kconfig"
- source "board/phytec/phycore_imx8mp/Kconfig"
+ 	select IMX8MQ
+@@ -477,6 +487,7 @@ source "board/phytec/phycore_imx8mp/Kconfig"
+ source "board/polyhex/imx8mp_debix_model_a/Kconfig"
+ source "board/purism/librem5/Kconfig"
  source "board/ronetix/imx8mq-cm/Kconfig"
 +source "board/solidrun/imx8mp_solidrun/Kconfig"
  source "board/technexion/pico-imx8mq/Kconfig"
  source "board/variscite/imx8mn_var_som/Kconfig"
  source "board/toradex/verdin-imx8mm/Kconfig"
 diff --git a/board/solidrun/imx8mp_solidrun/Kconfig b/board/solidrun/imx8mp_solidrun/Kconfig
 new file mode 100644
-index 0000000000..d7a81984fb
+index 00000000000..d7a81984fbe
 --- /dev/null
 +++ b/board/solidrun/imx8mp_solidrun/Kconfig
 @@ -0,0 +1,17 @@
@@ -960,7 +957,7 @@ index 0000000000..d7a81984fb
 +endif
 diff --git a/board/solidrun/imx8mp_solidrun/MAINTAINERS b/board/solidrun/imx8mp_solidrun/MAINTAINERS
 new file mode 100644
-index 0000000000..cf21393d36
+index 00000000000..cf21393d366
 --- /dev/null
 +++ b/board/solidrun/imx8mp_solidrun/MAINTAINERS
 @@ -0,0 +1,6 @@
@@ -972,7 +969,7 @@ index 0000000000..cf21393d36
 +F:	configs/imx8mp_solidrun_defconfig
 diff --git a/board/solidrun/imx8mp_solidrun/Makefile b/board/solidrun/imx8mp_solidrun/Makefile
 new file mode 100644
-index 0000000000..6ef4c05b40
+index 00000000000..6ef4c05b403
 --- /dev/null
 +++ b/board/solidrun/imx8mp_solidrun/Makefile
 @@ -0,0 +1,12 @@
@@ -990,7 +987,7 @@ index 0000000000..6ef4c05b40
 +endif
 diff --git a/board/solidrun/imx8mp_solidrun/imx8mp_solidrun.c b/board/solidrun/imx8mp_solidrun/imx8mp_solidrun.c
 new file mode 100644
-index 0000000000..be11b11eb0
+index 00000000000..be11b11eb0c
 --- /dev/null
 +++ b/board/solidrun/imx8mp_solidrun/imx8mp_solidrun.c
 @@ -0,0 +1,360 @@
@@ -1356,7 +1353,7 @@ index 0000000000..be11b11eb0
 +#endif /* CONFIG_FSL_FASTBOOT */
 diff --git a/board/solidrun/imx8mp_solidrun/imximage-8mp-sd.cfg b/board/solidrun/imx8mp_solidrun/imximage-8mp-sd.cfg
 new file mode 100644
-index 0000000000..6dedf1724a
+index 00000000000..6dedf1724ab
 --- /dev/null
 +++ b/board/solidrun/imx8mp_solidrun/imximage-8mp-sd.cfg
 @@ -0,0 +1,9 @@
@@ -1371,7 +1368,7 @@ index 0000000000..6dedf1724a
 +LOADER		u-boot-spl-ddr.bin	0x920000
 diff --git a/board/solidrun/imx8mp_solidrun/lpddr4_timing_1gb_samsung.c b/board/solidrun/imx8mp_solidrun/lpddr4_timing_1gb_samsung.c
 new file mode 100644
-index 0000000000..ba2b5686dc
+index 00000000000..ba2b5686dcb
 --- /dev/null
 +++ b/board/solidrun/imx8mp_solidrun/lpddr4_timing_1gb_samsung.c
 @@ -0,0 +1,1852 @@
@@ -3229,7 +3226,7 @@ index 0000000000..ba2b5686dc
 +};
 diff --git a/board/solidrun/imx8mp_solidrun/lpddr4_timing_3gb_micron.c b/board/solidrun/imx8mp_solidrun/lpddr4_timing_3gb_micron.c
 new file mode 100644
-index 0000000000..2dc6efc01c
+index 00000000000..2dc6efc01c1
 --- /dev/null
 +++ b/board/solidrun/imx8mp_solidrun/lpddr4_timing_3gb_micron.c
 @@ -0,0 +1,1854 @@
@@ -5089,7 +5086,7 @@ index 0000000000..2dc6efc01c
 +};
 diff --git a/board/solidrun/imx8mp_solidrun/mmc.c b/board/solidrun/imx8mp_solidrun/mmc.c
 new file mode 100644
-index 0000000000..ab1652d697
+index 00000000000..ab1652d6972
 --- /dev/null
 +++ b/board/solidrun/imx8mp_solidrun/mmc.c
 @@ -0,0 +1,51 @@
@@ -5146,7 +5143,7 @@ index 0000000000..ab1652d697
 +}
 diff --git a/board/solidrun/imx8mp_solidrun/spl.c b/board/solidrun/imx8mp_solidrun/spl.c
 new file mode 100644
-index 0000000000..2c49850f31
+index 00000000000..2c49850f312
 --- /dev/null
 +++ b/board/solidrun/imx8mp_solidrun/spl.c
 @@ -0,0 +1,204 @@
@@ -5356,7 +5353,7 @@ index 0000000000..2c49850f31
 +}
 diff --git a/configs/imx8mp_solidrun_defconfig b/configs/imx8mp_solidrun_defconfig
 new file mode 100644
-index 0000000000..4ef45e3094
+index 00000000000..4ef45e30946
 --- /dev/null
 +++ b/configs/imx8mp_solidrun_defconfig
 @@ -0,0 +1,192 @@
@@ -5554,7 +5551,7 @@ index 0000000000..4ef45e3094
 +CONFIG_CMD_TLV_EEPROM=y
 diff --git a/include/configs/imx8mp_solidrun.h b/include/configs/imx8mp_solidrun.h
 new file mode 100644
-index 0000000000..cf3cac9a16
+index 00000000000..cf3cac9a162
 --- /dev/null
 +++ b/include/configs/imx8mp_solidrun.h
 @@ -0,0 +1,207 @@
@@ -5767,4 +5764,3 @@ index 0000000000..cf3cac9a16
 +#endif
 -- 
 2.40.1
-

recipes-bsp/u-boot/u-boot-imx/0002-imx8mp-add-memory-support-for-2GByte-Samsung.patch

@@ -1,7 +1,7 @@
-From d673cbb9560308b474eb9f49d589919ed833577c Mon Sep 17 00:00:00 2001
+From 161d2fc8f435fb89c7470392ebc6a945a95eb0e0 Mon Sep 17 00:00:00 2001
 From: Yazan Shhady <[email protected]>
 Date: Tue, 17 Jan 2023 11:09:03 +0200
-Subject: [PATCH 02/21] imx8mp: add memory support for 2GByte Samsung
+Subject: [PATCH] imx8mp: add memory support for 2GByte Samsung
 
 SolidRun supports Samsung 1GByte|2GByte and Micron 3GByte.
 
@@ -17,7 +17,7 @@ testing in multiplications of 1GByte or 2GByte.
  create mode 100644 board/solidrun/imx8mp_solidrun/lpddr4_timing_2gb_samsung.c
 
 diff --git a/board/solidrun/imx8mp_solidrun/Makefile b/board/solidrun/imx8mp_solidrun/Makefile
-index 6ef4c05b40..8d03edd813 100644
+index 6ef4c05b403..8d03edd8131 100644
 --- a/board/solidrun/imx8mp_solidrun/Makefile
 +++ b/board/solidrun/imx8mp_solidrun/Makefile
 @@ -8,5 +8,5 @@ obj-y += imx8mp_solidrun.o mmc.o
@@ -28,7 +28,7 @@ index 6ef4c05b40..8d03edd813 100644
 +obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing_3gb_micron.o lpddr4_timing_2gb_samsung.o lpddr4_timing_1gb_samsung.o
  endif
 diff --git a/board/solidrun/imx8mp_solidrun/imx8mp_solidrun.c b/board/solidrun/imx8mp_solidrun/imx8mp_solidrun.c
-index be11b11eb0..38f4810b26 100644
+index be11b11eb0c..38f4810b262 100644
 --- a/board/solidrun/imx8mp_solidrun/imx8mp_solidrun.c
 +++ b/board/solidrun/imx8mp_solidrun/imx8mp_solidrun.c
 @@ -88,25 +88,51 @@ int board_early_init_f(void)
@@ -97,7 +97,7 @@ index be11b11eb0..38f4810b26 100644
 
 diff --git a/board/solidrun/imx8mp_solidrun/lpddr4_timing_2gb_samsung.c b/board/solidrun/imx8mp_solidrun/lpddr4_timing_2gb_samsung.c
 new file mode 100644
-index 0000000000..079f9c2e61
+index 00000000000..079f9c2e61d
 --- /dev/null
 +++ b/board/solidrun/imx8mp_solidrun/lpddr4_timing_2gb_samsung.c
 @@ -0,0 +1,1853 @@
@@ -1955,7 +1955,7 @@ index 0000000000..079f9c2e61
 +	.fsp_table = { 4000, 400, 100, },
 +};
 diff --git a/board/solidrun/imx8mp_solidrun/spl.c b/board/solidrun/imx8mp_solidrun/spl.c
-index 2c49850f31..74b172cf34 100644
+index 2c49850f312..74b172cf34f 100644
 --- a/board/solidrun/imx8mp_solidrun/spl.c
 +++ b/board/solidrun/imx8mp_solidrun/spl.c
 @@ -33,6 +33,7 @@ DECLARE_GLOBAL_DATA_PTR;