summaryrefslogtreecommitdiffstats
path: root/meta-openbmc-machines/meta-x86
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2018-02-09 08:50:23 -0500
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-06-15 13:03:37 +0000
commit768c44e78c33642c55de1d6e60a26508292e1eec (patch)
tree280cff95fc8c51947adf91055b74498c4fa286d8 /meta-openbmc-machines/meta-x86
parent73821e1893a5241d769491f17932a2e2adb4fdcb (diff)
downloadtalos-openbmc-768c44e78c33642c55de1d6e60a26508292e1eec.tar.gz
talos-openbmc-768c44e78c33642c55de1d6e60a26508292e1eec.zip
machines: Drop ast2400/ast2500 layers
The Aspeed layer now supports both chips and the SOC specific layers do not have any content. Drop the redundant layers. Change-Id: I48a813fe4c02b8fc8861c6dd58906ae559c64403 Tested: Built and verified witherspoon and palmetto images Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openbmc-machines/meta-x86')
-rw-r--r--meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample1
-rw-r--r--meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample2
-rw-r--r--meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample1
-rw-r--r--meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample2
4 files changed, 0 insertions, 6 deletions
diff --git a/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample
index c35649c2a..1f4bbcaaf 100644
--- a/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample
@@ -16,7 +16,6 @@ BBLAYERS ?= " \
##OEROOT##/import-layers/meta-virtualization \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
- ##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2500 \
##OEROOT##/meta-openbmc-machines/meta-x86 \
##OEROOT##/meta-openbmc-machines/meta-x86/meta-intel \
##OEROOT##/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf \
diff --git a/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample
index 8735273b6..2dcafab42 100644
--- a/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample
@@ -16,7 +16,6 @@ BBLAYERS ?= " \
##OEROOT##/import-layers/meta-virtualization \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
- ##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2500 \
##OEROOT##/meta-openbmc-machines/meta-x86 \
##OEROOT##/meta-openbmc-machines/meta-x86/meta-mellanox \
##OEROOT##/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn \
@@ -32,7 +31,6 @@ BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/import-layers/meta-virtualization \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
- ##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2500 \
##OEROOT##/meta-openbmc-machines/meta-x86 \
##OEROOT##/meta-openbmc-machines/meta-x86/meta-mellanox \
##OEROOT##/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn \
diff --git a/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample
index 3cf9ed6c3..ff145b0a7 100644
--- a/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample
@@ -16,6 +16,5 @@ BBLAYERS ?= " \
##OEROOT##/import-layers/meta-virtualization \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
- ##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2500 \
##OEROOT##/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune \
"
diff --git a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample
index af19388da..86c3a2298 100644
--- a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample
@@ -16,7 +16,6 @@ BBLAYERS ?= " \
##OEROOT##/import-layers/meta-virtualization \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
- ##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2400 \
##OEROOT##/meta-openbmc-machines/meta-x86 \
##OEROOT##/meta-openbmc-machines/meta-x86/meta-quanta \
##OEROOT##/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l \
@@ -32,7 +31,6 @@ BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/import-layers/meta-virtualization \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
- ##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2400 \
##OEROOT##/meta-openbmc-machines/meta-x86 \
##OEROOT##/meta-openbmc-machines/meta-x86/meta-quanta \
##OEROOT##/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l \
OpenPOWER on IntegriCloud