coreboot-gerrit March 2016

coreboot-gerrit@coreboot.org

1 participants
1119 discussions

Patch set updated for coreboot: libpayload: Fix ARM workaround code
by Stefan Reinauer 13 Mar '16

13 Mar '16

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14076 -gerrit commit 052690c9f9446233a9d87457e385f1b9bcb993c3 Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Sat Mar 12 16:38:17 2016 -0800 libpayload: Fix ARM workaround code _LDFLAGS+="foo" did not work in my shell (bash on Ubuntu 15.10), so change it to _LDFLAGS="$_LDFLAGS foo". I'm mildly surprised that this ever worked. Change-Id: I59c10f34992240c6df2ec7f24aebc6daafb76493 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- payloads/libpayload/bin/lpgcc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payloads/libpayload/bin/lpgcc b/payloads/libpayload/bin/lpgcc index 7511300..b3ef342 100755 --- a/payloads/libpayload/bin/lpgcc +++ b/payloads/libpayload/bin/lpgcc @@ -184,7 +184,7 @@ else if grep -q ARM64_A53_ERRATUM_843419=y $BASE/../libpayload.config && grep -q fix-cortex-a53-843419 $BASE/../libpayload.xcompile; then - _LDFLAGS+=" -Wl,--fix-cortex-a53-843419" + _LDFLAGS="$_LDFLAGS -Wl,--fix-cortex-a53-843419" fi _LDFLAGS="$_LDFLAGS -Wl,--defsym=CONFIG_LP_BASE_ADDRESS=$CONFIG_LP_BASE_ADDRESS"

1 0

Patch set updated for coreboot: libpayload: recreate config files
by Stefan Reinauer 13 Mar '16

13 Mar '16

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14077 -gerrit commit f2616e1087e61bb4d48ab9f9f8e1e71c5dee4263 Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Sat Mar 12 16:51:30 2016 -0800 libpayload: recreate config files Add all the default options with: for i in configs/* do cp $i .config make oldconfig cp .config $i done We should probably switch over to using minimal configs here. Change-Id: If18a32eca4df9e1dfeb0e212b652d972cea8e4b8 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- payloads/libpayload/configs/config.arm64-generic | 9 ++++++++- payloads/libpayload/configs/config.purin | 6 +++++- payloads/libpayload/configs/config.veyron | 6 +++++- payloads/libpayload/configs/defconfig | 7 +++++-- payloads/libpayload/configs/defconfig-arm | 9 +++++++-- payloads/libpayload/configs/defconfig-mips | 8 ++++++-- payloads/libpayload/configs/defconfig-tinycurses | 7 +++++-- 7 files changed, 41 insertions(+), 11 deletions(-) diff --git a/payloads/libpayload/configs/config.arm64-generic b/payloads/libpayload/configs/config.arm64-generic index a2d596c..ff9dec9 100644 --- a/payloads/libpayload/configs/config.arm64-generic +++ b/payloads/libpayload/configs/config.arm64-generic @@ -11,6 +11,7 @@ # CONFIG_LP_DEVELOPER is not set CONFIG_LP_COMPILER_GCC=y # CONFIG_LP_COMPILER_LLVM_CLANG is not set +# CONFIG_LP_MEMMAP_RAM_ONLY is not set # # Architecture Options @@ -19,7 +20,9 @@ CONFIG_LP_COMPILER_GCC=y # CONFIG_LP_ARCH_X86 is not set CONFIG_LP_ARCH_ARM64=y # CONFIG_LP_ARCH_MIPS is not set -# CONFIG_LP_MEMMAP_RAM_ONLY is not set +CONFIG_LP_HEAP_SIZE=131072 +CONFIG_LP_STACK_SIZE=16384 +CONFIG_LP_BASE_ADDRESS=0x80100000 # # Standard Libraries @@ -28,6 +31,7 @@ CONFIG_LP_LIBC=y # CONFIG_LP_CURSES is not set CONFIG_LP_CBFS=y CONFIG_LP_LZMA=y +CONFIG_LP_LZ4=y # # Console Options @@ -48,6 +52,7 @@ CONFIG_LP_TIMER_NONE=y # CONFIG_LP_TIMER_MCT is not set # CONFIG_LP_TIMER_TEGRA_1US is not set # CONFIG_LP_TIMER_IPQ806X is not set +# CONFIG_LP_TIMER_ARMADA38X is not set # CONFIG_LP_TIMER_RK is not set # CONFIG_LP_TIMER_BG4CD is not set # CONFIG_LP_TIMER_CYGNUS is not set @@ -58,6 +63,7 @@ CONFIG_LP_USB=y CONFIG_LP_USB_EHCI=y CONFIG_LP_USB_XHCI=y # CONFIG_LP_USB_XHCI_MTK_QUIRK is not set +# CONFIG_LP_USB_DWC2 is not set CONFIG_LP_USB_HID=y CONFIG_LP_USB_HUB=y # CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set @@ -69,4 +75,5 @@ CONFIG_LP_USB_GEN_HUB=y CONFIG_LP_LITTLE_ENDIAN=y # CONFIG_LP_IO_ADDRESS_SPACE is not set CONFIG_LP_ARCH_SPECIFIC_OPTIONS=y +CONFIG_LP_ARM64_A53_ERRATUM_843419=y CONFIG_LP_DMA_LIM_EXCL=0x1000 diff --git a/payloads/libpayload/configs/config.purin b/payloads/libpayload/configs/config.purin index c4f225b..5b51146 100644 --- a/payloads/libpayload/configs/config.purin +++ b/payloads/libpayload/configs/config.purin @@ -12,6 +12,7 @@ CONFIG_LP_GPL=y CONFIG_LP_COMPILER_GCC=y # CONFIG_LP_COMPILER_LLVM_CLANG is not set # CONFIG_LP_REMOTEGDB is not set +# CONFIG_LP_MEMMAP_RAM_ONLY is not set # # Architecture Options @@ -20,7 +21,9 @@ CONFIG_LP_ARCH_ARM=y # CONFIG_LP_ARCH_X86 is not set # CONFIG_LP_ARCH_ARM64 is not set # CONFIG_LP_ARCH_MIPS is not set -# CONFIG_LP_MEMMAP_RAM_ONLY is not set +CONFIG_LP_HEAP_SIZE=131072 +CONFIG_LP_STACK_SIZE=16384 +CONFIG_LP_BASE_ADDRESS=0x04000000 # # Standard Libraries @@ -56,6 +59,7 @@ CONFIG_LP_8250_SERIAL_CONSOLE=y # CONFIG_LP_TIMER_MCT is not set # CONFIG_LP_TIMER_TEGRA_1US is not set # CONFIG_LP_TIMER_IPQ806X is not set +# CONFIG_LP_TIMER_ARMADA38X is not set # CONFIG_LP_TIMER_RK is not set # CONFIG_LP_TIMER_BG4CD is not set CONFIG_LP_TIMER_CYGNUS=y diff --git a/payloads/libpayload/configs/config.veyron b/payloads/libpayload/configs/config.veyron index 47d54ea..2988ed5 100644 --- a/payloads/libpayload/configs/config.veyron +++ b/payloads/libpayload/configs/config.veyron @@ -12,6 +12,7 @@ CONFIG_LP_GPL=y CONFIG_LP_COMPILER_GCC=y # CONFIG_LP_COMPILER_LLVM_CLANG is not set # CONFIG_LP_REMOTEGDB is not set +# CONFIG_LP_MEMMAP_RAM_ONLY is not set # # Architecture Options @@ -20,7 +21,9 @@ CONFIG_LP_ARCH_ARM=y # CONFIG_LP_ARCH_X86 is not set # CONFIG_LP_ARCH_ARM64 is not set # CONFIG_LP_ARCH_MIPS is not set -# CONFIG_LP_MEMMAP_RAM_ONLY is not set +CONFIG_LP_HEAP_SIZE=131072 +CONFIG_LP_STACK_SIZE=16384 +CONFIG_LP_BASE_ADDRESS=0x04000000 # # Standard Libraries @@ -57,6 +60,7 @@ CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # CONFIG_LP_TIMER_MCT is not set # CONFIG_LP_TIMER_TEGRA_1US is not set # CONFIG_LP_TIMER_IPQ806X is not set +# CONFIG_LP_TIMER_ARMADA38X is not set CONFIG_LP_TIMER_RK=y # CONFIG_LP_TIMER_BG4CD is not set # CONFIG_LP_TIMER_CYGNUS is not set diff --git a/payloads/libpayload/configs/defconfig b/payloads/libpayload/configs/defconfig index 53320e7..1c9c8b5 100644 --- a/payloads/libpayload/configs/defconfig +++ b/payloads/libpayload/configs/defconfig @@ -11,6 +11,7 @@ # CONFIG_LP_DEVELOPER is not set CONFIG_LP_COMPILER_GCC=y # CONFIG_LP_COMPILER_LLVM_CLANG is not set +# CONFIG_LP_MEMMAP_RAM_ONLY is not set # # Architecture Options @@ -19,8 +20,10 @@ CONFIG_LP_COMPILER_GCC=y CONFIG_LP_ARCH_X86=y # CONFIG_LP_ARCH_ARM64 is not set # CONFIG_LP_ARCH_MIPS is not set -# CONFIG_LP_MEMMAP_RAM_ONLY is not set # CONFIG_LP_MULTIBOOT is not set +CONFIG_LP_HEAP_SIZE=131072 +CONFIG_LP_STACK_SIZE=16384 +CONFIG_LP_BASE_ADDRESS=0x00100000 # # Standard Libraries @@ -41,7 +44,6 @@ CONFIG_LP_CBMEM_CONSOLE=y CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y # CONFIG_LP_S5P_SERIAL_CONSOLE is not set -# CONFIG_LP_8250_MMIO32_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_BG4CD_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set @@ -76,6 +78,7 @@ CONFIG_LP_USB_OHCI=y CONFIG_LP_USB_EHCI=y CONFIG_LP_USB_XHCI=y # CONFIG_LP_USB_XHCI_MTK_QUIRK is not set +# CONFIG_LP_USB_DWC2 is not set CONFIG_LP_USB_HID=y CONFIG_LP_USB_HUB=y # CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set diff --git a/payloads/libpayload/configs/defconfig-arm b/payloads/libpayload/configs/defconfig-arm index 5b0ebe6..127767b 100644 --- a/payloads/libpayload/configs/defconfig-arm +++ b/payloads/libpayload/configs/defconfig-arm @@ -11,6 +11,7 @@ # CONFIG_LP_DEVELOPER is not set CONFIG_LP_COMPILER_GCC=y # CONFIG_LP_COMPILER_LLVM_CLANG is not set +# CONFIG_LP_MEMMAP_RAM_ONLY is not set # # Architecture Options @@ -19,7 +20,9 @@ CONFIG_LP_ARCH_ARM=y # CONFIG_LP_ARCH_X86 is not set # CONFIG_LP_ARCH_ARM64 is not set # CONFIG_LP_ARCH_MIPS is not set -# CONFIG_LP_MEMMAP_RAM_ONLY is not set +CONFIG_LP_HEAP_SIZE=131072 +CONFIG_LP_STACK_SIZE=16384 +CONFIG_LP_BASE_ADDRESS=0x04000000 # # Standard Libraries @@ -30,6 +33,7 @@ CONFIG_LP_TINYCURSES=y # CONFIG_LP_PDCURSES is not set CONFIG_LP_CBFS=y CONFIG_LP_LZMA=y +CONFIG_LP_LZ4=y # # Console Options @@ -39,7 +43,6 @@ CONFIG_LP_CBMEM_CONSOLE=y CONFIG_LP_SERIAL_CONSOLE=y # CONFIG_LP_8250_SERIAL_CONSOLE is not set # CONFIG_LP_S5P_SERIAL_CONSOLE is not set -# CONFIG_LP_8250_MMIO32_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_BG4CD_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set @@ -60,6 +63,7 @@ CONFIG_LP_TIMER_NONE=y # CONFIG_LP_TIMER_MCT is not set # CONFIG_LP_TIMER_TEGRA_1US is not set # CONFIG_LP_TIMER_IPQ806X is not set +# CONFIG_LP_TIMER_ARMADA38X is not set # CONFIG_LP_TIMER_RK is not set # CONFIG_LP_TIMER_BG4CD is not set # CONFIG_LP_TIMER_CYGNUS is not set @@ -70,6 +74,7 @@ CONFIG_LP_USB_OHCI=y CONFIG_LP_USB_EHCI=y CONFIG_LP_USB_XHCI=y # CONFIG_LP_USB_XHCI_MTK_QUIRK is not set +# CONFIG_LP_USB_DWC2 is not set CONFIG_LP_USB_HID=y CONFIG_LP_USB_HUB=y # CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set diff --git a/payloads/libpayload/configs/defconfig-mips b/payloads/libpayload/configs/defconfig-mips index 5b78777..a7067f9 100644 --- a/payloads/libpayload/configs/defconfig-mips +++ b/payloads/libpayload/configs/defconfig-mips @@ -11,6 +11,7 @@ # CONFIG_LP_DEVELOPER is not set CONFIG_LP_COMPILER_GCC=y # CONFIG_LP_COMPILER_LLVM_CLANG is not set +# CONFIG_LP_MEMMAP_RAM_ONLY is not set # # Architecture Options @@ -19,7 +20,9 @@ CONFIG_LP_COMPILER_GCC=y # CONFIG_LP_ARCH_X86 is not set # CONFIG_LP_ARCH_ARM64 is not set CONFIG_LP_ARCH_MIPS=y -# CONFIG_LP_MEMMAP_RAM_ONLY is not set +CONFIG_LP_HEAP_SIZE=131072 +CONFIG_LP_STACK_SIZE=16384 +CONFIG_LP_BASE_ADDRESS=0x00000000 # # Standard Libraries @@ -30,6 +33,7 @@ CONFIG_LP_CURSES=y CONFIG_LP_PDCURSES=y CONFIG_LP_CBFS=y CONFIG_LP_LZMA=y +CONFIG_LP_LZ4=y # # Console Options @@ -39,7 +43,6 @@ CONFIG_LP_CBMEM_CONSOLE=y CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y # CONFIG_LP_S5P_SERIAL_CONSOLE is not set -# CONFIG_LP_8250_MMIO32_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_BG4CD_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set @@ -63,6 +66,7 @@ CONFIG_LP_STORAGE_ATAPI=y # CONFIG_LP_TIMER_MCT is not set # CONFIG_LP_TIMER_TEGRA_1US is not set # CONFIG_LP_TIMER_IPQ806X is not set +# CONFIG_LP_TIMER_ARMADA38X is not set # CONFIG_LP_TIMER_RK is not set # CONFIG_LP_TIMER_BG4CD is not set # CONFIG_LP_TIMER_CYGNUS is not set diff --git a/payloads/libpayload/configs/defconfig-tinycurses b/payloads/libpayload/configs/defconfig-tinycurses index ad0a8cf..1785075 100644 --- a/payloads/libpayload/configs/defconfig-tinycurses +++ b/payloads/libpayload/configs/defconfig-tinycurses @@ -11,6 +11,7 @@ # CONFIG_LP_DEVELOPER is not set CONFIG_LP_COMPILER_GCC=y # CONFIG_LP_COMPILER_LLVM_CLANG is not set +# CONFIG_LP_MEMMAP_RAM_ONLY is not set # # Architecture Options @@ -19,8 +20,10 @@ CONFIG_LP_COMPILER_GCC=y CONFIG_LP_ARCH_X86=y # CONFIG_LP_ARCH_ARM64 is not set # CONFIG_LP_ARCH_MIPS is not set -# CONFIG_LP_MEMMAP_RAM_ONLY is not set # CONFIG_LP_MULTIBOOT is not set +CONFIG_LP_HEAP_SIZE=131072 +CONFIG_LP_STACK_SIZE=16384 +CONFIG_LP_BASE_ADDRESS=0x00100000 # # Standard Libraries @@ -41,7 +44,6 @@ CONFIG_LP_CBMEM_CONSOLE=y CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y # CONFIG_LP_S5P_SERIAL_CONSOLE is not set -# CONFIG_LP_8250_MMIO32_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_BG4CD_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set @@ -76,6 +78,7 @@ CONFIG_LP_USB_OHCI=y CONFIG_LP_USB_EHCI=y CONFIG_LP_USB_XHCI=y # CONFIG_LP_USB_XHCI_MTK_QUIRK is not set +# CONFIG_LP_USB_DWC2 is not set CONFIG_LP_USB_HID=y CONFIG_LP_USB_HUB=y # CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set

1 0

Patch set updated for coreboot: libpayload: Move base address, stack and heap size to Kconfig
by Stefan Reinauer 13 Mar '16

13 Mar '16

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14074 -gerrit commit a285357ece8e20db651885669d29c3e37afc0413 Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Sat Mar 12 16:18:17 2016 -0800 libpayload: Move base address, stack and heap size to Kconfig This will allow more payloads to use the standard linker script instead of implementing their own. Change-Id: Ie60120769829f427ceb722109d85859b61dbde31 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- payloads/libpayload/Kconfig | 29 ++++++++++++++++++++++ payloads/libpayload/arch/arm/libpayload.ldscript | 11 +++----- payloads/libpayload/arch/arm64/libpayload.ldscript | 13 +++------- payloads/libpayload/arch/mips/libpayload.ldscript | 10 +++----- payloads/libpayload/arch/x86/libpayload.ldscript | 11 +++----- payloads/libpayload/bin/lpgcc | 4 +++ 6 files changed, 46 insertions(+), 32 deletions(-) diff --git a/payloads/libpayload/Kconfig b/payloads/libpayload/Kconfig index 3c579e6..be68859 100644 --- a/payloads/libpayload/Kconfig +++ b/payloads/libpayload/Kconfig @@ -119,6 +119,35 @@ config MULTIBOOT depends on ARCH_X86 default y +config HEAP_SIZE + int "Heap size" + default 131072 + help + This is the heap size (malloc'able size) available + to the payload. + + If unsure, set to 131072 (128K) + +config STACK_SIZE + int "Stack size" + default 16384 + help + This is the stack size available to the payload. + + If unsure, set to 16384 (16K) + +config BASE_ADDRESS + hex "Base address" + default 0x04000000 if ARCH_ARM + default 0x80100000 if ARCH_ARM64 + default 0x00000000 if ARCH_MIPS + default 0x00100000 if ARCH_X86 + help + This is the base address for the payload. + + If unsure, set to 0x00100000 on x86, 0x00000000 on MIPS, + 0x04000000 on ARM or 0x80100000 on ARM64. + endmenu menu "Standard Libraries" diff --git a/payloads/libpayload/arch/arm/libpayload.ldscript b/payloads/libpayload/arch/arm/libpayload.ldscript index 5f65bd7..492bd0c 100644 --- a/payloads/libpayload/arch/arm/libpayload.ldscript +++ b/payloads/libpayload/arch/arm/libpayload.ldscript @@ -28,19 +28,14 @@ * SUCH DAMAGE. */ -BASE_ADDRESS = 0x4000000; - OUTPUT_FORMAT("elf32-littlearm","elf32-littlearm", "elf32-littlearm") OUTPUT_ARCH(arm) ENTRY(_entry) -HEAP_SIZE = 2*64*1024; -STACK_SIZE = 16384; - SECTIONS { - . = BASE_ADDRESS; + . = CONFIG_LP_BASE_ADDRESS; . = ALIGN(16); _start = .; @@ -74,12 +69,12 @@ SECTIONS . = ALIGN(16); _heap = .; - . += HEAP_SIZE; + . += CONFIG_LP_HEAP_SIZE; . = ALIGN(16); _eheap = .; _estack = .; - . += STACK_SIZE; + . += CONFIG_LP_STACK_SIZE; . = ALIGN(16); _stack = .; } diff --git a/payloads/libpayload/arch/arm64/libpayload.ldscript b/payloads/libpayload/arch/arm64/libpayload.ldscript index 1b4395f..0cb88cf 100644 --- a/payloads/libpayload/arch/arm64/libpayload.ldscript +++ b/payloads/libpayload/arch/arm64/libpayload.ldscript @@ -28,19 +28,14 @@ * SUCH DAMAGE. */ -BASE_ADDRESS = 0x80100000; - OUTPUT_FORMAT("elf64-littleaarch64","elf64-littleaarch64", "elf64-littleaarch64") OUTPUT_ARCH(arm64) ENTRY(_entry) -HEAP_SIZE = 2*64*1024; -STACK_SIZE = 16384; - SECTIONS { - . = BASE_ADDRESS; + . = CONFIG_LP_BASE_ADDRESS; . = ALIGN(16); _start = .; @@ -74,17 +69,17 @@ SECTIONS . = ALIGN(16); _heap = .; - . += HEAP_SIZE; + . += CONFIG_LP_HEAP_SIZE; . = ALIGN(16); _eheap = .; _estack = .; - . += STACK_SIZE; + . += CONFIG_LP_STACK_SIZE; . = ALIGN(16); _stack = .; _exc_estack = .; - . += STACK_SIZE; + . += CONFIG_LP_STACK_SIZE; . = ALIGN(16); _exc_stack = .; } diff --git a/payloads/libpayload/arch/mips/libpayload.ldscript b/payloads/libpayload/arch/mips/libpayload.ldscript index 28a7412..351c225 100644 --- a/payloads/libpayload/arch/mips/libpayload.ldscript +++ b/payloads/libpayload/arch/mips/libpayload.ldscript @@ -20,15 +20,11 @@ OUTPUT_ARCH(mips) -BASE_ADDRESS = 0x00000000; ENTRY(_entry) -HEAP_SIZE = 2*64*1024; -STACK_SIZE = 16*1024; - SECTIONS { - . = BASE_ADDRESS; + . = CONFIG_LP_BASE_ADDRESS; . = ALIGN(16); _start = .; @@ -68,12 +64,12 @@ SECTIONS . = ALIGN(16); _heap = .; - . += HEAP_SIZE; + . += CONFIG_LP_HEAP_SIZE; . = ALIGN(16); _eheap = .; _estack = .; - . += STACK_SIZE; + . += CONFIG_LP_STACK_SIZE; . = ALIGN(16); _stack = .; } diff --git a/payloads/libpayload/arch/x86/libpayload.ldscript b/payloads/libpayload/arch/x86/libpayload.ldscript index 3e7d4cc..bcb2165 100644 --- a/payloads/libpayload/arch/x86/libpayload.ldscript +++ b/payloads/libpayload/arch/x86/libpayload.ldscript @@ -27,19 +27,14 @@ * SUCH DAMAGE. */ -BASE_ADDRESS = 0x100000; - OUTPUT_FORMAT(elf32-i386) OUTPUT_ARCH(i386) ENTRY(_entry) -HEAP_SIZE = 2*64*1024; -STACK_SIZE = 16384; - SECTIONS { - . = BASE_ADDRESS; + . = CONFIG_LP_BASE_ADDRESS; . = ALIGN(16); _start = .; @@ -73,12 +68,12 @@ SECTIONS . = ALIGN(16); _heap = .; - . += HEAP_SIZE; + . += CONFIG_LP_HEAP_SIZE; . = ALIGN(16); _eheap = .; _estack = .; - . += STACK_SIZE; + . += CONFIG_LP_STACK_SIZE; . = ALIGN(16); _stack = .; } diff --git a/payloads/libpayload/bin/lpgcc b/payloads/libpayload/bin/lpgcc index 0974d03..7511300 100755 --- a/payloads/libpayload/bin/lpgcc +++ b/payloads/libpayload/bin/lpgcc @@ -187,6 +187,10 @@ else _LDFLAGS+=" -Wl,--fix-cortex-a53-843419" fi + _LDFLAGS="$_LDFLAGS -Wl,--defsym=CONFIG_LP_BASE_ADDRESS=$CONFIG_LP_BASE_ADDRESS" + _LDFLAGS="$_LDFLAGS -Wl,--defsym=CONFIG_LP_HEAP_SIZE=$CONFIG_LP_HEAP_SIZE" + _LDFLAGS="$_LDFLAGS -Wl,--defsym=CONFIG_LP_STACK_SIZE=$CONFIG_LP_STACK_SIZE" + if [ $DEBUGME -eq 1 ]; then echo "$DEFAULT_CC $_LDFLAGS $HEAD_O $CMDLINE $_CFLAGS -lpayload $_LIBGCC" fi

1 0

Patch set updated for coreboot: libpayload: Add comment about ARM64 exception stack
by Stefan Reinauer 13 Mar '16

13 Mar '16

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14075 -gerrit commit 968d2b66dbb5350f3bc10d8fc8fd97c435d870ba Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Sat Mar 12 16:36:57 2016 -0800 libpayload: Add comment about ARM64 exception stack Change-Id: I8b74cbf6bdde32c90ad0510e14e899711269e57f Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- payloads/libpayload/arch/arm64/libpayload.ldscript | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/payloads/libpayload/arch/arm64/libpayload.ldscript b/payloads/libpayload/arch/arm64/libpayload.ldscript index 0cb88cf..5c807ce 100644 --- a/payloads/libpayload/arch/arm64/libpayload.ldscript +++ b/payloads/libpayload/arch/arm64/libpayload.ldscript @@ -78,6 +78,10 @@ SECTIONS . = ALIGN(16); _stack = .; + /* Exception stack. Having a separate exception stack + * allows us to have later stages running in non-EL3 levels. + */ + _exc_estack = .; . += CONFIG_LP_STACK_SIZE; . = ALIGN(16);

1 0

Patch set updated for coreboot: coreinfo: Pretty print RAM addresses
by Stefan Reinauer 13 Mar '16

13 Mar '16

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14072 -gerrit commit 6c2e5d10d4a6ab87249c74becba96a7210876cc9 Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Sat Mar 12 12:17:48 2016 -0800 coreinfo: Pretty print RAM addresses Instead of 500, print 0x00000500 in the ram dump module. Change-Id: Id250bd99f36dad4088ab88953fb371c400b4231b Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- payloads/coreinfo/ramdump_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payloads/coreinfo/ramdump_module.c b/payloads/coreinfo/ramdump_module.c index a0ccc4f..8401a61 100644 --- a/payloads/coreinfo/ramdump_module.c +++ b/payloads/coreinfo/ramdump_module.c @@ -30,7 +30,7 @@ static void dump_ram(WINDOW *win, uint32_t addr, int row, int col) int i, x = 0, y = 0, count = 0; volatile uint8_t *ptr = (void *)(addr); - mvwprintw(win, 0, col + 54, "RAM address: %10x", addr); + mvwprintw(win, 0, col + 54, "RAM address: 0x%08x", addr); /* Dump 256 bytes of RAM. */ for (i = 1; i < 257; i++) {

1 0

Patch set updated for coreboot: libpayload: Drop CONFIG_LP_CHROMEOS
by Stefan Reinauer 13 Mar '16

13 Mar '16

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14070 -gerrit commit c4c267dce64105d476af473b2be7e075d20d1f4c Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Sat Mar 12 12:12:14 2016 -0800 libpayload: Drop CONFIG_LP_CHROMEOS This is adding complexity to the code more than it saves space, plus some of the tables could potentially be interesting outside of the ChromeOS context. Change-Id: I4bf24608f3e26d3b7871a5031ae8f03bc2c8c21f Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- payloads/libpayload/Kconfig | 6 ------ payloads/libpayload/configs/config.arm64-generic | 1 - payloads/libpayload/configs/config.purin | 1 - payloads/libpayload/configs/config.veyron | 1 - payloads/libpayload/configs/defconfig | 1 - payloads/libpayload/configs/defconfig-arm | 1 - payloads/libpayload/configs/defconfig-mips | 1 - payloads/libpayload/configs/defconfig-tinycurses | 1 - payloads/libpayload/include/sysinfo.h | 6 ------ payloads/libpayload/libc/coreboot.c | 5 ----- 10 files changed, 24 deletions(-) diff --git a/payloads/libpayload/Kconfig b/payloads/libpayload/Kconfig index e95f31b..ef452ac 100644 --- a/payloads/libpayload/Kconfig +++ b/payloads/libpayload/Kconfig @@ -80,12 +80,6 @@ config REMOTEGDB help Enable Remote GDB debugging support. -config CHROMEOS - bool "ChromeOS specific features" - default n - help - Enable ChromeOS specific features. - endmenu menu "Architecture Options" diff --git a/payloads/libpayload/configs/config.arm64-generic b/payloads/libpayload/configs/config.arm64-generic index cca00b3..a2d596c 100644 --- a/payloads/libpayload/configs/config.arm64-generic +++ b/payloads/libpayload/configs/config.arm64-generic @@ -11,7 +11,6 @@ # CONFIG_LP_DEVELOPER is not set CONFIG_LP_COMPILER_GCC=y # CONFIG_LP_COMPILER_LLVM_CLANG is not set -CONFIG_LP_CHROMEOS=y # # Architecture Options diff --git a/payloads/libpayload/configs/config.purin b/payloads/libpayload/configs/config.purin index adb93b1..c4f225b 100644 --- a/payloads/libpayload/configs/config.purin +++ b/payloads/libpayload/configs/config.purin @@ -12,7 +12,6 @@ CONFIG_LP_GPL=y CONFIG_LP_COMPILER_GCC=y # CONFIG_LP_COMPILER_LLVM_CLANG is not set # CONFIG_LP_REMOTEGDB is not set -CONFIG_LP_CHROMEOS=y # # Architecture Options diff --git a/payloads/libpayload/configs/config.veyron b/payloads/libpayload/configs/config.veyron index aca5817..47d54ea 100644 --- a/payloads/libpayload/configs/config.veyron +++ b/payloads/libpayload/configs/config.veyron @@ -12,7 +12,6 @@ CONFIG_LP_GPL=y CONFIG_LP_COMPILER_GCC=y # CONFIG_LP_COMPILER_LLVM_CLANG is not set # CONFIG_LP_REMOTEGDB is not set -CONFIG_LP_CHROMEOS=y # # Architecture Options diff --git a/payloads/libpayload/configs/defconfig b/payloads/libpayload/configs/defconfig index 1d516f7..53320e7 100644 --- a/payloads/libpayload/configs/defconfig +++ b/payloads/libpayload/configs/defconfig @@ -11,7 +11,6 @@ # CONFIG_LP_DEVELOPER is not set CONFIG_LP_COMPILER_GCC=y # CONFIG_LP_COMPILER_LLVM_CLANG is not set -# CONFIG_LP_CHROMEOS is not set # # Architecture Options diff --git a/payloads/libpayload/configs/defconfig-arm b/payloads/libpayload/configs/defconfig-arm index fa7e4f6..5b0ebe6 100644 --- a/payloads/libpayload/configs/defconfig-arm +++ b/payloads/libpayload/configs/defconfig-arm @@ -11,7 +11,6 @@ # CONFIG_LP_DEVELOPER is not set CONFIG_LP_COMPILER_GCC=y # CONFIG_LP_COMPILER_LLVM_CLANG is not set -# CONFIG_LP_CHROMEOS is not set # # Architecture Options diff --git a/payloads/libpayload/configs/defconfig-mips b/payloads/libpayload/configs/defconfig-mips index 0b05f87..5b78777 100644 --- a/payloads/libpayload/configs/defconfig-mips +++ b/payloads/libpayload/configs/defconfig-mips @@ -11,7 +11,6 @@ # CONFIG_LP_DEVELOPER is not set CONFIG_LP_COMPILER_GCC=y # CONFIG_LP_COMPILER_LLVM_CLANG is not set -# CONFIG_LP_CHROMEOS is not set # # Architecture Options diff --git a/payloads/libpayload/configs/defconfig-tinycurses b/payloads/libpayload/configs/defconfig-tinycurses index 7e74fb2..ad0a8cf 100644 --- a/payloads/libpayload/configs/defconfig-tinycurses +++ b/payloads/libpayload/configs/defconfig-tinycurses @@ -11,7 +11,6 @@ # CONFIG_LP_DEVELOPER is not set CONFIG_LP_COMPILER_GCC=y # CONFIG_LP_COMPILER_LLVM_CLANG is not set -# CONFIG_LP_CHROMEOS is not set # # Architecture Options diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h index b97ae14..2110d88 100644 --- a/payloads/libpayload/include/sysinfo.h +++ b/payloads/libpayload/include/sysinfo.h @@ -66,10 +66,8 @@ struct sysinfo_t { u32 cmos_range_start; u32 cmos_range_end; u32 cmos_checksum_location; -#if IS_ENABLED(CONFIG_LP_CHROMEOS) u32 vbnv_start; u32 vbnv_size; -#endif char *version; char *extra_version; @@ -86,25 +84,21 @@ struct sysinfo_t { struct cb_framebuffer *framebuffer; -#if IS_ENABLED(CONFIG_LP_CHROMEOS) int num_gpios; struct cb_gpio gpios[SYSINFO_MAX_GPIOS]; int num_macs; struct mac_address macs[SYSINFO_MAX_MACS]; char *serialno; -#endif unsigned long *mbtable; /** Pointer to the multiboot table */ struct cb_header *header; struct cb_mainboard *mainboard; -#if IS_ENABLED(CONFIG_LP_CHROMEOS) void *vboot_handoff; u32 vboot_handoff_size; void *vdat_addr; u32 vdat_size; -#endif #if IS_ENABLED(CONFIG_LP_ARCH_X86) int x86_rom_var_mtrr_index; diff --git a/payloads/libpayload/libc/coreboot.c b/payloads/libpayload/libc/coreboot.c index 3abd610..7ad8e06 100644 --- a/payloads/libpayload/libc/coreboot.c +++ b/payloads/libpayload/libc/coreboot.c @@ -78,7 +78,6 @@ static void cb_parse_serial(void *ptr, struct sysinfo_t *info) info->serial = ((struct cb_serial *)ptr); } -#if IS_ENABLED(CONFIG_LP_CHROMEOS) static void cb_parse_vboot_handoff(unsigned char *ptr, struct sysinfo_t *info) { struct lb_range *vbho = (struct lb_range *)ptr; @@ -128,8 +127,6 @@ static void cb_parse_mac_addresses(unsigned char *ptr, info->macs[i] = macs->mac_addrs[i]; } -#endif - static void cb_parse_tstamp(unsigned char *ptr, struct sysinfo_t *info) { struct cb_cbmem_tab *const cbmem = (struct cb_cbmem_tab *)ptr; @@ -349,7 +346,6 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info) case CB_TAG_MAINBOARD: info->mainboard = (struct cb_mainboard *)ptr; break; -#if IS_ENABLED(CONFIG_LP_CHROMEOS) case CB_TAG_GPIO: cb_parse_gpios(ptr, info); break; @@ -368,7 +364,6 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info) case CB_TAG_SERIALNO: cb_parse_string(ptr, &info->serialno); break; -#endif case CB_TAG_TIMESTAMPS: cb_parse_tstamp(ptr, info); break;

1 0

Patch set updated for coreboot: libpayload: Move MEMMAP_RAM_ONLY to generic options
by Stefan Reinauer 13 Mar '16

13 Mar '16

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14071 -gerrit commit c8a81af36dcd3c7bd1607ae30f39a4aaaedf80bd Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Sat Mar 12 12:14:46 2016 -0800 libpayload: Move MEMMAP_RAM_ONLY to generic options MEMMAP_RAM_ONLY is not an architecture specific option, hence move it out of the architecture specific menu. Change-Id: Iaeef03ed8cbff930a580ad03b1e712087b48714e Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- payloads/libpayload/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/payloads/libpayload/Kconfig b/payloads/libpayload/Kconfig index ef452ac..3c579e6 100644 --- a/payloads/libpayload/Kconfig +++ b/payloads/libpayload/Kconfig @@ -80,6 +80,10 @@ config REMOTEGDB help Enable Remote GDB debugging support. +config MEMMAP_RAM_ONLY + bool "Only consider RAM entries in memory map for further processing" + default n + endmenu menu "Architecture Options" @@ -110,10 +114,6 @@ config ARCH_MIPS endchoice -config MEMMAP_RAM_ONLY - bool "Only consider RAM entries in memory map for further processing" - default n - config MULTIBOOT bool "Multiboot header support" depends on ARCH_X86

1 0

Patch set updated for coreboot: libpayload: Make comment into help text
by Stefan Reinauer 13 Mar '16

13 Mar '16

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14068 -gerrit commit df82abfd5787c47ba8ebaacf35ce308344f39e9a Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Sat Mar 12 11:48:44 2016 -0800 libpayload: Make comment into help text Change-Id: I8c8669e73e335e12cb3785cf84b878c305dd5929 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- payloads/libpayload/Kconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/payloads/libpayload/Kconfig b/payloads/libpayload/Kconfig index 95bd045..e95f31b 100644 --- a/payloads/libpayload/Kconfig +++ b/payloads/libpayload/Kconfig @@ -629,10 +629,12 @@ config LITTLE_ENDIAN default n bool -# Whether the target system has an IO address space. config IO_ADDRESS_SPACE default n bool + help + This option is turned on if the target system has a separate + IO address space. This is typically only the case on x86. source "arch/arm/Kconfig" source "arch/arm64/Kconfig"

1 0

Patch set updated for coreboot: libpayload: Unify defconfigs
by Stefan Reinauer 13 Mar '16

13 Mar '16

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14069 -gerrit commit 024b99b62853f89a10cd912eace0c87cfd849dc0 Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Sat Mar 12 11:51:18 2016 -0800 libpayload: Unify defconfigs Bring defconfig and defconfig-tinycurses in sync, so that defconfig and defconfig-tinycurses only differ in the selection of the curses implementation. Change-Id: I739c5122b5aaaa2681055c845905721a0b2a11c1 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- payloads/libpayload/configs/defconfig | 1 + payloads/libpayload/configs/defconfig-tinycurses | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/payloads/libpayload/configs/defconfig b/payloads/libpayload/configs/defconfig index 37bf50d..1d516f7 100644 --- a/payloads/libpayload/configs/defconfig +++ b/payloads/libpayload/configs/defconfig @@ -32,6 +32,7 @@ CONFIG_LP_CURSES=y CONFIG_LP_PDCURSES=y CONFIG_LP_CBFS=y CONFIG_LP_LZMA=y +CONFIG_LP_LZ4=y # # Console Options diff --git a/payloads/libpayload/configs/defconfig-tinycurses b/payloads/libpayload/configs/defconfig-tinycurses index f876903..7e74fb2 100644 --- a/payloads/libpayload/configs/defconfig-tinycurses +++ b/payloads/libpayload/configs/defconfig-tinycurses @@ -21,7 +21,7 @@ CONFIG_LP_ARCH_X86=y # CONFIG_LP_ARCH_ARM64 is not set # CONFIG_LP_ARCH_MIPS is not set # CONFIG_LP_MEMMAP_RAM_ONLY is not set -CONFIG_LP_MULTIBOOT=y +# CONFIG_LP_MULTIBOOT is not set # # Standard Libraries @@ -52,7 +52,7 @@ CONFIG_LP_SERIAL_IOBASE=0x3f8 CONFIG_LP_VIDEO_CONSOLE=y CONFIG_LP_VGA_VIDEO_CONSOLE=y # CONFIG_LP_GEODELX_VIDEO_CONSOLE is not set -# CONFIG_LP_COREBOOT_VIDEO_CONSOLE is not set +CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y CONFIG_LP_PC_KEYBOARD=y CONFIG_LP_PC_KEYBOARD_LAYOUT_US=y # CONFIG_LP_PC_KEYBOARD_LAYOUT_DE is not set @@ -71,8 +71,18 @@ CONFIG_LP_STORAGE_ATAPI=y CONFIG_LP_STORAGE_AHCI=y CONFIG_LP_STORAGE_AHCI_ONLY_TESTED=y CONFIG_LP_TIMER_RDTSC=y -# CONFIG_LP_USB is not set -# CONFIG_LP_USB_GEN_HUB is not set +CONFIG_LP_USB=y +CONFIG_LP_USB_UHCI=y +CONFIG_LP_USB_OHCI=y +CONFIG_LP_USB_EHCI=y +CONFIG_LP_USB_XHCI=y +# CONFIG_LP_USB_XHCI_MTK_QUIRK is not set +CONFIG_LP_USB_HID=y +CONFIG_LP_USB_HUB=y +# CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set +CONFIG_LP_USB_MSC=y +CONFIG_LP_USB_GEN_HUB=y +CONFIG_LP_USB_PCI=y # CONFIG_LP_UDC is not set # CONFIG_LP_BIG_ENDIAN is not set CONFIG_LP_LITTLE_ENDIAN=y

1 0

Patch set updated for coreboot: coreinfo: Use tinycurses
by Stefan Reinauer 13 Mar '16

13 Mar '16

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14067 -gerrit commit 96ee2f5cbaeae35d69d466277da2577da3bb84e9 Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Sat Mar 12 11:47:00 2016 -0800 coreinfo: Use tinycurses When using PDcurses over a serial line, the background of coreinfo is not properly cleared. Hence use tinycurses, which was the only option when coreinfo was developed. Change-Id: I15bb6eb552cf924de98d09ef63be33ecf336c526 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- payloads/coreinfo/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payloads/coreinfo/Makefile b/payloads/coreinfo/Makefile index 47a7dfb..e2a4d6d 100644 --- a/payloads/coreinfo/Makefile +++ b/payloads/coreinfo/Makefile @@ -117,7 +117,7 @@ else libpayload: printf "Building libpayload @ $(LIBCONFIG_PATH).\n" $(MAKE) -C $(LIBCONFIG_PATH) distclean coreinfo_obj=$(coreinfo_obj)/libptmp - $(MAKE) -C $(LIBCONFIG_PATH) $(LIB_CONFIG) + $(MAKE) -C $(LIBCONFIG_PATH) $(LIB_CONFIG) KBUILD_DEFCONFIG=configs/defconfig-tinycurses $(MAKE) -C $(LIBCONFIG_PATH) install DESTDIR=$(coreinfo_obj) endif

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit March 2016