From 4feb727cd6b77a68bdaca63e121b378d814f5eaf Mon Sep 17 00:00:00 2001
From: Dave Cobbley <david.j.cobbley@linux.intel.com>
Date: Tue, 14 Aug 2018 13:30:07 -0700
Subject: [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>
---
 meta-aspeed/conf/machine/include/aspeed.inc         |  6 ++++++
 meta-aspeed/conf/machine/include/ast2400.inc        | 19 +++++++++++++++++++
 meta-aspeed/conf/machine/include/ast2500.inc        | 21 +++++++++++++++++++++
 .../conf/machine/include/tune-arm1176jz-s.inc       | 11 +++++++++++
 4 files changed, 57 insertions(+)
 create mode 100644 meta-aspeed/conf/machine/include/aspeed.inc
 create mode 100644 meta-aspeed/conf/machine/include/ast2400.inc
 create mode 100644 meta-aspeed/conf/machine/include/ast2500.inc
 create mode 100644 meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc

(limited to 'meta-aspeed/conf/machine')

diff --git a/meta-aspeed/conf/machine/include/aspeed.inc b/meta-aspeed/conf/machine/include/aspeed.inc
new file mode 100644
index 000000000..88290ff82
--- /dev/null
+++ b/meta-aspeed/conf/machine/include/aspeed.inc
@@ -0,0 +1,6 @@
+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-aspeed/conf/machine/include/ast2400.inc b/meta-aspeed/conf/machine/include/ast2400.inc
new file mode 100644
index 000000000..22374752d
--- /dev/null
+++ b/meta-aspeed/conf/machine/include/ast2400.inc
@@ -0,0 +1,19 @@
+#@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-aspeed/conf/machine/include/ast2500.inc b/meta-aspeed/conf/machine/include/ast2500.inc
new file mode 100644
index 000000000..fe079ee61
--- /dev/null
+++ b/meta-aspeed/conf/machine/include/ast2500.inc
@@ -0,0 +1,21 @@
+#@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-aspeed/conf/machine/include/tune-arm1176jz-s.inc b/meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc
new file mode 100644
index 000000000..5216533eb
--- /dev/null
+++ b/meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc
@@ -0,0 +1,11 @@
+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}"
-- 
cgit v1.2.1