summaryrefslogtreecommitdiff
path: root/meta-openbmc-bsp/meta-aspeed/conf
diff options
context:
space:
mode:
authorDave Cobbley <david.j.cobbley@linux.intel.com>2018-08-14 23:30:07 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-08-23 04:26:37 +0300
commit4feb727cd6b77a68bdaca63e121b378d814f5eaf (patch)
tree871b558e24c63450a7a5c2eacda38cf21dbb21e8 /meta-openbmc-bsp/meta-aspeed/conf
parenteb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (diff)
downloadopenbmc-4feb727cd6b77a68bdaca63e121b378d814f5eaf.tar.xz
[Subtree] Move board support packages to top level
The new subtree paradigm has moved the meta-bsp layers to the top level Change-Id: Ic4f64c39465be699bed3649e125e027d17daf938 Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openbmc-bsp/meta-aspeed/conf')
-rw-r--r--meta-openbmc-bsp/meta-aspeed/conf/layer.conf12
-rw-r--r--meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc6
-rw-r--r--meta-openbmc-bsp/meta-aspeed/conf/machine/include/ast2400.inc19
-rw-r--r--meta-openbmc-bsp/meta-aspeed/conf/machine/include/ast2500.inc21
-rw-r--r--meta-openbmc-bsp/meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc11
5 files changed, 0 insertions, 69 deletions
diff --git a/meta-openbmc-bsp/meta-aspeed/conf/layer.conf b/meta-openbmc-bsp/meta-aspeed/conf/layer.conf
deleted file mode 100644
index dcd420b51f..0000000000
--- a/meta-openbmc-bsp/meta-aspeed/conf/layer.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
- ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "aspeed-layer"
-BBFILE_PATTERN_aspeed-layer = ""
-LAYERVERSION_aspeed-layer = "1"
-LAYERSERIES_COMPAT_aspeed-layer = "sumo"
-
-ASPEEDBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc b/meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc
deleted file mode 100644
index 88290ff82b..0000000000
--- a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-aspeed"
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-aspeed"
-PREFERRED_PROVIDER_u-boot ?= "u-boot-aspeed"
-PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-fw-utils-aspeed"
-
-MACHINEOVERRIDES .= ":aspeed"
diff --git a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/ast2400.inc b/meta-openbmc-bsp/meta-aspeed/conf/machine/include/ast2400.inc
deleted file mode 100644
index 22374752da..0000000000
--- a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/ast2400.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: Aspeed AST2400
-#@DESCRIPTION: Common machine configuration for the Aspeed AST2400 Chip
-
-require conf/machine/include/aspeed.inc
-
-UBOOT_MACHINE ?= "ast_g4_ncsi_config"
-UBOOT_ENTRYPOINT ?= "0x40001000"
-UBOOT_LOADADDRESS ?= "0x40001000"
-
-MACHINE_EXTRA_RDEPENDS += "udev-aspeed-vuart"
-
-SERIAL_CONSOLES = "115200;ttyS4"
-
-SOC_FAMILY = "aspeed-g4"
-include conf/machine/include/soc-family.inc
-MACHINEOVERRIDES .= ":ast2400"
-
-require conf/machine/include/tune-arm926ejs.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/ast2500.inc b/meta-openbmc-bsp/meta-aspeed/conf/machine/include/ast2500.inc
deleted file mode 100644
index fe079ee615..0000000000
--- a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/ast2500.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-#@TYPE: Machine
-#@NAME: Aspeed AST2500
-#@DESCRIPTION: Common machine configuration for the Aspeed AST2500 Chip
-
-require conf/machine/include/aspeed.inc
-
-UBOOT_MACHINE ?= "ast_g5_ncsi_config"
-UBOOT_ENTRYPOINT ?= "0x80001000"
-UBOOT_LOADADDRESS ?= "0x80001000"
-
-MACHINE_EXTRA_RDEPENDS += "udev-aspeed-vuart"
-
-DEFAULTTUNE ?= "arm1176jzs"
-
-SERIAL_CONSOLES = "115200;ttyS4"
-
-SOC_FAMILY = "aspeed-g5"
-include conf/machine/include/soc-family.inc
-MACHINEOVERRIDES .= ":ast2500"
-
-require conf/machine/include/tune-arm1176jz-s.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc b/meta-openbmc-bsp/meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc
deleted file mode 100644
index 5216533ebc..0000000000
--- a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFAULTTUNE ?= "armv6t-novfp"
-
-require conf/machine/include/arm/arch-armv6.inc
-
-TUNEVALID[arm1176jzs] = "Enable arm1176jzs specific processor optimizations"
-TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "arm1176jzs", "-mtune=arm1176jz-s", "", d)}"
-
-AVAILTUNES += "arm1176jzs"
-ARMPKGARCH_tune-arm1176jzs = "${ARMPKGARCH_tune-armv6t-novfp}"
-TUNE_FEATURES_tune-arm1176jzs = "${TUNE_FEATURES_tune-armv6t-novfp} arm1176jzs"
-PACKAGE_EXTRA_ARCHS_tune-arm1176jzs = "${PACKAGE_EXTRA_ARCHS_tune-armv6t-novfp}"