[linux-yocto] [PATCH 1/4] meta: eg20t: Drop eg20t branch, rename feature

[Darren Hart]

All the eg20t sources are in mainline, there is no longer a need for the
branch. Drop the branch and rename the eg20t-enable feature to eg20t.

Signed-off-by: Darren Hart <dvhart at linux.intel.com>
---
 meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc    |    2 +-
 meta/cfg/kernel-cache/bsp/fri2/fri2.scc            |    2 +-
 meta/cfg/kernel-cache/bsp/minnow/minnow.scc        |    2 +-
 meta/cfg/kernel-cache/bsp/sys940x/sys940x.scc      |    2 +-
 .../kernel-cache/features/eg20t/eg20t-enable.scc   |    4 ----
 meta/cfg/kernel-cache/features/eg20t/eg20t.scc     |    6 +++---
 6 files changed, 7 insertions(+), 11 deletions(-)
 delete mode 100644 meta/cfg/kernel-cache/features/eg20t/eg20t-enable.scc

diff --git a/meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc b/meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc
index 45bba7c..13794f7 100644
--- a/meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc
+++ b/meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc
@@ -1,7 +1,7 @@
 kconf hardware crownbay.cfg
 
 include cfg/x86.scc
-include features/eg20t/eg20t-enable.scc
+include features/eg20t/eg20t.scc
 include features/intel-e1xxxx/intel-e100.scc
 include features/intel-e1xxxx/intel-e1xxxx.scc
 include cfg/dmaengine.scc
diff --git a/meta/cfg/kernel-cache/bsp/fri2/fri2.scc b/meta/cfg/kernel-cache/bsp/fri2/fri2.scc
index c70d942..8d4a656 100644
--- a/meta/cfg/kernel-cache/bsp/fri2/fri2.scc
+++ b/meta/cfg/kernel-cache/bsp/fri2/fri2.scc
@@ -1,7 +1,7 @@
 kconf hardware fri2.cfg
 
 include cfg/x86.scc
-include features/eg20t/eg20t-enable.scc
+include features/eg20t/eg20t.scc
 include cfg/dmaengine.scc
 include features/ericsson-3g/f5521gw.scc
 include features/power/intel.scc
diff --git a/meta/cfg/kernel-cache/bsp/minnow/minnow.scc b/meta/cfg/kernel-cache/bsp/minnow/minnow.scc
index 3e3260b..8c55a8f 100644
--- a/meta/cfg/kernel-cache/bsp/minnow/minnow.scc
+++ b/meta/cfg/kernel-cache/bsp/minnow/minnow.scc
@@ -1,5 +1,5 @@
 include cfg/x86.scc
-include features/eg20t/eg20t-enable.scc
+include features/eg20t/eg20t.scc
 include cfg/dmaengine.scc
 include features/power/intel.scc
 include cfg/efi.scc
diff --git a/meta/cfg/kernel-cache/bsp/sys940x/sys940x.scc b/meta/cfg/kernel-cache/bsp/sys940x/sys940x.scc
index 4d57241..b1f35a9 100644
--- a/meta/cfg/kernel-cache/bsp/sys940x/sys940x.scc
+++ b/meta/cfg/kernel-cache/bsp/sys940x/sys940x.scc
@@ -1,7 +1,7 @@
 kconf hardware sys940x.cfg
 
 include cfg/x86.scc
-include features/eg20t/eg20t-enable.scc
+include features/eg20t/eg20t.scc
 include cfg/dmaengine.scc
 include cfg/8250.scc
 include cfg/usb-mass-storage.scc
diff --git a/meta/cfg/kernel-cache/features/eg20t/eg20t-enable.scc b/meta/cfg/kernel-cache/features/eg20t/eg20t-enable.scc
deleted file mode 100644
index 178123f..0000000
--- a/meta/cfg/kernel-cache/features/eg20t/eg20t-enable.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "Enable Support for Platform Controller Hub EG20T"
-define KFEATURE_COMPATIBILITY board
-
-kconf hardware eg20t.cfg
diff --git a/meta/cfg/kernel-cache/features/eg20t/eg20t.scc b/meta/cfg/kernel-cache/features/eg20t/eg20t.scc
index 70f7d60..178123f 100644
--- a/meta/cfg/kernel-cache/features/eg20t/eg20t.scc
+++ b/meta/cfg/kernel-cache/features/eg20t/eg20t.scc
@@ -1,4 +1,4 @@
-# changes should be staged on "eg20t"
-git branch eg20t master
+define KFEATURE_DESCRIPTION "Enable Support for Platform Controller Hub EG20T"
+define KFEATURE_COMPATIBILITY board
 
-include eg20t-enable.scc
+kconf hardware eg20t.cfg
-- 
1.7.9.5