From 7c10d17e0256b27f1750df76e4d27c60d013a1a2 Mon Sep 17 00:00:00 2001 From: bzt Date: Mon, 14 Sep 2020 22:38:23 +0200 Subject: [PATCH] Arch specific libpayload config --- aarch64-cb/Makefile | 3 +- aarch64-cb/lib.config | 108 ++++++++++++++++ coreboot/payloads/external/BOOTBOOT/Makefile | 5 +- x86_64-cb/Makefile | 5 +- x86_64-cb/lib.config | 124 +++++++++++++++++++ 5 files changed, 241 insertions(+), 4 deletions(-) create mode 100644 aarch64-cb/lib.config create mode 100644 x86_64-cb/lib.config diff --git a/aarch64-cb/Makefile b/aarch64-cb/Makefile index 9b8c5e0..d443d8e 100644 --- a/aarch64-cb/Makefile +++ b/aarch64-cb/Makefile @@ -17,7 +17,8 @@ CFLAGS += -Wall -Wvla -Werror -Os -ffreestanding -nostdinc -nostdlib all: $(TARGET) $(LIBPAYLOAD_DIR): - $(MAKE) -C $(LIBCONFIG_PATH) $(LPOPTS) defconfig + @cp lib.config $(LIBCONFIG_PATH)/.config + $(MAKE) -C $(LIBCONFIG_PATH) $(LPOPTS) oldconfig $(MAKE) -C $(LIBCONFIG_PATH) $(LPOPTS) $(MAKE) -C $(LIBCONFIG_PATH) $(LPOPTS) install diff --git a/aarch64-cb/lib.config b/aarch64-cb/lib.config new file mode 100644 index 0000000..f195327 --- /dev/null +++ b/aarch64-cb/lib.config @@ -0,0 +1,108 @@ +# +# Automatically generated file; DO NOT EDIT. +# Libpayload Configuration +# + +# +# Generic Options +# +# CONFIG_LP_GPL is not set +# CONFIG_LP_EXPERIMENTAL is not set +# CONFIG_LP_DEVELOPER is not set +# CONFIG_LP_CHROMEOS 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 +# +# CONFIG_LP_ARCH_ARM is not set +# CONFIG_LP_ARCH_X86 is not set +CONFIG_LP_ARCH_ARM64=y +CONFIG_LP_HEAP_SIZE=1048576 +CONFIG_LP_STACK_SIZE=16384 +CONFIG_LP_BASE_ADDRESS=0x00100000 + +# +# Standard Libraries +# +CONFIG_LP_LIBC=y +CONFIG_LP_CURSES=y +# CONFIG_LP_TINYCURSES is not set +CONFIG_LP_PDCURSES=y +CONFIG_LP_CBFS=y +CONFIG_LP_LZMA=y +CONFIG_LP_LZ4=y + +# +# Console Options +# +# CONFIG_LP_SKIP_CONSOLE_INIT is not set +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_IPQ806X_SERIAL_CONSOLE is not set +# CONFIG_LP_IPQ40XX_SERIAL_CONSOLE is not set +# CONFIG_LP_QCS405_SERIAL_CONSOLE is not set +# CONFIG_LP_QUALCOMM_QUPV3_SERIAL_CONSOLE is not set +# CONFIG_LP_PL011_SERIAL_CONSOLE is not set +# CONFIG_LP_SERIAL_SET_SPEED is not set +# CONFIG_LP_SERIAL_ACS_FALLBACK is not set +CONFIG_LP_VIDEO_CONSOLE=y +CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y +# CONFIG_LP_COREBOOT_VIDEO_CENTERED is not set +CONFIG_LP_FONT_SCALE_FACTOR=0 +# CONFIG_LP_CBGFX_FAST_RESAMPLE is not set +CONFIG_LP_PC_I8042=y +CONFIG_LP_PC_MOUSE=y +CONFIG_LP_PC_KEYBOARD=y +# CONFIG_LP_PC_KEYBOARD_AT_TRANSLATED is not set +CONFIG_LP_PC_KEYBOARD_LAYOUT_US=y +# CONFIG_LP_PC_KEYBOARD_LAYOUT_DE is not set + +# +# Drivers +# +CONFIG_LP_MOUSE_CURSOR=y +# CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set +# CONFIG_LP_TIMER_RDTSC is not set +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_IPQ40XX is not set +# CONFIG_LP_TIMER_ARM64_ARCH is not set +# CONFIG_LP_TIMER_RK3288 is not set +# CONFIG_LP_TIMER_RK3399 is not set +# CONFIG_LP_TIMER_MTK is not set +CONFIG_LP_TIMER_GENERIC_HZ=0 +CONFIG_LP_TIMER_GENERIC_REG=0x0 +CONFIG_LP_TIMER_GENERIC_HIGH_REG=0x0 +CONFIG_LP_STORAGE=y +# CONFIG_LP_STORAGE_64BIT_LBA is not set +CONFIG_LP_STORAGE_ATA=y +CONFIG_LP_STORAGE_ATAPI=y +CONFIG_LP_USB=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_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 +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 +# 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 +# CONFIG_LP_IGNORE_UNKNOWN_INTERRUPTS is not set +# CONFIG_LP_LOG_UNKNOWN_INTERRUPTS is not set +# CONFIG_LP_DIE_ON_UNKNOWN_INTERRUPT is not set diff --git a/coreboot/payloads/external/BOOTBOOT/Makefile b/coreboot/payloads/external/BOOTBOOT/Makefile index 9c369d8..5cd716a 100644 --- a/coreboot/payloads/external/BOOTBOOT/Makefile +++ b/coreboot/payloads/external/BOOTBOOT/Makefile @@ -33,8 +33,9 @@ bootboot: libpayload $(MAKE) -C $(loader_dir) LIBCONFIG_PATH=../../../libpayload libpayload: checkout - cd ../../libpayload && $(MAKE) defconfig && \ - $(MAKE) && $(MAKE) DESTDIR=../external/FILO/filo/build install + cp $(loader_dir)/lib.config ../../libpayload/.config + cd ../../libpayload && $(MAKE) oldconfig && \ + $(MAKE) && $(MAKE) DESTDIR=../external/BOOTBOOT/$(loader_dir) install clean: test -d $(loader_dir) && $(MAKE) -C $(loader_dir) clean || exit 0 diff --git a/x86_64-cb/Makefile b/x86_64-cb/Makefile index d6dceec..8d0841f 100644 --- a/x86_64-cb/Makefile +++ b/x86_64-cb/Makefile @@ -17,7 +17,10 @@ CFLAGS += -Wall -Wvla -Werror -Os -ffreestanding -nostdinc -nostdlib all: $(TARGET) $(LIBPAYLOAD_DIR): - $(MAKE) -C $(LIBCONFIG_PATH) $(LPOPTS) defconfig + echo $(LIBCONFIG_PATH) + ls $(LIBCONFIG_PATH) + @cp lib.config $(LIBCONFIG_PATH)/.config + $(MAKE) -C $(LIBCONFIG_PATH) $(LPOPTS) oldconfig $(MAKE) -C $(LIBCONFIG_PATH) $(LPOPTS) $(MAKE) -C $(LIBCONFIG_PATH) $(LPOPTS) install diff --git a/x86_64-cb/lib.config b/x86_64-cb/lib.config new file mode 100644 index 0000000..d9bc601 --- /dev/null +++ b/x86_64-cb/lib.config @@ -0,0 +1,124 @@ +# +# Automatically generated file; DO NOT EDIT. +# Libpayload Configuration +# + +# +# Generic Options +# +CONFIG_LP_GPL=y +CONFIG_LP_EXPERIMENTAL=y +CONFIG_LP_DEVELOPER=y +# CONFIG_LP_CHROMEOS is not set +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 +# +# CONFIG_LP_ARCH_ARM is not set +CONFIG_LP_ARCH_X86=y +# CONFIG_LP_ARCH_ARM64 is not set +# CONFIG_LP_MULTIBOOT is not set +CONFIG_LP_HEAP_SIZE=1048576 +CONFIG_LP_STACK_SIZE=16384 +CONFIG_LP_BASE_ADDRESS=0x00100000 +# CONFIG_LP_USE_MARCH_586 is not set + +# +# Standard Libraries +# +CONFIG_LP_LIBC=y +# CONFIG_LP_CURSES is not set +# CONFIG_LP_TINYCURSES is not set +# CONFIG_LP_PDCURSES is not set +# CONFIG_LP_CBFS is not set +# CONFIG_LP_LZMA is not set +# CONFIG_LP_LZ4 is not set + +# +# Console Options +# +# CONFIG_LP_SKIP_CONSOLE_INIT is not set +# CONFIG_LP_CBMEM_CONSOLE is not set +CONFIG_LP_SERIAL_CONSOLE=y +CONFIG_LP_8250_SERIAL_CONSOLE=y +# CONFIG_LP_S5P_SERIAL_CONSOLE is not set +# CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set +# CONFIG_LP_IPQ40XX_SERIAL_CONSOLE is not set +# CONFIG_LP_QCS405_SERIAL_CONSOLE is not set +# CONFIG_LP_QUALCOMM_QUPV3_SERIAL_CONSOLE is not set +# CONFIG_LP_PL011_SERIAL_CONSOLE is not set +CONFIG_LP_SERIAL_IOBASE=0x3f8 +# CONFIG_LP_SERIAL_SET_SPEED is not set +# CONFIG_LP_SERIAL_ACS_FALLBACK is not set +CONFIG_LP_VIDEO_CONSOLE=y +CONFIG_LP_VGA_VIDEO_CONSOLE=y +# CONFIG_LP_GEODELX_VIDEO_CONSOLE is not set +CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y +# CONFIG_LP_COREBOOT_VIDEO_CENTERED is not set +CONFIG_LP_FONT_SCALE_FACTOR=0 +# CONFIG_LP_CBGFX_FAST_RESAMPLE is not set +CONFIG_LP_PC_I8042=y +CONFIG_LP_PC_MOUSE=y +CONFIG_LP_PC_KEYBOARD=y +# CONFIG_LP_PC_KEYBOARD_AT_TRANSLATED is not set +CONFIG_LP_PC_KEYBOARD_LAYOUT_US=y +# CONFIG_LP_PC_KEYBOARD_LAYOUT_DE is not set + +# +# Drivers +# +CONFIG_LP_PCI=y +CONFIG_LP_NVRAM=y +# CONFIG_LP_MOUSE_CURSOR is not set +# CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set +# CONFIG_LP_SPEAKER is not set +# CONFIG_LP_TIMER_RDTSC is not set +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_IPQ40XX is not set +# CONFIG_LP_TIMER_ARM64_ARCH is not set +# CONFIG_LP_TIMER_RK3288 is not set +# CONFIG_LP_TIMER_RK3399 is not set +# CONFIG_LP_TIMER_MTK is not set +CONFIG_LP_TIMER_GENERIC_HZ=0 +CONFIG_LP_TIMER_GENERIC_REG=0x0 +CONFIG_LP_TIMER_GENERIC_HIGH_REG=0x0 +CONFIG_LP_STORAGE=y +# CONFIG_LP_STORAGE_64BIT_LBA is not set +CONFIG_LP_STORAGE_ATA=y +CONFIG_LP_STORAGE_ATAPI=y +CONFIG_LP_STORAGE_AHCI=y +CONFIG_LP_STORAGE_AHCI_ONLY_TESTED=y +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_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 +CONFIG_LP_USB_MSC=y +CONFIG_LP_USB_GEN_HUB=y +CONFIG_LP_USB_PCI=y +# CONFIG_LP_UDC is not set + +# +# Debugging +# +# CONFIG_LP_DEBUG_MALLOC is not set +# CONFIG_LP_BIG_ENDIAN is not set +CONFIG_LP_LITTLE_ENDIAN=y +CONFIG_LP_IO_ADDRESS_SPACE=y +CONFIG_LP_ARCH_SPECIFIC_OPTIONS=y +# CONFIG_LP_ENABLE_APIC is not set +# CONFIG_LP_IGNORE_UNKNOWN_INTERRUPTS is not set +# CONFIG_LP_LOG_UNKNOWN_INTERRUPTS is not set +CONFIG_LP_DIE_ON_UNKNOWN_INTERRUPT=y