x86: efi: Add a 64-bit coreboot payload
v3 cover x86: efi: Add a 64-bit coreboot payload
This series creates a new 64-bit 'coreboot64' build which can be launched from coreboot. It uses SPL to effect the jump to 64-bit mode.
This was done in an attempt to get the Ubuntu FirmwareTestSuite[1] working. Unfortunately the latest version shows a splash screen and hangs, perhaps due to some missing EFI support.
[1] https://wiki.ubuntu.com/FirmwareTestSuite
Changes in v3:
- Add new patch to make coreboot detection work in 64-bit code
- Show bit width for all archs, use sizeof(void *)
Changes in v2:
- Add a new patch to indicate 32/64-bit in bdinfo
Simon Glass (7):
x86: Move coreboot-table detection to common 32/64-bit code
x86: Allow building an SPL image for coreboot
x86: Move work-around out of cpu_jump_to_64bit_uboot()
x86: Update SPL for coreboot
x86: coreboot: Allow building an SPL image
x86: Add an indication of 32/64-bit to bdinfo
x86: Add a 64-bit coreboot build
Makefile | 6 ++++ arch/x86/cpu/Makefile | 4 ++- arch/x86/cpu/coreboot/Kconfig | 1 + arch/x86/cpu/coreboot/Makefile | 8 ++++- arch/x86/cpu/coreboot/coreboot.c | 3 +- arch/x86/cpu/coreboot/coreboot_spl.c | 12 +++++++ arch/x86/cpu/cpu.c | 25 +++++++++++++++ arch/x86/cpu/i386/cpu.c | 36 +-------------------- arch/x86/cpu/intel_common/Makefile | 2 ++ arch/x86/cpu/x86_64/cpu.c | 2 ++ arch/x86/dts/coreboot-u-boot.dtsi | 18 +++++++++++ arch/x86/lib/spl.c | 23 ++++++++++--- board/coreboot/coreboot/MAINTAINERS | 7 ++++ cmd/bdinfo.c | 20 ++++++++++++ configs/coreboot64_defconfig | 48 ++++++++++++++++++++++++++++ doc/board/coreboot/coreboot.rst | 10 ++++++ 16 files changed, 183 insertions(+), 42 deletions(-) create mode 100644 arch/x86/cpu/coreboot/coreboot_spl.c create mode 100644 arch/x86/dts/coreboot-u-boot.dtsi create mode 100644 configs/coreboot64_defconfig
Signature · 1 line
2.26.2.526.g744177e7f7-goog
PATCH v3 1/7 x86: Move coreboot-table detection to common 32/64-bit code
At present this function is only available in 32-bit code. Move it to the common cpu file so it can be used by 64-bit U-Boot too.
---
Changes in v3:
- Add new patch to make coreboot detection work in 64-bit code
Changes in v2: None
arch/x86/cpu/cpu.c | 25 +++++++++++++++++++++++++ arch/x86/cpu/i386/cpu.c | 26 +------------------------- 2 files changed, 26 insertions(+), 25 deletions(-)
arch/x86/cpu/cpu.c +25 -0
@@ -290,3 +290,28 @@ int reserve_arch(void) return 0; }#endif + +long detect_coreboot_table_at (ulong start,ulong size) +{ +u32 *ptr, *end; + + size /=4 ; +for (ptr = (void *)start, end = ptr + size; ptr < end; ptr +=4 ) { +if (*ptr ==0x4f49424c )/* "LBIO" */ +return (long )ptr; + } + +return -ENOENT ; +} + +long locate_coreboot_table (void ) +{ +long addr; + +/* We look for LBIO in the first 4K of RAM and again@960KB */ + addr =detect_coreboot_table_at (0x0 ,0x1000 ); +if (addr <0 ) + addr =detect_coreboot_table_at (0xf0000 ,0x1000 ); + +return addr; +}
arch/x86/cpu/i386/cpu.c +1 -25
@@ -24,6 +24,7 @@#include <malloc.h> #include <spl.h> #include <asm/control_regs.h> +#include <asm/coreboot_tables.h> #include <asm/cpu.h> #include <asm/mp.h> #include <asm/msr.h>
@@ -447,31 +448,6 @@ int x86_cpu_init_f(void)return 0 ; } -long detect_coreboot_table_at (ulong start,ulong size) -{ -u32 *ptr, *end; - - size /=4 ; -for (ptr = (void *)start, end = ptr + size; ptr < end; ptr +=4 ) { -if (*ptr ==0x4f49424c )/* "LBIO" */ -return (long )ptr; - } - -return -ENOENT ; -} - -long locate_coreboot_table (void ) -{ -long addr; - -/* We look for LBIO in the first 4K of RAM and again@960KB */ - addr =detect_coreboot_table_at (0x0 ,0x1000 ); -if (addr <0 ) - addr =detect_coreboot_table_at (0xf0000 ,0x1000 ); - -return addr; -} -int x86_cpu_reinit_f (void ) {setup_identity ();
Signature · 1 line
2.26.2.526.g744177e7f7-goog
PATCH v3 1/7 x86: Move coreboot-table detection to common 32/64-bit code
Quoted 7 lines · Simon Glass
At present this function is only available in 32-bit code. Move it to the common cpu file so it can be used by 64-bit U-Boot too.
Signed-off-by Simon Glass <[email protected]>---
Quoted 9 lines
Changes in v3:
- Add new patch to make coreboot detection work in 64-bit codeChanges in v2: None
arch/x86/cpu/cpu.c | 25 +++++++++++++++++++++++++ arch/x86/cpu/i386/cpu.c | 26 +------------------------- 2 files changed, 26 insertions(+), 25 deletions(-)
PATCH v3 1/7 x86: Move coreboot-table detection to common 32/64-bit code
Quoted 14 lines · Bin Meng
Quoted 12 lines · Simon Glass
At present this function is only available in 32-bit code. Move it to the common cpu file so it can be used by 64-bit U-Boot too.
Signed-off-by Simon Glass <[email protected]>---
Changes in v3:
- Add new patch to make coreboot detection work in 64-bit codeChanges in v2: None
Quoted 7 lines
Quoted 4 lines
arch/x86/cpu/cpu.c | 25 +++++++++++++++++++++++++ arch/x86/cpu/i386/cpu.c | 26 +------------------------- 2 files changed, 26 insertions(+), 25 deletions(-)Reviewed-by Bin Meng <[email protected]>Tested-by Bin Meng <[email protected]>
applied to u-boot-x86, thanks!
PATCH v3 2/7 x86: Allow building an SPL image for coreboot
In reply to Simon GlassCoreboot runs in 32-bit mode and cannot run a 64-bit U-Boot. To get around this we can build a combined image with 32-bit SPL and 64-bit U-Boot. Add a build rule and binman definition for this.
---
Changes in v3: None
Changes in v2: None
Makefile | 6 ++++++ arch/x86/cpu/coreboot/Kconfig | 1 + arch/x86/dts/coreboot-u-boot.dtsi | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 arch/x86/dts/coreboot-u-boot.dtsi
Makefile +6 -0
@@ -926,6 +926,9 @@ ALL-$(CONFIG_EFI_STUB) += u-boot-payload.efi ifneq ($(BUILD_ROM)$(CONFIG_BUILD_ROM),) ALL-$(CONFIG_X86_RESET_VECTOR) += u-boot.rom endif +ifeq ($(CONFIG_SYS_COREBOOT)$(CONFIG_SPL),yy) +ALL-$(CONFIG_BINMAN) += u-boot-x86-with-spl.bin +endif # Build a combined spl + u-boot image for sunxi ifeq ($(CONFIG_ARCH_SUNXI)$(CONFIG_SPL),yy)
@@ -1626,6 +1629,9 @@ u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.itb FORCE endif endif +u-boot-x86-with-spl.bin: spl/u-boot-spl.bin u-boot.bin FORCE + $(call if_changed,binman) + ifneq ($(CONFIG_TEGRA),) ifneq ($(CONFIG_BINMAN),) # Makes u-boot-dtb-tegra.bin u-boot-tegra.bin u-boot-nodtb-tegra.bin
arch/x86/cpu/coreboot/Kconfig +1 -0
@@ -25,5 +25,6 @@ config SYS_COREBOOT imply FS_CBFS imply CBMEM_CONSOLE imply X86_TSC_READ_BASE + select BINMAN if X86_64 endif
arch/x86/dts/coreboot-u-boot.dtsi new file +18 -0
@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2020 Google LLC + * Written by Simon Glass <[email protected]> + */ + +#include <config.h> + +/ { + binman { + filename = "u-boot-x86-with-spl.bin"; + u-boot-spl { + }; + u-boot { + offset = <0x10000>; + }; + }; +};
Signature · 1 line
2.26.2.526.g744177e7f7-goog
PATCH v3 2/7 x86: Allow building an SPL image for coreboot
Quoted 8 lines · Simon Glass
Coreboot runs in 32-bit mode and cannot run a 64-bit U-Boot. To get around this we can build a combined image with 32-bit SPL and 64-bit U-Boot. Add a build rule and binman definition for this.
Signed-off-by Simon Glass <[email protected]>---
Quoted 9 lines
Changes in v3: None
Changes in v2: NoneMakefile | 6 ++++++ arch/x86/cpu/coreboot/Kconfig | 1 + arch/x86/dts/coreboot-u-boot.dtsi | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 arch/x86/dts/coreboot-u-boot.dtsi
PATCH v3 2/7 x86: Allow building an SPL image for coreboot
Quoted 20 lines · Bin Meng
Quoted 8 lines · Simon Glass
Coreboot runs in 32-bit mode and cannot run a 64-bit U-Boot. To get around this we can build a combined image with 32-bit SPL and 64-bit U-Boot. Add a build rule and binman definition for this.
Signed-off-by Simon Glass <[email protected]>---
Quoted 9 lines
Changes in v3: None
Changes in v2: NoneMakefile | 6 ++++++ arch/x86/cpu/coreboot/Kconfig | 1 + arch/x86/dts/coreboot-u-boot.dtsi | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 arch/x86/dts/coreboot-u-boot.dtsi
Quoted 2 lines
Reviewed-by Bin Meng <[email protected]>Tested-by Bin Meng <[email protected]>
applied to u-boot-x86, thanks!
PATCH v3 3/7 x86: Move work-around out of cpu_jump_to_64bit_uboot()
In reply to Simon GlassAt present this function copies U-Boot from the last 1MB of ROM. This is not the right way to do it. Instead, the binman symbol should provide the location.
But in any case the code should live in the caller, spl_board_load_image(), so that the 64-bit jump function can be used elsewhere. Move it.
---
Changes in v3: None
Changes in v2: None
arch/x86/cpu/i386/cpu.c | 10 ---------- arch/x86/lib/spl.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 10 deletions(-)
arch/x86/cpu/i386/cpu.c +0 -10
@@ -614,16 +614,6 @@ int cpu_jump_to_64bit_uboot(ulong target) func = (func_t )ptr; -/* -* Copy U-Boot from ROM -* TODO(sjg at chromium.org): Figure out a way to get the text base -* correctly here, and in the device-tree binman definition. -* -* Also consider using FIT so we get the correct image length and -* parameters. -*/ -memcpy ((char *)target, (char *)0xfff00000 ,0x100000 ); -/* Jump to U-Boot */ func ((ulong )pgtable,0 , (ulong )target);
arch/x86/lib/spl.c +13 -0
@@ -207,6 +207,19 @@ static int spl_board_load_image(struct spl_image_info *spl_image, spl_image->os =IH_OS_U_BOOT ; spl_image->name ="U-Boot" ; +if (!IS_ENABLED (CONFIG_SYS_COREBOOT )) { +/* +* Copy U-Boot from ROM +* TODO(sjg at chromium.org): Figure out a way to get the text base +* correctly here, and in the device-tree binman definition. +* +* Also consider using FIT so we get the correct image length +* and parameters. +*/ +memcpy ((char *)spl_image->load_addr, (char *)0xfff00000 , +0x100000 ); + } +debug ("Loading to %lx\n" , spl_image->load_addr);return 0 ;
Signature · 1 line
2.26.2.526.g744177e7f7-goog
PATCH v3 3/7 x86: Move work-around out of cpu_jump_to_64bit_uboot()
Quoted 10 lines · Simon Glass
At present this function copies U-Boot from the last 1MB of ROM. This is not the right way to do it. Instead, the binman symbol should provide the location.
But in any case the code should live in the caller,
spl_board_load_image(), so that the 64-bit jump function can be used elsewhere. Move it.Signed-off-by Simon Glass <[email protected]>
Quoted 9 lines
---
Changes in v3: None
Changes in v2: Nonearch/x86/cpu/i386/cpu.c | 10 ---------- arch/x86/lib/spl.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 10 deletions(-)
PATCH v3 3/7 x86: Move work-around out of cpu_jump_to_64bit_uboot()
Quoted 17 lines · Bin Meng
Quoted 15 lines · Simon Glass
At present this function copies U-Boot from the last 1MB of ROM. This is not the right way to do it. Instead, the binman symbol should provide the location.
But in any case the code should live in the caller,
spl_board_load_image(), so that the 64-bit jump function can be used elsewhere. Move it.Signed-off-by Simon Glass <[email protected]>---
Changes in v3: None
Changes in v2: None
Quoted 7 lines
Quoted 4 lines
arch/x86/cpu/i386/cpu.c | 10 ---------- arch/x86/lib/spl.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 10 deletions(-)Reviewed-by Bin Meng <[email protected]>Tested-by Bin Meng <[email protected]>
applied to u-boot-x86, thanks!
PATCH v3 4/7 x86: Update SPL for coreboot
In reply to Simon GlassAt present SPL only works on bare-metal builds. With a few tweaks it can be used for coreboot also.
---
Changes in v3: None
Changes in v2: None
arch/x86/lib/spl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
arch/x86/lib/spl.c +6 -4
@@ -63,7 +63,7 @@ static int x86_spl_init(void)* is not needed. We could make this a CONFIG option or perhaps * place it immediately below CONFIG_SYS_TEXT_BASE. */ -char *ptr = (char *)0x110000 ; +__maybe_unused char *ptr = (char *)0x110000 ;#else struct udevice *punit;#endif
@@ -111,7 +111,8 @@ static int x86_spl_init(void) __func__, ret); } -#ifndef CONFIG_TPL +#ifndef CONFIG_SYS_COREBOOT +# ifndef CONFIG_TPL memset (&__bss_start,0 , (ulong )&__bss_end - (ulong )&__bss_start);/* TODO(sjg at chromium.org): Consider calling cpu_init_r() here */
@@ -140,7 +141,7 @@ static int x86_spl_init(void) return ret; }mtrr_commit (true); -#else +# else ret =syscon_get_by_driver_data (X86_SYSCON_PUNIT , &punit);if (ret)debug ("Could not find PUNIT (err=%d)\n" , ret);
@@ -148,6 +149,7 @@ static int x86_spl_init(void) ret =set_max_freq ();if (ret)debug ("Failed to set CPU frequency (err=%d)\n" , ret); +# endif #endif return 0 ;
@@ -162,7 +164,7 @@ void board_init_f(ulong flags)debug ("Error %d\n" , ret);panic ("x86_spl_init fail" ); } -#ifdef CONFIG_TPL +#if IS_ENABLED (CONFIG_TPL ) ||IS_ENABLED (CONFIG_SYS_COREBOOT ) gd->bd =malloc (sizeof (*gd->bd));if (!gd->bd) {printf ("Out of memory for bd_info size %x\n" ,sizeof (*gd->bd));
Signature · 1 line
2.26.2.526.g744177e7f7-goog
PATCH v3 4/7 x86: Update SPL for coreboot
Quoted 4 lines · Simon Glass
At present SPL only works on bare-metal builds. With a few tweaks it can be used for coreboot also.
Quoted 9 lines
Signed-off-by Simon Glass <[email protected]>---
Changes in v3: None
Changes in v2: Nonearch/x86/lib/spl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
PATCH v3 4/7 x86: Update SPL for coreboot
Quoted 12 lines · Bin Meng
Quoted 10 lines · Simon Glass
At present SPL only works on bare-metal builds. With a few tweaks it can be used for coreboot also.
Signed-off-by Simon Glass <[email protected]>---
Changes in v3: None
Changes in v2: None
Quoted 6 lines
Quoted 3 lines
arch/x86/lib/spl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)Reviewed-by Bin Meng <[email protected]>Tested-by Bin Meng <[email protected]>
applied to u-boot-x86, thanks!
PATCH v3 5/7 x86: coreboot: Allow building an SPL image
In reply to Simon GlassMake a few adjustments to allow us to build an SPL image for coreboot.
---
Changes in v3: None
Changes in v2: None
arch/x86/cpu/Makefile | 4 +++- arch/x86/cpu/coreboot/Makefile | 8 +++++++- arch/x86/cpu/coreboot/coreboot.c | 3 ++- arch/x86/cpu/coreboot/coreboot_spl.c | 12 ++++++++++++ arch/x86/cpu/intel_common/Makefile | 2 ++ arch/x86/cpu/x86_64/cpu.c | 2 ++ 6 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 arch/x86/cpu/coreboot/coreboot_spl.c
arch/x86/cpu/Makefile +3 -1
@@ -54,9 +54,11 @@ obj-$(CONFIG_INTEL_QUARK) += quark/ obj-$(CONFIG_INTEL_QUEENSBAY) += queensbay/ obj-$(CONFIG_INTEL_TANGIER) += tangier/ obj-$(CONFIG_APIC) += lapic.o ioapic.o -obj-$(CONFIG_$(SPL_TPL_)X86_32BIT_INIT) += irq.o obj-$(CONFIG_$(SPL_TPL_)ACPI_GPE) += acpi_gpe.o obj-$(CONFIG_QFW) += qfw_cpu.o +ifndef CONFIG_SYS_COREBOOT +obj-$(CONFIG_$(SPL_TPL_)X86_32BIT_INIT) += irq.o +endif ifndef CONFIG_$(SPL_)X86_64 obj-$(CONFIG_SMP) += mp_init.o endif
arch/x86/cpu/coreboot/Makefile +7 -1
@@ -11,8 +11,14 @@ # (C) Copyright 2002 # Daniel Engstr?m, Omicron Ceti AB, daniel at omicron.se. +ifndef CONFIG_SPL obj-y += car.o +endif +ifdef CONFIG_SPL_BUILD +obj-y += coreboot_spl.o +else +obj-y += sdram.o +endif obj-y += coreboot.o obj-y += tables.o -obj-y += sdram.o obj-y += timestamp.o
arch/x86/cpu/coreboot/coreboot.c +2 -1
@@ -27,7 +27,8 @@ int arch_cpu_init(void)timestamp_init (); -return x86_cpu_init_f (); +return IS_ENABLED (CONFIG_X86_RUN_64BIT ) ?x86_cpu_reinit_f () : +x86_cpu_init_f (); }int checkcpu (void )
arch/x86/cpu/coreboot/coreboot_spl.c new file +12 -0
@@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright 2020 Google LLC +*/ + +#include <common.h> +#include <init.h> + +int dram_init (void ) +{ +return 0 ; +}
arch/x86/cpu/intel_common/Makefile +2 -0
@@ -32,6 +32,8 @@ obj-$(CONFIG_HAVE_P2SB) += p2sb.o ifdef CONFIG_SPL ifndef CONFIG_SPL_BUILD +ifndef CONFIG_SYS_COREBOOT obj-y += cpu_from_spl.o endif endif +endif
arch/x86/cpu/x86_64/cpu.c +2 -0
@@ -53,6 +53,7 @@ int misc_init_r(void)return 0 ; } +#ifndef CONFIG_SYS_COREBOOT int checkcpu (void ) {return 0 ;
@@ -62,6 +63,7 @@ int print_cpuinfo(void) {return 0 ; } +#endif int x86_cpu_reinit_f (void ) {
Signature · 1 line
2.26.2.526.g744177e7f7-goog
PATCH v3 5/7 x86: coreboot: Allow building an SPL image
Quoted 9 lines · Simon Glass
Make a few adjustments to allow us to build an SPL image for coreboot.
Signed-off-by Simon Glass <[email protected]>---
Changes in v3: None
Changes in v2: None
Quoted 9 lines
arch/x86/cpu/Makefile | 4 +++- arch/x86/cpu/coreboot/Makefile | 8 +++++++- arch/x86/cpu/coreboot/coreboot.c | 3 ++- arch/x86/cpu/coreboot/coreboot_spl.c | 12 ++++++++++++ arch/x86/cpu/intel_common/Makefile | 2 ++ arch/x86/cpu/x86_64/cpu.c | 2 ++ 6 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 arch/x86/cpu/coreboot/coreboot_spl.c
PATCH v3 5/7 x86: coreboot: Allow building an SPL image
Quoted 21 lines · Bin Meng
Quoted 9 lines · Simon Glass
Make a few adjustments to allow us to build an SPL image for coreboot.
Signed-off-by Simon Glass <[email protected]>---
Changes in v3: None
Changes in v2: NoneQuoted 9 lines
arch/x86/cpu/Makefile | 4 +++- arch/x86/cpu/coreboot/Makefile | 8 +++++++- arch/x86/cpu/coreboot/coreboot.c | 3 ++- arch/x86/cpu/coreboot/coreboot_spl.c | 12 ++++++++++++ arch/x86/cpu/intel_common/Makefile | 2 ++ arch/x86/cpu/x86_64/cpu.c | 2 ++ 6 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 arch/x86/cpu/coreboot/coreboot_spl.c
Quoted 2 lines
Reviewed-by Bin Meng <[email protected]>Tested-by Bin Meng <[email protected]>
applied to u-boot-x86, thanks!
PATCH v3 6/7 x86: Add an indication of 32/64-bit to bdinfo
In reply to Simon GlassIt is useful to know what mode U-Boot is running in. Add a message at the end of the 'bdinfo' output.
---
Changes in v3:
- Show bit width for all archs, use sizeof(void *)
Changes in v2:
- Add a new patch to indicate 32/64-bit in bdinfo
cmd/bdinfo.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
cmd/bdinfo.c +20 -0
@@ -15,6 +15,11 @@DECLARE_GLOBAL_DATA_PTR ; +__maybe_unused void print_cpu_word_size (void ) +{ +printf ("%-12s= %d-bit\n" ,"Build" , (uint )sizeof (void *) *8 ); +} +__maybe_unused static void print_num (const char *name,ulong value) {
@@ -208,6 +213,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])print_baudrate ();print_num ("relocaddr" , gd->relocaddr);board_detail (); +print_cpu_word_size (); +return 0 ; }
@@ -227,6 +234,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])print_eth_ip_addr ();print_baudrate (); +print_cpu_word_size ();return 0 ; }
@@ -252,6 +260,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])print_num ("fdt_blob" , (ulong )gd->fdt_blob);print_num ("new_fdt" , (ulong )gd->new_fdt);print_num ("fdt_size" , (ulong )gd->fdt_size); +print_cpu_word_size ();return 0 ; }
@@ -283,6 +292,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])#endif print_eth_ip_addr ();print_baudrate (); +print_cpu_word_size ();return 0 ; }
@@ -294,6 +304,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])print_std_bdinfo (gd->bd);print_num ("relocaddr" , gd->relocaddr);print_num ("reloc off" , gd->reloc_off); +print_cpu_word_size ();return 0 ; }
@@ -354,6 +365,7 @@ static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc,#endif if (gd->fdt_blob)print_num ("fdt_blob" , (ulong )gd->fdt_blob); +print_cpu_word_size ();return 0 ; }
@@ -368,6 +380,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])print_bi_flash (bd);print_eth_ip_addr ();print_baudrate (); +print_cpu_word_size (); +return 0 ; }
@@ -388,6 +402,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])print_mhz ("ethspeed" , bd->bi_ethspeed);#endif print_baudrate (); +print_cpu_word_size ();return 0 ; }
@@ -405,6 +420,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])#if defined(CONFIG_LCD ) || defined(CONFIG_VIDEO )print_num ("FB base " , gd->fb_base);#endif +print_cpu_word_size (); +return 0 ; }
@@ -419,6 +436,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])print_bi_dram (bd);print_eth_ip_addr ();print_baudrate (); +print_cpu_word_size ();return 0 ; }
@@ -435,6 +453,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])print_num ("reloc off" , gd->reloc_off);print_eth_ip_addr ();print_baudrate (); +print_cpu_word_size ();return 0 ; }
@@ -448,6 +467,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])print_bi_mem (bd);print_eth_ip_addr ();print_baudrate (); +print_cpu_word_size ();return 0 ; }
Signature · 1 line
2.26.2.526.g744177e7f7-goog
PATCH v3 6/7 x86: Add an indication of 32/64-bit to bdinfo
Am May 1, 2020 3:21:44 AM UTC schrieb Simon Glass <[email protected]>:
Quoted 22 lines
It is useful to know what mode U-Boot is running in. Add a message at the
end of the 'bdinfo' output.Signed-off-by Simon Glass <[email protected]>Suggested-by Mark Kettenis <[email protected]>---
Changes in v3:
- Show bit width for all archs, usesizeof(void *)Changes in v2:
- Add a new patch to indicate 32/64-bit in bdinfo
cmd/bdinfo.c| 20 ++++++++++++++++++++1 file changed, 20 insertions(+)cmd/bdinfo.c +0
-0
cmd/bdinfo.c line 20
Quoted 6 lines
cmd/bdinfo.c +3
-0@@ -15,6 +15,11 @@DECLARE_GLOBAL_DATA_PTR ; +__maybe_unused void print_cpu_word_size (void ) +{ +printf ("%-12s= %d-bit\n" ,"Build" , (uint )sizeof (void *) *8 );
%d and uint do not match. Please, use %u for unsigned int.
Best regards
Heinrich
Quoted 116 lines
cmd/bdinfo.c +2
-0+} +
__maybe_unused
static voidprint_num(const char *name, ulong value){cmd/bdinfo.c +3
-0@@ -208,6 +213,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])print_baudrate ();print_num ("relocaddr" , gd->relocaddr);board_detail (); +print_cpu_word_size (); +return 0 ; }@@ -227,6 +234,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])print_eth_ip_addr ();print_baudrate (); +print_cpu_word_size ();return 0 ;}
cmd/bdinfo.c +1
-0@@ -252,6 +260,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_num("fdt_blob", (ulong)gd->fdt_blob);print_num ("new_fdt" , (ulong )gd->new_fdt);print_num ("fdt_size" , (ulong )gd->fdt_size); +print_cpu_word_size ();return 0 ;}
cmd/bdinfo.c +1
-0@@ -283,6 +292,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])#endif print_eth_ip_addr ();print_baudrate (); +print_cpu_word_size ();return 0 ;}
cmd/bdinfo.c +1
-0@@ -294,6 +304,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_std_bdinfo(gd->bd);print_num ("relocaddr" , gd->relocaddr);print_num ("reloc off" , gd->reloc_off); +print_cpu_word_size ();return 0 ;}
cmd/bdinfo.c +1
-0@@ -354,6 +365,7 @@ static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc,#endif if (gd->fdt_blob)print_num ("fdt_blob" , (ulong )gd->fdt_blob); +print_cpu_word_size ();return 0 ;}
cmd/bdinfo.c +3
-0@@ -368,6 +380,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])print_bi_flash (bd );print_eth_ip_addr ();print_baudrate (); +print_cpu_word_size (); +return 0 ; }@@ -388,6 +402,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_mhz("ethspeed", bd->bi_ethspeed);#endif print_baudrate (); +print_cpu_word_size ();return 0 ;}
cmd/bdinfo.c +3
-0@@ -405,6 +420,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])#if defined(CONFIG_LCD ) || defined(CONFIG_VIDEO )print_num ("FB base " , gd->fb_base);#endif +print_cpu_word_size (); +return 0 ; }@@ -419,6 +436,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])print_bi_dram (bd );print_eth_ip_addr ();print_baudrate (); +print_cpu_word_size ();return 0 ;}
cmd/bdinfo.c +1
-0@@ -435,6 +453,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_num("reloc off", gd->reloc_off);print_eth_ip_addr ();print_baudrate (); +print_cpu_word_size ();return 0 ;}
cmd/bdinfo.c +1
-0@@ -448,6 +467,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])print_bi_mem (bd );print_eth_ip_addr ();print_baudrate (); +print_cpu_word_size ();return 0 ;}
PATCH v3 6/7 x86: Add an indication of 32/64-bit to bdinfo
Hi Heinrich,
Quoted 25 lines · Heinrich Schuchardt
Am May 1, 2020 3:21:44 AM UTC schrieb Simon Glass <[email protected]>:
Quoted 23 lines
It is useful to know what mode U-Boot is running in. Add a message at the
end of the 'bdinfo' output.Signed-off-by Simon Glass <[email protected]>Suggested-by Mark Kettenis <[email protected]>---
Changes in v3:
- Show bit width for all archs, usesizeof(void *)Changes in v2:
- Add a new patch to indicate 32/64-bit in bdinfo
cmd/bdinfo.c| 20 ++++++++++++++++++++1 file changed, 20 insertions(+)cmd/bdinfo.c +0
-0@@ -15,6 +15,11 @@
Quoted 7 lines
cmd/bdinfo.c line 20
Quoted 5 lines
cmd/bdinfo.c +3
-0DECLARE_GLOBAL_DATA_PTR ; +__maybe_unused void print_cpu_word_size (void ) +{ +printf ("%-12s= %d-bit\n" ,"Build" , (uint )sizeof (void *) *8 );%d and uint do not match. Please, use %u for unsigned int.
Yes I was thinking that but somehow managed to change one without the other.
Regards,
SImon
PATCH v3 7/7 x86: Add a 64-bit coreboot build
In reply to Simon GlassAdd a build for running 64-bit U-Boot from coreboot (which is 32-bit). This uses binman to create an image with a 32-bit SPL and a 64-bit U-Boot.
Coreboot boots into SPL and then SPL boots into U-Boot.
This allows running 64-bit EFI images on x86.
---
Changes in v3: None
Changes in v2: None
board/coreboot/coreboot/MAINTAINERS | 7 +++++ configs/coreboot64_defconfig | 48 +++++++++++++++++++++++++++++ doc/board/coreboot/coreboot.rst | 10 ++++++ 3 files changed, 65 insertions(+) create mode 100644 configs/coreboot64_defconfig
board/coreboot/coreboot/MAINTAINERS +7 -0
@@ -4,3 +4,10 @@ S: Maintained F: board/coreboot/coreboot/ F: include/configs/chromebook_link.h F: configs/coreboot_defconfig + +COREBOOT64 BOARD +M: Simon Glass <[email protected]> +S: Maintained +F: board/coreboot/coreboot/ +F: include/configs/chromebook_link.h +F: configs/coreboot64_defconfig
configs/coreboot64_defconfig new file +48 -0
48 lines not on this page · raw message
doc/board/coreboot/coreboot.rst +10 -0
@@ -40,3 +40,13 @@ To enable video you must enable these options in coreboot: At present it seems that for Minnowboard Max, coreboot does not pass through the video information correctly (it always says the resolution is 0x0). This works correctly for link though. + +64-bit U-Boot +------------- + +In addition to the 32-bit 'coreboot' build there is a 'coreboot64' build. This +produces an image which can be booted from coreboot (32-bit). Internally it +works by using a 32-bit SPL binary to switch to 64-bit for running U-Boot. It +can be useful for running UEFI applications, for example. + +This has only been lightly tested.
Signature · 1 line
2.26.2.526.g744177e7f7-goog
PATCH v3 7/7 x86: Add a 64-bit coreboot build
Am May 1, 2020 3:21:45 AM UTC schrieb Simon Glass <[email protected]>:
Quoted 46 lines
Add a build for running 64-bit U-Boot from coreboot (which is 32-bit). This uses binman to create an image with a 32-bit SPL and a 64-bit U-Boot.
Coreboot boots into SPL and then SPL boots into U-Boot.
This allows running 64-bit EFI images on x86.
Signed-off-by Simon Glass <[email protected]>---
Changes in v3: None
Changes in v2: Noneboard/coreboot/coreboot/MAINTAINERS | 7 +++++ configs/coreboot64_defconfig | 48 +++++++++++++++++++++++++++++ doc/board/coreboot/coreboot.rst | 10 ++++++ 3 files changed, 65 insertions(+)create mode 100644 configs/coreboot64_defconfig
board/coreboot/coreboot/MAINTAINERS +0
-0@@ -4,3 +4,10 @@ S: MaintainedF: board/coreboot/coreboot/
F:include/configs/chromebook_link.h
F: configs/coreboot_defconfigboard/coreboot/coreboot/MAINTAINERS +7
-0+ +COREBOOT64 BOARD +M: Simon Glass <[email protected]> +S: Maintained +F: board/coreboot/coreboot/ +F: include/configs/chromebook_link.h +F: configs/coreboot64_defconfigconfigs/coreboot64_defconfig new file +4
-0@@ -0,0 +1,48 @@ +CONFIG_X86=y +CONFIG_SYS_TEXT_BASE=0x1120000 +CONFIG_ENV_SIZE=0x1000 +CONFIG_NR_DRAM_BANKS=8
configs/coreboot64_defconfig line 14
Quoted 10 lines
configs/coreboot64_defconfig new file +10
-0+CONFIG_PRE_CON_BUF_ADDR=0x100000 +CONFIG_X86_RUN_64BIT=y +CONFIG_VENDOR_COREBOOT=y +CONFIG_TARGET_COREBOOT=y +CONFIG_SPL_TEXT_BASE=0x1110000 +CONFIG_FIT=y +CONFIG_FIT_SIGNATURE=y +CONFIG_SHOW_BOOT_PROGRESS=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
Isn't this defconfig for a generic coreboot device? So why would you prescribe a boot partition which may not exist? And what should a non-Linux OS do with 'init='?
Best regards
Heinrich
Quoted 59 lines
configs/coreboot64_defconfig new file +34
-0+CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_LAST_STAGE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_IDE=y +CONFIG_CMD_MMC=y +CONFIG_CMD_PART=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y +# CONFIG_CMD_NFS is not set +CONFIG_CMD_PING=y +CONFIG_CMD_TIME=y +CONFIG_CMD_SOUND=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_MAC_PARTITION=y +# CONFIG_SPL_MAC_PARTITION is not set +# CONFIG_SPL_DOS_PARTITION is not set +CONFIG_ISO_PARTITION=y +CONFIG_EFI_PARTITION=y +# CONFIG_SPL_EFI_PARTITION is not set +CONFIG_DEFAULT_DEVICE_TREE="coreboot" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y +# CONFIG_PCI_PNP is not set +CONFIG_SOUND=y +CONFIG_SOUND_I8254=y +CONFIG_CONSOLE_SCROLL_LINES=5doc/board/coreboot/coreboot.rst +0
-0@@ -40,3 +40,13 @@ To enable video you must enable these options incoreboot:
At present it seems that for Minnowboard Max, coreboot does not pass through
the video information correctly (it always says the resolution is0x0). This
works correctly for link though.doc/board/coreboot/coreboot.rst +5
-0+ +64-bit U-Boot +------------- + +In addition to the 32-bit 'coreboot' build there is a 'coreboot64'build. This
+produces an image which can be booted from coreboot (32-bit). Internally it
+works by using a 32-bit SPL binary to switch to 64-bit for running U-Boot. Itdoc/board/coreboot/coreboot.rst +3
-0+can be useful for running UEFI applications, for example. + +This has only been lightly tested.
PATCH v3 7/7 x86: Add a 64-bit coreboot build
HI Heinrich,
Quoted 52 lines · Heinrich Schuchardt
Am May 1, 2020 3:21:45 AM UTC schrieb Simon Glass <[email protected]>:
Quoted 50 lines
Add a build for running 64-bit U-Boot from coreboot (which is 32-bit). This uses binman to create an image with a 32-bit SPL and a 64-bit U-Boot.
Coreboot boots into SPL and then SPL boots into U-Boot.
This allows running 64-bit EFI images on x86.
Signed-off-by Simon Glass <[email protected]>---
Changes in v3: None
Changes in v2: Noneboard/coreboot/coreboot/MAINTAINERS | 7 +++++ configs/coreboot64_defconfig | 48 +++++++++++++++++++++++++++++ doc/board/coreboot/coreboot.rst | 10 ++++++ 3 files changed, 65 insertions(+)create mode 100644 configs/coreboot64_defconfig
board/coreboot/coreboot/MAINTAINERS +0
-0@@ -4,3 +4,10 @@ S: MaintainedF: board/coreboot/coreboot/ F: include/configs/chromebook_link.h F: configs/coreboot_defconfigboard/coreboot/coreboot/MAINTAINERS +7
-0+ +COREBOOT64 BOARD +M: Simon Glass <[email protected]> +S: Maintained +F: board/coreboot/coreboot/ +F: include/configs/chromebook_link.h +F: configs/coreboot64_defconfigconfigs/coreboot64_defconfig new file +8
-0@@ -0,0 +1,48 @@ +CONFIG_X86=y +CONFIG_SYS_TEXT_BASE=0x1120000 +CONFIG_ENV_SIZE=0x1000 +CONFIG_NR_DRAM_BANKS=8 +CONFIG_PRE_CON_BUF_ADDR=0x100000 +CONFIG_X86_RUN_64BIT=y +CONFIG_VENDOR_COREBOOT=y +CONFIG_TARGET_COREBOOT=y
Quoted 8 lines
configs/coreboot64_defconfig line 14
Quoted 6 lines
configs/coreboot64_defconfig new file +6
-0+CONFIG_SPL_TEXT_BASE=0x1110000 +CONFIG_FIT=y +CONFIG_FIT_SIGNATURE=y +CONFIG_SHOW_BOOT_PROGRESS=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"Isn't this defconfig for a generic coreboot device? So why would you prescribe a boot partition which may not exist? And what should a non-Linux OS do with 'init='?
What do you suggest?
This matches the coreboot board and is the default boot device on one board that uses this.
Perhaps we should be finding out the bootdevice from coreboot? But in any case, people can add their own script.
Regards,
Simon
PATCH v3 7/7 x86: Add a 64-bit coreboot build
Am May 1, 2020 4:04:06 AM UTC schrieb Simon Glass <[email protected]>:
Quoted 66 lines
HI Heinrich,
Quoted 3 lines · Heinrich Schuchardt
Am May 1, 2020 3:21:45 AM UTC schrieb Simon Glass <[email protected]>:
Quoted 1 line
Add a build for running 64-bit U-Boot from coreboot (which is
32-bit).
Quoted 9 lines
Quoted 9 lines
This uses binman to create an image with a 32-bit SPL and a 64-bit U-Boot.
Coreboot boots into SPL and then SPL boots into U-Boot.
This allows running 64-bit EFI images on x86.
Signed-off-by Simon Glass <[email protected]>---
Quoted 5 lines
Quoted 5 lines
Changes in v3: None
Changes in v2: Noneboard/coreboot/coreboot/MAINTAINERS | 7 +++++
configs/coreboot64_defconfig | 48+++++++++++++++++++++++++++++
Quoted 35 lines
Quoted 35 lines
doc/board/coreboot/coreboot.rst| 10 ++++++3 files changed, 65 insertions(+)create mode 100644 configs/coreboot64_defconfig
board/coreboot/coreboot/MAINTAINERS +0
-0@@ -4,3 +4,10 @@ S: MaintainedF: board/coreboot/coreboot/ F: include/configs/chromebook_link.h F: configs/coreboot_defconfigboard/coreboot/coreboot/MAINTAINERS +7
-0+ +COREBOOT64 BOARD +M: Simon Glass <[email protected]> +S: Maintained +F: board/coreboot/coreboot/ +F: include/configs/chromebook_link.h +F: configs/coreboot64_defconfigconfigs/coreboot64_defconfig new file +8
-0@@ -0,0 +1,48 @@ +CONFIG_X86=y +CONFIG_SYS_TEXT_BASE=0x1120000 +CONFIG_ENV_SIZE=0x1000 +CONFIG_NR_DRAM_BANKS=8 +CONFIG_PRE_CON_BUF_ADDR=0x100000 +CONFIG_X86_RUN_64BIT=y +CONFIG_VENDOR_COREBOOT=y +CONFIG_TARGET_COREBOOT=yQuoted 8 lines
configs/coreboot64_defconfig line 14
Quoted 6 lines
configs/coreboot64_defconfig new file +6
-0+CONFIG_SPL_TEXT_BASE=0x1110000 +CONFIG_FIT=y +CONFIG_FIT_SIGNATURE=y +CONFIG_SHOW_BOOT_PROGRESS=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"Isn't this defconfig for a generic coreboot device? So why would you
Quoted 8 lines
prescribe a boot partition which may not exist? And what should a non-Linux OS do with 'init='?
What do you suggest?
This matches the coreboot board and is the default boot device on one board that uses this.
I thought this patch series is about boards booted via the fimware "Coreboot" and not a specific board by chance also called "Coreboot". Please, clarify this in the commit message.
And if this defconfig is for a specific board called "Coreboot" couldn't you add some indication of the vendor name to the defconfig filename to avoid further misunderstandings.
Best regards
Heinrich
Quoted 5 lines
Perhaps we should be finding out the bootdevice from coreboot? But in any case, people can add their own script.
Regards,
Simon
PATCH v3 7/7 x86: Add a 64-bit coreboot build
Hi Simon,
Quoted 77 lines · Heinrich Schuchardt
Am May 1, 2020 4:04:06 AM UTC schrieb Simon Glass <[email protected]>:
Quoted 66 lines
HI Heinrich,
Quoted 3 lines · Heinrich Schuchardt
Am May 1, 2020 3:21:45 AM UTC schrieb Simon Glass <[email protected]>:
Quoted 1 line
Add a build for running 64-bit U-Boot from coreboot (which is
32-bit).
Quoted 9 lines
Quoted 9 lines
This uses binman to create an image with a 32-bit SPL and a 64-bit U-Boot.
Coreboot boots into SPL and then SPL boots into U-Boot.
This allows running 64-bit EFI images on x86.
Signed-off-by Simon Glass <[email protected]>---
Quoted 5 lines
Quoted 5 lines
Changes in v3: None
Changes in v2: Noneboard/coreboot/coreboot/MAINTAINERS | 7 +++++
configs/coreboot64_defconfig | 48+++++++++++++++++++++++++++++
Quoted 35 lines
Quoted 35 lines
doc/board/coreboot/coreboot.rst| 10 ++++++3 files changed, 65 insertions(+)create mode 100644 configs/coreboot64_defconfig
board/coreboot/coreboot/MAINTAINERS +0
-0@@ -4,3 +4,10 @@ S: MaintainedF: board/coreboot/coreboot/ F: include/configs/chromebook_link.h F: configs/coreboot_defconfigboard/coreboot/coreboot/MAINTAINERS +7
-0+ +COREBOOT64 BOARD +M: Simon Glass <[email protected]> +S: Maintained +F: board/coreboot/coreboot/ +F: include/configs/chromebook_link.h +F: configs/coreboot64_defconfigconfigs/coreboot64_defconfig new file +8
-0@@ -0,0 +1,48 @@ +CONFIG_X86=y +CONFIG_SYS_TEXT_BASE=0x1120000 +CONFIG_ENV_SIZE=0x1000 +CONFIG_NR_DRAM_BANKS=8 +CONFIG_PRE_CON_BUF_ADDR=0x100000 +CONFIG_X86_RUN_64BIT=y +CONFIG_VENDOR_COREBOOT=y +CONFIG_TARGET_COREBOOT=yQuoted 8 lines
configs/coreboot64_defconfig line 14
Quoted 6 lines
configs/coreboot64_defconfig new file +6
-0+CONFIG_SPL_TEXT_BASE=0x1110000 +CONFIG_FIT=y +CONFIG_FIT_SIGNATURE=y +CONFIG_SHOW_BOOT_PROGRESS=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"Isn't this defconfig for a generic coreboot device? So why would you
Quoted 8 lines
prescribe a boot partition which may not exist? And what should a non-Linux OS do with 'init='?
What do you suggest?
This matches the coreboot board and is the default boot device on one board that uses this.
Quoted 6 lines
I thought this patch series is about boards booted via the fimware "Coreboot" and not a specific board by chance also called "Coreboot". Please, clarify this in the commit message.
And if this defconfig is for a specific board called "Coreboot" couldn't you add some indication of the vendor name to the defconfig filename to avoid further misunderstandings.
Best regards
I left this patch unapplied since Heinrich has some comments. Please rebase the next version on top of u-boot-x86/master.
Regards,
Bin