From: Masahiro Yamada <masahiroy@kernel.org>
To: barebox@lists.infradead.org
Cc: Masahiro Yamada <masahiroy@kernel.org>
Subject: [PATCH 6/6] kbuild: set SRCARCH=arm when ARCH=arm64
Date: Sat, 25 Apr 2020 03:59:24 +0900 [thread overview]
Message-ID: <20200424185924.705754-6-masahiroy@kernel.org> (raw)
In-Reply-To: <20200424185924.705754-1-masahiroy@kernel.org>
In Linux, ARCH can be passed from the command line or the environment.
In barebox, "ARCH=arm64 make" works, but "make ARCH=arm64" does not.
Instead of overriding ARCH, use SRCARCH properly.
This is what Linux does for biarch directories (x86, sh, sparc).
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 477741a72..16b23c107 100644
--- a/Makefile
+++ b/Makefile
@@ -163,10 +163,6 @@ export srctree objtree VPATH
# Alternatively CROSS_COMPILE can be set in the environment.
# Default value for CROSS_COMPILE is not to prefix executables
-ifeq ($(ARCH),arm64)
-ARCH = arm
-endif
-
ARCH ?= sandbox
CROSS_COMPILE ?=
@@ -174,6 +170,10 @@ CROSS_COMPILE ?=
UTS_MACHINE := $(ARCH)
SRCARCH := $(ARCH)
+ifeq ($(ARCH),arm64)
+ SRCARCH := arm
+endif
+
KCONFIG_CONFIG ?= .config
# Default file for 'make defconfig'. This may be overridden by arch-Makefile.
--
2.25.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2020-04-24 19:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-24 18:59 [PATCH 1/6] kbuild: remove meaningless headers_check from help target Masahiro Yamada
2020-04-24 18:59 ` [PATCH 2/6] modpost: sync mk_elfconfig.c with Linux 5.7-rc2 Masahiro Yamada
2020-04-24 18:59 ` [PATCH 3/6] kbuild: swap the include order of arch Makefile and auto.conf.cmd Masahiro Yamada
2020-04-24 18:59 ` [PATCH 4/6] kbuild: make DEFCONFIG_LIST work Masahiro Yamada
2020-04-24 18:59 ` [PATCH 5/6] kbuild: use $(SRCARCH) to point to the arch directory Masahiro Yamada
2020-04-24 18:59 ` Masahiro Yamada [this message]
2020-04-27 7:56 ` [PATCH 1/6] kbuild: remove meaningless headers_check from help target Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200424185924.705754-6-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox