The machines are split between bsp/linux musl-only/linux with glibc. This way the users will be able to build a purecap-musl-only environment in the future or a glibc environment with two system loaders. The bsp is its own separate machine to deal with the fact that we want a single solution for pure musl and glibc machines.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk Reviewed-by: Andrew Murray amurray@thegoodpenguin.co.uk --- conf/bblayers.conf.sample | 16 ++ conf/layer.conf | 15 ++ conf/local.conf.sample | 177 ++++++++++++++++++++++ conf/machine/include/morello-1.5.inc | 1 + conf/machine/include/morello-common.inc | 27 ++++ conf/machine/morello-bsp.conf | 1 + conf/machine/morello-linux-glibc.conf | 3 + conf/machine/morello-linux-musl.conf | 3 + conf/multiconfig/morello-firmware.conf | 1 + conf/multiconfig/morello-linux-glibc.conf | 1 + conf/multiconfig/morello-linux-musl.conf | 1 + 11 files changed, 246 insertions(+) create mode 100644 conf/bblayers.conf.sample create mode 100644 conf/layer.conf create mode 100644 conf/local.conf.sample create mode 100644 conf/machine/include/morello-1.5.inc create mode 100644 conf/machine/include/morello-common.inc create mode 100644 conf/machine/morello-bsp.conf create mode 100644 conf/machine/morello-linux-glibc.conf create mode 100644 conf/machine/morello-linux-musl.conf create mode 100644 conf/multiconfig/morello-firmware.conf create mode 100644 conf/multiconfig/morello-linux-glibc.conf create mode 100644 conf/multiconfig/morello-linux-musl.conf
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample new file mode 100644 index 0000000..d86dbed --- /dev/null +++ b/conf/bblayers.conf.sample @@ -0,0 +1,16 @@ +# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# changes incompatibly +LCONF_VERSION = "7" + +BBPATH = "${TOPDIR}" + +BBFILES ?= "" + +BBLAYERS = " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-poky \ + ##OEROOT##/meta-arm/meta-arm \ + ##OEROOT##/meta-arm/meta-arm-bsp \ + ##OEROOT##/meta-arm/meta-arm-toolchain \ + ##OEROOT##/meta-morello \ + " \ No newline at end of file diff --git a/conf/layer.conf b/conf/layer.conf new file mode 100644 index 0000000..5cd622e --- /dev/null +++ b/conf/layer.conf @@ -0,0 +1,15 @@ +BBPATH := "${BBPATH}:${LAYERDIR}" + +BBFILES := "${BBFILES} \ + ${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "meta-morello" +BBFILE_PATTERN_meta-morello := "^${LAYERDIR}/" +BBFILE_PRIORITY_meta-morello = "5" + +LAYERDEPENDS_meta-morello = " \ + core \ + meta-arm \ +" +LAYERSERIES_COMPAT_meta-morello = "kirkstone" diff --git a/conf/local.conf.sample b/conf/local.conf.sample new file mode 100644 index 0000000..ef7bc7d --- /dev/null +++ b/conf/local.conf.sample @@ -0,0 +1,177 @@ +MACHINE ?= "morello-linux-glibc" +BBMULTICONFIG = "morello-firmware morello-linux-glibc" + +BB_NUMBER_THREADS ?= "${@oe.utils.cpu_count()}" +PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}" + +PACKAGE_CLASSES ?= "package_rpm" + +# DISTRO ?= "poky-bleeding" + +# +# SDK target architecture +# +# This variable specifies the architecture to build SDK items for and means +# you can build the SDK packages for architectures other than the machine you are +# running the build on (i.e. building i686 packages on an x86_64 host). +# Supported values are i686, x86_64, aarch64 +#SDKMACHINE ?= "i686" + +# +# Extra image configuration defaults +# +# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated +# images. Some of these options are added to certain image types automatically. The +# variable can contain the following options: +# "dbg-pkgs" - add -dbg packages for all installed packages +# (adds symbol information for debugging/profiling) +# "src-pkgs" - add -src packages for all installed packages +# (adds source code for debugging) +# "dev-pkgs" - add -dev packages for all installed packages +# (useful if you want to develop against libs in the image) +# "ptest-pkgs" - add -ptest packages for all ptest-enabled packages +# (useful if you want to run the package test suites) +# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) +# "tools-debug" - add debugging tools (gdb, strace) +# "eclipse-debug" - add Eclipse remote debugging support +# "tools-profile" - add profiling tools (oprofile, lttng, valgrind) +# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) +# "debug-tweaks" - make an image suitable for development +# e.g. ssh root access has a blank password +# There are other application targets that can be used here too, see +# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. +# We default to enabling the debugging tweaks. +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" + +# +# Additional image features +# +# The following is a list of additional classes to use when building images which +# enable extra features. Some available options which can be included in this variable +# are: +# - 'buildstats' collect build statistics +USER_CLASSES ?= "buildstats" + +# +# Runtime testing of images +# +# The build system can test booting virtual machine images under qemu (an emulator) +# after any root filesystems are created and run tests against those images. It can also +# run tests against any SDK that are built. To enable this uncomment these lines. +# See classes/test{image,sdk}.bbclass for further details. +#IMAGE_CLASSES += "testimage testsdk" +#TESTIMAGE_AUTO:qemuall = "1" + +# +# Interactive shell configuration +# +# Under certain circumstances the system may need input from you and to do this it +# can launch an interactive shell. It needs to do this since the build is +# multithreaded and needs to be able to handle the case where more than one parallel +# process may require the user's attention. The default is iterate over the available +# terminal types to find one that works. +# +# Examples of the occasions this may happen are when resolving patches which cannot +# be applied, to use the devshell or the kernel menuconfig +# +# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none +# Note: currently, Konsole support only works for KDE 3.x due to the way +# newer Konsole versions behave +#OE_TERMINAL = "auto" +# By default disable interactive patch resolution (tasks will just fail instead): +PATCHRESOLVE = "noop" + +# +# Disk Space Monitoring during the build +# +# Monitor the disk space during the build. If there is less that 1GB of space or less +# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully +# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard halt +# of the build. The reason for this is that running completely out of space can corrupt +# files and damages the build in ways which may not be easily recoverable. +# It's necessary to monitor /tmp, if there is no space left the build will fail +# with very exotic errors. +BB_DISKMON_DIRS ??= "\ + STOPTASKS,${TMPDIR},1G,100K \ + STOPTASKS,${DL_DIR},1G,100K \ + STOPTASKS,${SSTATE_DIR},1G,100K \ + STOPTASKS,/tmp,100M,100K \ + HALT,${TMPDIR},100M,1K \ + HALT,${DL_DIR},100M,1K \ + HALT,${SSTATE_DIR},100M,1K \ + HALT,/tmp,10M,1K" + +# +# Shared-state files from other locations +# +# As mentioned above, shared state files are prebuilt cache data objects which can be +# used to accelerate build time. This variable can be used to configure the system +# to search other mirror locations for these objects before it builds the data itself. +# +# This can be a filesystem directory, or a remote url such as https or ftp. These +# would contain the sstate-cache results from previous builds (possibly from other +# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the +# cache locations to check for the shared objects. +# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH +# at the end as shown in the examples below. This will be substituted with the +# correct path within the directory structure. +#SSTATE_MIRRORS ?= "\ +#file://.* https://someserver.tld/share/sstate/PATH%3Bdownloadfilename=PATH \ +#file://.* file:///some/local/dir/sstate/PATH" + +# +# Yocto Project SState Mirror +# +# The Yocto Project has prebuilt artefacts available for its releases, you can enable +# use of these by uncommenting the following lines. This will mean the build uses +# the network to check for artefacts at the start of builds, which does slow it down +# equally, it will also speed up the builds by not having to build things if they are +# present in the cache. It assumes you can download something faster than you can build it +# which will depend on your network. +# Note: For this to work you also need hash-equivalence passthrough to the matching server +# +#BB_HASHSERVE_UPSTREAM = "typhoon.yocto.io:8687" +#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/all/PATH%3Bdownloadfilename=PATH" + +# +# Qemu configuration +# +# By default native qemu will build with a builtin VNC server where graphical output can be +# seen. The line below enables the SDL UI frontend too. +PACKAGECONFIG:append:pn-qemu-system-native = " sdl" +# By default libsdl2-native will be built, if you want to use your host's libSDL instead of +# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. +#ASSUME_PROVIDED += "libsdl2-native" + +# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds +# a handy set of menus for controlling the emulator. +#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+" + +# +# Hash Equivalence +# +# Enable support for automatically running a local hash equivalence server and +# instruct bitbake to use a hash equivalence aware signature generator. Hash +# equivalence improves reuse of sstate by detecting when a given sstate +# artifact can be reused as equivalent, even if the current task hash doesn't +# match the one that generated the artifact. +# +# A shared hash equivalent server can be set with "<HOSTNAME>:<PORT>" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + +# +# Memory Resident Bitbake +# +# Bitbake's server component can stay in memory after the UI for the current command +# has completed. This means subsequent commands can run faster since there is no need +# for bitbake to reload cache files and so on. Number is in seconds, after which the +# server will shut down. +# +#BB_SERVER_TIMEOUT = "60" + +# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to +# track the version of this file when it was generated. This can safely be ignored if +# this doesn't mean anything to you. +CONF_VERSION = "2" diff --git a/conf/machine/include/morello-1.5.inc b/conf/machine/include/morello-1.5.inc new file mode 100644 index 0000000..ba38033 --- /dev/null +++ b/conf/machine/include/morello-1.5.inc @@ -0,0 +1 @@ +MORELLO_RELEASE_VERSION = "1.5" \ No newline at end of file diff --git a/conf/machine/include/morello-common.inc b/conf/machine/include/morello-common.inc new file mode 100644 index 0000000..31601a4 --- /dev/null +++ b/conf/machine/include/morello-common.inc @@ -0,0 +1,27 @@ +require ${COREBASE}/meta/conf/machine/include/arm/armv8-2a/tune-neoversen1.inc +require conf/machine/include/morello-1.5.inc + +MACHINEOVERRIDES =. "morello" + +LLVM_SHARED_SOURCE ?= "${TMPDIR}/work-shared/${MACHINE}/llvm-morello-source" + +MUSL_INSTALL_DIR ??="" + +C64_ARCH_TRIPLE = "aarch64-linux-musl_purecap" +A64_ARCH_TRIPLE = "aarch64-linux-gnu" + +A64_LIB_TRIPLE = "aarch64-unknown-linux-gnu" +C64_LIB_TRIPLE = "aarch64-unknown-linux-musl_purecap" + +A64_ARCH_FLAGS = "-march=armv8" +C64_ARCH_FLAGS = "-march=morello+c64 -mabi=purecap" + +MORELLO_ARCH ?= "c64" +GLOBAL_ARCH_TRIPLE ?= "${C64_ARCH_TRIPLE}" +GLOBAL_LIB_TRIPLE ?= "${C64_LIB_TRIPLE}" +GLOBAL_ARCH_FLAGS ?= "${C64_ARCH_FLAGS}" + +TMPDIR_BSP = "tmp-bsp" +TMPDIR_LINUX = "tmp-linux" + +APP_DIR ?= "pure-cap-apps" \ No newline at end of file diff --git a/conf/machine/morello-bsp.conf b/conf/machine/morello-bsp.conf new file mode 100644 index 0000000..e5c8799 --- /dev/null +++ b/conf/machine/morello-bsp.conf @@ -0,0 +1 @@ +require conf/machine/include/morello-common.inc diff --git a/conf/machine/morello-linux-glibc.conf b/conf/machine/morello-linux-glibc.conf new file mode 100644 index 0000000..6ed824d --- /dev/null +++ b/conf/machine/morello-linux-glibc.conf @@ -0,0 +1,3 @@ +require conf/machine/include/morello-common.inc + +MACHINEOVERRIDES =. "morello-linux-glibc:" diff --git a/conf/machine/morello-linux-musl.conf b/conf/machine/morello-linux-musl.conf new file mode 100644 index 0000000..e22493d --- /dev/null +++ b/conf/machine/morello-linux-musl.conf @@ -0,0 +1,3 @@ +require conf/machine/include/morello-common.inc + +MACHINEOVERRIDES =. "morello-linux-musl:" diff --git a/conf/multiconfig/morello-firmware.conf b/conf/multiconfig/morello-firmware.conf new file mode 100644 index 0000000..1473440 --- /dev/null +++ b/conf/multiconfig/morello-firmware.conf @@ -0,0 +1 @@ +MACHINE="morello-bsp" \ No newline at end of file diff --git a/conf/multiconfig/morello-linux-glibc.conf b/conf/multiconfig/morello-linux-glibc.conf new file mode 100644 index 0000000..9f9a8e8 --- /dev/null +++ b/conf/multiconfig/morello-linux-glibc.conf @@ -0,0 +1 @@ +MACHINE="morello-linux-glibc" \ No newline at end of file diff --git a/conf/multiconfig/morello-linux-musl.conf b/conf/multiconfig/morello-linux-musl.conf new file mode 100644 index 0000000..f8660f3 --- /dev/null +++ b/conf/multiconfig/morello-linux-musl.conf @@ -0,0 +1 @@ +MACHINE="morello-linux-musl" \ No newline at end of file