From f7a2d7e95c0db67dd1f19a904a92c0bd420d9b90 Mon Sep 17 00:00:00 2001 From: Sona Sarmadi Date: Wed, 2 May 2018 13:56:11 +0200 Subject: Rename machine name denverton -> atom-c3000 1) Renamed conf/machine/denverton.conf -> atom-c3000.conf 2) Renamed KERNEL_FEATURES_append-denverton to: KERNEL_FEATURES_append-atom-c3000 in linux-intel.inc Signed-off-by: Sona Sarmadi Signed-off-by: Martin Borg --- conf/machine/atom-c3000.conf | 45 ++++++++++++++++++++++++++++++++++++ conf/machine/denverton.conf | 45 ------------------------------------ recipes-kernel/linux/linux-intel.inc | 4 ++-- 3 files changed, 47 insertions(+), 47 deletions(-) create mode 100644 conf/machine/atom-c3000.conf delete mode 100644 conf/machine/denverton.conf diff --git a/conf/machine/atom-c3000.conf b/conf/machine/atom-c3000.conf new file mode 100644 index 0000000..ce26958 --- /dev/null +++ b/conf/machine/atom-c3000.conf @@ -0,0 +1,45 @@ +#@TYPE: Machine +#@NAME: atom-c3000 +#@SUMMARY: Intel® Atom™ Processor C Series +#@DESCRIPTION: Machine configuration based on 64 bit Intel Core i7 CPU (and later) with MMX, SSE, SSE2, SSE3, and SSSE3 +# instruction set support. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. +# +# +# This is a clean-up version of conf/machine/intel-corei7-64.conf +# If the configuration need to be updated please check first the original .conf + +# Soft set linux-yocto as preferred kernel like x86-base.inc +PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel-host" +PREFERRED_PROVIDER_virtual/kernel_poky-tiny ?= "linux-intel-host" +PREFERRED_VERSION_linux-intel-host ?= "4.14%" + +MACHINE_FEATURES += "pcbios efi" + +# include the user space intel microcode loading support in the generated images. +MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', ' intel-microcode', '', d)}" + +# Add general MACHINEOVERRIDE for meta-intel +MACHINEOVERRIDES =. "intel-x86-common:" + +require conf/machine/include/intel-corei7-64-common.inc +require conf/machine/include/intel-common-pkgarch.inc + +MACHINE_EXTRA_RRECOMMENDS += "lms8" + +XSERVER_X86_MATROX_MGA = "xf86-video-mga \ + " +XSERVER_X86_ASPEED_AST = "xf86-video-ast \ + " +XSERVER ?= "${XSERVER_X86_BASE} \ + ${XSERVER_X86_EXT} \ + ${XSERVER_X86_FBDEV} \ + ${XSERVER_X86_I915} \ + ${XSERVER_X86_I965} \ + ${XSERVER_X86_MATROX_MGA} \ + ${XSERVER_X86_MODESETTING} \ + ${XSERVER_X86_VESA} \ + ${XSERVER_X86_ASPEED_AST} \ + " + +SYSLINUX_OPTS = "serial 0 115200" +SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2" diff --git a/conf/machine/denverton.conf b/conf/machine/denverton.conf deleted file mode 100644 index 522efbd..0000000 --- a/conf/machine/denverton.conf +++ /dev/null @@ -1,45 +0,0 @@ -#@TYPE: Machine -#@NAME: Denverton -#@SUMMARY: Intel® Atom™ Processor C Series -#@DESCRIPTION: Machine configuration based on 64 bit Intel Core i7 CPU (and later) with MMX, SSE, SSE2, SSE3, and SSSE3 -# instruction set support. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. -# -# -# This is a clean-up version of conf/machine/intel-corei7-64.conf -# If the configuration need to be updated please check first the original .conf - -# Soft set linux-yocto as preferred kernel like x86-base.inc -PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel-host" -PREFERRED_PROVIDER_virtual/kernel_poky-tiny ?= "linux-intel-host" -PREFERRED_VERSION_linux-intel-host ?= "4.14%" - -MACHINE_FEATURES += "pcbios efi" - -# include the user space intel microcode loading support in the generated images. -MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', ' intel-microcode', '', d)}" - -# Add general MACHINEOVERRIDE for meta-intel -MACHINEOVERRIDES =. "intel-x86-common:" - -require conf/machine/include/intel-corei7-64-common.inc -require conf/machine/include/intel-common-pkgarch.inc - -MACHINE_EXTRA_RRECOMMENDS += "lms8" - -XSERVER_X86_MATROX_MGA = "xf86-video-mga \ - " -XSERVER_X86_ASPEED_AST = "xf86-video-ast \ - " -XSERVER ?= "${XSERVER_X86_BASE} \ - ${XSERVER_X86_EXT} \ - ${XSERVER_X86_FBDEV} \ - ${XSERVER_X86_I915} \ - ${XSERVER_X86_I965} \ - ${XSERVER_X86_MATROX_MGA} \ - ${XSERVER_X86_MODESETTING} \ - ${XSERVER_X86_VESA} \ - ${XSERVER_X86_ASPEED_AST} \ - " - -SYSLINUX_OPTS = "serial 0 115200" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2" diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index 8e95e31..40485bd 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -2,11 +2,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:" require common/recipes-kernel/linux/linux-intel_4.14.bb require recipes-kernel/linux/linux-deploy-kconfig.inc -SRCREV_metaenea = "c4bd5f6e084a6ced2c7a2f76798d0a34947ffeb7" +SRCREV_metaenea = "5069865aaa6c8664991493530076a16ad99a0a8d" KENEABRANCH = "intel-4.14" SRC_URI_append = " git://git@git.enea.com/linux/enea-kernel-cache.git;protocol=ssh;type=kmeta;name=metaenea;branch=${KENEABRANCH};destsuffix=enea-kernel-meta" -KERNEL_FEATURES_append_denverton = " bsp/denverton/denverton.scc" +KERNEL_FEATURES_append_atom-c3000 = " bsp/atom-c3000/atom-c3000.scc" KERNEL_FEATURES_append = " features/udev/udev.scc" -- cgit v1.2.3-54-g00ecf