[PATCH master] Revert "MAKEALL: query CONFIG_64BIT before make instead of CONFIG_ARM64 after"

[PATCH master] Revert "MAKEALL: query CONFIG_64BIT before make instead of CONFIG_ARM64 after"

[Ahmad Fatoum]

The commit being reverted here assumed that all defconfigs have a
corresponding file, but this doesn't hold true for generated configs
like multi_v8_efi_defconfig.

The issue that was meant to be addressed disappeared after rerunning
the test, so it might have been just a fluke (or triggered by shuffle,
although I was unable to reproduce with the same seed).

Until better understood, reinstate the old code.

Fixes: bdf0a4da1d28 ("MAKEALL: query CONFIG_64BIT before make instead of CONFIG_ARM64 after")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 MAKEALL | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/MAKEALL b/MAKEALL
index abce297a9bf8..d47f0204f1f1 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -135,10 +135,13 @@ do_build_defconfig() {
 	[ -n "$logdir" ] && mkdir -p "${logdir}/${defconfig}"
 
 	MAKE="make -j${JOBS} ARCH=${arch} O=${BUILDDIR}"
+	${MAKE} ${defconfig} &>/dev/null
 
-	grep -q "CONFIG_64BIT=y" arch/${arch}/configs/${defconfig}
-	if [ $? = 0 ]; then
-		arch=arm64
+	if [ ${arch} = "arm" ]; then
+		grep -q "CONFIG_ARM64=y" ${BUILDDIR}/.config
+		if [ $? = 0 ]; then
+			arch=arm64
+		fi
 	fi
 
 	tmp=$(echo "${defconfig}" | tr - _)
-- 
2.47.3

Re: [PATCH master] Revert "MAKEALL: query CONFIG_64BIT before make instead of CONFIG_ARM64 after"

[Sascha Hauer]

On Tue, 30 Sep 2025 12:38:22 +0200, Ahmad Fatoum wrote:
> The commit being reverted here assumed that all defconfigs have a
> corresponding file, but this doesn't hold true for generated configs
> like multi_v8_efi_defconfig.
> 
> The issue that was meant to be addressed disappeared after rerunning
> the test, so it might have been just a fluke (or triggered by shuffle,
> although I was unable to reproduce with the same seed).
> 
> [...]

Applied, thanks!

[1/1] Revert "MAKEALL: query CONFIG_64BIT before make instead of CONFIG_ARM64 after"
      https://git.pengutronix.de/cgit/barebox/commit/?id=92d503132efc (link may not be stable)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>