From f2e30943eecacfaf5fee1944888ec9c33d5695e2 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Wed, 11 Oct 2023 12:43:38 +0200
Subject: [PATCH] board/common: generate images/Config.in and reduce x86 ram

The default arch and disk image filename needs to be generated
to be unique per, at least, each architecture build.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 board/common/post-build.sh                    | 10 ----------
 board/common/post-image.sh                    | 12 ++++++++++++
 board/common/qemu/{Config.in => Config.in.in} |  6 +++---
 3 files changed, 15 insertions(+), 13 deletions(-)
 rename board/common/qemu/{Config.in => Config.in.in} (95%)

diff --git a/board/common/post-build.sh b/board/common/post-build.sh
index 4b90cbd2..54dced0d 100755
--- a/board/common/post-build.sh
+++ b/board/common/post-build.sh
@@ -46,13 +46,3 @@ grep -qsE '^/bin/true$$' "$TARGET_DIR/etc/shells" \
         || echo "/bin/true" >> "$TARGET_DIR/etc/shells"
 grep -qsE '^/bin/false$$' "$TARGET_DIR/etc/shells" \
         || echo "/bin/false" >> "$TARGET_DIR/etc/shells"
-
-# Menuconfig support for modifying Qemu args in release tarballs
-cp "$BR2_EXTERNAL_INFIX_PATH/board/common/qemu/qemu.sh" "$BINARIES_DIR/"
-sed "s/default QEMU_aarch64/default QEMU_$BR2_ARCH/" \
-    < "$BR2_EXTERNAL_INFIX_PATH/board/common/qemu/Config.in" \
-    > "$BINARIES_DIR/Config.in"
-rm -f "$BINARIES_DIR/qemu.cfg"
-CONFIG_="CONFIG_" BR2_CONFIG="$BINARIES_DIR/qemu.cfg" \
-       "$O/build/buildroot-config/conf" --olddefconfig "$BINARIES_DIR/Config.in"
-rm -f "$BINARIES_DIR/qemu.cfg.old" "$BINARIES_DIR/.config.old"
diff --git a/board/common/post-image.sh b/board/common/post-image.sh
index bfdd864d..f74182c1 100755
--- a/board/common/post-image.sh
+++ b/board/common/post-image.sh
@@ -7,6 +7,7 @@ load_cfg BR2_DEFCONFIG
 load_cfg BR2_EXTERNAL_INFIX_PATH
 load_cfg BR2_TARGET_ROOTFS
 NAME=infix-$(basename "$BR2_DEFCONFIG" _defconfig | tr _ - | sed 's/x86-64/x86_64/')
+diskimg=disk.img
 
 ver()
 {
@@ -71,3 +72,14 @@ if [ "$BR2_TARGET_ROOTFS_SQUASHFS" = "y" ]; then
 	ln -sf "$BINARIES_DIR/${NAME}${rel}.img" "$BINARIES_DIR/${NAME}.img"
     fi
 fi
+
+# Menuconfig support for modifying Qemu args in release tarballs
+cp "$BR2_EXTERNAL_INFIX_PATH/board/common/qemu/qemu.sh" "$BINARIES_DIR/"
+sed -e "s/@ARCH@/QEMU_$BR2_ARCH/" \
+    -e "s/@DISK_IMG@/$diskimg/"   \
+    < "$BR2_EXTERNAL_INFIX_PATH/board/common/qemu/Config.in.in" \
+    > "$BINARIES_DIR/Config.in"
+rm -f "$BINARIES_DIR/qemu.cfg"
+CONFIG_="CONFIG_" BR2_CONFIG="$BINARIES_DIR/qemu.cfg" \
+       "$O/build/buildroot-config/conf" --olddefconfig "$BINARIES_DIR/Config.in"
+rm -f "$BINARIES_DIR/qemu.cfg.old" "$BINARIES_DIR/.config.old"
diff --git a/board/common/qemu/Config.in b/board/common/qemu/Config.in.in
similarity index 95%
rename from board/common/qemu/Config.in
rename to board/common/qemu/Config.in.in
index 58b4285a..5a506e0e 100644
--- a/board/common/qemu/Config.in
+++ b/board/common/qemu/Config.in.in
@@ -2,7 +2,7 @@ mainmenu "QEMU Virtualization"
 
 choice
 	prompt "Target Architecture"
-	default QEMU_aarch64
+	default @ARCH@
 
 config QEMU_x86_64
 	bool "x86_64"
@@ -64,7 +64,7 @@ endchoice
 config QEMU_MACHINE
 	string
 	default "qemu-system-aarch64 -M virt -cpu cortex-a72 -m 256M"   if QEMU_aarch64
-	default "qemu-system-x86_64 -M q35,accel=kvm -cpu host -m 512M" if QEMU_x86_64
+	default "qemu-system-x86_64 -M q35,accel=kvm -cpu host -m 256M" if QEMU_x86_64
 
 config QEMU_KERNEL
 	string
@@ -80,7 +80,7 @@ config QEMU_BIOS
 
 config QEMU_ROOTFS
 	string
-	default "disk.img"        if !QEMU_ROOTFS_INITRD
+	default "@DISK_IMG@" if !QEMU_ROOTFS_INITRD
 	default "rootfs.squashfs" if QEMU_ROOTFS_INITRD
 
 config QEMU_DTB_EXTEND