[PATCH 1/2] sandbox: add empty <asm/linkage.h>

[PATCH 1/2] sandbox: add empty <asm/linkage.h>

[Ahmad Fatoum]

Sandbox code including <linux/linkage.h> will trip over this file being
missing, so add an empty stub.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/sandbox/include/asm/linkage.h | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 arch/sandbox/include/asm/linkage.h

diff --git a/arch/sandbox/include/asm/linkage.h b/arch/sandbox/include/asm/linkage.h
new file mode 100644
index 000000000000..1d78d9169b6a
--- /dev/null
+++ b/arch/sandbox/include/asm/linkage.h
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __ASM_LINKAGE_H
+#define __ASM_LINKAGE_H
+
+/* referenced by <linux/linkage.h> */
+
+#endif
-- 
2.39.2

[PATCH 2/2] sandbox: move sandbox-specific options into menu

[Ahmad Fatoum]

The two sandbox related options are shown in the top-level menu.
Move them into an architecture-specific menu instead as done for other
architectures.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/sandbox/Kconfig | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig
index 31c4484cf1ef..88da35a955ee 100644
--- a/arch/sandbox/Kconfig
+++ b/arch/sandbox/Kconfig
@@ -23,12 +23,7 @@ config ARCH_TEXT_BASE
 	hex
 	default 0x00000000
 
-config SANDBOX_REEXEC
-	prompt "exec(2) reset handler"
-	def_bool y
-	help
-	  The normal reset handler hangs barebox. On Linux, barebox
-	  instead can exec itself to simulate a reset.
+menu "Sandbox specific settings"
 
 config PHYS_ADDR_T_64BIT
 	bool
@@ -52,5 +47,14 @@ config 32BIT
 config SANDBOX_LINUX_I386
 	bool "32-bit x86 barebox" if CC_HAS_LINUX_I386_SUPPORT
 
+config SANDBOX_REEXEC
+	prompt "exec(2) reset handler"
+	def_bool y
+	help
+	  The normal reset handler hangs barebox. On Linux, barebox
+	  instead can exec itself to simulate a reset.
+
 config SDL
 	bool
+
+endmenu
-- 
2.39.2

Re: [PATCH 1/2] sandbox: add empty <asm/linkage.h>

[Sascha Hauer]

On Mon, Oct 09, 2023 at 01:52:00PM +0200, Ahmad Fatoum wrote:
> Sandbox code including <linux/linkage.h> will trip over this file being
> missing, so add an empty stub.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  arch/sandbox/include/asm/linkage.h | 8 ++++++++
>  1 file changed, 8 insertions(+)
>  create mode 100644 arch/sandbox/include/asm/linkage.h

Applied, thanks

Sascha

> 
> diff --git a/arch/sandbox/include/asm/linkage.h b/arch/sandbox/include/asm/linkage.h
> new file mode 100644
> index 000000000000..1d78d9169b6a
> --- /dev/null
> +++ b/arch/sandbox/include/asm/linkage.h
> @@ -0,0 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +
> +#ifndef __ASM_LINKAGE_H
> +#define __ASM_LINKAGE_H
> +
> +/* referenced by <linux/linkage.h> */
> +
> +#endif
> -- 
> 2.39.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |