imx8mp-evk: Change kernel settings

2026-07-28 19:53:01 +02:00 · 2025-05-27 12:23:35 +02:00
40 changed files with 196 additions and 159 deletions
@@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.32"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.30"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.32"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.30"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -29,7 +29,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.32"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.30"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/rk3328-nanopi-r2s-dts.patch"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/r2s/linux_defconfig"
@@ -29,7 +29,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh ${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/rpi/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.32"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.30"
 BR2_LINUX_KERNEL_PATCH="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/rpi/bcm2711-rpi-4-b-dts.patch"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/rpi/bcm2711_defconfig"
@@ -26,7 +26,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.32"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.30"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.32"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.30"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -3,16 +3,7 @@ Change Log

 All notable changes to the project are documented in this file.

-[v25.05.1][] - 2025-06-12
-------------------------
-
-### Changes
- Upgrade Linux kernel to 6.12.32 (LTS)
-
-### Fixes
- Fix #1060: Restore of missing CLI commands, regression in Infix v25.05.0
-
-[v25.05.0][] - 2025-05-27
+[v25.05.0][UNRELEASED]
 -------------------------

 ### Changes
@@ -31,8 +22,8 @@ All notable changes to the project are documented in this file.

 ### Fixes
 - Fix containers with multiple mounts
- Correct description for LAG LACP modes
- Fix #1040: Add `mount` constraint for container config
+- Correct description for LAG LACP modes 
+- Fix #1040: Add `mount` constraint for container config 


 [v25.04.0][] - 2025-04-30
@@ -1578,8 +1569,7 @@ Supported YANG models in addition to those used by sysrepo and netopeer:
 - N/A

 [buildroot]:  https://buildroot.org/
-[UNRELEASED]: https://github.com/kernelkit/infix/compare/v25.05.1...HEAD
-[v25.05.1]:   https://github.com/kernelkit/infix/compare/v25.05.0...v25.05.1
+[UNRELEASED]: https://github.com/kernelkit/infix/compare/v25.04.0...HEAD
 [v25.05.0]:   https://github.com/kernelkit/infix/compare/v25.04.0...v25.05.0
 [v25.04.0]:   https://github.com/kernelkit/infix/compare/v25.03.0...v25.04.0
 [v25.03.0]:   https://github.com/kernelkit/infix/compare/v25.02.0...v25.03.0
@@ -63,7 +63,7 @@ bootloader's validation procedure, user configuration is kept to a
 minimum.  Two settings are available:

 - **Boot order**: Since Infix maintains two copies of its software image,
-  and as some bootloaders support [netbooting][2], the order in which boot
+  and as some bootloaders support netbooting, the order in which boot
  sources are considered can be configured. To select the active
  source, use [RAUC][]:

@@ -352,5 +352,3 @@ If `var` is not available, Infix will still persist `/var/lib` using
 [^1]: See [Upgrading procedures and boot
    order](system.md#upgrade-procedures-and-boot-order) for
    information on upgrading via CLI.
-
-[2]: netboot.md
@@ -357,45 +357,25 @@ booted from one partition, an `upgrade` will apply to the other

 1. Download and unpack the release to install. Make the image *pkg*
   bundle available at some URL[^10]
-2. (Optional) Backup the startup configuration
-3. Assume the unit has booted the `primary` image. Then running the
+2. Assume the unit has booted the `primary` image. Then running the
   `upgrade` command installs a new image on the `secondary`
   partition
-4. As part of a successful upgrade, the boot-order is implictly
+3. As part of a successful upgrade, the boot-order is implictly
   changed to boot the newly installed image
-5. Reboot the unit
-6. The unit now runs the new image. To upgrade the remaining partition
+4. Reboot the unit
+5. The unit now runs the new image. To upgrade the remaining partition
   (`primary`), run the same upgrade command again, and (optionally)
   reboot to verify the upgrade
   
 > [!CAUTION]
-> During boot (step 5), the unit may
-> [migrate](#configuration-migration) the startup configuration for
-> any syntax changes.  It is therefore important that you make sure to
-> upgrade the other partition as well after reboot, of course after
-> having verified your setup.
+> During boot, the unit may [migrate](#configuration-migration) the
+> startup configuration for any syntax changes.  It is therefore
+> important that you make sure to upgrade the other partition as well
+> after reboot, of course after having verified your setup.

-The CLI example below shows steps 2-5.
+The CLI example below shows steps 2-4.

-*Backup startup configuration:* It is recommended to backup the
-startup configuration before performing an upgrade. The backup is
-useful if the upgrade fails, and makes a later
-[downgrade](#downgrading-infix) smoother to conduct.
-
-```
-admin@example:/> dir /cfg
-/cfg directory
-backup/             ssl/                startup-config.cfg
-
-admin@example:/> copy /cfg/startup-config.cfg /cfg/v25.01.0-startup-config.cfg
-admin@example:/> dir /cfg
-/cfg directory
-backup/             ssl/                startup-config.cfg           v25.01.0-startup-config.cfg
-
-admin@example:/> 
-```
-
-*Upgrade:* Here the image *pkg bundle* was made available via TFTP.
+Upgrade: here the image *pkg bundle* was made available via TFTP.

 ```
 admin@example:/> upgrade tftp://198.18.117.1/infix-aarch64-25.03.1.pkg
@@ -413,7 +393,7 @@ Installing `tftp://198.18.117.1/infix-aarch64-25.03.1.pkg` succeeded
 admin@example:/>
 ```

-*Reboot:* The unit will boot on the other partition, with the newly
+Reboot: The unit will boot on the other partition, with the newly
 installed image. The `Loading startup-config` step conducts migration
 of startup configuration if applicable.

@@ -455,7 +435,7 @@ As shown, the *boot order* has been updated, so that *secondary* is
 now the preferred boot source.

 To upgrade the remaining partition (`primary`), run the `upgrade URL`
-command again, and (optionally) reboot.
+command again, and reboot.

 ### Configuration Migration

@@ -539,25 +519,8 @@ with the unit in *failure config*.

 *Find the backup configuration file:*

-Assume you have a backup startup config for the Infix version to
-downgrade to (here Infix v25.01.0, config `version 1.4`).
-
-The preferred approach is to use a startup configuration backed up
-when running Infix v25.01.0 on the unit. See the section on [upgrading
-Infix](#upgrading-infix) above for more information. In the example
-below, there is a backup file available named
-*v25.01.0-startup-config.cfg* 
-
-```
-admin@example:/> dir /cfg
-/cfg directory
-backup/             ssl/                startup-config.cfg           v25.01.0-startup-config.cfg
-
-admin@example:/> 
-```
-
-The alternative is to use a startup config implicitly backed up by the
-system as part of [configuration migration](#configuration-migration).
+Assume you have a backup startup config for the version to downgrade
+to (here Infix v25.01.0, config `version 1.4`).

 ```
 admin@example:/> dir /cfg/backup/
@@ -567,23 +530,6 @@ startup-config-1.4.cfg
 admin@example:/>
 ```

-> [!CAUTION] Using a backup configuration file stored when the unit
-> was running the old version (e.g., v25.01.0-startup-config.cfg) is
-> preferred. Although backup files stored due to configuration
-> migration (e.g., startup-config-1.4.cfg) usually works too if the
-> configuration file version (`1.4`) matches, there are
-> situations when the system may fail to apply it as described below.
-
-The *configuration file version* (`1.4`) is only incremented when
-changes in YANG configuration syntax mandates it to handle
-*upgrading*.  Say the next Infix version includes a new feature
-setting, it can still have version `1.4`, as upgrading to it would not
-need migration. If a user then enables the new feature setting, the
-new configuration will no longer be compatible with the previous *Infix
-version*. A downgrade after enabling new features risks ending up with
-the unit in *failure config*. 
-
-
 *Use `upgrade` command to downgrade:*

 ```
@@ -602,19 +548,6 @@ admin@example:/>

 *Apply the backup configuration file:*

-It is recommended to use a backup configuration file for the Infix version to
-downgrade to, if there is one available.
-
-```
-admin@example:/> copy /cfg/v25.01.0-startup-config.cfg /cfg/startup-config.cfg
-Overwrite existing file /cfg/startup-config.cfg (y/N)? y
-admin@example:/>
-```
-
-An alternative is to use a backup file stored when the system
-conducted a [configuration migration](#configuration-migration). See
-the *caution* note above.
-
 ```
 admin@example:/> copy /cfg/backup/startup-config-1.4.cfg /cfg/startup-config.cfg
 Overwrite existing file /cfg/startup-config.cfg (y/N)? y
@@ -623,7 +556,8 @@ admin@example:/>

 *Reboot:*

-The unit will come up with the applied backup configuration. 
+The unit will come up with the applied backup configuration instead of
+failure config.

 ```
 admin@example:/> reboot
@@ -641,9 +575,6 @@ admin@example:/> reboot
 Infix -- a Network Operating System v25.01.0 (ttyS0)
 example login:
 ```
-> [!NOTE]
-> If the unit despite these measures ends up in *failure config*, see
-> the next section for more information on how to recover.

 #### Downgrading without applying a backup startup configuration

@@ -749,7 +680,7 @@ Continued configuration is done as with any unit after factory reset.
 [3]: https://www.rfc-editor.org/rfc/rfc8341
 [4]: https://chrony-project.org/doc/4.6.1/chronyc.html
 [5]: https://github.com/kernelkit/infix/blob/main/src/confd/yang/confd/infix-system-software.yang
-[6]: netboot.md
+[6]: boot.md#system-configuration
 [7]: introduction.md#system-boot
 [8]: management.md#console-port
 [^9]: In failure config, Infix puts all Ethernet ports as individual
@@ -757,5 +688,3 @@ Continued configuration is done as with any unit after factory reset.
    using link local IPv6 addresses. This as an alternative to
    connecting via a console port.
 [^10]: Set up an FTP/TFTP/SFTP or HTTP/HTTPS server on the same LAN. 
-
-[11]: scripting.md#-backup-configuration-using-sysrepocfg-and-scp
@@ -38,9 +38,25 @@ define FREESCALE_IMX8MP_EVK_LINUX_CONFIG_FIXUPS
 	$(call KCONFIG_DISABLE_OPT,CONFIG_USB_DWC3_GADGET)
 	$(call KCONFIG_ENABLE_OPT,CONFIG_USB_DWC3_HOST)
 	$(call KCONFIG_ENABLE_OPT,CONFIG_ARM_IMX_BUS_DEVFREQ)
+	$(call KCONFIG_DISABLE_OPT,CONFIG_TYPEC_TCPCI)
 	$(call KCONFIG_ENABLE_OPT,CONFIG_TYPEC_TCPCI)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_TYPEC_SWITCH_GPIO)
-endef
+#	$(call KCONFIG_ENABLE_OPT,CONFIG_TYPEC_SWITCH_GPIO)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_TYPEC_MUX_GPIO_SBU)

+# LVDS display on LVDS0
+        $(call KCONFIG_ENABLE_OPT,CONFIG_DRM_ITE_IT6263)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_BACKLIGHT_CLASS_DEVICE)
+	$(call KCONFIG_DISABLE_OPT,CONFIG_DRM_FSL_LDB)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_DRM_FSL_LDB)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_BACKLIGHT_PWM)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_DRM_PANEL_SIMPLE)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_INPUT_TOUCHSCREEN)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_TOUCHSCREEN_ILI210X)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_PWM_IMX27)
+#	$(call KCONFIG_ENABLE_OPT,CONFIG_PHY_FSL_IMX8MP_LVDS)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_DRM_SAMSUNG_DSIM)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_DRM_DISPLAY_CONNECTOR)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_RESET_IMX7)
+endef
 $(eval $(ix-board))
 $(eval $(generic-package))
@@ -1,4 +1,4 @@
-From fcbddd99782709b8bb8b028b580eaaf750431502 Mon Sep 17 00:00:00 2001
+From 735a3f8537b65fbe5d2fe5e97beb485cffa1bbbe Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Mar 2024 10:27:24 +0100
 Subject: [PATCH 01/27] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for
@@ -1,4 +1,4 @@
-From b5056d553c2f1493b66a1c7c456b74fb87eb6f9d Mon Sep 17 00:00:00 2001
+From a9cadaebc7868f3f37c343642e631e3db2ea27db Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 15:52:43 +0100
 Subject: [PATCH 02/27] net: dsa: mv88e6xxx: Improve indirect register access
@@ -1,4 +1,4 @@
-From 11d35cf88242ab4c896baadced08c92385264cf5 Mon Sep 17 00:00:00 2001
+From 5f8612dc0445ca95a7428bf7b837612406875b07 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Mon, 22 Apr 2024 23:18:01 +0200
 Subject: [PATCH 03/27] net: dsa: mv88e6xxx: Honor ports being managed via
@@ -1,4 +1,4 @@
-From a975aade77741273d2531e52de5163ed83dda411 Mon Sep 17 00:00:00 2001
+From 730dfa9a57604ff0b099cc5e244e42fdbebbe0d9 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 24 Apr 2024 22:41:04 +0200
 Subject: [PATCH 04/27] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user
@@ -1,4 +1,4 @@
-From 3ec7b214fc24eb0590517eb2e32fcc55e1ddcd43 Mon Sep 17 00:00:00 2001
+From 8ce7a3a19676c148e6c247641000a5d5b86c6a3d Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 Nov 2023 19:44:32 +0100
 Subject: [PATCH 05/27] net: dsa: mv88e6xxx: Add LED infrastructure
@@ -1,4 +1,4 @@
-From 245031376473a5da1aa58d2d94cec8b860fa4094 Mon Sep 17 00:00:00 2001
+From 79741bd8278bf1958ef6f414e89d7052d1c9486b Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 Nov 2023 21:59:35 +0100
 Subject: [PATCH 06/27] net: dsa: mv88e6xxx: Add LED support for 6393X
@@ -1,4 +1,4 @@
-From 43f2078a012891e34673b6cd5f59d8a6d761a49a Mon Sep 17 00:00:00 2001
+From 4ada7a3d2fa1fdb0abe4485a8f80a50c699d2607 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 28 May 2024 10:38:42 +0200
 Subject: [PATCH 07/27] net: dsa: tag_dsa: Use tag priority as initial
@@ -1,4 +1,4 @@
-From b461a4b81f08577cb932405712e9b828be69ae2c Mon Sep 17 00:00:00 2001
+From ef42cca1aee6a3756f6995368bf740d6c92e8ab4 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 16 Jan 2024 16:00:55 +0100
 Subject: [PATCH 08/27] net: dsa: Support MDB memberships whose L2 addresses
@@ -1,4 +1,4 @@
-From b7685c7c95324e6cbd5b74343b065b2fd6dd7033 Mon Sep 17 00:00:00 2001
+From 927b942567ad59e71b44095c054e1565e2e1a01f Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 21 Mar 2024 19:12:15 +0100
 Subject: [PATCH 09/27] net: dsa: Support EtherType based priority overrides
@@ -1,4 +1,4 @@
-From 88b342d0c8d46b8b51fdebde1f89c74cbae93801 Mon Sep 17 00:00:00 2001
+From ef919d2970639d542534b6f27605c0a7d053e57f Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 22 Mar 2024 16:15:43 +0100
 Subject: [PATCH 10/27] net: dsa: mv88e6xxx: Support EtherType based priority
@@ -1,4 +1,4 @@
-From cc93e5f94d1c0f5c459f4ce479bb3e51a636ea3e Mon Sep 17 00:00:00 2001
+From 06cf0fc089d4b4f4d0d00384d0b38bb87dca0494 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 28 May 2024 11:04:22 +0200
 Subject: [PATCH 11/27] net: dsa: mv88e6xxx: Add mqprio qdisc support
@@ -1,4 +1,4 @@
-From eaf7cdbe2d1f8f4c1a7e3a9da9af8005224564d6 Mon Sep 17 00:00:00 2001
+From 44ff969f4646f5d6987c6c6afb33c9894116687d Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 29 May 2024 13:20:41 +0200
 Subject: [PATCH 12/27] net: dsa: mv88e6xxx: Use VLAN prio over IP when both
@@ -1,4 +1,4 @@
-From 072e5f29fda05c64ef460c6f22d341c1a15bf0b8 Mon Sep 17 00:00:00 2001
+From 868a65caca9a649616a9aef0e319f3744bda3df3 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 26 Nov 2024 19:45:59 +0100
 Subject: [PATCH 13/27] [FIX] net: dsa: mv88e6xxx: Trap locally terminated
@@ -1,4 +1,4 @@
-From d60964c1fcffda523339c6dc920a0d9bb47c2dc5 Mon Sep 17 00:00:00 2001
+From 7e3b3153f5edfdcc7c4460744efbd3f8c0f4bf4b Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 19 Sep 2023 18:38:10 +0200
 Subject: [PATCH 14/27] net: phy: marvell10g: Support firmware loading on
@@ -1,4 +1,4 @@
-From b3f76049e4f7aa89f9bbc345d7d512ad4623a431 Mon Sep 17 00:00:00 2001
+From 7769ff987e8619d012863851eb14dec613bee3fa Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 21 Nov 2023 20:15:24 +0100
 Subject: [PATCH 15/27] net: phy: marvell10g: Fix power-up when strapped to
@@ -1,4 +1,4 @@
-From b3e8ff6144d695ddd6209bf2c83e709a307e53ad Mon Sep 17 00:00:00 2001
+From 3b64cbe7764bb3cb77953c8d0b8676c685c9f0b5 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 15 Nov 2023 20:58:42 +0100
 Subject: [PATCH 16/27] net: phy: marvell10g: Add LED support for 88X3310
@@ -1,4 +1,4 @@
-From 92de10bbe084fb2744e3fa487bc0b4a85595ccf8 Mon Sep 17 00:00:00 2001
+From 9b6d4099be8eb492d1ff46561b74f30688e53aef Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Dec 2023 09:51:05 +0100
 Subject: [PATCH 17/27] net: phy: marvell10g: Support LEDs tied to a single
@@ -1,4 +1,4 @@
-From e4d37c329a06d914ad7c49f9230804eb2f02a310 Mon Sep 17 00:00:00 2001
+From 8ca0ef48d4530da5cb6b807fd8b0901c916b0e8c Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 10:10:19 +0100
 Subject: [PATCH 18/27] net: phy: Do not resume PHY when attaching
@@ -1,4 +1,4 @@
-From 6c543747d8b5611b84041376fa2299944fb60ab4 Mon Sep 17 00:00:00 2001
+From 848fdabbb0cd804dceac4ea34d47a422a65e7227 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 4 Mar 2024 16:47:28 +0100
 Subject: [PATCH 19/27] net: bridge: avoid classifying unknown multicast as
@@ -188,7 +188,7 @@ index b2ae0d2434d2..3137c1fcfc6a 100644
 		    ipv6_addr_is_all_snoopers(&ipv6_hdr(skb)->daddr))
 			br_ip6_multicast_mrd_rcv(brmctx, pmctx, skb);
 diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
-index df502cc1191c..b456cf9ec1cc 100644
+index 041f6e571a20..40651b07df94 100644
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
@@ -483,6 +483,7 @@ enum net_bridge_opts {
@@ -199,7 +199,7 @@ index df502cc1191c..b456cf9ec1cc 100644
 };
 
 struct net_bridge {
-@@ -887,8 +888,8 @@ void br_forward(const struct net_bridge_port *to, struct sk_buff *skb,
+@@ -886,8 +887,8 @@ void br_forward(const struct net_bridge_port *to, struct sk_buff *skb,
 		bool local_rcv, bool local_orig);
 int br_forward_finish(struct net *net, struct sock *sk, struct sk_buff *skb);
 void br_flood(struct net_bridge *br, struct sk_buff *skb,
@@ -210,7 +210,7 @@ index df502cc1191c..b456cf9ec1cc 100644
 
 /* return true if both source port and dest port are isolated */
 static inline bool br_skb_isolated(const struct net_bridge_port *to,
-@@ -1409,6 +1410,19 @@ static inline void br_multicast_flood(struct net_bridge_mdb_entry *mdst,
+@@ -1408,6 +1409,19 @@ static inline void br_multicast_flood(struct net_bridge_mdb_entry *mdst,
 {
 }
 
@@ -1,4 +1,4 @@
-From 2a32b5fa3c5a1eccba292572eea1c092b4dd5fc7 Mon Sep 17 00:00:00 2001
+From 930edf3bd31e77703ca805d816ed7b2cac695e44 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Tue, 5 Mar 2024 06:44:41 +0100
 Subject: [PATCH 20/27] net: bridge: Ignore router ports when forwarding L2
@@ -16,10 +16,10 @@ Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 1 file changed, 4 insertions(+), 1 deletion(-)

 diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
-index b456cf9ec1cc..aad99a27d968 100644
+index 40651b07df94..e90b4f5cab76 100644
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
-@@ -1087,7 +1087,10 @@ br_multicast_get_first_rport_node(struct net_bridge_mcast *brmctx,
+@@ -1086,7 +1086,10 @@ br_multicast_get_first_rport_node(struct net_bridge_mcast *brmctx,
 	if (skb->protocol == htons(ETH_P_IPV6))
 		return rcu_dereference(hlist_first_rcu(&brmctx->ip6_mc_router_list));
 #endif
@@ -1,4 +1,4 @@
-From d8e5e7cef63d5eba6ef2c9e4f1f2cec359b71019 Mon Sep 17 00:00:00 2001
+From ec644e878010241f593bfccb2f7127dec6f69294 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 4 Apr 2024 16:36:30 +0200
 Subject: [PATCH 21/27] net: bridge: drop delay for applying strict multicast
@@ -163,7 +163,7 @@ index 3137c1fcfc6a..34be07a1fd00 100644
 #endif
 
 diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
-index aad99a27d968..ee8c2268ab5a 100644
+index e90b4f5cab76..73b78c594564 100644
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
@@ -78,7 +78,6 @@ struct bridge_mcast_own_query {
@@ -174,7 +174,7 @@ index aad99a27d968..ee8c2268ab5a 100644
 };
 
 /* selected querier */
-@@ -1165,8 +1164,7 @@ __br_multicast_querier_exists(struct net_bridge_mcast *brmctx,
+@@ -1164,8 +1163,7 @@ __br_multicast_querier_exists(struct net_bridge_mcast *brmctx,
 		own_querier_enabled = false;
 	}
 
@@ -1,4 +1,4 @@
-From 9a1600de341da6d7e5b4294040f9b9bb1dbaf4c2 Mon Sep 17 00:00:00 2001
+From d46286898fbadf40a2fe1f4e449a3acdaede788b Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 May 2024 14:51:54 +0200
 Subject: [PATCH 22/27] net: bridge: Differentiate MDB additions from
@@ -40,7 +40,7 @@ index db7254d52d93..63508279df47 100644
 	RTM_NEWNSID = 88,
 #define RTM_NEWNSID RTM_NEWNSID
 diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
-index 7e1ad229e133..3b1873e7c499 100644
+index 1a52a0bca086..d5757ab72d2f 100644
 --- a/net/bridge/br_mdb.c
 +++ b/net/bridge/br_mdb.c
@@ -734,7 +734,7 @@ static int br_mdb_replace_group_sg(const struct br_mdb_config *cfg,
@@ -1,4 +1,4 @@
-From 0c877e451f0c7b722ad5d230ea1caab0967c1dad Mon Sep 17 00:00:00 2001
+From cd8e2556f6b220fd6795779a37fbd6ff3159dcaf Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 24 Nov 2023 23:29:55 +0100
 Subject: [PATCH 23/27] nvmem: layouts: onie-tlv: Let device probe even when
@@ -1,4 +1,4 @@
-From 97cf0cdd2066192002da814883dc0bfff423a7ff Mon Sep 17 00:00:00 2001
+From bbd05c87d8a872731eb2f46ffc63bcddf80bbfca Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 29 Apr 2024 15:14:51 +0200
 Subject: [PATCH 24/27] usb: core: adjust log level for unauthorized devices
@@ -1,4 +1,4 @@
-From 2a0b03f9e4d789a36627a0798542b265be075b97 Mon Sep 17 00:00:00 2001
+From 6612adb18ad9ec35d81b131ebcff0b358a993a62 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 16 Jan 2025 12:35:12 +0100
 Subject: [PATCH 25/27] net: dsa: mv88e6xxx: collapse disabled state into
@@ -1,4 +1,4 @@
-From 856ee833fe803bcda382c0ddd5af5dfe1f29add5 Mon Sep 17 00:00:00 2001
+From c95150639c61db088df0c7c2f9b0e18c0ef64550 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 12 Feb 2025 22:03:14 +0100
 Subject: [PATCH 26/27] net: dsa: mv88e6xxx: Only activate LAG offloading when
@@ -1,4 +1,4 @@
-From f5bea4bc63d8c77ba4268f53acadde1b7fbd384f Mon Sep 17 00:00:00 2001
+From 18d9518aba9afbd190e90a2661525bd4bf6d02d0 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Sun, 11 Aug 2024 11:27:35 +0200
 Subject: [PATCH 27/27] net: usb: r8152: add r8153b support for link/activity
@@ -18,7 +18,7 @@ Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 1 file changed, 8 insertions(+)

 diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
-index 2cab046749a9..c9947ad320ff 100644
+index 96fa3857d8e2..cddb025aa56b 100644
 --- a/drivers/net/usb/r8152.c
 +++ b/drivers/net/usb/r8152.c
@@ -41,6 +41,11 @@
@@ -1,2 +1,2 @@
 # Calculated with ../utils/kernel-refresh.sh
-sha256   a9b020721778384507010177d3929e7d4058f7f6120f05a99d56b5c5c0346a70  linux-6.12.32.tar.xz
+sha256   df046a48971e40ce0b2e003e7e55b6b1e7da2912120eb216d5d6c8450c9cf82e  linux-6.12.30.tar.xz
@@ -1,13 +1,15 @@
 #include <arm64/freescale/imx8mp-evk.dts>
 #include <dt-bindings/usb/pd.h>
-&usb3_phy0 {
+#include <dt-bindings/gpio/gpio.h>

+&usb3_phy0 {
 	status = "okay";
 };
+
 &iomuxc {
 	pinctrl_typec_mux: typec1muxgrp {
 		fsl,pins = <
-		MX8MP_IOMUXC_SAI1_MCLK__GPIO4_IO20	0x16
+			MX8MP_IOMUXC_SAI1_MCLK__GPIO4_IO20	0x16
 		>;
 	};
 	pinctrl_typec: typec1grp {
@@ -25,7 +27,7 @@
 		reg = <0x50>;
 		interrupt-parent = <&gpio4>;
 		interrupts = <19 8>;
-
+		status = "disabled";
 		port {
 			typec_dr_sw: endpoint {
 				remote-endpoint = <&usb3_drd_sw>;
@@ -40,7 +42,7 @@
 			try-power-role = "sink";
 			source-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
 			sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)
-			PDO_VAR(5000, 20000, 3000)>;
+					PDO_VAR(5000, 20000, 3000)>;
 			op-sink-microwatt = <15000000>;
 			self-powered;

@@ -57,7 +59,69 @@
 			};
 		};
 	};
+
+	it6263: hdmi@4c {
+		compatible = "ite,it6263";
+		reg = <0x4c>;
+		data-mapping = "jeida-24";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_lvds_en>;
+		reset-gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+		ivdd-supply = <&reg_buck5>;
+		ovdd-supply = <&reg_vext_3v3>;
+		txavcc18-supply = <&reg_buck5>;
+		txavcc33-supply = <&reg_vext_3v3>;
+		pvcc1-supply = <&reg_buck5>;
+		pvcc2-supply = <&reg_buck5>;
+		avcc-supply = <&reg_vext_3v3>;
+		anvdd-supply = <&reg_buck5>;
+		apvdd-supply = <&reg_buck5>;
+		status = "okay";
+		ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "okay";
+			port@0 {
+				reg = <0>;
+				status = "okay";
+				it6263_in: endpoint {
+					remote-endpoint = <&ldb_lvds_ch0>;
+				};
+
+			};
+
+			port@2 {
+				reg = <2>;
+				status = "okay";
+				it6263_out: endpoint {
+					remote-endpoint = <&lvds2hdmi_connector_in>;
+				};
+			};
+
+		};
+
+	};
+
 };
+
+&lvds_bridge {
+	status = "okay";
+	ports {
+	        port@1 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <1>;
+			status = "okay";
+			ldb_lvds_ch0: endpoint {
+				remote-endpoint = <&it6263_in>;
+			};
+		};
+		port@2 {
+			status = "disabled";
+		};
+	};
+};
+
 &usb3_phy0 {
 	fsl,phy-tx-vref-tune = <0xe>;
 	fsl,phy-tx-preemp-amp-tune = <3>;
@@ -90,6 +154,32 @@
 	};
 };

+&lcdif1 {
+	status = "disabled";
+};
+&lcdif2 {
+	status = "okay";
+};
+&lcdif3 {
+	status = "disabled";
+};
+&micfil  {
+	status = "disabled";
+};
+
+&pcie  {
+	status = "disabled";
+};
+&pcie_phy {
+	status = "disabled";
+};
+&sai2  {
+	status = "disabled";
+};
+&sai3  {
+	status = "disabled";
+};
+
 / {
 	gpio-sbu-mux {
 		compatible = "gpio-sbu-mux";
@@ -104,10 +194,23 @@
 			};
 		};
 	};
-        chosen {
-                infix {
-                        /* "admin" */
-                        factory-password-hash = "$5$mI/zpOAqZYKLC2WU$i7iPzZiIjOjrBF3NyftS9CCq8dfYwHwrmUK097Jca9A";
+
+        lvds-hdmi-connector {
+                compatible = "hdmi-connector";
+                label = "J2";
+                type = "a";
+		status = "okay";
+
+                port {
+                        lvds2hdmi_connector_in: endpoint {
+                                remote-endpoint = <&it6263_out>;
+                        };
                };
        };
+
+	chosen {
+		infix {
+			factory-password-hash = "$5$mI/zpOAqZYKLC2WU$i7iPzZiIjOjrBF3NyftS9CCq8dfYwHwrmUK097Jca9A";
+		};
+	};
 };
@@ -492,7 +492,6 @@
  <COMMAND name="startup-config" help="Show startup-config">
    <ACTION sym="script" in="tty" out="tty" interrupt="true">jq -C . /cfg/startup-config.cfg |pager</ACTION>
  </COMMAND>
-</COMMAND>

  <COMMAND name="factory-reset" help="Restore the system to factory default state">
    <ACTION sym="script" in="tty" out="tty" interrupt="true">
@@ -587,6 +586,8 @@
      rauc install $force $KLISH_PARAM_URI
    </ACTION>
  </COMMAND>
+
+</COMMAND>
 </VIEW>

 <VIEW name="config">