Skip to contentSkip to conversation

zephyr-kernel: add Zephyr RTOS version 2.3.0 support

PATCH Superseded [email protected] 2 participants 2 messages Sep 18, 2020

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 zephyr-kernel: add Zephyr RTOS version 2.3.0 support

From: yockgenm <[email protected]>

---
 classes/zephyr-kernel-src.bbclass                  | 12 ++++----
 .../{qemu_4.2.%.bbappend => qemu_5.1.%.bbappend}   |  0
 .../zephyr-kernel/zephyr-kernel-common.inc         |  1 +
 .../zephyr-kernel/zephyr-kernel-src_2.2.bb         | 33 ----------------------
 .../zephyr-kernel/zephyr-kernel-src_2.3.bb         | 24 ++++++++++++++++
 .../zephyr-kernel/zephyr-kernel-test.inc           |  7 ++---
 6 files changed, 35 insertions(+), 42 deletions(-)
 rename recipes-devtools/qemu/{qemu_4.2.%.bbappend => qemu_5.1.%.bbappend} (100%)
 delete mode 100644 recipes-kernel/zephyr-kernel/zephyr-kernel-src_2.2.bb
 create mode 100644 recipes-kernel/zephyr-kernel/zephyr-kernel-src_2.3.bb
classes/zephyr-kernel-src.bbclass +7 -5
index 653cb9b..d202293 100644
@@ -1,13 +1,15 @@
 #Set relevant variables based on Zephyr kernel version
 
-PREFERRED_VERSION_zephyr-kernel ??= "2.2.0"
+PREFERRED_VERSION_zephyr-kernel ??= "2.3.0"
 
-SRCREV = "d39cb42d0920d5658fad358ad5b91de75d747a20"
+SRCREV = "b8c78e254ff875680e99c9f131fbe285c4575927"
+SRCREV_cmsis = "542b2296e6d515b265e25c6b7208e8fea3014f90"
 
-SRC_URI = "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=v2.2-branch \
+SRC_URI = "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=v2.3-branch \
+           git://github.com/zephyrproject-rtos/cmsis.git;protocol=https;destsuffix=git/modules/cmsis;name=cmsis \
           file://0001-cmake-add-yocto-toolchain.patch \
         "
-PV = "2.2.0"
+PV = "2.3.0"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
 
@@ -15,7 +17,7 @@ ZEPHYR_TEST_SRCDIR = "tests/legacy/kernel/"
 
 python () {
     src_pn = d.getVar('PREFERRED_VERSION_zephyr-kernel', True)
-    if src_pn == '2.2.0':
+    if src_pn == '2.3.0':
         return
     else:
         bb.error("Unsupported Zephyr kernel version requested")
recipes-devtools/qemu/qemu_5.1.%.bbappend renamed from recipes-devtools/qemu/qemu_4.2.%.bbappend +0 -0
similarity index 100%
rename from recipes-devtools/qemu/qemu_4.2.%.bbappend
rename to recipes-devtools/qemu/qemu_5.1.%.bbappend
recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc +1 -0
index d7147d5..aaf71a8 100644
@@ -14,6 +14,7 @@ ZEPHYR_MAKE_OUTPUT = "zephyr.elf"
 
 
 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"
+EXTRA_OECMAKE_append_arm = " -DZEPHYR_MODULES=${S}/modules/cmsis"
 export ZEPHYR_BASE="${S}"
 
 
recipes-kernel/zephyr-kernel/zephyr-kernel-src_2.2.bb deleted +0 -33
deleted file mode 100644
index a3e1c28..0000000
@@ -1,33 +0,0 @@
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
-
-# tag v2.2
-SRCREV="d39cb42d0920d5658fad358ad5b91de75d747a20"
-SRC_URI = "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=v2.2-branch \
-          file://0001-cmake-add-yocto-toolchain.patch \
-        "
-inherit cmake 
-PV = "2.2.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-src_2.3.bb new file +24 -0
new file mode 100644
index 0000000..8e8b5b8
@@ -0,0 +1,24 @@
+
+inherit zephyr-kernel-src
+inherit cmake
+
+S = "${WORKDIR}/git"
+
+IMAGE_NO_MANIFEST = "1"
+INHIBIT_DEFAULT_DEPS = "1"
+
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+
+
+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-test.inc +3 -4
index 65da7e8..7ab9bd4 100644
@@ -1,4 +1,4 @@
-ZEPHYRTESTS_remove = "fifo fp_sharing lifo mbox mem_heap mem_pool \
+ZEPHYRTESTS_remove = "fifo fpu_sharing lifo mbox mem_heap mem_pool \
     mem_protect mem_slab msgq mutex pipe profiling sched semaphore \
     stack threads tickless timer workq"
 
@@ -22,13 +22,12 @@ ZEPHYRTESTS_remove = "gen_isr_table spinlock smp mp"
 # List of all available kernel tests
 ZEPHYRTESTS = " \
     common \
-    context \
-    critical \
+    context \    
     device \
     early_sleep \
     fatal \
     fifo \
-    fp_sharing \
+    fpu_sharing \
     gen_isr_table \
     interrupt \
     lifo \
Signature · 1 line
2.7.4
#1 lore raw
Quoted 20 lines · On 9/17/20 9:43 PM, [email protected] wrote:

From: yockgenm <[email protected]>

---
  classes/zephyr-kernel-src.bbclass                  | 12 ++++----
  .../{qemu_4.2.%.bbappend => qemu_5.1.%.bbappend}   |  0
  .../zephyr-kernel/zephyr-kernel-common.inc         |  1 +
  .../zephyr-kernel/zephyr-kernel-src_2.2.bb         | 33 ----------------------
  .../zephyr-kernel/zephyr-kernel-src_2.3.bb         | 24 ++++++++++++++++
  .../zephyr-kernel/zephyr-kernel-test.inc           |  7 ++---
  6 files changed, 35 insertions(+), 42 deletions(-)

rename recipes-devtools/qemu/{qemu_4.2.%.bbappend => qemu_5.1.%.bbappend} (100%) delete mode 100644 recipes-kernel/zephyr-kernel/zephyr-kernel-src_2.2.bb create mode 100644 recipes-kernel/zephyr-kernel/zephyr-kernel-src_2.3.bb

classes/zephyr-kernel-src.bbclass +0 -0
index 653cb9b..d202293 100644

classes/zephyr-kernel-src.bbclass line 6

Quoted 8 lines
classes/zephyr-kernel-src.bbclass +3 -2
@@ -1,13 +1,15 @@
  #Set relevant variables based on Zephyr kernel version
 
-PREFERRED_VERSION_zephyr-kernel ??= "2.2.0"
+PREFERRED_VERSION_zephyr-kernel ??= "2.3.0"
 
-SRCREV = "d39cb42d0920d5658fad358ad5b91de75d747a20"
+SRCREV = "b8c78e254ff875680e99c9f131fbe285c4575927"
+SRCREV_cmsis = "542b2296e6d515b265e25c6b7208e8fea3014f90"

Perhaps you also should be defining

SRECREV_FORMAT = "default_cmsis"

as well now that you have multiple SRC_URIs

Quoted 136 lines
classes/zephyr-kernel-src.bbclass +4 -3
-SRC_URI = "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=v2.2-branch \
+SRC_URI = "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=v2.3-branch \
+           git://github.com/zephyrproject-rtos/cmsis.git;protocol=https;destsuffix=git/modules/cmsis;name=cmsis \
            file://0001-cmake-add-yocto-toolchain.patch \
          "
-PV = "2.2.0"
+PV = "2.3.0"
  LICENSE = "Apache-2.0"
  LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
 
@@ -15,7 +17,7 @@ ZEPHYR_TEST_SRCDIR = "tests/legacy/kernel/"
 
  python () {
      src_pn = d.getVar('PREFERRED_VERSION_zephyr-kernel', True)
-    if src_pn == '2.2.0':
+    if src_pn == '2.3.0':
          return
      else:
          bb.error("Unsupported Zephyr kernel version requested")
recipes-devtools/qemu/qemu_5.1.%.bbappend renamed from recipes-devtools/qemu/qemu_4.2.%.bbappend +0 -0
similarity index 100%
rename from recipes-devtools/qemu/qemu_4.2.%.bbappend
rename to recipes-devtools/qemu/qemu_5.1.%.bbappend
recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc +1 -0
index d7147d5..aaf71a8 100644
@@ -14,6 +14,7 @@ ZEPHYR_MAKE_OUTPUT = "zephyr.elf"
 
 
  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"
+EXTRA_OECMAKE_append_arm = " -DZEPHYR_MODULES=${S}/modules/cmsis"
  export ZEPHYR_BASE="${S}"
 
 
recipes-kernel/zephyr-kernel/zephyr-kernel-src_2.2.bb deleted +0 -33
deleted file mode 100644
index a3e1c28..0000000
@@ -1,33 +0,0 @@
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
-
-# tag v2.2
-SRCREV="d39cb42d0920d5658fad358ad5b91de75d747a20"
-SRC_URI = "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=v2.2-branch \
-          file://0001-cmake-add-yocto-toolchain.patch \
-        "
-inherit cmake
-PV = "2.2.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-src_2.3.bb new file +24 -0
new file mode 100644
index 0000000..8e8b5b8
@@ -0,0 +1,24 @@
+
+inherit zephyr-kernel-src
+inherit cmake
+
+S = "${WORKDIR}/git"
+
+IMAGE_NO_MANIFEST = "1"
+INHIBIT_DEFAULT_DEPS = "1"
+
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+
+
+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-test.inc +3 -4
index 65da7e8..7ab9bd4 100644
@@ -1,4 +1,4 @@
-ZEPHYRTESTS_remove = "fifo fp_sharing lifo mbox mem_heap mem_pool \
+ZEPHYRTESTS_remove = "fifo fpu_sharing lifo mbox mem_heap mem_pool \
      mem_protect mem_slab msgq mutex pipe profiling sched semaphore \
      stack threads tickless timer workq"
 
@@ -22,13 +22,12 @@ ZEPHYRTESTS_remove = "gen_isr_table spinlock smp mp"
  # List of all available kernel tests
  ZEPHYRTESTS = " \
      common \
-    context \
-    critical \
+    context \
      device \
      early_sleep \
      fatal \
      fifo \
-    fp_sharing \
+    fpu_sharing \
      gen_isr_table \
      interrupt \
      lifo \