barebox: Separate out from kernel-arch.bbclass

Move the ARCH usage into barebox.bbclass and stop using kernel-arch.bbclass
since there are things in there which barebox might not want.

This does mean the variables ARCH and UBOOT_ARCH are no longer in the environment
but I hopefully covered the main usages of the variables with alternatives.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes-recipe/barebox.bbclass b/meta/classes-recipe/barebox.bbclass
index 2411fb5caa10ff824cbfae9d905f8f21e541b7ec..d8f568594849aa0d17d792a73fabda249617e287 100644 (file)
--- a/meta/classes-recipe/barebox.bbclass
+++ b/meta/classes-recipe/barebox.bbclass
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-inherit kernel-arch deploy cml1 pkgconfig
+inherit deploy cml1 pkgconfig
 
 LICENSE ?= "GPL-2.0-only"
 
@@ -49,7 +49,7 @@ BAREBOX_FIRMWARE_DIR[doc] = "Overwrite barebox' firmware blobs search directory
 BAREBOX_FIRMWARE_DIR ??= "${B}/firmware"
 
 EXTRA_OEMAKE = " \
-    CROSS_COMPILE=${TARGET_PREFIX} -C ${S} O=${B} \
+    ARCH=${@oe.kernel.map_kernel_arch(d)} CROSS_COMPILE=${TARGET_PREFIX} -C ${S} O=${B} \
     BUILDSYSTEM_VERSION=${BAREBOX_BUILDSYSTEM_VERSION} \
     CONFIG_EXTRA_FIRMWARE_DIR=${BAREBOX_FIRMWARE_DIR} \
     PKG_CONFIG=pkg-config-native \