diff --git a/README.txt b/README.txt index ec860fd588160f2f5808f9956a058d644e3b5e10..5e0c4b625239e383e1798de6fbfbdbe57b82dd86 100644 --- a/README.txt +++ b/README.txt @@ -9,9 +9,9 @@ Prerequisites: ============== This layer depends on: - Yocto distro (master) + Yocto distro (kirkstone) git://git.yoctoproject.org/poky - Python layer (meta-openembedded/meta-python) + Python layer (meta-openembedded/meta-python) (kirkstone) git://git.openembedded.org/meta-openembedded Modify local conf by adding: diff --git a/meta-zephyr-bsp/conf/machine/qemu-nios2.conf b/meta-zephyr-bsp/conf/machine/qemu-nios2.conf index de203205863ae9b99b9f748c99541884c127e765..c41f505878e02c0f2a62f1de3de4eca6d1360a45 100644 --- a/meta-zephyr-bsp/conf/machine/qemu-nios2.conf +++ b/meta-zephyr-bsp/conf/machine/qemu-nios2.conf @@ -14,3 +14,5 @@ QB_OPT_APPEND = "-nographic" QB_CPU = "-cpu nios2" ARCH:qemu-nios2 = "nios2" + +TCLIBC = "glibc" diff --git a/meta-zephyr-core/classes/zephyrtest.bbclass b/meta-zephyr-core/classes/zephyrtest.bbclass index 248fd15c82d45904f06ff58317ae9e753f2e79d1..aa48e6c44582608ea25c7e2abcf81c027727891f 100644 --- a/meta-zephyr-core/classes/zephyrtest.bbclass +++ b/meta-zephyr-core/classes/zephyrtest.bbclass @@ -50,4 +50,4 @@ python testdata_clean() { os.remove(fname) } -addtask do_testdata_write before do_build after do_deploy +addtask do_testdata_write before do_testimage after do_deploy diff --git a/meta-zephyr-core/conf/distro/zephyr.conf b/meta-zephyr-core/conf/distro/zephyr.conf index 6ecd4211ed04d7c1eb44293f13eba2e9ff375b55..bdf18215fe5f2cc6072d353e5364de58096ca0b6 100644 --- a/meta-zephyr-core/conf/distro/zephyr.conf +++ b/meta-zephyr-core/conf/distro/zephyr.conf @@ -4,7 +4,7 @@ DISTRO_VERSION = "1.0" TARGET_VENDOR = "-yocto" -TCLIBC = "newlib" +TCLIBC ?= "newlib" TEST_TARGET = "QemuTargetZephyr" TEST_SUITES = "zephyr" diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.2.inc similarity index 97% rename from meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.2.inc index 4b38a75b38875a2b485603f17722699c09fc97c6..16e4251a6a4bb62ada725d09ac1385fe261eb103 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.2.inc @@ -17,7 +17,7 @@ SRC_URI += " \ # echo SRCREV_$x = \"$rev\"' # -SRCREV_default = "e4da3e528088a34a9989f5a50e7ed3149d57de92" +SRCREV_default = "6dd320f791c4da49190b30f9134f776d85bc5836" SRCREV_canopennode = "f167efe85c8c7de886f1bc47f9173cfb8a346bb5" SRCREV_civetweb = "094aeb41bb93e9199d24d665ee43e9e05d6d7b1c" SRCREV_cmsis = "b0612c97c1401feeb4160add6462c3627fe90fc7" @@ -63,6 +63,6 @@ SRCREV_TraceRecorder = "36c577727642457b0db7274298a4b96558374832" SRCREV_tfm = "c74be3890c9d975976fde1b1a3b2f5742bec34c0" ZEPHYR_BRANCH = "v2.7-branch" -PV = "2.7.1+git${SRCPV}" +PV = "2.7.2+git${SRCPV}" SRC_URI:append = " file://dtc.patch"