zephyr-kernel: Remove redundant ZEPHYR_BASE definitions

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>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>

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

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} \

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"