Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync with imx8mp_build #26

Merged
merged 2 commits into from
Dec 27, 2024
Merged

sync with imx8mp_build #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7de8e13
sync with imx8mp_build
Josua-SR Dec 26, 2024
46255bd
machine: imx8mpsolidrun: include all solidrun imx8mp dtbs in image
Josua-SR Dec 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions conf/machine/imx8mpsolidrun.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS:append = " kernel-modules firmware-imx-sdma-
require conf/machine/include/imx-base.inc
require conf/machine/include/arm/armv8a/tune-cortexa53.inc

KERNEL_DEVICETREE ?= "freescale/imx8mp-cubox-m.dtb \
freescale/imx8mp-hummingboard-extended.dtb \
freescale/imx8mp-hummingboard-mate.dtb \
freescale/imx8mp-hummingboard-pulse.dtb \
freescale/imx8mp-hummingboard-ripple.dtb \
KERNEL_DEVICETREE ?= " \
freescale/imx8mp-cubox-m.dtb \
freescale/imx8mp-hummingboard-extended.dtb \
freescale/imx8mp-hummingboard-iiot-main.dtb \
freescale/imx8mp-hummingboard-mate.dtb \
freescale/imx8mp-hummingboard-pro.dtb \
freescale/imx8mp-hummingboard-pulse.dtb \
freescale/imx8mp-hummingboard-ripple.dtb \
"

WKS_FILE_DEPENDS:append:imx8mp-solidrun = " imx-m7-demos"
Expand Down
38 changes: 38 additions & 0 deletions ...es-bsp/u-boot/u-boot-imx/0041-imx8mp_solidrun-update-SKU-parsing-to-detect-SRHBIIOT.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From 73f8958bfce39a69819063cc788a8021f398520a Mon Sep 17 00:00:00 2001
From: Yazan Shhady <[email protected]>
Date: Mon, 2 Dec 2024 14:57:22 +0200
Subject: [PATCH] imx8mp_solidrun: update SKU parsing to detect SRHBIIOTIVxx
(HB-IIOT)

Enhanced the `board_id_from_tlv_info` function to include detection of the HB-IIOT board.
Added a check for the "HBI" identifier in the TLV part number array,
ensuring proper recognition of SRHBIIOTIVxx as HB-IIOT.
---
board/solidrun/imx8mp_solidrun/imx8mp_solidrun.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/board/solidrun/imx8mp_solidrun/imx8mp_solidrun.c b/board/solidrun/imx8mp_solidrun/imx8mp_solidrun.c
index ac4d56b6dc..d4b675e248 100644
--- a/board/solidrun/imx8mp_solidrun/imx8mp_solidrun.c
+++ b/board/solidrun/imx8mp_solidrun/imx8mp_solidrun.c
@@ -473,7 +473,8 @@ static void board_id_from_tlv_info(void) {

for(int i = 0; i < TLV_MAX_DEVICES; i++) {
// parse sku - processor or carrier indicated at index 2-6
- if(memcmp(&hb_tlv_data.tlv_part_number[i][2], "HBC", 3) == 0) {
+ if(memcmp(&hb_tlv_data.tlv_part_number[i][2], "HBC", 3) == 0 ||
+ memcmp(&hb_tlv_data.tlv_part_number[i][2], "HBI", 3) == 0 ) {
/*
HummingBoard:
SKU - Board_Name {xx: board version}:
@@ -482,6 +483,7 @@ static void board_id_from_tlv_info(void) {
SRHBCUPRO0IVxx HB-Pro
SRHBCME000CVxx HB-Mate
SRHBCRE000CVxx HB-Ripple
+ SRHBIIOTIVxx HB-IIOT
*/
switch(hb_tlv_data.tlv_part_number[i][5]) {
case 'M': // Mate
--
2.25.1

1 change: 1 addition & 0 deletions recipes-bsp/u-boot/u-boot-imx_2022.04.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ SRC_URI += " \
file://0038-board-solidrun-imx8mp-Add-HummingBoard-IIOT-tlv-base.patch \
file://0039-imx8mp_solidrun-update-SKU-parsing-for-HummingBoard-.patch \
file://0040-board-solidrun-imx8mp-configure-phy-reset-lines-open.patch \
file://0041-imx8mp_solidrun-update-SKU-parsing-to-detect-SRHBIIOT.patch \
file://0201-HACK-fastboot-emmc_dev-default-to-0.patch \
file://0202-HACK-usb-ci_udc-ignore-ID-pin-value.patch \
file://0203-board-solidrun-add-imx8dxl-som.patch \
Expand Down
118 changes: 118 additions & 0 deletions recipes-kernel/linux/linux-imx/0015-arm64-dts-add-support-for-imx8mp-hummingboard-pro.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
From 01a1da6f877db1c034317810479d5435c7784152 Mon Sep 17 00:00:00 2001
From: Yazan Shhady <[email protected]>
Date: Wed, 27 Dec 2023 15:48:06 +0200
Subject: [PATCH 2/2] arm64: dts: add support for imx8mp hummingboard pro

imx8mp-hummingboard-pro.dts entry added and imx8mp-hummingboard-extended.dts
just includes this file for backward compatibiltiy as the board name changed

Signed-off-by: Yazan Shhady <[email protected]>
---
arch/arm64/boot/dts/freescale/Makefile | 1 +
.../imx8mp-hummingboard-extended.dts | 36 +++----------------
.../dts/freescale/imx8mp-hummingboard-pro.dts | 36 +++++++++++++++++++
3 files changed, 41 insertions(+), 32 deletions(-)
create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-hummingboard-pro.dts

diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile
index 421faf67edc9..f91e289abbe6 100644
--- a/arch/arm64/boot/dts/freescale/Makefile
+++ b/arch/arm64/boot/dts/freescale/Makefile
@@ -121,6 +121,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mp-ddr4-evk.dtb
dtb-$(CONFIG_ARCH_MXC) += imx8mp-evk-ndm.dtb
dtb-$(CONFIG_ARCH_MXC) += imx8mp-cubox-m.dtb
dtb-$(CONFIG_ARCH_MXC) += imx8mp-hummingboard-extended.dtb
+dtb-$(CONFIG_ARCH_MXC) += imx8mp-hummingboard-pro.dtb
dtb-$(CONFIG_ARCH_MXC) += imx8mp-hummingboard-mate.dtb
dtb-$(CONFIG_ARCH_MXC) += imx8mp-hummingboard-pulse.dtb
dtb-$(CONFIG_ARCH_MXC) += imx8mp-hummingboard-ripple.dtb
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-hummingboard-extended.dts b/arch/arm64/boot/dts/freescale/imx8mp-hummingboard-extended.dts
index f1c47092bddd..0bed70d7db06 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-hummingboard-extended.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-hummingboard-extended.dts
@@ -1,36 +1,8 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
- * Copyright 2023 Josua Mayer <[email protected]>
+ * Device Tree Source for the i.MX8MP HummingBoard Pro/Extended
+ *
+ * Copyright (C) 2023 SolidRun Ltd.
*/

-/dts-v1/;
-
-#include <dt-bindings/usb/pd.h>
-#include "imx8mp-sr-som.dtsi"
-#include "imx8mp-hummingboard-pulse.dtsi"
-
-/ {
- model = "SolidRun i.MX8MP HummingBoard Extended";
- compatible = "fsl,imx8mp-sr-som", "fsl,imx8mp";
-
- /*
- * leave m.2 W_DISABLE signal floating to improve
- * compatibility with certain pcie cards;
- */
- /delete-node/ rfkill_m2_wdis;
-};
-
-&fec {
- status = "okay";
-};
-
-&iomuxc {
- pinctrl_pcie: pciegrp {
- fsl,pins = <MX8MP_IOMUXC_GPIO1_IO06__GPIO1_IO06 0x19>;
- };
-};
-
-&pcie{
- pinctrl-0 = <&pinctrl_pcie>;
- reset-gpio = <&gpio1 6 GPIO_ACTIVE_LOW>;
-};
+#include "imx8mp-hummingboard-pro.dts"
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-hummingboard-pro.dts b/arch/arm64/boot/dts/freescale/imx8mp-hummingboard-pro.dts
new file mode 100644
index 000000000000..8699053b31ca
--- /dev/null
+++ b/arch/arm64/boot/dts/freescale/imx8mp-hummingboard-pro.dts
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+* Device Tree Source for the i.MX8MP HummingBoard Pro
+*/
+
+/dts-v1/;
+
+#include <dt-bindings/usb/pd.h>
+#include "imx8mp-sr-som.dtsi"
+#include "imx8mp-hummingboard-pulse.dtsi"
+
+/ {
+ model = "SolidRun i.MX8MP HummingBoard Pro";
+ compatible = "fsl,imx8mp-sr-som", "fsl,imx8mp";
+
+ /*
+ * leave m.2 W_DISABLE signal floating to improve
+ * compatibility with certain pcie cards;
+ */
+ /delete-node/ rfkill_m2_wdis;
+};
+
+&fec {
+ status = "okay";
+};
+
+&iomuxc {
+ pinctrl_pcie: pciegrp {
+ fsl,pins = <MX8MP_IOMUXC_GPIO1_IO06__GPIO1_IO06 0x19>;
+ };
+};
+
+&pcie{
+ pinctrl-0 = <&pinctrl_pcie>;
+ reset-gpio = <&gpio1 6 GPIO_ACTIVE_LOW>;
+};
--
2.25.1

47 changes: 47 additions & 0 deletions recipes-kernel/linux/linux-imx/0022-arm64-dts-imx8mp-sr-som-fix-phy-interrupt-support.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
From 875fcc390bb774942b76857da0b2cac6c5f1c04a Mon Sep 17 00:00:00 2001
From: Josua Mayer <[email protected]>
Date: Sun, 10 Nov 2024 17:16:25 +0100
Subject: [PATCH] arm64: dts: imx8mp-sr-som: fix phy interrupt support

Contrary to previous change description, the interrupt lines do not
have external pull-up and require the CPU to activate internal pull-up
on the pads.

Signed-off-by: Josua Mayer <[email protected]>
---
arch/arm64/boot/dts/freescale/imx8mp-sr-som.dtsi | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/imx8mp-sr-som.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-sr-som.dtsi
index 5ab7c33fb..375265829 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-sr-som.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp-sr-som.dtsi
@@ -547,9 +547,9 @@ MX8MP_IOMUXC_ENET_TXC__CCM_ENET_QOS_CLOCK_GENERATE_TX_CLK 0x1f

pinctrl_phy0: phy0grp {
fsl,pins = <
- /* INT_N: weak i/o, external 1.5k pull-up */
- MX8MP_IOMUXC_SAI1_TXD6__GPIO4_IO18 0x0
- /* RESET_N: weak i/o, open drain, external 1k pull-up */
+ /* INT_N: weak i/o, pull-up */
+ MX8MP_IOMUXC_SAI1_TXD6__GPIO4_IO18 0x140
+ /* RESET_N: weak i/o, open drain, external 10k pull-up */
MX8MP_IOMUXC_SAI1_TXD7__GPIO4_IO19 0x20
>;
};
@@ -575,9 +575,9 @@ MX8MP_IOMUXC_SAI1_TXD5__ENET1_RGMII_TXC 0x1f

pinctrl_phy1: phy1grp {
fsl,pins = <
- /* INT_N: weak i/o, external 1.5k pull-up */
- MX8MP_IOMUXC_SAI1_RXD1__GPIO4_IO03 0x0
- /* RESET_N: weak i/o, open drain, external 1k pull-up */
+ /* INT_N: weak i/o, pull-up */
+ MX8MP_IOMUXC_SAI1_RXD1__GPIO4_IO03 0x140
+ /* RESET_N: weak i/o, open drain, external 10k pull-up */
MX8MP_IOMUXC_SAI1_RXD0__GPIO4_IO02 0x20
>;
};
--
2.43.0

Loading
Loading