[linux-yocto] [PATCH] intel: Remove the standard ktype nesting

[Darren Hart]

Fixes [YOCTO 6710]

intel-common-standard.scc included the standard ktype, but the
preempt-rt scc files included intel-common-standard and the preempt-rt
ktype. This resulted in a double include of the standard ktype, which
caused the meta/scripts/updateme to change the source tree from
standard/preempt-rt/base to standard/standard/preempt-rt and drop
all the preempt-rt commits.

To address this, avoid the nested inclusion of ktypes by explicitly
including them in each top level BSP definition. Remove the ktype from
intel-common-standard.scc and rename it intel-common-drivers.scc, which
more accurately describes its purpose anyway. Update the top the BSPs to
use the new name and explicitly include the required ktype.

Remove some obsolete comments and clean-up the whitespace in the
top-level BSP scc files a bit.

Signed-off-by: Darren Hart <dvhart at linux.intel.com>
Cc: Bruce Ashfield <bruce.ashfield at windriver.com>

--

Please apply to linux-yocto-3.14 and to 3.17 after reverting:
intel: create intel-common-preempt-rt and use it
---
 .../bsp/intel-common/intel-common-drivers.scc      | 72 +++++++++++++++++++++
 .../bsp/intel-common/intel-common-standard.scc     | 74 ----------------------
 .../bsp/intel-common/intel-core2-32-preempt-rt.scc |  5 +-
 .../bsp/intel-common/intel-core2-32-standard.scc   |  3 +-
 .../intel-common/intel-corei7-64-preempt-rt.scc    |  5 +-
 .../bsp/intel-common/intel-corei7-64-standard.scc  |  3 +-
 6 files changed, 78 insertions(+), 84 deletions(-)
 create mode 100644 meta/cfg/kernel-cache/bsp/intel-common/intel-common-drivers.scc
 delete mode 100644 meta/cfg/kernel-cache/bsp/intel-common/intel-common-standard.scc

diff --git a/meta/cfg/kernel-cache/bsp/intel-common/intel-common-drivers.scc b/meta/cfg/kernel-cache/bsp/intel-common/intel-common-drivers.scc
new file mode 100644
index 0000000..5dc19fc
--- /dev/null
+++ b/meta/cfg/kernel-cache/bsp/intel-common/intel-common-drivers.scc
@@ -0,0 +1,72 @@
+# intel-common-drivers.scc
+#
+# Common drivers and technologies to enable intel-common derived BSPs.
+#
+
+include intel-common.scc
+
+# Borrow the driver selection from common-pc until
+# it is better abstracted on its own.
+kconf hardware bsp/common-pc/common-pc-drivers.cfg
+kconf hardware bsp/common-pc/common-pc-eth.cfg
+kconf hardware bsp/common-pc/common-pc-gfx.cfg
+kconf hardware bsp/common-pc/common-pc-wifi.cfg
+
+# USB
+include features/usb/ehci-hcd.scc
+include features/usb/uhci-hcd.scc
+include features/usb/ohci-hcd.scc
+include features/usb/xhci-hcd.scc
+include features/usb/usb-gadgets.scc
+include features/usb/touchscreen-composite.scc
+
+include cfg/timer/hpet.scc
+include cfg/timer/rtc.scc
+include features/eg20t/eg20t.scc
+
+# Graphics
+include cfg/vesafb.scc
+include features/i915/i915.scc
+
+# Networking
+include features/intel-e1xxxx/intel-e100.scc
+include features/intel-e1xxxx/intel-e1xxxx.scc
+include features/ericsson-3g/f5521gw.scc
+include features/igb/igb.scc
+include features/ixgbe/ixgbe.scc
+include features/iwlwifi/iwlwifi.scc
+include features/iwlegacy/iwlegacy.scc
+
+# Various RF/Wireless technologies
+include features/bluetooth/bluetooth.scc
+include features/ieee802154/ieee802154.scc
+
+# Various media device support, like webcams and capture cards
+include features/media/media-all.scc
+
+# Industrial IO Support
+include features/iio/iio.scc
+
+# Intel HD Audio
+include features/sound/snd_hda_intel.scc
+
+# Intel technology
+include features/amt/mei/mei.scc
+include features/power/intel.scc
+
+# Subsystems and interfaces
+include features/hugetlb/hugetlb.scc
+include features/i2c/i2cdev.scc
+include features/leds/leds.scc
+include features/spi/spidev.scc
+
+# Miscellaneous
+include cfg/dmaengine.scc
+include features/uio/uio.scc
+include cfg/efi-ext.scc
+
+# default policy for standard kernels
+include cfg/usb-mass-storage.scc
+include cfg/boot-live.scc
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc
diff --git a/meta/cfg/kernel-cache/bsp/intel-common/intel-common-standard.scc b/meta/cfg/kernel-cache/bsp/intel-common/intel-common-standard.scc
deleted file mode 100644
index 2b4930c..0000000
--- a/meta/cfg/kernel-cache/bsp/intel-common/intel-common-standard.scc
+++ /dev/null
@@ -1,74 +0,0 @@
-# intel-common-standard.scc
-#
-# Common drivers and technologies to enable for the "standard" ktype for
-# intel-common derived BSPs.
-#
-
-include ktypes/standard/standard.scc
-include intel-common.scc
-
-# Borrow the driver selection from common-pc until
-# it is better abstracted on its own.
-kconf hardware bsp/common-pc/common-pc-drivers.cfg
-kconf hardware bsp/common-pc/common-pc-eth.cfg
-kconf hardware bsp/common-pc/common-pc-gfx.cfg
-kconf hardware bsp/common-pc/common-pc-wifi.cfg
-
-# USB
-include features/usb/ehci-hcd.scc
-include features/usb/uhci-hcd.scc
-include features/usb/ohci-hcd.scc
-include features/usb/xhci-hcd.scc
-include features/usb/usb-gadgets.scc
-include features/usb/touchscreen-composite.scc
-
-include cfg/timer/hpet.scc
-include cfg/timer/rtc.scc
-include features/eg20t/eg20t.scc
-
-# Graphics
-include cfg/vesafb.scc
-include features/i915/i915.scc
-
-# Networking
-include features/intel-e1xxxx/intel-e100.scc
-include features/intel-e1xxxx/intel-e1xxxx.scc
-include features/ericsson-3g/f5521gw.scc
-include features/igb/igb.scc
-include features/ixgbe/ixgbe.scc
-include features/iwlwifi/iwlwifi.scc
-include features/iwlegacy/iwlegacy.scc
-
-# Various RF/Wireless technologies
-include features/bluetooth/bluetooth.scc
-include features/ieee802154/ieee802154.scc
-
-# Various media device support, like webcams and capture cards
-include features/media/media-all.scc
-
-# Industrial IO Support
-include features/iio/iio.scc
-
-# Intel HD Audio
-include features/sound/snd_hda_intel.scc
-
-# Intel technology
-include features/amt/mei/mei.scc
-include features/power/intel.scc
-
-# Subsystems and interfaces
-include features/hugetlb/hugetlb.scc
-include features/i2c/i2cdev.scc
-include features/leds/leds.scc
-include features/spi/spidev.scc
-
-# Miscellaneous
-include cfg/dmaengine.scc
-include features/uio/uio.scc
-include cfg/efi-ext.scc
-
-# default policy for standard kernels
-include cfg/usb-mass-storage.scc
-include cfg/boot-live.scc
-include features/latencytop/latencytop.scc
-include features/profiling/profiling.scc
diff --git a/meta/cfg/kernel-cache/bsp/intel-common/intel-core2-32-preempt-rt.scc b/meta/cfg/kernel-cache/bsp/intel-common/intel-core2-32-preempt-rt.scc
index b5f5603..b25dfbc 100644
--- a/meta/cfg/kernel-cache/bsp/intel-common/intel-core2-32-preempt-rt.scc
+++ b/meta/cfg/kernel-cache/bsp/intel-common/intel-core2-32-preempt-rt.scc
@@ -2,9 +2,6 @@ define KMACHINE intel-core2-32
 define KTYPE preempt-rt
 define KARCH i386
 
-include intel-common-standard.scc
-
-# no new branch required, re-use the ktypes/preempt-rt/preempt-rt.scc branch
 include ktypes/preempt-rt/preempt-rt.scc
-
+include intel-common-drivers.scc
 include intel-core2-32.scc
diff --git a/meta/cfg/kernel-cache/bsp/intel-common/intel-core2-32-standard.scc b/meta/cfg/kernel-cache/bsp/intel-common/intel-core2-32-standard.scc
index 9f5b5f0..dc7b49f 100644
--- a/meta/cfg/kernel-cache/bsp/intel-common/intel-core2-32-standard.scc
+++ b/meta/cfg/kernel-cache/bsp/intel-common/intel-core2-32-standard.scc
@@ -7,5 +7,6 @@ define KMACHINE intel-core2-32
 define KARCH i386
 define KTYPE standard
 
-include intel-common-standard.scc
+include ktypes/standard/standard.scc
+include intel-common-drivers.scc
 include intel-core2-32.scc
diff --git a/meta/cfg/kernel-cache/bsp/intel-common/intel-corei7-64-preempt-rt.scc b/meta/cfg/kernel-cache/bsp/intel-common/intel-corei7-64-preempt-rt.scc
index d5bed76..386931c 100644
--- a/meta/cfg/kernel-cache/bsp/intel-common/intel-corei7-64-preempt-rt.scc
+++ b/meta/cfg/kernel-cache/bsp/intel-common/intel-corei7-64-preempt-rt.scc
@@ -2,9 +2,6 @@ define KMACHINE intel-corei7-64
 define KTYPE preempt-rt
 define KARCH x86_64
 
-include intel-common-standard.scc
-
-# no new branch required, re-use the ktypes/preempt-rt/preempt-rt.scc branch
 include ktypes/preempt-rt/preempt-rt.scc
-
+include intel-common-drivers.scc
 include intel-corei7-64.scc
diff --git a/meta/cfg/kernel-cache/bsp/intel-common/intel-corei7-64-standard.scc b/meta/cfg/kernel-cache/bsp/intel-common/intel-corei7-64-standard.scc
index f614ff3..0631142 100644
--- a/meta/cfg/kernel-cache/bsp/intel-common/intel-corei7-64-standard.scc
+++ b/meta/cfg/kernel-cache/bsp/intel-common/intel-corei7-64-standard.scc
@@ -7,5 +7,6 @@ define KMACHINE intel-corei7-64
 define KARCH x86_64
 define KTYPE standard
 
-include intel-common-standard.scc
+include ktypes/standard/standard.scc
+include intel-common-drivers.scc
 include intel-corei7-64.scc
-- 
2.1.0