mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
0a7f461e57
* Khadas VIM4: U-Boot: Mod bootargs/defconfig and add bootscr support Signed-off-by: Patrick Yavitz <pyavitz@gmail.com> * Khadas VIM4: Pull U-Boot from CoreELEC instead of Khadas Signed-off-by: Patrick Yavitz <pyavitz@gmail.com> * Khadas VIM4: Remove setexpr bootargs sub rootfstype= from boot.cmd This is no longer required Signed-off-by: Patrick Yavitz <pyavitz@gmail.com> * Meson S4T7: family.conf: Add missing `mkdir -p "${tbasedir}"` The toolchains fail to download because the dir isn't created Signed-off-by: Patrick Yavitz <pyavitz@gmail.com> * Meson T7: Add rootfstype= to command line Signed-off-by: Patrick Yavitz <pyavitz@gmail.com> * Khadas VIM4: Add extra boot arguments Signed-off-by: Patrick Yavitz <pyavitz@gmail.com> * Remove `viraniac` as maintainer and add `rw` to cmdline Signed-off-by: Patrick Yavitz <pyavitz@gmail.com> * Amlogic T7: Add `fsck.repair=yes` and `rootwait` to cmdline Signed-off-by: Patrick Yavitz <pyavitz@gmail.com> * Amlogic T7: Move `${bootargs}` placement Signed-off-by: Patrick Yavitz <pyavitz@gmail.com> --------- Signed-off-by: Patrick Yavitz <pyavitz@gmail.com> Co-authored-by: Igor <igor@armbian.com>
27 lines
836 B
Diff
27 lines
836 B
Diff
From b0e6b18407ea6aa7565153e5b9ae0fb9d03f9d98 Mon Sep 17 00:00:00 2001
|
|
From: Patrick Yavitz <pyavitz@gmail.com>
|
|
Date: Fri, 12 Sep 2025 13:21:40 -0400
|
|
Subject: [PATCH] Revert "config_distro_bootcmd.h: boot only from boot.ini"
|
|
|
|
This reverts commit 262c38c7e5b901e207392effd400a246e123ab38.
|
|
---
|
|
include/config_distro_bootcmd.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
|
index 992506e990a..6cf339b70cc 100644
|
|
--- a/include/config_distro_bootcmd.h
|
|
+++ b/include/config_distro_bootcmd.h
|
|
@@ -395,7 +395,7 @@
|
|
BOOTENV_SHARED_EFI \
|
|
BOOTENV_SHARED_VIRTIO \
|
|
"boot_prefixes=/ /boot/\0" \
|
|
- "boot_scripts=boot.ini\0" \
|
|
+ "boot_scripts=boot.scr.uimg boot.scr boot.ini\0" \
|
|
"boot_script_dhcp=boot.scr.uimg\0" \
|
|
BOOTENV_BOOT_TARGETS \
|
|
\
|
|
--
|
|
2.43.0
|
|
|