layer.conf: add LAYERSERIES_COMPAT to warrior & zeus
PATCH 1/13 layer.conf: add LAYERSERIES_COMPAT to warrior & zeus
--- conf/layer.conf | 2 ++ 1 file changed, 2 insertions(+)
conf/layer.conf +2 -0
@@ -14,3 +14,5 @@ BBFILE_PRIORITY_zephyr = "6" LAYERVERSION_zephyr = "1" LAYERDEPENDS_zephyr = "core" + +LAYERSERIES_COMPAT_zephyr = "warrior zeus"
Signature · 1 line
2.17.1
PATCH 2/13 qemu: updated version to bbappend latest bb
---
.../qemu/{qemu_2.8.%.bbappend => qemu_4.1.%.bbappend} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename recipes-devtools/qemu/{qemu_2.8.%.bbappend => qemu_4.1.%.bbappend} (100%)recipes-devtools/qemu/qemu_4.1.%.bbappend renamed from recipes-devtools/qemu/qemu_2.8.%.bbappend +0 -0
Signature · 1 line
2.17.1
PATCH 3/13 zephyr-kernel-src: updated SRC_URI to point to github
In reply to Naveen Saini--- classes/zephyr-kernel-src.bbclass | 3 ++- recipes-kernel/zephyr-kernel/zephyr-kernel-src_1.6.bb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
classes/zephyr-kernel-src.bbclass +2 -1
@@ -3,7 +3,8 @@ PREFERRED_VERSION_zephyr-kernel ??= "1.6.0" SRCREV = "d4e799d77a36eaf6d678b357c207411ec32b2d62" -SRC_URI = "git://gerrit.zephyrproject.org/r/zephyr.git;protocol=https;branch=v1.6.0-branch \ + +SRC_URI = "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=v1.6-branch \ file://Makefile.toolchain.yocto " PV = "1.6.0"
recipes-kernel/zephyr-kernel/zephyr-kernel-src_1.6.bb +1 -1
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" # tag v1.6.0 SRCREV="d4e799d77a36eaf6d678b357c207411ec32b2d62" -SRC_URI = "git://gerrit.zephyrproject.org/r/zephyr.git;protocol=https;branch=v1.6.0-branch" +SRC_URI = "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=v1.6-branch" SRC_URI += "file://Makefile.toolchain.yocto" PV = "1.6.0"
Signature · 1 line
2.17.1
PATCH 4/13 zephyr-helloworld: add
In reply to Naveen Saini--- .../zephyr-kernel/zephyr-helloworld.bb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 recipes-kernel/zephyr-kernel/zephyr-helloworld.bb
recipes-kernel/zephyr-kernel/zephyr-helloworld.bb new file +18 -0
@@ -0,0 +1,18 @@ +require zephyr-kernel.inc +require zephyr-kernel-common.inc +inherit deploy + +ZEPHYR_SRC_DIR = "${S}/samples/hello_world" +ZEPHYR_BASE = "${S}" + +do_compile () { + cd ${ZEPHYR_SRC_DIR} + oe_runmake ${ZEPHYR_MAKE_ARGS} +} + +do_deploy () { + install -D samples/hello_world/outdir/${BOARD}/zephyr.elf ${DEPLOYDIR}/${PN}.elf + install -D samples/hello_world/outdir/${BOARD}/zephyr.bin ${DEPLOYDIR}/${PN}.bin +} + +addtask deploy after do_compile
Signature · 1 line
2.17.1
PATCH 5/13 qemu-x86.conf: remove invalid options
In reply to Naveen SainiThrow below error:
runqemu - ERROR - Failed to run qemu: qemu-system-i386: -clock: invalid option
--- conf/machine/qemu-x86.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
conf/machine/qemu-x86.conf +2 -1
@@ -10,7 +10,8 @@ ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot" # For runqemu QB_SYSTEM_NAME = "qemu-system-i386" QB_MACHINE = "-machine pc-0.14" -QB_OPT_APPEND = "-nographic -display none -clock dynticks -no-acpi -balloon none" +#QB_OPT_APPEND = "-nographic -display none -clock dynticks -no-acpi -balloon none" +QB_OPT_APPEND = "-nographic -display none -no-acpi" QB_CPU_x86 = "-cpu qemu32" QB_CPU_KVM_x86 = "-cpu kvm32"
Signature · 1 line
2.17.1
PATCH 6/13 zephyr-kernel: drop v1.7
In reply to Naveen Saini--- classes/zephyr-kernel-src.bbclass | 10 ----- .../zephyr-kernel/zephyr-kernel-src_1.7.bb | 40 ------------------- 2 files changed, 50 deletions(-) delete mode 100644 recipes-kernel/zephyr-kernel/zephyr-kernel-src_1.7.bb
classes/zephyr-kernel-src.bbclass +0 -10
@@ -8,12 +8,6 @@ SRC_URI = "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch= file://Makefile.toolchain.yocto " PV = "1.6.0" -# FIXME: This points to 1.7.rc4 -SRCREV_1.7 = "3d2893cf85d51ceca04aa3bec2dd5fc77625ff81" -SRC_URI_1.7 = "git://gerrit.zephyrproject.org/r/zephyr.git;protocol=https;branch=v1.7-branch\ - file://Makefile.toolchain.yocto " -PV_1.7 = "1.7.0" - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
@@ -23,10 +17,6 @@ python () { src_pn = d.getVar('PREFERRED_VERSION_zephyr-kernel', True) if src_pn == '1.6.0': return - elif src_pn == '1.7.0': - d.setVar('SRC_URI',d.getVar('SRC_URI_1.7', True)) - d.setVar('SRCREV',d.getVar('SRCREV_1.7', True)) - d.setVar('PV',d.getVar('PV_1.7', True)) else: bb.error("Unsupported Zephyr kernel version requested") }
recipes-kernel/zephyr-kernel/zephyr-kernel-src_1.7.bb deleted +0 -40
@@ -1,40 +0,0 @@ - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" - -SRCREV = "3d2893cf85d51ceca04aa3bec2dd5fc77625ff81" -SRC_URI = "git://gerrit.zephyrproject.org/r/zephyr.git;protocol=https;branch=v1.7-branch" -SRC_URI += "file://Makefile.toolchain.yocto" - -PV = "1.7.0" - -S = "${WORKDIR}/git" - -IMAGE_NO_MANIFEST = "1" -INHIBIT_DEFAULT_DEPS = "1" - -do_compile[noexec] = "1" - -do_configure() { - cp ${WORKDIR}/Makefile.toolchain.yocto ${S}/scripts -} - -do_compile () { -} - - -do_install () { - kerneldir=${D}/usr/src/zephyr - install -d $kerneldir - cp -r ${S}/* $kerneldir -} - -PACKAGES = "${PN}" -FILES_${PN} = "/usr/src/zephyr" - -SYSROOT_DIRS += "/usr/src/zephyr" - -#WARNING: zephyr-kernel-src-1.7.0-r0 do_package_qa: QA Issue: -# /usr/src/zephyr/scripts/checkpatch.pl contained in package zephyr-kernel-src -# requires /usr/bin/perl, but no providers found in RDEPENDS_zephyr-kernel-src? -INSANE_SKIP_${PN} = "file-rdeps"
Signature · 1 line
2.17.1
PATCH 7/13 zephyr-kernel: add Zephyr RTOS version 2.0.0 support
In reply to Naveen SainiRelease notes:
https://github.com/zephyrproject-rtos/zephyr/releases/tag/zephyr-v2.0.0
--- classes/zephyr-kernel-src.bbclass | 14 ++-- .../0001-cmake-add-yocto-toolchain.patch | 76 +++++++++++++++++++ .../zephyr-kernel/zephyr-kernel-common.inc | 2 - .../zephyr-kernel/zephyr-kernel-src_2.0.bb | 33 ++++++++ .../zephyr-kernel/zephyr-kernel.inc | 4 - 5 files changed, 116 insertions(+), 13 deletions(-) create mode 100644 recipes-kernel/zephyr-kernel/files/0001-cmake-add-yocto-toolchain.patch create mode 100644 recipes-kernel/zephyr-kernel/zephyr-kernel-src_2.0.bb
classes/zephyr-kernel-src.bbclass +7 -7
@@ -1,13 +1,13 @@ #Set relevant variables based on Zephyr kernel version -PREFERRED_VERSION_zephyr-kernel ??= "1.6.0" +PREFERRED_VERSION_zephyr-kernel ??= "2.0.0" -SRCREV = "d4e799d77a36eaf6d678b357c207411ec32b2d62" - -SRC_URI = "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=v1.6-branch \ - file://Makefile.toolchain.yocto " -PV = "1.6.0" +SRCREV = "ca3eb0eb31d134be41aefc952f696f7d9c356b7a" +SRC_URI = "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=v2.0-branch \ + file://0001-cmake-add-yocto-toolchain.patch \ + " +PV = "2.0.0" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
@@ -15,7 +15,7 @@ ZEPHYR_TEST_SRCDIR = "tests/legacy/kernel/" python () { src_pn = d.getVar('PREFERRED_VERSION_zephyr-kernel', True) - if src_pn == '1.6.0': + if src_pn == '2.0.0': return else: bb.error("Unsupported Zephyr kernel version requested")
recipes-kernel/zephyr-kernel/files/0001-cmake-add-yocto-toolchain.patch new file +76 -0
76 lines not on this page · raw message
recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc +0 -2
@@ -20,8 +20,6 @@ CROSS_COMPILE = "${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}" DEPENDS_append_qemuall = " qemu-native qemu-helper-native" -do_configure[noexec] = "1" - # The makefiles are explicit about the flags they want, so don't unset # them so zephyr flags actually get used. # This is done here rather than in the task so that things still work
recipes-kernel/zephyr-kernel/zephyr-kernel-src_2.0.bb new file +33 -0
@@ -0,0 +1,33 @@ + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" + +# tag v2.0 +SRCREV="ca3eb0eb31d134be41aefc952f696f7d9c356b7a" +SRC_URI = "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=v2.0-branch \ + file://0001-cmake-add-yocto-toolchain.patch \ + " +inherit cmake +PV = "2.0.0" +S = "${WORKDIR}/git" + +IMAGE_NO_MANIFEST = "1" +INHIBIT_DEFAULT_DEPS = "1" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_compile () { +} + +do_install () { + kerneldir=${D}/usr/src/zephyr + install -d $kerneldir + cp -r ${S}/* $kerneldir +} + +PACKAGES = "${PN}" +FILES_${PN} = "/usr/src/zephyr" + +SYSROOT_DIRS += "/usr/src/zephyr" +
recipes-kernel/zephyr-kernel/zephyr-kernel.inc +0 -4
@@ -2,7 +2,3 @@ inherit zephyr-kernel-src S = "${WORKDIR}/git" - -do_compile_prepend() { - cp ${WORKDIR}/Makefile.toolchain.yocto ${S}/scripts -}
Signature · 1 line
2.17.1
PATCH 8/13 qemu-x86.conf: drop deprecated qemu flags
In reply to Naveen Saini--- conf/machine/qemu-x86.conf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
conf/machine/qemu-x86.conf +2 -4
@@ -9,10 +9,8 @@ ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot" # For runqemu QB_SYSTEM_NAME = "qemu-system-i386" -QB_MACHINE = "-machine pc-0.14" -#QB_OPT_APPEND = "-nographic -display none -clock dynticks -no-acpi -balloon none" -QB_OPT_APPEND = "-nographic -display none -no-acpi" -QB_CPU_x86 = "-cpu qemu32" +QB_OPT_APPEND = "-nographic -no-acpi" +QB_CPU_x86 = "-cpu qemu32,+nx,+pae" QB_CPU_KVM_x86 = "-cpu kvm32" ARCH_qemu-x86 = "x86"
Signature · 1 line
2.17.1
PATCH 9/13 zephyr-helloworld: update recipe to build against zephyr v2.0
In reply to Naveen Saini--- recipes-kernel/zephyr-kernel/zephyr-helloworld.bb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
recipes-kernel/zephyr-kernel/zephyr-helloworld.bb +8 -7
@@ -1,18 +1,19 @@ require zephyr-kernel.inc require zephyr-kernel-common.inc -inherit deploy +inherit cmake pkgconfig deploy ZEPHYR_SRC_DIR = "${S}/samples/hello_world" ZEPHYR_BASE = "${S}" +OECMAKE_SOURCEPATH = "${ZEPHYR_SRC_DIR}" -do_compile () { - cd ${ZEPHYR_SRC_DIR} - oe_runmake ${ZEPHYR_MAKE_ARGS} -} +DEPENDS += "gperf-native" + +EXTRA_OECMAKE = " -DZEPHYR_BASE=${S} -DZEPHYR_GCC_VARIANT=yocto -DBOARD=${BOARD} -DARCH=${ARCH} -DCROSS_COMPILE=${CROSS_COMPILE} -DZEPHYR_SYSROOT=${ZEPHYR_SYSROOT} -DZEPHYR_TOOLCHAIN_VARIANT=yocto" +export ZEPHYR_BASE="${S}" do_deploy () { - install -D samples/hello_world/outdir/${BOARD}/zephyr.elf ${DEPLOYDIR}/${PN}.elf - install -D samples/hello_world/outdir/${BOARD}/zephyr.bin ${DEPLOYDIR}/${PN}.bin + install -D ${B}/zephyr/zephyr.elf ${DEPLOYDIR}/${PN}.elf } addtask deploy after do_compile +do_install[noexec] = "1"
Signature · 1 line
2.17.1
PATCH 10/13 acrn.conf: add new machine
In reply to Naveen SainiAdd new acrn machine, which actually is $BOARD
--- conf/machine/acrn.conf | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 conf/machine/acrn.conf
conf/machine/acrn.conf new file +10 -0
@@ -0,0 +1,10 @@ +#@TYPE: Machine +#@NAME: acrn +#@DESCRIPTION: Machine for Zephyr BOARD acrn + +require conf/machine/include/qemu.inc +require conf/machine/include/tune-i586.inc + +ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot" + +ARCH_acrn = "x86"
Signature · 1 line
2.17.1
PATCH 11/13 zephyr-kernel: drop obsolete v1.6
In reply to Naveen Saini--- .../files/Makefile.toolchain.yocto | 17 --------- .../zephyr-kernel/zephyr-kernel-src_1.6.bb | 37 ------------------- 2 files changed, 54 deletions(-) delete mode 100644 recipes-kernel/zephyr-kernel/files/Makefile.toolchain.yocto delete mode 100644 recipes-kernel/zephyr-kernel/zephyr-kernel-src_1.6.bb
recipes-kernel/zephyr-kernel/files/Makefile.toolchain.yocto deleted +0 -17
@@ -1,17 +0,0 @@ -$(info ZEPHYR_SYSROOT:${ZEPHYR_SYSROOT}) - -LIBGCC_DIR = $(shell dirname `$(CC) -print-libgcc-file-name`) -$(info LIBGCCDIR:${LIBGCC_DIR} ) - -#NEWLIB_DIR = $(shell `$(CC) -print-multi-directory`) -#$(info NEWLIB_DIR:${NEWLIB_DIR}) - -LIB_INCLUDE_DIR += -L $(LIBGCC_DIR) -L $(ZEPHYR_SYSROOT)/usr/lib/$(NEWLIB_DIR) -$(info LIB_INCLUDE_DIR:${LIB_INCLUDE_DIR}) - -TOOLCHAIN_CFLAGS = -I$(ZEPHYR_SYSROOT)/usr/include -$(info TOOLCHAIN_CFLAGS:${TOOLCHAIN_CFLAGS}) - -TOOLCHAIN_LIBS = gcc - -export LIB_INCLUDE_DIR CROSS_COMPILE TOOLCHAIN_LIBS TOOLCHAIN_CFLAGS
recipes-kernel/zephyr-kernel/zephyr-kernel-src_1.6.bb deleted +0 -37
@@ -1,37 +0,0 @@ - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" - -# tag v1.6.0 -SRCREV="d4e799d77a36eaf6d678b357c207411ec32b2d62" -SRC_URI = "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=v1.6-branch" -SRC_URI += "file://Makefile.toolchain.yocto" - -PV = "1.6.0" - -S = "${WORKDIR}/git" - -IMAGE_NO_MANIFEST = "1" -INHIBIT_DEFAULT_DEPS = "1" - -do_compile[noexec] = "1" - -do_configure() { - cp ${WORKDIR}/Makefile.toolchain.yocto ${S}/scripts -} - -do_compile () { -} - - -do_install () { - kerneldir=${D}/usr/src/zephyr - install -d $kerneldir - cp -r ${S}/* $kerneldir -} - -PACKAGES = "${PN}" -FILES_${PN} = "/usr/src/zephyr" - -SYSROOT_DIRS += "/usr/src/zephyr" -
Signature · 1 line
2.17.1
PATCH 12/13 zephyr-helloworld: code clean up
In reply to Naveen Saini--- recipes-kernel/zephyr-kernel/zephyr-helloworld.bb | 9 ++------- recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc | 10 +++++++--- 2 files changed, 9 insertions(+), 10 deletions(-)
recipes-kernel/zephyr-kernel/zephyr-helloworld.bb +2 -7
@@ -1,18 +1,13 @@ require zephyr-kernel.inc require zephyr-kernel-common.inc -inherit cmake pkgconfig deploy +inherit deploy ZEPHYR_SRC_DIR = "${S}/samples/hello_world" ZEPHYR_BASE = "${S}" OECMAKE_SOURCEPATH = "${ZEPHYR_SRC_DIR}" -DEPENDS += "gperf-native" - -EXTRA_OECMAKE = " -DZEPHYR_BASE=${S} -DZEPHYR_GCC_VARIANT=yocto -DBOARD=${BOARD} -DARCH=${ARCH} -DCROSS_COMPILE=${CROSS_COMPILE} -DZEPHYR_SYSROOT=${ZEPHYR_SYSROOT} -DZEPHYR_TOOLCHAIN_VARIANT=yocto" -export ZEPHYR_BASE="${S}" - do_deploy () { - install -D ${B}/zephyr/zephyr.elf ${DEPLOYDIR}/${PN}.elf + install -D ${B}/zephyr/${ZEPHYR_MAKE_OUTPUT} ${DEPLOYDIR}/${PN}.elf } addtask deploy after do_compile
recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc +7 -3
@@ -1,6 +1,6 @@ # Common settings for all Zephyr recipes -ZEPHYR_INHERIT_CLASSES += "zephyr" +ZEPHYR_INHERIT_CLASSES += "zephyr cmake" inherit ${ZEPHYR_INHERIT_CLASSES} # There shouldn't be a manifest for zephyr kernels since there is no root
@@ -11,11 +11,15 @@ ZEPHYR_GCC_VARIANT="yocto" ZEPHYR_SYSROOT="${STAGING_DIR_TARGET}" ZEPHYR_MAKE_OUTPUT = "zephyr.elf" -ZEPHYR_MAKE_ARGS = " BOARD=${BOARD} ARCH=${ARCH} CROSS_COMPILE=${CROSS_COMPILE} ZEPHYR_GCC_VARIANT=${ZEPHYR_GCC_VARIANT} ZEPHYR_BASE=${ZEPHYR_BASE} ZEPHYR_SYSROOT=${ZEPHYR_SYSROOT}" + + +EXTRA_OECMAKE = " -DZEPHYR_BASE=${S} -DZEPHYR_GCC_VARIANT=yocto -DBOARD=${BOARD} -DARCH=${ARCH} -DCROSS_COMPILE=${CROSS_COMPILE} -DZEPHYR_SYSROOT=${ZEPHYR_SYSROOT} -DZEPHYR_TOOLCHAIN_VARIANT=yocto" +export ZEPHYR_BASE="${S}" + # We always need a toolchain to cross-compile. INHIBIT_DEFAULT_DEPS = "1" -DEPENDS += "gcc-cross-${TARGET_ARCH} libgcc ${TOOLCHAIN_TARGET_TASK}" +DEPENDS += "gcc-cross-${TARGET_ARCH} libgcc ${TOOLCHAIN_TARGET_TASK} gperf-native" CROSS_COMPILE = "${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}" DEPENDS_append_qemuall = " qemu-native qemu-helper-native"
Signature · 1 line
2.17.1
PATCH 13/13 zephyr-philosophers: update recipe to build against v2.0
In reply to Naveen Saini--- recipes-kernel/zephyr-kernel/zephyr-philosophers.bb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
recipes-kernel/zephyr-kernel/zephyr-philosophers.bb +3 -7
@@ -4,15 +4,11 @@ inherit deploy ZEPHYR_SRC_DIR = "${S}/samples/philosophers" ZEPHYR_BASE = "${S}" - -do_compile () { - cd ${ZEPHYR_SRC_DIR} - oe_runmake ${ZEPHYR_MAKE_ARGS} -} +OECMAKE_SOURCEPATH = "${ZEPHYR_SRC_DIR}" do_deploy () { - install -D samples/philosophers/outdir/${BOARD}/zephyr.elf ${DEPLOYDIR}/${PN}.elf - install -D samples/philosophers/outdir/${BOARD}/zephyr.bin ${DEPLOYDIR}/${PN}.bin + install -D ${B}/zephyr/${ZEPHYR_MAKE_OUTPUT} ${DEPLOYDIR}/${PN}.elf } addtask deploy after do_compile +do_install[noexec] = "1"
Signature · 1 line
2.17.1