From 194ff4f1f5d44b12e9cb06ddafa6adb20174a13c Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Wed, 22 Aug 2018 21:40:54 -0400 Subject: [Subtree] Bring openbmc machines to top level The new subtree model brings the subtrees up from the openbmc-machines layer. Change-Id: I58a03ae1be374bc79ae1438e65e888375d12d0c0 Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- meta-evb/meta-evb-aspeed/conf/layer.conf | 5 ++++ .../meta-evb-aspeed/meta-evb-ast2500/README.md | 7 +++++ .../meta-evb-ast2500/conf/bblayers.conf.sample | 33 ++++++++++++++++++++++ .../meta-evb-ast2500/conf/conf-notes.txt | 2 ++ .../meta-evb-ast2500/conf/layer.conf | 5 ++++ .../meta-evb-ast2500/conf/local.conf.sample | 21 ++++++++++++++ .../meta-evb-ast2500/conf/machine/evb-ast2500.conf | 9 ++++++ 7 files changed, 82 insertions(+) create mode 100644 meta-evb/meta-evb-aspeed/conf/layer.conf create mode 100644 meta-evb/meta-evb-aspeed/meta-evb-ast2500/README.md create mode 100644 meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample create mode 100644 meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/conf-notes.txt create mode 100644 meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/layer.conf create mode 100644 meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample create mode 100644 meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/machine/evb-ast2500.conf (limited to 'meta-evb/meta-evb-aspeed') diff --git a/meta-evb/meta-evb-aspeed/conf/layer.conf b/meta-evb/meta-evb-aspeed/conf/layer.conf new file mode 100644 index 000000000..6d78f959c --- /dev/null +++ b/meta-evb/meta-evb-aspeed/conf/layer.conf @@ -0,0 +1,5 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +BBFILE_COLLECTIONS += "evb-aspeed" +BBFILE_PATTERN_evb-aspeed = "" diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/README.md b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/README.md new file mode 100644 index 000000000..a738aa27a --- /dev/null +++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/README.md @@ -0,0 +1,7 @@ +ASPEED AST2500 Evaluation Board +================ + +This is the ASPEED AST2500 evaluation board layer. +The AST2500 is an ARM, service management SOC made by ASPEED. More information +about the AST2500 can be found +[here](https://www.aspeedtech.com/products.php?fPath=20&rId=440). diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample new file mode 100644 index 000000000..a13721955 --- /dev/null +++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample @@ -0,0 +1,33 @@ +# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# changes incompatibly +LCONF_VERSION = "8" + +BBPATH = "${TOPDIR}" +BBFILES ?= "" + +BBLAYERS ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-poky \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-openembedded/meta-webserver \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-evb \ + ##OEROOT##/meta-evb/meta-evb-aspeed \ + ##OEROOT##/meta-evb/meta-evb-aspeed/meta-evb-ast2500 \ + " +BBLAYERS_NON_REMOVABLE ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-poky \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-openembedded/meta-webserver \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-evb \ + ##OEROOT##/meta-evb/meta-evb-aspeed \ + ##OEROOT##/meta-evb/meta-evb-aspeed/meta-evb-ast2500 \ + " diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/conf-notes.txt b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/conf-notes.txt new file mode 100644 index 000000000..9b3c01a55 --- /dev/null +++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/conf-notes.txt @@ -0,0 +1,2 @@ +Common targets are: + obmc-phosphor-image diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/layer.conf b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/layer.conf new file mode 100644 index 000000000..1c703369a --- /dev/null +++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/layer.conf @@ -0,0 +1,5 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +BBFILE_COLLECTIONS += "evb-ast2500" +BBFILE_PATTERN_evb-ast2500 = "" diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample new file mode 100644 index 000000000..6a12c601e --- /dev/null +++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample @@ -0,0 +1,21 @@ +MACHINE ??= "evb-ast2500" +DISTRO ?= "openbmc-phosphor" +PACKAGE_CLASSES ?= "package_rpm" +SANITY_TESTED_DISTROS_append ?= " *" +EXTRA_IMAGE_FEATURES = "debug-tweaks" +USER_CLASSES ?= "buildstats image-mklibs image-prelink" +PATCHRESOLVE = "noop" +BB_DISKMON_DIRS = "\ + STOPTASKS,${TMPDIR},1G,100K \ + STOPTASKS,${DL_DIR},1G,100K \ + STOPTASKS,${SSTATE_DIR},1G,100K \ + STOPTASKS,/tmp,100M,100K \ + ABORT,${TMPDIR},100M,1K \ + ABORT,${DL_DIR},100M,1K \ + ABORT,${SSTATE_DIR},100M,1K \ + ABORT,/tmp,10M,1K" +CONF_VERSION = "1" +INHERIT += "extrausers" +EXTRA_USERS_PARAMS = " \ + usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \ + " diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/machine/evb-ast2500.conf b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/machine/evb-ast2500.conf new file mode 100644 index 000000000..3d88c8702 --- /dev/null +++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/machine/evb-ast2500.conf @@ -0,0 +1,9 @@ +KMACHINE = "aspeed" +KERNEL_DEVICETREE = "${KMACHINE}-ast2500-evb.dtb" + +UBOOT_MACHINE = "ast_g5_phy_config" + +FLASH_SIZE = "32768" + +require conf/machine/include/ast2500.inc +require conf/machine/include/obmc-bsp-common.inc -- cgit v1.2.3