On 2016-07-26 05:00 PM, Tomas Winkler wrote:
1.Separete mei-me and mei-txe support and enable them only on approriate platforms 2. Amt is not anabled on all plaform and exists only on BigCores over mei-me.To not break anyting wwe left amt.cfg in bsp/intel-common/intel-common-drivers.scc, but this should be fine tunend later.
Looks fine to me. I'll let this sit for the day to see if anyone else has an opinion, but the split and include only by platforms that need the support is a better approach .. so I can't see there being an issue. Bruce
Signed-off-by: Tomas Winkler <[email protected]> --- bsp/intel-common/intel-common-drivers.scc | 2 +- bsp/minnow/minnow.scc | 1 + features/amt/mei/mei.cfg | 4 ---- features/mei/amt.cfg | 2 ++ features/mei/amt.scc | 6 ++++++ features/mei/mei-me.cfg | 2 ++ features/mei/mei-me.scc | 6 ++++++ features/mei/mei-txe.cfg | 1 + features/mei/mei-txe.scc | 6 ++++++ features/mei/mei.cfg | 1 + features/{amt => }/mei/mei.scc | 0 features/soc/baytrail/baytrail.scc | 2 ++ features/soc/broxton/broxton.scc | 2 ++ features/soc/x1000/x1000.scc | 2 +- 14 files changed, 31 insertions(+), 6 deletions(-) delete mode 100644 features/amt/mei/mei.cfg create mode 100644 features/mei/amt.cfg create mode 100644 features/mei/amt.scc create mode 100644 features/mei/mei-me.cfg create mode 100644 features/mei/mei-me.scc create mode 100644 features/mei/mei-txe.cfg create mode 100644 features/mei/mei-txe.scc create mode 100644 features/mei/mei.cfg rename features/{amt => }/mei/mei.scc (100%) diff --git a/bsp/intel-common/intel-common-drivers.scc b/bsp/intel-common/intel-common-drivers.scc index 128c725b31d6..4d466814e5c9 100644 --- a/bsp/intel-common/intel-common-drivers.scc +++ b/bsp/intel-common/intel-common-drivers.scc @@ -60,7 +60,7 @@ include features/iio/iio.scc include features/sound/snd_hda_intel.scc # Intel technology -include features/amt/mei/mei.scc +include features/mei/amt.scc include features/power/intel.scc include features/thermal/coretemp.scc diff --git a/bsp/minnow/minnow.scc b/bsp/minnow/minnow.scc index 0354fe9761a4..6570253c2233 100644 --- a/bsp/minnow/minnow.scc +++ b/bsp/minnow/minnow.scc @@ -11,6 +11,7 @@ include cfg/timer/hpet.scc include features/leds/leds.scc include features/spi/spidev.scc include features/i2c/i2cdev.scc +include features/mei/mei-txe.scc # Earlyprintk and port debug requires 8250 kconf hardware cfg/8250.cfg diff --git a/features/amt/mei/mei.cfg b/features/amt/mei/mei.cfg deleted file mode 100644 index 19aff024947a..000000000000 --- a/features/amt/mei/mei.cfg +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_WATCHDOG_CORE=y -CONFIG_INTEL_MEI=m -CONFIG_INTEL_MEI_ME=m -CONFIG_INTEL_MEI_TXE=m diff --git a/features/mei/amt.cfg b/features/mei/amt.cfg new file mode 100644 index 000000000000..f2ff6d531fa8 --- /dev/null +++ b/features/mei/amt.cfg @@ -0,0 +1,2 @@ +CONFIG_WATCHDOG_CORE=y +CONFIG_INTEL_MEI_WDT=m diff --git a/features/mei/amt.scc b/features/mei/amt.scc new file mode 100644 index 000000000000..84e682d5cd80 --- /dev/null +++ b/features/mei/amt.scc @@ -0,0 +1,6 @@ +define KFEATURE_DESCRIPTION "Enable options for the Intel Active Management Technology" +define KFEATURE_COMPATIBILITY board + +kconf hardware amt.cfg + +include features/mei/mei-me.scc diff --git a/features/mei/mei-me.cfg b/features/mei/mei-me.cfg new file mode 100644 index 000000000000..33423f8fadd6 --- /dev/null +++ b/features/mei/mei-me.cfg @@ -0,0 +1,2 @@ +CONFIG_PCI=m +CONFIG_INTEL_MEI_ME=m diff --git a/features/mei/mei-me.scc b/features/mei/mei-me.scc new file mode 100644 index 000000000000..765c9bb3304a --- /dev/null +++ b/features/mei/mei-me.scc @@ -0,0 +1,6 @@ +define KFEATURE_DESCRIPTION "Enable options for the Intel Management Engine Interface" +define KFEATURE_COMPATIBILITY board + +kconf hardware mei-me.cfg + +features/mei/mei.scc diff --git a/features/mei/mei-txe.cfg b/features/mei/mei-txe.cfg new file mode 100644 index 000000000000..359cad436d82 --- /dev/null +++ b/features/mei/mei-txe.cfg @@ -0,0 +1 @@ +CONFIG_INTEL_MEI_TXE=m diff --git a/features/mei/mei-txe.scc b/features/mei/mei-txe.scc new file mode 100644 index 000000000000..1db8b7ed8757 --- /dev/null +++ b/features/mei/mei-txe.scc @@ -0,0 +1,6 @@ +define KFEATURE_DESCRIPTION "Enable options for the Intel Management Engine Interface" +define KFEATURE_COMPATIBILITY board + +kconf hardware mei-txe.cfg + +include features/mei/mei.scc diff --git a/features/mei/mei.cfg b/features/mei/mei.cfg new file mode 100644 index 000000000000..15212b9f87ed --- /dev/null +++ b/features/mei/mei.cfg @@ -0,0 +1 @@ +CONFIG_INTEL_MEI=m diff --git a/features/amt/mei/mei.scc b/features/mei/mei.scc similarity index 100% rename from features/amt/mei/mei.scc rename to features/mei/mei.scc diff --git a/features/soc/baytrail/baytrail.scc b/features/soc/baytrail/baytrail.scc index 49c926a46f99..de83aaed5b6b 100644 --- a/features/soc/baytrail/baytrail.scc +++ b/features/soc/baytrail/baytrail.scc @@ -12,4 +12,6 @@ include features/usb/ehci-hcd.scc include features/usb/designware-usb3.scc include features/intel-pinctrl/intel-pinctrl.scc +include features/mei/mei-txe.scc + kconf hardware baytrail.cfg diff --git a/features/soc/broxton/broxton.scc b/features/soc/broxton/broxton.scc index 8e268e5b7c59..3502a7eeb544 100644 --- a/features/soc/broxton/broxton.scc +++ b/features/soc/broxton/broxton.scc @@ -14,4 +14,6 @@ include features/usb/designware-usb3.scc include features/intel-pinctrl/intel-pinctrl.scc include features/usb/usb-typec.scc +include features/mei/mei-me.scc + kconf hardware broxton.cfg diff --git a/features/soc/x1000/x1000.scc b/features/soc/x1000/x1000.scc index 635dd91a533f..80989f0ac1f7 100644 --- a/features/soc/x1000/x1000.scc +++ b/features/soc/x1000/x1000.scc @@ -19,7 +19,7 @@ include features/iwlwifi/iwlwifi.scc include features/iio/iio.scc # Intel technology -include features/amt/mei/mei.scc +include features/mei/amt.scc # Subsystems and interfaces include features/i2c/i2cdev.scc
-- _______________________________________________ linux-yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/linux-yocto
