linux-kernel - Re: [PATCH] parisc: Regenerate parisc defconfigs

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20200326221921.GA20495@ls3530.fritz.box>
Date:   Thu, 26 Mar 2020 23:19:21 +0100
From:   Helge Deller <deller@....de>
To:     Guenter Roeck <linux@...ck-us.net>
Cc:     Helge Deller <deller@....de>, linux-parisc@...r.kernel.org,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH] parisc: Regenerate parisc defconfigs

* Guenter Roeck <linux@...ck-us.net>:
> On Mon, Feb 03, 2020 at 10:31:22PM +0100, Helge Deller wrote:
> > Regenerate the 32- and 64-bit defconfigs and drop the outdated specific
> > machine defconfigs for the 712, A500, B160, C3000 and C8000 workstations.
> > ---
> >  arch/parisc/configs/712_defconfig           | 181 ---------------
> >  arch/parisc/configs/a500_defconfig          | 177 ---------------
> >  arch/parisc/configs/defconfig               | 206 -----------------
>
> Since the removal of arch/parisc/configs/defconfig, "make ARCH=parisc
> defconfig" results in an endless recursive make loop.

Can you please test the patch below?
Helge

----
[PATCH] parisc: Fix defconfig selection

Fix the recursive loop when running "make ARCH=parisc defconfig".

Fixes: 84669923e1ed ("parisc: Regenerate parisc defconfigs")
Noticed-by: Guenter Roeck <linux@...ck-us.net>
Signed-off-by: Helge Deller <deller@....de>

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 71034b54d74e..3801a2ef9bca 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -79,6 +79,11 @@ config MMU
 config STACK_GROWSUP
 	def_bool y

+config ARCH_DEFCONFIG
+	string
+	default "arch/parisc/configs/generic-32bit_defconfig" if !64BIT
+	default "arch/parisc/configs/generic-64bit_defconfig" if 64BIT
+
 config GENERIC_LOCKBREAK
 	bool
 	default y
diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile
index dca8f2de8cf5..628cd8bb7ad8 100644
--- a/arch/parisc/Makefile
+++ b/arch/parisc/Makefile
@@ -34,6 +34,13 @@ CC_ARCHES	= hppa hppa2.0 hppa1.1
 LD_BFD		:= elf32-hppa-linux
 endif

+# select defconfig based on actual architecture
+ifeq ($(shell uname -m),parisc64)
+	KBUILD_DEFCONFIG := generic-64bit_defconfig
+else
+	KBUILD_DEFCONFIG := generic-32bit_defconfig
+endif
+
 export LD_BFD

 ifneq ($(SUBARCH),$(UTS_MACHINE))