Commit b2da7603 authored by Oliver Horst's avatar Oliver Horst
Browse files

[chg] Support for the new configuration creation method of toki-setup

parent 10e375da
......@@ -9,4 +9,12 @@ BBLAYERS ?= " \
##OEROOT##/meta \
##OEROOT##/meta-poky \
##OEROOT##/meta-yocto-bsp \
##OEROOT##/../meta-openembedded/meta-oe \
##OEROOT##/../meta-openembedded/meta-python \
##OEROOT##/../meta-xilinx/meta-xilinx-bsp \
##OEROOT##/../meta-xilinx-tools \
##OEROOT##/../meta-toki-xilinx \
##OEROOT##/../meta-toki \
##OEROOT##/../meta-toki-apps \
##OEROOT##/../meta-toki-xilinx-apps \
"
......@@ -52,7 +52,7 @@ TOKI_CONFIG = "master/baseline"
#
# The default is a downloads directory under TOPDIR which is the build directory.
#
#DL_DIR ?= "${TOPDIR}/downloads"
DL_DIR ?= "$YOCTO_DOWNLOAD_DIR"
#
# Where to place shared-state files
......@@ -165,6 +165,7 @@ USER_CLASSES ?= "buildstats image-mklibs image-prelink"
# enable this uncomment this line. See classes/testimage(-auto).bbclass for
# further details.
#TEST_IMAGE = "1"
#
# Interactive shell configuration
#
......@@ -249,3 +250,28 @@ PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
# 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 = "1"
# Avoid polution of the source tree with external source tree builds
EXTERNALSRC_SYMLINKS = ""
# Use our external source tree
INHERIT += "externalsrc"
TOKI_SRC_DIR = "$TOKI_SRC_DIR"
# Deployment configuration used for AMP build
TOKI_DEPLOYMENT_CONFIG = ""
# Include and process deployment configuration
require ${TOKI_DEPLOYMENT_CONFIG}
require conf/distro/include/toki_config_parser.inc
# Initiliaze multiconfigs for AMP build according to the deployment configuration
BBMULTICONFIG = "${@get_toki_multiconfig_str(d)}"
# Initiliaze the used FPGA image according to the deployment configuration
HDF_BASE = "file://"
HDF_PATH = "${@get_toki_hw_image(d)}"
# Initialize AMP build specific helper variables used for the final image creation
TOKI_MASTER_CORE = "${@get_toki_master_core(d)}"
TOKI_SLAVE_CORES = "${@get_toki_slave_cores(d)}"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment