From d56fed9cc1c0e6db4df3d2f924d666a713b1a9a3 Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Mon, 4 Dec 2023 14:05:43 +0100 Subject: [PATCH] fix(netmodule-am64xx-common.inc): fix broken u-boot after meta-ti change K3_IMAGE_GEN_SRCREV does not exist anymore in TI layer TI_LINUX_FW_SRCREV point to a version which is not compatible with the recipe in TI layer. Generally: bad idea to overwrite srcrev from a different layer because these revision will have to be checked everytime the layer is updated to be sure they are not incompatible or outdated. id:397918 --- .../conf/machine/include/netmodule-am64xx-common.inc | 5 ----- .../conf/machine/include/netmodule-am64xx-k3.inc | 1 - .../conf/machine/include/netmodule-am64xx-k3r5.inc | 1 - 3 files changed, 7 deletions(-) delete mode 100644 layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-common.inc diff --git a/layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-common.inc b/layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-common.inc deleted file mode 100644 index 7336de7..0000000 --- a/layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-common.inc +++ /dev/null @@ -1,5 +0,0 @@ -# This file contains the part of the configuration that is common to all -# board based on the Gemini platform and that are the same for both -# the Cortex-A53 and Cortex-R5 core (Gemini use a multi-arch SOC) -TI_LINUX_FW_SRCREV = "0f4905088d24e474063f33777559149e11538be5" -K3_IMAGE_GEN_SRCREV ?= "2308bfb01e7bd3e03514cb33f06180dd9bb79121" diff --git a/layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-k3.inc b/layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-k3.inc index abe0929..6d4523f 100644 --- a/layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-k3.inc +++ b/layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-k3.inc @@ -6,7 +6,6 @@ WKS_FILE ?= "" require conf/machine/include/k3.inc -require conf/machine/include/netmodule-am64xx-common.inc # Workarround to remove wic related settings added to IMAGE_FSTYPE in k3.inc # without too much risk of breaking a distro or local config (as remove) diff --git a/layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-k3r5.inc b/layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-k3r5.inc index 5b4d69c..7bba4b8 100644 --- a/layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-k3r5.inc +++ b/layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-k3r5.inc @@ -2,7 +2,6 @@ # board based on the Gemini platform and that are the Cortex-A53 core. require conf/machine/include/k3r5.inc -require conf/machine/include/netmodule-am64xx-common.inc SYSFW_SOC = "am64x" SYSFW_CONFIG = "evm"