All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Cc: Simon Glass <sjg@chromium.org>, Bin Meng <bmeng.cn@gmail.com>
Subject: [PATCH v3 11/12] x86: qemu: Expand ROM size
Date: Sun,  1 Oct 2023 19:14:46 -0600	[thread overview]
Message-ID: <20231002011450.462468-7-sjg@chromium.org> (raw)
In-Reply-To: <20231002011450.462468-1-sjg@chromium.org>

Expand the ROM for x86_64 to 2MB to make space for the font, as it is
already on the edge.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

(no changes since v1)

 board/emulation/qemu-x86/Kconfig | 3 ++-
 configs/qemu-x86_64_defconfig    | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/board/emulation/qemu-x86/Kconfig b/board/emulation/qemu-x86/Kconfig
index 787751abba4f..04b7a8aff89e 100644
--- a/board/emulation/qemu-x86/Kconfig
+++ b/board/emulation/qemu-x86/Kconfig
@@ -21,7 +21,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select X86_RESET_VECTOR
 	select QEMU
 	select QFW_PIO
-	select BOARD_ROMSIZE_KB_1024
+	select BOARD_ROMSIZE_KB_1024 if TARGET_QEMU_X86
+	select BOARD_ROMSIZE_KB_2048 if TARGET_QEMU_X86_64
 	imply VIRTIO_PCI
 	imply VIRTIO_NET
 	imply VIRTIO_BLK
diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig
index 165f0b512c8b..6de3da2d8269 100644
--- a/configs/qemu-x86_64_defconfig
+++ b/configs/qemu-x86_64_defconfig
@@ -6,7 +6,7 @@ CONFIG_ENV_SIZE=0x40000
 CONFIG_MAX_CPUS=2
 CONFIG_SPL_DM_SPI=y
 CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx"
-CONFIG_SPL_TEXT_BASE=0xfffd8000
+CONFIG_SPL_TEXT_BASE=0xfffd4000
 CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
@@ -17,12 +17,12 @@ CONFIG_DEBUG_UART=y
 CONFIG_SMP=y
 CONFIG_GENERATE_PIRQ_TABLE=y
 CONFIG_GENERATE_MP_TABLE=y
-CONFIG_X86_OFFSET_U_BOOT=0xfff00000
+CONFIG_X86_OFFSET_U_BOOT=0xffe00000
+CONFIG_SYS_MONITOR_BASE=0x01110000
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_BOOTSTD_FULL=y
 CONFIG_BOOTSTD_DEFAULTS=y
-CONFIG_SYS_MONITOR_BASE=0x01110000
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_SHOW_BOOT_PROGRESS=y
-- 
2.42.0.582.g8ccd20d70d-goog


  parent reply	other threads:[~2023-10-02  1:30 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-02  1:14 [PATCH v3 00/12] Resolve issues with booting distros on x86 Simon Glass
2023-10-02  1:14 ` [PATCH v3 01/12] efi: Correct handling of frame buffer Simon Glass
2023-11-05 14:06   ` Bin Meng
2023-11-15 13:17   ` Simon Glass
2023-10-02  1:14 ` [PATCH v3 02/12] bootstd: Refactor mmc prep to allow a different scan Simon Glass
2023-10-02  1:14 ` [PATCH v3 03/12] bootstd: Add a return code to bootflow menu Simon Glass
2023-10-02  1:14 ` [PATCH v3 04/12] x86: coreboot: Add a boot script Simon Glass
2023-11-05 14:06   ` Bin Meng
2023-10-02  1:14 ` [PATCH v3 05/12] usb: Avoid unbinding devices in use by bootflows Simon Glass
2023-10-02  1:14 ` [PATCH v3 06/12] expo: Correct background colour Simon Glass
2023-11-05 14:06   ` Bin Meng
2023-11-15 13:17   ` Simon Glass
2023-10-02  1:14 ` [PATCH v3 07/12] video: Correct setting of cursor position Simon Glass
2023-11-12 20:01   ` Simon Glass
2023-11-12 20:27     ` Anatolij Gustschin
2023-11-12 20:25   ` Anatolij Gustschin
2023-10-02  1:14 ` [PATCH v3 08/12] video: Drop unnecessary truetype operations from SPL Simon Glass
2023-11-05 14:06   ` Bin Meng
2023-10-02  1:14 ` [PATCH v3 09/12] x86: Enable SSE in 64-bit mode Simon Glass
2023-11-05 14:05   ` Bin Meng
2023-11-05 16:29     ` Simon Glass
2023-11-06 10:26       ` Bin Meng
2023-11-06 15:36         ` Tom Rini
2023-11-12 20:01           ` Simon Glass
2023-11-13 13:01             ` Bin Meng
2023-11-13 14:00               ` Simon Glass
2023-11-13 14:06               ` Tom Rini
2023-11-13 14:11                 ` Simon Glass
2023-10-02  1:14 ` [PATCH v3 10/12] x86: coreboot: Enable truetype fonts Simon Glass
2023-10-02  1:14 ` Simon Glass [this message]
2023-10-02  1:14 ` [PATCH v3 12/12] x86: qemu: " Simon Glass
2023-11-15 13:17 ` [PATCH v3 03/12] bootstd: Add a return code to bootflow menu Simon Glass
2023-11-15 13:17 ` [PATCH v3 02/12] bootstd: Refactor mmc prep to allow a different scan Simon Glass

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231002011450.462468-7-sjg@chromium.org \
    --to=sjg@chromium.org \
    --cc=bmeng.cn@gmail.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.