rom.sh: insert grub background in cbfs not memdisk

for some reason, when the background is in memdisk, inserting
it into cbfs afterward doesn't override, despite this
being the behaviour in grub.cfg

put it in cbfs explicitly, and skip inserting into memdisk

Signed-off-by: Leah Rowe <leah@libreboot.org>

.gitignore

@@ -36,3 +36,6 @@
 /hash/
 /dump/
 /qrun*.sh
+*.tar.*
+/m
+/f

config/coreboot/next/patches/0010-dell-3050micro-disable-nvme-hotplug.patch

@@ -0,0 +1,57 @@
+From adfeaeabcf98878814b463f14aba7871721d7606 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <info@minifree.org>
+Date: Wed, 11 Dec 2024 01:06:01 +0000
+Subject: [PATCH 1/1] dell/3050micro: disable nvme hotplug
+
+in my testing, when running my 3050micro for a few days,
+the nvme would sometimes randomly rename.
+
+e.g. nvme0n1 renamed to nvme0n2
+
+this might cause crashes in linux, if booting only from the
+nvme. in my case, i was booting from mdraid (sata+nvme) and
+every few days, the nvme would rename at least once, causing
+my RAID to become unsynced. since i'm using RAID1, this was
+OK and I could simply re-sync the array, but this is quite
+precarious indeed. if you're using raid0, that will potentially
+corrupt your RAID array indefinitely.
+
+this same issue manifested on the T480/T480 thinkpads, and
+S3 resume would break because of that, when booting from nvme,
+because the nvme would be "unplugged" and appear to linux as a
+new device (the one that you booted from).
+
+the fix there was to disable hotplugging on that pci-e slot
+for the nvme, so apply the same fix here for 3050 micro
+
+Signed-off-by: Leah Rowe <info@minifree.org>
+---
+ 3rdparty/vboot                                 | 2 +-
+ src/mainboard/dell/optiplex_3050/devicetree.cb | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/3rdparty/vboot b/3rdparty/vboot
+index f1f70f46dc..902fe8af96 160000
+--- a/3rdparty/vboot
++++ b/3rdparty/vboot
+@@ -1 +1 @@
+-Subproject commit f1f70f46dc5482bb7c654e53ed58d4001e386df2
++Subproject commit 902fe8af96ad662fac127cb8f51596491cf8272f
+diff --git a/src/mainboard/dell/optiplex_3050/devicetree.cb b/src/mainboard/dell/optiplex_3050/devicetree.cb
+index 039709aa4a..0678ed1765 100644
+--- a/src/mainboard/dell/optiplex_3050/devicetree.cb
++++ b/src/mainboard/dell/optiplex_3050/devicetree.cb
+@@ -45,7 +45,9 @@ chip soc/intel/skylake
+ 			register "PcieRpAdvancedErrorReporting[20]"     = "1"
+ 			register "PcieRpLtrEnable[20]"                  = "1"
+ 			register "PcieRpClkSrcNumber[20]"               = "3"
+-			register "PcieRpHotPlug[20]"                    = "1"
++# disable hotplug on nvme to prevent renaming e.g. nvme0n1 rename to nvme0n2,
++# which could cause crashes in linux if booting from nvme
++			register "PcieRpHotPlug[20]"                    = "0"
+ 		end
+ 
+ 		# Realtek LAN
+-- 
+2.39.5
+

config/coreboot/t480_fsp_16mb/config/libgfxinit_corebootfb

@@ -115,7 +115,7 @@ CONFIG_MAINBOARD_VERSION="1.0"
 CONFIG_MAINBOARD_DIR="lenovo/sklkbl_thinkpad"
 CONFIG_VGA_BIOS_ID="8086,0406"
 CONFIG_DIMM_MAX=2
-CONFIG_DIMM_SPD_SIZE=256
+CONFIG_DIMM_SPD_SIZE=512
 CONFIG_FMDFILE=""
 # CONFIG_NO_POST is not set
 CONFIG_MAINBOARD_VENDOR="LENOVO"

config/coreboot/t480_fsp_16mb/config/libgfxinit_txtmode

@@ -115,7 +115,7 @@ CONFIG_MAINBOARD_VERSION="1.0"
 CONFIG_MAINBOARD_DIR="lenovo/sklkbl_thinkpad"
 CONFIG_VGA_BIOS_ID="8086,0406"
 CONFIG_DIMM_MAX=2
-CONFIG_DIMM_SPD_SIZE=256
+CONFIG_DIMM_SPD_SIZE=512
 CONFIG_FMDFILE=""
 # CONFIG_NO_POST is not set
 CONFIG_MAINBOARD_VENDOR="LENOVO"

config/coreboot/t480s_fsp_16mb/config/libgfxinit_corebootfb

@@ -115,7 +115,7 @@ CONFIG_MAINBOARD_VERSION="1.0"
 CONFIG_MAINBOARD_DIR="lenovo/sklkbl_thinkpad"
 CONFIG_VGA_BIOS_ID="8086,0406"
 CONFIG_DIMM_MAX=2
-CONFIG_DIMM_SPD_SIZE=256
+CONFIG_DIMM_SPD_SIZE=512
 CONFIG_FMDFILE=""
 # CONFIG_NO_POST is not set
 CONFIG_MAINBOARD_VENDOR="LENOVO"

config/coreboot/t480s_fsp_16mb/config/libgfxinit_txtmode

@@ -115,7 +115,7 @@ CONFIG_MAINBOARD_VERSION="1.0"
 CONFIG_MAINBOARD_DIR="lenovo/sklkbl_thinkpad"
 CONFIG_VGA_BIOS_ID="8086,0406"
 CONFIG_DIMM_MAX=2
-CONFIG_DIMM_SPD_SIZE=256
+CONFIG_DIMM_SPD_SIZE=512
 CONFIG_FMDFILE=""
 # CONFIG_NO_POST is not set
 CONFIG_MAINBOARD_VENDOR="LENOVO"

config/grub/default/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch

@@ -16,7 +16,7 @@ index bd4431000..300f55fe1 100644
    grub_term_cls (term);
  
 -  msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), PACKAGE_VERSION);
-+  msg_formatted = grub_xasprintf (_("Libreboot 20241205 release, based on coreboot.    https://libreboot.org/"));
++  msg_formatted = grub_xasprintf (_("Libreboot 20241206 release, based on coreboot.    https://libreboot.org/"));
    if (!msg_formatted)
      return;
  

config/grub/nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch

@@ -16,7 +16,7 @@ index bd4431000..300f55fe1 100644
    grub_term_cls (term);
  
 -  msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), PACKAGE_VERSION);
-+  msg_formatted = grub_xasprintf (_("Libreboot 20241205 release, based on coreboot.    https://libreboot.org/"));
++  msg_formatted = grub_xasprintf (_("Libreboot 20241206 release, based on coreboot.    https://libreboot.org/"));
    if (!msg_formatted)
      return;
  

config/grub/xhci/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch

@@ -16,7 +16,7 @@ index bd4431000..300f55fe1 100644
    grub_term_cls (term);
  
 -  msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), PACKAGE_VERSION);
-+  msg_formatted = grub_xasprintf (_("Libreboot 20241205 release, based on coreboot.    https://libreboot.org/"));
++  msg_formatted = grub_xasprintf (_("Libreboot 20241206 release, based on coreboot.    https://libreboot.org/"));
    if (!msg_formatted)
      return;
  

config/u-boot/default/patches/0007-Libreboot-branding-version-on-the-bootflow-menu.patch

@@ -18,7 +18,7 @@ index 84831915a2..8e26ec2aef 100644
  	ret |= scene_obj_set_pos(scn, OBJ_MENU, MARGIN_LEFT, 100);
  	ret |= scene_txt_str(scn, "title", OBJ_MENU_TITLE, STR_MENU_TITLE,
 -			     "U-Boot - Boot Menu", NULL);
-+	    "Libreboot 20241205 release (U-Boot Menu)                                                    https://libreboot.org/", NULL);
++	    "Libreboot 20241206 release (U-Boot Menu)                                                    https://libreboot.org/", NULL);
  	ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT);
  
  	logo = video_get_u_boot_logo();

config/u-boot/x86/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch

@@ -18,7 +18,7 @@ index 84831915a2..8e26ec2aef 100644
  	ret |= scene_obj_set_pos(scn, OBJ_MENU, MARGIN_LEFT, 100);
  	ret |= scene_txt_str(scn, "title", OBJ_MENU_TITLE, STR_MENU_TITLE,
 -			     "U-Boot - Boot Menu", NULL);
-+	    "Libreboot 20241205 release (U-Boot Menu)                                                    https://libreboot.org/", NULL);
++	    "Libreboot 20241206 release (U-Boot Menu)                                                    https://libreboot.org/", NULL);
  	ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT);
  
  	logo = video_get_u_boot_logo();

config/u-boot/x86_64/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch

@@ -18,7 +18,7 @@ index 84831915a2..8e26ec2aef 100644
  	ret |= scene_obj_set_pos(scn, OBJ_MENU, MARGIN_LEFT, 100);
  	ret |= scene_txt_str(scn, "title", OBJ_MENU_TITLE, STR_MENU_TITLE,
 -			     "U-Boot - Boot Menu", NULL);
-+	    "Libreboot 20241205 release (U-Boot Menu)                                                    https://libreboot.org/", NULL);
++	    "Libreboot 20241206 release (U-Boot Menu)                                                    https://libreboot.org/", NULL);
  	ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT);
  
  	logo = video_get_u_boot_logo();

include/rom.sh

@@ -44,8 +44,7 @@ mkpayload_grub()
 	    --fonts= --themes= --locales=  --modules="$grub_modules" \
 	    --install-modules="$grub_install_modules" \
 	    "/boot/grub/grub_default.cfg=${srcdir}/.config" \
-	    "/boot/grub/grub.cfg=$grubdata/memdisk.cfg" \
+	    "/boot/grub/grub.cfg=$grubdata/memdisk.cfg" || \
-	    "/background.png=$grubdata/background/background1280x800.png" || \
 	    $err "$tree: cannot build grub.elf"; return 0
 }
 
@@ -165,6 +164,9 @@ add_grub()
 	printf "set grub_scan_disk=\"%s\"\n" "$grub_scan_disk" \
 	    > "$TMPDIR/tmpcfg" || $err "$target: !insert scandisk"
 	cbfs "$tmprom" "$TMPDIR/tmpcfg" scan.cfg raw
+	[ "$initmode" != "normal" ] && [ "$displaymode" != "txtmode" ] && \
+	    cbfs "$tmprom" "$grubdata/background/background1280x800.png" \
+	    "background.png" raw; :
 }
 
 mkseagrub()
@@ -214,7 +216,8 @@ add_uboot()
 	    ubootelf="$ubdir/u-boot-x86-with-spl.bin" # EFI-compatible
 
 	[ -f "$ubootelf" ] || $err "cb/$ubtarget: Can't find u-boot"
-	cbfs "$tmprom" "$ubootelf" "$ubpath" $ubcbfsargs; cprom
+	cbfs "$tmprom" "$ubootelf" "$ubpath" $ubcbfsargs
+	[ "$payload_seabios" = "y" ] || cprom; :
 }
 
 cprom()

include/vendor.sh

@@ -180,7 +180,7 @@ extract_archive()
 	    innoextract "$1" -d "$2" || python "$pfs_extract" "$1" -e || 7z x \
 	    "$1" -o"$2" || unar "$1" -o "$2" || unzip "$1" -d "$2" || return 1
 
-	[ ! -d "${_dl}_extracted" ] || mv "${_dl}_extracted" "$2" || \
+	[ ! -d "${_dl}_extracted" ] || cp -R "${_dl}_extracted" "$2" || \
 	    $err "!mv '${_dl}_extracted' '$2'"; :
 }