From 3bf28622c1b2207e752b6e0b9725b4d27fa328a0 Mon Sep 17 00:00:00 2001 From: Patrick Vogelaar Date: Tue, 24 Oct 2023 15:18:44 +0200 Subject: [PATCH] refactor(eagle40-03): rename MACHINE from eagle40_03 to eagle40-03 --- .../conf/machine/{eagle40_03.conf => eagle40-03.conf} | 9 ++++----- .../recipes-kernel/linux/linux-yocto_5.15.bbappend | 10 +++++----- 2 files changed, 9 insertions(+), 10 deletions(-) rename layers/meta-belden-coreos-bsp/conf/machine/{eagle40_03.conf => eagle40-03.conf} (85%) diff --git a/layers/meta-belden-coreos-bsp/conf/machine/eagle40_03.conf b/layers/meta-belden-coreos-bsp/conf/machine/eagle40-03.conf similarity index 85% rename from layers/meta-belden-coreos-bsp/conf/machine/eagle40_03.conf rename to layers/meta-belden-coreos-bsp/conf/machine/eagle40-03.conf index cb2c4bf..bca4a27 100644 --- a/layers/meta-belden-coreos-bsp/conf/machine/eagle40_03.conf +++ b/layers/meta-belden-coreos-bsp/conf/machine/eagle40-03.conf @@ -1,12 +1,11 @@ #@TYPE: Machine -#@NAME: eagle40_03 +#@NAME: eagle40-03 #@DESCRIPTION: Machine support for EAGLE40-03 # -DEFAULTTUNE ?= "core2-64" -require conf/machine/include/x86/tune-core2.inc +require include/coreos-generic-arch/x64.inc -MACHINE_FEATURES += "pci usbhost x86 acpi serial" +MACHINE_FEATURES += "pci usbhost x86 acpi serial efi tpm2 " # Kernel configuration # ****************************************************************************** @@ -36,6 +35,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " kernel-modules" # COREOS_IMAGE_SWUPDATE_EXTRACLASSES += "" --> TBD # No watchdog available yet -EFIBOOTGUARD_TIMEOUT ?= "60" +EFIBOOTGUARD_TIMEOUT ?= "0" require conf/machine/include/coreos-generic-features/efi.inc require conf/machine/include/coreos-generic-features/partitions.inc \ No newline at end of file diff --git a/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_5.15.bbappend b/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_5.15.bbappend index a858e2e..91c4862 100644 --- a/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_5.15.bbappend +++ b/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_5.15.bbappend @@ -5,11 +5,11 @@ COMPATIBLE_MACHINE:vm-x64 = "vm-x64" KERNEL_FEATURES:append:vm-x64=" cfg/virtio.scc cfg/paravirt_kvm.scc" -KMACHINE:eagle40_03 ?= "common-pc-64" -KBRANCH:eagle40_03 = "v5.15/standard/base" -SRCREV_machine:eagle40_03 ?= "3baf1c5c0e6084b3f4a1d2d805168d657f872e60" -COMPATIBLE_MACHINE:eagle40_03 = "eagle40_03" -LINUX_VERSION:eagle40_03 = "5.15.134" +KMACHINE:eagle40-03 ?= "common-pc-64" +KBRANCH:eagle40-03 = "v5.15/standard/base" +SRCREV_machine:eagle40-03 ?= "3baf1c5c0e6084b3f4a1d2d805168d657f872e60" +COMPATIBLE_MACHINE:eagle40-03 = "eagle40-03" +LINUX_VERSION:eagle40-03 = "5.15.134" KBRANCH:beaglebone = "v5.15/standard/beaglebone"