From 476f558b75ae40b92ea96b4692ce6e39cf5ff210 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Mon, 16 Aug 2021 18:01:43 -0400 Subject: yocto-bsp: update machine confs with new tune locations (From meta-yocto rev: c909922cc70bbf1420a51e035625d06537334b47) Signed-off-by: Jon Mason Signed-off-by: Richard Purdie --- meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 2 +- meta-yocto-bsp/conf/machine/edgerouter.conf | 2 +- meta-yocto-bsp/conf/machine/genericx86-64.conf | 2 +- meta-yocto-bsp/conf/machine/genericx86.conf | 2 +- meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta-yocto-bsp/conf/machine') diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index 65c79fd34d..fa7275fe2d 100644 --- a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf @@ -12,7 +12,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules kernel-devicetree" EXTRA_IMAGEDEPENDS += "virtual/bootloader" DEFAULTTUNE ?= "cortexa8hf-neon" -include conf/machine/include/tune-cortexa8.inc +include conf/machine/include/arm/armv7a/tune-cortexa8.inc IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap" EXTRA_IMAGECMD:jffs2 = "-lnp " diff --git a/meta-yocto-bsp/conf/machine/edgerouter.conf b/meta-yocto-bsp/conf/machine/edgerouter.conf index fbe33be9d1..447862f550 100644 --- a/meta-yocto-bsp/conf/machine/edgerouter.conf +++ b/meta-yocto-bsp/conf/machine/edgerouter.conf @@ -2,7 +2,7 @@ #@NAME: Edgerouter #@DESCRIPTION: Machine configuration for a generic edgerouter -require conf/machine/include/tune-mips64.inc +require conf/machine/include/mips/tune-mips64.inc MACHINE_FEATURES = "pci ext2 ext3 serial" diff --git a/meta-yocto-bsp/conf/machine/genericx86-64.conf b/meta-yocto-bsp/conf/machine/genericx86-64.conf index 81ec24e971..14913ea1f1 100644 --- a/meta-yocto-bsp/conf/machine/genericx86-64.conf +++ b/meta-yocto-bsp/conf/machine/genericx86-64.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for generic x86_64 (64-bit) PCs and servers. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. DEFAULTTUNE ?= "core2-64" -require conf/machine/include/tune-core2.inc +require conf/machine/include/x86/tune-core2.inc require conf/machine/include/genericx86-common.inc SERIAL_CONSOLES_CHECK = "ttyS0" diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf index 1387bde852..ed4fc8a3de 100644 --- a/meta-yocto-bsp/conf/machine/genericx86.conf +++ b/meta-yocto-bsp/conf/machine/genericx86.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for generic x86 (32-bit) PCs. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. DEFAULTTUNE ?= "core2-32" -require conf/machine/include/tune-core2.inc +require conf/machine/include/x86/tune-core2.inc require conf/machine/include/genericx86-common.inc MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check" diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index 59d96d1417..253a855dc3 100644 --- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc @@ -1,5 +1,5 @@ -include conf/machine/include/x86-base.inc -require conf/machine/include/qemuboot-x86.inc +include conf/machine/include/x86/x86-base.inc +require conf/machine/include/x86/qemuboot-x86.inc MACHINE_FEATURES += "wifi efi pcbios" PREFERRED_VERSION_linux-yocto ?= "5.10%" -- cgit v1.2.3-54-g00ecf