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>
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample
index f2f3036..ccd2099 100644
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample
@@ -16,7 +16,6 @@
##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-arm \
##OEROOT##/meta-openbmc-machines/meta-arm/meta-qualcomm \
##OEROOT##/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep \
@@ -32,7 +31,6 @@
##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-arm \
##OEROOT##/meta-openbmc-machines/meta-arm/meta-qualcomm \
##OEROOT##/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep \
diff --git a/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample
index acf6591..8b1910b 100644
--- a/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample
@@ -15,7 +15,6 @@
##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-evb \
##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-aspeed \
##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500 \
@@ -30,7 +29,6 @@
##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-evb \
##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-aspeed \
##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500 \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample
index 48a1301..89d3549 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample
@@ -16,7 +16,6 @@
##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-openpower \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto \
@@ -32,7 +31,6 @@
##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-openpower \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample
index b186e9d..b06f6a2 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample
@@ -16,7 +16,6 @@
##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-openpower \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus \
@@ -32,7 +31,6 @@
##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-openpower \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-stonewither/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-stonewither/conf/bblayers.conf.sample
index a944599..61545f6 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-stonewither/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-stonewither/conf/bblayers.conf.sample
@@ -16,7 +16,6 @@
##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-openpower \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon \
@@ -33,7 +32,6 @@
##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-openpower \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample
index 738a413..18a97de 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample
@@ -16,7 +16,6 @@
##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-openpower \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon \
@@ -32,7 +31,6 @@
##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-openpower \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample
index fcc684d..4be9f26 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample
@@ -16,7 +16,6 @@
##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-openpower \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ingrasys \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius \
@@ -32,7 +31,6 @@
##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-openpower \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ingrasys \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius \
diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample
index 8b1312f..cf49c35 100644
--- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample
@@ -15,7 +15,6 @@
##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-openpower \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang \
@@ -30,7 +29,6 @@
##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-openpower \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang \
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
index 7a06dc9..306b0f9 100644
--- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
@@ -16,7 +16,6 @@
##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-openpower \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye \
@@ -32,7 +31,6 @@
##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-openpower \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace \
##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye \
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 c35649c..1f4bbca 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 @@
##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 8735273..2dcafab 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 @@
##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 @@
##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 3cf9ed6..ff145b0 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 @@
##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 af19388..86c3a22 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 @@
##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 @@
##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 \