diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-02-09 08:50:23 -0500 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-15 13:03:37 +0000 |
| commit | 768c44e78c33642c55de1d6e60a26508292e1eec (patch) | |
| tree | 280cff95fc8c51947adf91055b74498c4fa286d8 /meta-openbmc-machines | |
| parent | 73821e1893a5241d769491f17932a2e2adb4fdcb (diff) | |
| download | talos-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')
13 files changed, 0 insertions, 24 deletions
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 f2f303681..ccd209947 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 @@ 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-arm \ ##OEROOT##/meta-openbmc-machines/meta-arm/meta-qualcomm \ ##OEROOT##/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep \ @@ -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-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 acf659104..8b1910b2c 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 @@ 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-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 @@ 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-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 48a130175..89d3549a8 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 @@ 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-openpower \ ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \ ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto \ @@ -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-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 b186e9d44..b06f6a28c 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 @@ 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-openpower \ ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \ ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus \ @@ -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-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 a9445994c..61545f6ee 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 @@ 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-openpower \ ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \ ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon \ @@ -33,7 +32,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-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 738a4133e..18a97de55 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 @@ 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-openpower \ ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \ ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon \ @@ -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-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 fcc684dab..4be9f2685 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 @@ 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-openpower \ ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ingrasys \ ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius \ @@ -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-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 8b1312fb0..cf49c35c5 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 @@ 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-openpower \ ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec \ ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang \ @@ -30,7 +29,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-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 7a06dc91e..306b0f93f 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 @@ 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-openpower \ ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace \ ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye \ @@ -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-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 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 \ |
