diff mbox series

[meta-zephyr,1/3] zephyr-kernel: Remove redundant ZEPHYR_BASE definitions

Message ID 20220808074256.3081464-1-peter.hoyes@arm.com
State New
Headers show
Series [meta-zephyr,1/3] zephyr-kernel: Remove redundant ZEPHYR_BASE definitions | expand

Commit Message

Peter Hoyes Aug. 8, 2022, 7:42 a.m. UTC 
From: Peter Hoyes <Peter.Hoyes@arm.com>

zephyr-image.inc and zephyr-sample.inc both include
zephyr-kernel-common.inc, which already defines ZEPHYR_BASE. Remove the
redundant definitions.

Also, pass -DZEPHYR_BASE=${ZEPHYR_BASE} instead of ${S} in
EXTRA_OECMAKE.

Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
---
 meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc  | 1 -
 .../recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc       | 2 +-
 meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-sample.inc | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc
index 2d4c6ff..d4127d6 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc
@@ -3,7 +3,6 @@  inherit testimage
 
 QEMU_BIN_PATH = "${STAGING_BINDIR_NATIVE}"
 
-ZEPHYR_BASE = "${S}"
 OECMAKE_SOURCEPATH = "${S}/${ZEPHYR_SRC_DIR}"
 
 addtask deploy after do_compile
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc
index e69ba3c..1c80fe0 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc
@@ -15,7 +15,7 @@  ZEPHYR_MAKE_BIN_OUTPUT = "zephyr.bin"
 ZEPHYR_MAKE_EFI_OUTPUT = "zephyr.efi"
 
 EXTRA_OECMAKE = "\
-    -DZEPHYR_BASE=${S} \
+    -DZEPHYR_BASE=${ZEPHYR_BASE} \
     -DZEPHYR_GCC_VARIANT=yocto \
     -DBOARD=${BOARD} \
     -DARCH=${ARCH} \
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-sample.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-sample.inc
index 77fa5ad..10c25c5 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-sample.inc
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-sample.inc
@@ -2,7 +2,6 @@  require zephyr-kernel-src.inc
 require zephyr-kernel-common.inc
 inherit deploy
 
-ZEPHYR_BASE = "${S}"
 OECMAKE_SOURCEPATH = "${ZEPHYR_SRC_DIR}"
 
 do_install[noexec] = "1"