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-intel/meta-s2600wf/conf/bblayers.conf.sample b/meta-intel/meta-s2600wf/conf/bblayers.conf.sample
index c35649c..1f4bbca 100644
--- a/meta-intel/meta-s2600wf/conf/bblayers.conf.sample
+++ b/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-mellanox/meta-msn/conf/bblayers.conf.sample b/meta-mellanox/meta-msn/conf/bblayers.conf.sample
index 8735273..2dcafab 100644
--- a/meta-mellanox/meta-msn/conf/bblayers.conf.sample
+++ b/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-portwell/meta-neptune/conf/bblayers.conf.sample b/meta-portwell/meta-neptune/conf/bblayers.conf.sample
index 3cf9ed6..ff145b0 100644
--- a/meta-portwell/meta-neptune/conf/bblayers.conf.sample
+++ b/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-quanta/meta-q71l/conf/bblayers.conf.sample b/meta-quanta/meta-q71l/conf/bblayers.conf.sample
index af19388..86c3a22 100644
--- a/meta-quanta/meta-q71l/conf/bblayers.conf.sample
+++ b/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 \