diff mbox

[U-Boot,12/14] x86: qemu: Add a text base for 64-bit U-Boot

Message ID 1484739184-24211-13-git-send-email-bmeng.cn@gmail.com
State Accepted
Commit 8149d114a9ea663cc0487cc3660ba9fc8ede379a
Delegated to: Bin Meng
Headers show

Commit Message

Bin Meng Jan. 18, 2017, 11:33 a.m. UTC
Set up the 64-bit U-Boot text base if building for that target.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 board/emulation/qemu-x86/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Simon Glass Jan. 25, 2017, 4:09 a.m. UTC | #1
On 18 January 2017 at 04:33, Bin Meng <bmeng.cn@gmail.com> wrote:
> Set up the 64-bit U-Boot text base if building for that target.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  board/emulation/qemu-x86/Kconfig | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>
Bin Meng Feb. 7, 2017, 5:45 a.m. UTC | #2
On Wed, Jan 25, 2017 at 12:09 PM, Simon Glass <sjg@chromium.org> wrote:
> On 18 January 2017 at 04:33, Bin Meng <bmeng.cn@gmail.com> wrote:
>> Set up the 64-bit U-Boot text base if building for that target.
>>
>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>> ---
>>
>>  board/emulation/qemu-x86/Kconfig | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> Reviewed-by: Simon Glass <sjg@chromium.org>

applied to u-boot-x86, thanks!
diff mbox

Patch

diff --git a/board/emulation/qemu-x86/Kconfig b/board/emulation/qemu-x86/Kconfig
index c9181fc..a773e8f 100644
--- a/board/emulation/qemu-x86/Kconfig
+++ b/board/emulation/qemu-x86/Kconfig
@@ -13,8 +13,8 @@  config SYS_CONFIG_NAME
 	default "qemu-x86"
 
 config SYS_TEXT_BASE
-	default 0xfff00000 if !EFI_STUB
-	default 0x01110000 if EFI_STUB
+	default 0xfff00000 if !EFI_STUB && !SUPPORT_SPL
+	default 0x01110000 if EFI_STUB || SUPPORT_SPL
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y