mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
qemu-uboot-{x86,arm64} fixes + bump to u-boot 23.10-rc4 + rework x86 patches
This commit is contained in:
Ricardo Pardini
@@ -0,0 +1,35 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Ricardo Pardini <ricardo@pardini.net>
|
||||
Date: Sat, 18 Feb 2023 11:40:33 +0100
|
||||
Subject: hack: higher ramdisk load address both in u-boot source and
|
||||
bootscript
|
||||
|
||||
---
|
||||
include/configs/x86-common.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
|
||||
index 8bd0716c08d..f1907792d33 100644
|
||||
--- a/include/configs/x86-common.h
|
||||
+++ b/include/configs/x86-common.h
|
||||
@@ -13,7 +13,7 @@
|
||||
*/
|
||||
|
||||
/* Default environment */
|
||||
-#define CFG_RAMDISK_ADDR 0x4000000
|
||||
+#define CFG_RAMDISK_ADDR 0x8000000
|
||||
#if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB)
|
||||
#define CFG_OTHBOOTARGS "othbootargs=\0"
|
||||
#else
|
||||
@@ -33,7 +33,7 @@
|
||||
CFG_OTHBOOTARGS \
|
||||
"scriptaddr=0x7000000\0" \
|
||||
"kernel_addr_r=0x1000000\0" \
|
||||
- "ramdisk_addr_r=0x4000000\0" \
|
||||
+ "ramdisk_addr_r=0x8000000\0" \
|
||||
"ramdiskfile=initramfs.gz\0"
|
||||
|
||||
|
||||
--
|
||||
Armbian
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Ricardo Pardini <ricardo@pardini.net>
|
||||
Date: Sat, 18 Feb 2023 11:40:33 +0100
|
||||
Subject: x86: patch uboot defconfig to use the `q35` machine type, not
|
||||
`i440fx`
|
||||
|
||||
---
|
||||
configs/qemu-x86_defconfig | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
|
||||
index 24682a5387d..efdf520d813 100644
|
||||
--- a/configs/qemu-x86_defconfig
|
||||
+++ b/configs/qemu-x86_defconfig
|
||||
@@ -4,7 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x1000
|
||||
CONFIG_NR_DRAM_BANKS=8
|
||||
CONFIG_ENV_SIZE=0x40000
|
||||
CONFIG_MAX_CPUS=2
|
||||
-CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx"
|
||||
+CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_q35"
|
||||
CONFIG_DEBUG_UART_BASE=0x3f8
|
||||
CONFIG_DEBUG_UART_CLOCK=1843200
|
||||
CONFIG_DEBUG_UART=y
|
||||
@@ -58,6 +58,7 @@ CONFIG_LBA48=y
|
||||
CONFIG_SYS_64BIT_LBA=y
|
||||
CONFIG_CPU=y
|
||||
CONFIG_NVME_PCI=y
|
||||
+CONFIG_DM_RNG=y
|
||||
CONFIG_SYS_NS16550_PORT_MAPPED=y
|
||||
CONFIG_SPI=y
|
||||
CONFIG_USB_KEYBOARD=y
|
||||
@@ -65,5 +66,6 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
|
||||
CONFIG_FRAMEBUFFER_VESA_MODE_USER=y
|
||||
CONFIG_FRAMEBUFFER_VESA_MODE=0x144
|
||||
CONFIG_CONSOLE_SCROLL_LINES=5
|
||||
+CONFIG_VIRTIO_MMIO=y
|
||||
CONFIG_GENERATE_ACPI_TABLE=y
|
||||
# CONFIG_GZIP is not set
|
||||
--
|
||||
Armbian
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Ricardo Pardini <ricardo@pardini.net>
|
||||
Date: Tue, 26 Sep 2023 16:51:20 +0200
|
||||
Subject: hack: bump bzimage max size to 45mb from 15mb
|
||||
|
||||
---
|
||||
arch/x86/include/asm/zimage.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/x86/include/asm/zimage.h b/arch/x86/include/asm/zimage.h
|
||||
index 9ad74dc0b94..e1f057df380 100644
|
||||
--- a/arch/x86/include/asm/zimage.h
|
||||
+++ b/arch/x86/include/asm/zimage.h
|
||||
@@ -22,7 +22,7 @@
|
||||
#define COMMAND_LINE_MAGIC 0xA33F
|
||||
|
||||
/* limits */
|
||||
-#define BZIMAGE_MAX_SIZE 15*1024*1024 /* 15MB */
|
||||
+#define BZIMAGE_MAX_SIZE 45*1024*1024 /* 45MB */
|
||||
#define ZIMAGE_MAX_SIZE 512*1024 /* 512k */
|
||||
#define SETUP_MAX_SIZE 32768
|
||||
|
||||
--
|
||||
Armbian
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
Subject: [PATCH] hack_x86_ramdisk_addr_and_boot_virtio_first
|
||||
---
|
||||
Index: include/configs/qemu-x86.h
|
||||
IDEA additional info:
|
||||
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||||
<+>UTF-8
|
||||
===================================================================
|
||||
diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h
|
||||
--- a/include/configs/qemu-x86.h (revision fd4ed6b7e83ec3aea9a2ce21baea8ca9676f40dd)
|
||||
+++ b/include/configs/qemu-x86.h (revision 8cbd5f0763ba2558020392dfcaddfcd5270e9aca)
|
||||
@@ -13,10 +13,9 @@
|
||||
#include <linux/sizes.h>
|
||||
|
||||
#define BOOT_TARGET_DEVICES(func) \
|
||||
+ func(VIRTIO, virtio, 0) \
|
||||
func(USB, usb, 0) \
|
||||
func(SCSI, scsi, 0) \
|
||||
- func(VIRTIO, virtio, 0) \
|
||||
- func(IDE, ide, 0) \
|
||||
func(DHCP, dhcp, na)
|
||||
|
||||
#include <config_distro_bootcmd.h>
|
||||
Index: include/configs/x86-common.h
|
||||
IDEA additional info:
|
||||
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||||
<+>UTF-8
|
||||
===================================================================
|
||||
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
|
||||
--- a/include/configs/x86-common.h (revision fd4ed6b7e83ec3aea9a2ce21baea8ca9676f40dd)
|
||||
+++ b/include/configs/x86-common.h (revision 8cbd5f0763ba2558020392dfcaddfcd5270e9aca)
|
||||
@@ -25,7 +25,7 @@
|
||||
*/
|
||||
|
||||
/* Default environment */
|
||||
-#define CFG_RAMDISK_ADDR 0x4000000
|
||||
+#define CFG_RAMDISK_ADDR 0x8000000
|
||||
#if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB)
|
||||
#define CFG_OTHBOOTARGS "othbootargs=\0"
|
||||
#else
|
||||
@@ -52,7 +52,7 @@
|
||||
CFG_OTHBOOTARGS \
|
||||
"scriptaddr=0x7000000\0" \
|
||||
"kernel_addr_r=0x1000000\0" \
|
||||
- "ramdisk_addr_r=0x4000000\0" \
|
||||
+ "ramdisk_addr_r=0x8000000\0" \
|
||||
"ramdiskfile=initramfs.gz\0"
|
||||
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
Subject: [PATCH] use_q35_dts_for_qemu-x86_defconfig
|
||||
---
|
||||
Index: configs/qemu-x86_defconfig
|
||||
IDEA additional info:
|
||||
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||||
<+>UTF-8
|
||||
===================================================================
|
||||
diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
|
||||
--- a/configs/qemu-x86_defconfig (revision 8cbd5f0763ba2558020392dfcaddfcd5270e9aca)
|
||||
+++ b/configs/qemu-x86_defconfig (revision a7508f38ea82842d4067d33643a6dae399bb0121)
|
||||
@@ -4,7 +4,7 @@
|
||||
CONFIG_NR_DRAM_BANKS=8
|
||||
CONFIG_ENV_SIZE=0x40000
|
||||
CONFIG_MAX_CPUS=2
|
||||
-CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx"
|
||||
+CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_q35"
|
||||
CONFIG_SMP=y
|
||||
CONFIG_GENERATE_PIRQ_TABLE=y
|
||||
CONFIG_GENERATE_MP_TABLE=y
|
||||
@@ -51,6 +51,7 @@
|
||||
CONFIG_SYS_64BIT_LBA=y
|
||||
CONFIG_CPU=y
|
||||
CONFIG_NVME_PCI=y
|
||||
+CONFIG_DM_RNG=y
|
||||
CONFIG_SYS_NS16550_PORT_MAPPED=y
|
||||
CONFIG_SPI=y
|
||||
CONFIG_USB_KEYBOARD=y
|
||||
@@ -58,5 +59,6 @@
|
||||
CONFIG_FRAMEBUFFER_VESA_MODE_USER=y
|
||||
CONFIG_FRAMEBUFFER_VESA_MODE=0x144
|
||||
CONFIG_CONSOLE_SCROLL_LINES=5
|
||||
+CONFIG_VIRTIO_MMIO=y
|
||||
CONFIG_GENERATE_ACPI_TABLE=y
|
||||
# CONFIG_GZIP is not set
|
||||
Reference in New Issue
Block a user