commit 946a6dbe7ee9751f3e2c6698cccd36116301483c
author Brad Bishop <bradleyb@fuzziesquirrel.com> Fri Feb 09 08:50:23 2018 -0500
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Fri Jun 15 13:03:37 2018 +0000
tree 50d7a6679898a8b21960656ff9597df8dbb4a13c
parent 52c64cc6814f866301f8efd2b07b14ccf4b5e7b3

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>

meta-palmetto/conf/bblayers.conf.sample

diff --git a/meta-palmetto/conf/bblayers.conf.sample b/meta-palmetto/conf/bblayers.conf.sample
index 48a1301..89d3549 100644
--- a/meta-palmetto/conf/bblayers.conf.sample
+++ b/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 \

meta-romulus/conf/bblayers.conf.sample

diff --git a/meta-romulus/conf/bblayers.conf.sample b/meta-romulus/conf/bblayers.conf.sample
index b186e9d..b06f6a2 100644
--- a/meta-romulus/conf/bblayers.conf.sample
+++ b/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 \

meta-stonewither/conf/bblayers.conf.sample

diff --git a/meta-stonewither/conf/bblayers.conf.sample b/meta-stonewither/conf/bblayers.conf.sample
index a944599..61545f6 100644
--- a/meta-stonewither/conf/bblayers.conf.sample
+++ b/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 \

meta-witherspoon/conf/bblayers.conf.sample

diff --git a/meta-witherspoon/conf/bblayers.conf.sample b/meta-witherspoon/conf/bblayers.conf.sample
index 738a413..18a97de 100644
--- a/meta-witherspoon/conf/bblayers.conf.sample
+++ b/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 \