63 files changed, 26 insertions, 34 deletions
diff --git a/meta-openbmc-bsp/meta-aspeed/COPYING.MIT b/meta-aspeed/COPYING.MIT
index fb950dc69..fb950dc69 100644
--- a/meta-openbmc-bsp/meta-aspeed/COPYING.MIT
+++ b/meta-aspeed/COPYING.MIT
diff --git a/meta-openbmc-bsp/meta-aspeed/COPYING.apache-2.0 b/meta-aspeed/COPYING.apache-2.0
index 67db85882..67db85882 100644
--- a/meta-openbmc-bsp/meta-aspeed/COPYING.apache-2.0
+++ b/meta-aspeed/COPYING.apache-2.0
diff --git a/meta-openbmc-bsp/meta-aspeed/LICENSE b/meta-aspeed/LICENSE
index 2bf823dc4..2bf823dc4 100644
--- a/meta-openbmc-bsp/meta-aspeed/LICENSE
+++ b/meta-aspeed/LICENSE
diff --git a/meta-openbmc-bsp/meta-aspeed/MAINTAINERS b/meta-aspeed/MAINTAINERS
index 9b799c237..9b799c237 100644
--- a/meta-openbmc-bsp/meta-aspeed/MAINTAINERS
+++ b/meta-aspeed/MAINTAINERS
diff --git a/meta-openbmc-bsp/meta-aspeed/README.md b/meta-aspeed/README.md
index 6c3221ef9..6c3221ef9 100644
--- a/meta-openbmc-bsp/meta-aspeed/README.md
+++ b/meta-aspeed/README.md
diff --git a/meta-openbmc-bsp/meta-aspeed/conf/layer.conf b/meta-aspeed/conf/layer.conf
index dcd420b51..dcd420b51 100644
--- a/meta-openbmc-bsp/meta-aspeed/conf/layer.conf
+++ b/meta-aspeed/conf/layer.conf
diff --git a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc b/meta-aspeed/conf/machine/include/aspeed.inc
index 88290ff82..88290ff82 100644
--- a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc
+++ b/meta-aspeed/conf/machine/include/aspeed.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/ast2400.inc b/meta-aspeed/conf/machine/include/ast2400.inc
index 22374752d..22374752d 100644
--- a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/ast2400.inc
+++ b/meta-aspeed/conf/machine/include/ast2400.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/ast2500.inc b/meta-aspeed/conf/machine/include/ast2500.inc
index fe079ee61..fe079ee61 100644
--- a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/ast2500.inc
+++ b/meta-aspeed/conf/machine/include/ast2500.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc b/meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc
index 5216533eb..5216533eb 100644
--- a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc
+++ b/meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/alt_fw_env.config b/meta-aspeed/recipes-bsp/u-boot/files/alt_fw_env.config
index 3d85f9974..3d85f9974 100644
--- a/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/alt_fw_env.config
+++ b/meta-aspeed/recipes-bsp/u-boot/files/alt_fw_env.config
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/default-gcc.patch b/meta-aspeed/recipes-bsp/u-boot/files/default-gcc.patch
index 04184df8b..04184df8b 100644
--- a/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/default-gcc.patch
+++ b/meta-aspeed/recipes-bsp/u-boot/files/default-gcc.patch
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/fw_env.config b/meta-aspeed/recipes-bsp/u-boot/files/fw_env.config
index 19ace4b88..19ace4b88 100644
--- a/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/fw_env.config
+++ b/meta-aspeed/recipes-bsp/u-boot/files/fw_env.config
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb
index b3a41a28a..b3a41a28a 100644
--- a/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb
+++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc
index e92ba8760..e92ba8760 100644
--- a/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc
+++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb
index 713133ceb..713133ceb 100644
--- a/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb
+++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb b/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb
index 9e85308cd..9e85308cd 100644
--- a/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb
+++ b/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions/76-aspeed-mtd-partitions.rules b/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions/76-aspeed-mtd-partitions.rules
index 28e458645..28e458645 100644
--- a/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions/76-aspeed-mtd-partitions.rules
+++ b/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions/76-aspeed-mtd-partitions.rules
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb b/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb
index c0ee6771e..c0ee6771e 100644
--- a/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb
+++ b/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-vuart/61-aspeed-vuart.rules b/meta-aspeed/recipes-core/udev/udev-aspeed-vuart/61-aspeed-vuart.rules
index f9b93c9e4..f9b93c9e4 100644
--- a/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-vuart/61-aspeed-vuart.rules
+++ b/meta-aspeed/recipes-core/udev/udev-aspeed-vuart/61-aspeed-vuart.rules
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2400/defconfig b/meta-aspeed/recipes-kernel/linux/ast2400/defconfig
index 5c789d7ae..5c789d7ae 100644
--- a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2400/defconfig
+++ b/meta-aspeed/recipes-kernel/linux/ast2400/defconfig
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2500/defconfig b/meta-aspeed/recipes-kernel/linux/ast2500/defconfig
index 12234dfb0..12234dfb0 100755
--- a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2500/defconfig
+++ b/meta-aspeed/recipes-kernel/linux/ast2500/defconfig
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc b/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc
index 93433939d..93433939d 100644
--- a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc
+++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
index daa998c41..daa998c41 100644
--- a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
+++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/COPYING.MIT b/meta-ibm/meta-fsp2/COPYING.MIT
index fb950dc69..fb950dc69 100644
--- a/meta-openbmc-bsp/meta-ibm/meta-fsp2/COPYING.MIT
+++ b/meta-ibm/meta-fsp2/COPYING.MIT
diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/COPYING.apache-2.0 b/meta-ibm/meta-fsp2/COPYING.apache-2.0
index 67db85882..67db85882 100644
--- a/meta-openbmc-bsp/meta-ibm/meta-fsp2/COPYING.apache-2.0
+++ b/meta-ibm/meta-fsp2/COPYING.apache-2.0
diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/LICENSE b/meta-ibm/meta-fsp2/LICENSE
index 2bf823dc4..2bf823dc4 100644
--- a/meta-openbmc-bsp/meta-ibm/meta-fsp2/LICENSE
+++ b/meta-ibm/meta-fsp2/LICENSE
diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/conf/layer.conf b/meta-ibm/meta-fsp2/conf/layer.conf
index 11d9b6eee..11d9b6eee 100644
--- a/meta-openbmc-bsp/meta-ibm/meta-fsp2/conf/layer.conf
+++ b/meta-ibm/meta-fsp2/conf/layer.conf
diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/conf/machine/include/fsp2.inc b/meta-ibm/meta-fsp2/conf/machine/include/fsp2.inc
index a053d37d3..a053d37d3 100644
--- a/meta-openbmc-bsp/meta-ibm/meta-fsp2/conf/machine/include/fsp2.inc
+++ b/meta-ibm/meta-fsp2/conf/machine/include/fsp2.inc
diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/conf/machine/sunray2.conf b/meta-ibm/meta-fsp2/conf/machine/sunray2.conf
index e61487f7f..e61487f7f 100644
--- a/meta-openbmc-bsp/meta-ibm/meta-fsp2/conf/machine/sunray2.conf
+++ b/meta-ibm/meta-fsp2/conf/machine/sunray2.conf
diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc b/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc
index 0f65dfea1..0f65dfea1 100644
--- a/meta-openbmc-bsp/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc
+++ b/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc
diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2_4.13.bb b/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2_4.13.bb
index 1c2929bab..1c2929bab 100644
--- a/meta-openbmc-bsp/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2_4.13.bb
+++ b/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2_4.13.bb
diff --git a/meta-openbmc-bsp/meta-ibm/meta-fsp2/recipes.txt b/meta-ibm/meta-fsp2/recipes.txt
index 149509f3e..149509f3e 100644
--- a/meta-openbmc-bsp/meta-ibm/meta-fsp2/recipes.txt
+++ b/meta-ibm/meta-fsp2/recipes.txt
diff --git a/meta-openbmc-bsp/meta-nuvoton/COPYING.MIT b/meta-nuvoton/COPYING.MIT
index fb950dc69..fb950dc69 100644
--- a/meta-openbmc-bsp/meta-nuvoton/COPYING.MIT
+++ b/meta-nuvoton/COPYING.MIT
diff --git a/meta-openbmc-bsp/meta-nuvoton/LICENSE b/meta-nuvoton/LICENSE
index 1ed34d75f..1ed34d75f 100644
--- a/meta-openbmc-bsp/meta-nuvoton/LICENSE
+++ b/meta-nuvoton/LICENSE
diff --git a/meta-openbmc-bsp/meta-nuvoton/README.md b/meta-nuvoton/README.md
index a93a03c6e..a93a03c6e 100644
--- a/meta-openbmc-bsp/meta-nuvoton/README.md
+++ b/meta-nuvoton/README.md
diff --git a/meta-openbmc-bsp/meta-nuvoton/conf/layer.conf b/meta-nuvoton/conf/layer.conf
index fe22772f8..fe22772f8 100644
--- a/meta-openbmc-bsp/meta-nuvoton/conf/layer.conf
+++ b/meta-nuvoton/conf/layer.conf
diff --git a/meta-openbmc-bsp/meta-nuvoton/conf/machine/evb-npcm750.conf b/meta-nuvoton/conf/machine/evb-npcm750.conf
index 38c02ed19..38c02ed19 100644
--- a/meta-openbmc-bsp/meta-nuvoton/conf/machine/evb-npcm750.conf
+++ b/meta-nuvoton/conf/machine/evb-npcm750.conf
diff --git a/meta-openbmc-bsp/meta-nuvoton/conf/machine/include/npcm7xx.inc b/meta-nuvoton/conf/machine/include/npcm7xx.inc
index 3d8847dc4..3d8847dc4 100644
--- a/meta-openbmc-bsp/meta-nuvoton/conf/machine/include/npcm7xx.inc
+++ b/meta-nuvoton/conf/machine/include/npcm7xx.inc
diff --git a/meta-openbmc-bsp/meta-nuvoton/conf/machine/include/nuvoton.inc b/meta-nuvoton/conf/machine/include/nuvoton.inc
index 068fe3507..068fe3507 100644
--- a/meta-openbmc-bsp/meta-nuvoton/conf/machine/include/nuvoton.inc
+++ b/meta-nuvoton/conf/machine/include/nuvoton.inc
diff --git a/meta-openbmc-bsp/meta-nuvoton/conf/machine/include/tune-arm7a-novfp.inc b/meta-nuvoton/conf/machine/include/tune-arm7a-novfp.inc
index 18730db69..18730db69 100644
--- a/meta-openbmc-bsp/meta-nuvoton/conf/machine/include/tune-arm7a-novfp.inc
+++ b/meta-nuvoton/conf/machine/include/tune-arm7a-novfp.inc
diff --git a/meta-openbmc-bsp/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb b/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb
index cefdea803..cefdea803 100644
--- a/meta-openbmc-bsp/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb
+++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb
diff --git a/meta-openbmc-bsp/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb b/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb
index ea1fdbebe..ea1fdbebe 100644
--- a/meta-openbmc-bsp/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb
+++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb
diff --git a/meta-openbmc-bsp/meta-nuvoton/recipes-kernel/linux/linux-nuvoton.inc b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton.inc
index 5380478e8..5380478e8 100644
--- a/meta-openbmc-bsp/meta-nuvoton/recipes-kernel/linux/linux-nuvoton.inc
+++ b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton.inc
diff --git a/meta-openbmc-bsp/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig
index 07e0f4ad1..07e0f4ad1 100644
--- a/meta-openbmc-bsp/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig
+++ b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig
diff --git a/meta-openbmc-bsp/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb
index bdd08bc97..bdd08bc97 100644
--- a/meta-openbmc-bsp/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb
+++ b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb
diff --git a/meta-openbmc-bsp/meta-nuvoton/recipes.txt b/meta-nuvoton/recipes.txt
index 149509f3e..149509f3e 100644
--- a/meta-openbmc-bsp/meta-nuvoton/recipes.txt
+++ b/meta-nuvoton/recipes.txt
diff --git a/meta-openbmc-bsp/README.md b/meta-openbmc-bsp/README.md
deleted file mode 100644
index 804db3c6e..000000000
--- a/meta-openbmc-bsp/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-OpenBMC Board Support Package (BSP)
-================
-
-This is the OpenBMC Board Support Package (BSP) layer.
-A Board Support Package (BSP) is a collection of information that defines how
-to support a particular hardware device, set of devices, or hardware platform.
-The OpenBMC BSP layer includes the service management SOCs, such as ASPEED's
-AST2500 and Nuvoton's NPCM7XX.
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 50aab0732..c561f7664 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
@@ -14,7 +14,7 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##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 \
@@ -28,7 +28,7 @@ BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##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/README.md b/meta-openbmc-machines/meta-evb/README.md
index 757f3c2b4..6f9a17959 100644
--- a/meta-openbmc-machines/meta-evb/README.md
+++ b/meta-openbmc-machines/meta-evb/README.md
@@ -3,7 +3,7 @@ OpenBMC Evaluation Board (EVB)
 
 This is the OpenBMC Evaluation Board (EVB) layer. The boards in the EVB layer
 are for evaluation and reference. The [Board Support Package (BSP)
-layer](https://github.com/openbmc/openbmc/tree/master/meta-openbmc-bsp)
+layer](https://github.com/openbmc/openbmc/tree/master/)
 should be used to support a hardware device in a system. Therefore, there
 should not be any EVB layers in a system's bblayers.conf, the BSP layer should
 be used instead. Boards might be found be in both the EVB layer and the BSP
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 4b3e798c6..fad77afe1 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
@@ -13,7 +13,7 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##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 \
@@ -26,7 +26,7 @@ BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##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-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample
index fefa4168e..99dd4d7ea 100644
--- a/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample
@@ -12,7 +12,7 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-nuvoton \
+  ##OEROOT##/meta-nuvoton \
   ##OEROOT##/meta-openbmc-machines/meta-evb \
   ##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-nuvoton \
   ##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750 \
@@ -24,7 +24,7 @@ BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-nuvoton \
+  ##OEROOT##/meta-nuvoton \
   ##OEROOT##/meta-openbmc-machines/meta-evb \
   ##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-nuvoton \
   ##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750 \
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 48f8174cd..e7b9f3d1a 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
@@ -14,7 +14,7 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto \
@@ -28,7 +28,7 @@ BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##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 83eed8b77..52ee80d6b 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
@@ -14,7 +14,7 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus \
@@ -28,7 +28,7 @@ BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##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-witherspoon/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample
index ab22ee1f8..414cb61ae 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
@@ -14,7 +14,7 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon \
@@ -28,7 +28,7 @@ BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##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-z/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/bblayers.conf.sample
index cb42c6341..43eef923d 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/bblayers.conf.sample
@@ -14,7 +14,7 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-python/   \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-ibm/meta-fsp2 \
+  ##OEROOT##/meta-ibm/meta-fsp2 \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z \
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 e153a4b23..80b95b5e5 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
@@ -14,7 +14,7 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ingrasys \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius \
@@ -28,7 +28,7 @@ BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##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 5884868fd..296acc3c3 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
@@ -13,7 +13,7 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-perl \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang \
@@ -26,7 +26,7 @@ BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta-openembedded/meta-perl \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##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 2a4140f62..6bd2bf61d 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
@@ -14,7 +14,7 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace \
   ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye \
@@ -28,7 +28,7 @@ BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##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 3c231c7f6..5f4301b0b 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
@@ -14,7 +14,7 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##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 7bc1aa2dd..95b3b5850 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
@@ -14,7 +14,7 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-x86 \
   ##OEROOT##/meta-openbmc-machines/meta-x86/meta-mellanox \
   ##OEROOT##/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn \
@@ -28,7 +28,7 @@ BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##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 972649131..90488aab4 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
@@ -14,6 +14,6 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##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 874a472de..4fc679957 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
@@ -14,7 +14,7 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-x86 \
   ##OEROOT##/meta-openbmc-machines/meta-x86/meta-quanta \
   ##OEROOT##/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l \
@@ -28,7 +28,7 @@ BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-x86 \
   ##OEROOT##/meta-openbmc-machines/meta-x86/meta-quanta \
   ##OEROOT##/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l \