intel-common: Make using intel-common override opt-in

Currently the intel-core*-common.inc files also include the
intel-common-pkgarch.inc, forcing the introduction of the intel-common
PACKAGE_ARCH. Coupling this with the addition of the intel-common
MACHINE_OVERRIDE, means that even MACHINE_ARCH packages can be
influenced by intel-common overrides, which is not desirable.

Remove the intel-common-pkgarch.inc from the intel-core*common.inc
include files, requiring BSPs wanting to use the intel-common mechanism
to explicitly include it. This obviates the need to reset the
linux-yocto PACKAGE_ARCH to MACHINE_ARCH.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Darren Hart 2014-02-05 19:15:29 -08:00
parent dd0bd45aa4
commit c7bf6a327b
64 changed files with 4 additions and 96 deletions

View File

@ -3,6 +3,5 @@
#
DEFAULTTUNE ?= "core2-32"
require intel-common-pkgarch.inc
require conf/machine/include/tune-core2.inc
require conf/machine/include/x86-base.inc

View File

@ -3,6 +3,5 @@
#
DEFAULTTUNE ?= "corei7-64"
require intel-common-pkgarch.inc
require conf/machine/include/tune-corei7.inc
require conf/machine/include/x86-base.inc

View File

@ -5,4 +5,5 @@
PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
include conf/machine/include/intel-core2-32-common.inc
require conf/machine/include/intel-core2-32-common.inc
require conf/machine/include/intel-common-pkgarch.inc

View File

@ -5,5 +5,5 @@
PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
# Should these be require?
include conf/machine/include/intel-corei7-64-common.inc
require conf/machine/include/intel-corei7-64-common.inc
require conf/machine/include/intel-common-pkgarch.inc

View File

@ -1,6 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_chiefriver = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_chiefriver = "chiefriver"
KMACHINE_chiefriver = "chiefriver"

View File

@ -1,5 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_chiefriver = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_chiefriver = "chiefriver"
KMACHINE_chiefriver = "chiefriver"

View File

@ -1,6 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_chiefriver = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_chiefriver = "chiefriver"
KMACHINE_chiefriver = "chiefriver"

View File

@ -1,6 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_chiefriver = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_chiefriver = "chiefriver"
KMACHINE_chiefriver = "chiefriver"

View File

@ -1,6 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_chiefriver = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_chiefriver = "chiefriver"
KMACHINE_chiefriver = "chiefriver"

View File

@ -1,6 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_chiefriver = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_chiefriver = "chiefriver"
KMACHINE_chiefriver = "chiefriver"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}"
PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_crownbay = "crownbay"
KMACHINE_crownbay = "crownbay"

View File

@ -1,6 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
KMACHINE_crownbay-noemgd = "crownbay"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}"
PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
KMACHINE_crownbay-noemgd = "crownbay"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}"
PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
KMACHINE_crownbay-noemgd = "crownbay"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}"
PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_crownbay = "crownbay"
KMACHINE_crownbay = "crownbay"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}"
PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_crownbay = "crownbay"
KMACHINE_crownbay = "crownbay"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}"
PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_crownbay = "crownbay"
KMACHINE_crownbay = "crownbay"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_crystalforest-gladden = "${MACHINE_ARCH}"
PACKAGE_ARCH_crystalforest-server = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladen"
KMACHINE_crystalforest-gladden = "crystalforest"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_crystalforest-gladden = "${MACHINE_ARCH}"
PACKAGE_ARCH_crystalforest-server = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladden"
KMACHINE_crystalforest-gladden = "crystalforest"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_crystalforest-gladden = "${MACHINE_ARCH}"
PACKAGE_ARCH_crystalforest-server = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladden"
KMACHINE_crystalforest-gladden = "crystalforest"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_crystalforest = "${MACHINE_ARCH}"
PACKAGE_ARCH_crystalforest-server = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladden"
KMACHINE_crystalforest-gladden = "crystalforest"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_emenlow = "${MACHINE_ARCH}"
PACKAGE_ARCH_emenlow-noemgd = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_emenlow = "emenlow"
KMACHINE_emenlow = "emenlow"

View File

@ -1,5 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_emenlow = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_emenlow = "emenlow"
KMACHINE_emenlow = "emenlow"

View File

@ -1,5 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_emenlow = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_emenlow = "emenlow"
KMACHINE_emenlow = "emenlow"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_emenlow = "${MACHINE_ARCH}"
PACKAGE_ARCH_emenlow-noemgd = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_emenlow = "emenlow"
KMACHINE_emenlow = "emenlow"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_emenlow = "${MACHINE_ARCH}"
PACKAGE_ARCH_emenlow-noemgd = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_emenlow = "emenlow"
KMACHINE_emenlow = "emenlow"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_emenlow = "${MACHINE_ARCH}"
PACKAGE_ARCH_emenlow-noemgd = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_emenlow = "emenlow"
KMACHINE_emenlow = "emenlow"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_fri2 = "fri2"
KMACHINE_fri2 = "fri2"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_fri2 = "fri2"
KMACHINE_fri2 = "fri2"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_fri2 = "fri2"
KMACHINE_fri2 = "fri2"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_fri2 = "fri2"
KMACHINE_fri2 = "fri2"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_fri2 = "fri2"
KMACHINE_fri2 = "fri2"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
LINUX_VERSION = "3.10.19"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_fri2 = "fri2"
KMACHINE_fri2 = "fri2"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
LINUX_VERSION = "3.8.13"

View File

@ -1,6 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_jasperforest = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_jasperforest = "jasperforest"

View File

@ -1,5 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_jasperforest = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_jasperforest = "jasperforest"
KMACHINE_jasperforest = "jasperforest"

View File

@ -1,6 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_jasperforest = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_jasperforest = "jasperforest"
KMACHINE_jasperforest = "jasperforest"

View File

@ -1,6 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_jasperforest = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_jasperforest = "jasperforest"

View File

@ -1,6 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_jasperforest = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_jasperforest = "jasperforest"

View File

@ -1,6 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_jasperforest = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_jasperforest = "jasperforest"

View File

@ -1,5 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_n450 = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_n450 = "n450"
KMACHINE_n450 = "atom-pc"

View File

@ -1,6 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_n450 = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_n450 = "n450"
KMACHINE_n450 = "atom-pc"

View File

@ -1,6 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_n450 = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_n450 = "n450"
KMACHINE_n450 = "atom-pc"

View File

@ -1,6 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_n450 = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_n450 = "n450"
KMACHINE_n450 = "atom-pc"

View File

@ -1,6 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_nuc = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_nuc = "nuc"
KMACHINE_nuc = "chiefriver"

View File

@ -1,6 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_nuc = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_nuc = "nuc"
KMACHINE_nuc = "chiefriver"

View File

@ -1,6 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_nuc = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_nuc = "nuc"
KMACHINE_nuc = "chiefriver"

View File

@ -1,6 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_nuc = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_nuc = "nuc"
KMACHINE_nuc = "chiefriver"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_romley = "${MACHINE_ARCH}"
PACKAGE_ARCH_romley-ivb = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_romley = "romley"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_romley = "${MACHINE_ARCH}"
PACKAGE_ARCH_romley-ivb = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_romley = "romley"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_romley = "${MACHINE_ARCH}"
PACKAGE_ARCH_romley-ivb = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_romley = "romley"

View File

@ -1,6 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_sugarbay = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_sugarbay = "sugarbay"

View File

@ -1,5 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_sugarbay = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_sugarbay = "sugarbay"
KMACHINE_sugarbay = "sugarbay"

View File

@ -1,5 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_sugarbay = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_sugarbay = "sugarbay"
KMACHINE_sugarbay = "sugarbay"

View File

@ -1,6 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_sugarbay = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_sugarbay = "sugarbay"

View File

@ -1,6 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_sugarbay = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_sugarbay = "sugarbay"

View File

@ -1,6 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_sugarbay = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_sugarbay = "sugarbay"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_sys940x = "${MACHINE_ARCH}"
PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}"
KMETA = "meta"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_sys940x = "${MACHINE_ARCH}"
PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_sys940x = "sys940x"
KMACHINE_sys940x = "sys940x"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_sys940x = "${MACHINE_ARCH}"
PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_sys940x = "sys940x"
KMACHINE_sys940x = "sys940x"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_sys940x = "${MACHINE_ARCH}"
PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}"
KMETA = "meta"
LINUX_VERSION = "3.10.19"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_sys940x = "${MACHINE_ARCH}"
PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}"
KMETA = "meta"

View File

@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH_sys940x = "${MACHINE_ARCH}"
PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}"
KMETA = "meta"
LINUX_VERSION = "3.8.13"