From de4ee2227f2d04b465ec659851b5b0f9f9f98848 Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Sun, 23 Nov 2014 07:01:29 +0000 Subject: Update coreboot Some notes: DEBLOB script updated (more blobs added). i945: reverted to legacy brightness. i945: permanently set tft_brightness to 0xff (works around a bug on X60 where brightness loops to zero when at max brightness and trying to increase the brightness level) EHCI debug dongle (BeagleBone Black) now enabled on all boards. --- resources/cbfstool/patch/rmodule.c | 49 +++++++++++++---- resources/libreboot/config/macbook21/config | 68 +++++++++++++---------- resources/libreboot/config/t60/config | 73 +++++++++++++++---------- resources/libreboot/config/x60/config | 72 ++++++++++++++---------- resources/libreboot/config/x60t/config | 72 ++++++++++++++---------- resources/libreboot/patch/COPYING | 6 -- resources/libreboot/patch/t60_6731buildfix.diff | 12 ---- 7 files changed, 205 insertions(+), 147 deletions(-) delete mode 100644 resources/libreboot/patch/COPYING delete mode 100644 resources/libreboot/patch/t60_6731buildfix.diff (limited to 'resources') diff --git a/resources/cbfstool/patch/rmodule.c b/resources/cbfstool/patch/rmodule.c index 989da86..3bee1e0 100644 --- a/resources/cbfstool/patch/rmodule.c +++ b/resources/cbfstool/patch/rmodule.c @@ -82,12 +82,38 @@ static int should_emit_386(struct rmod_context *ctx, Elf64_Rela *rel) return (type == R_386_32); } +static int valid_reloc_arm(struct rmod_context *ctx, Elf64_Rela *rel) +{ + int type; + + type = ELF64_R_TYPE(rel->r_info); + + /* Only these 3 relocations are expected to be found. */ + return (type == R_ARM_ABS32 || type == R_ARM_THM_PC22 || + type == R_ARM_THM_JUMP24); +} + +static int should_emit_arm(struct rmod_context *ctx, Elf64_Rela *rel) +{ + int type; + + type = ELF64_R_TYPE(rel->r_info); + + /* R_ARM_ABS32 relocations are absolute. Must emit these. */ + return (type == R_ARM_ABS32); +} + static struct arch_ops reloc_ops[] = { { .arch = EM_386, .valid_type = valid_reloc_386, .should_emit = should_emit_386, }, + { + .arch = EM_ARM, + .valid_type = valid_reloc_arm, + .should_emit = should_emit_arm, + }, }; /* @@ -259,10 +285,8 @@ static int collect_relocations(struct rmod_context *ctx) nrelocs = ctx->nrelocs; INFO("%d relocations to be emitted.\n", nrelocs); - if (!nrelocs) { - ERROR("No valid relocations in file.\n"); - return -1; - } + if (!nrelocs) + return 0; /* Reset the counter for indexing into the array. */ ctx->nrelocs = 0; @@ -518,11 +542,11 @@ write_elf(const struct rmod_context *ctx, const struct buffer *in, * is considered a part of the program. */ total_size += buffer_size(&rmod_header); - total_size += ctx->phdr->p_memsz; - if (buffer_size(&relocs) + ctx->phdr->p_filesz > total_size) { - total_size -= ctx->phdr->p_memsz; + if (buffer_size(&relocs) + ctx->phdr->p_filesz > ctx->phdr->p_memsz) { total_size += buffer_size(&relocs); total_size += ctx->phdr->p_filesz; + } else { + total_size += ctx->phdr->p_memsz; } ret = add_section(ew, &rmod_header, ".header", addr, @@ -536,10 +560,13 @@ write_elf(const struct rmod_context *ctx, const struct buffer *in, goto out; addr += ctx->phdr->p_filesz; - ret = add_section(ew, &relocs, ".relocs", addr, buffer_size(&relocs)); - if (ret < 0) - goto out; - addr += buffer_size(&relocs); + if (ctx->nrelocs) { + ret = add_section(ew, &relocs, ".relocs", addr, + buffer_size(&relocs)); + if (ret < 0) + goto out; + addr += buffer_size(&relocs); + } if (total_size != addr) { ret = add_section(ew, NULL, ".empty", addr, total_size - addr); diff --git a/resources/libreboot/config/macbook21/config b/resources/libreboot/config/macbook21/config index f443f49..1efe064 100644 --- a/resources/libreboot/config/macbook21/config +++ b/resources/libreboot/config/macbook21/config @@ -23,6 +23,11 @@ CONFIG_DYNAMIC_CBMEM=y # CONFIG_COLLECT_TIMESTAMPS is not set # CONFIG_USE_BLOBS is not set # CONFIG_COVERAGE is not set +# CONFIG_RELOCATABLE_MODULES is not set +CONFIG_BOOTBLOCK_SIMPLE=y +# CONFIG_BOOTBLOCK_NORMAL is not set +CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c" +# CONFIG_UPDATE_IMAGE is not set # # Mainboard @@ -104,9 +109,6 @@ CONFIG_MAINBOARD_PART_NUMBER="MacBook2,1" CONFIG_IRQ_SLOT_COUNT=18 CONFIG_MAINBOARD_VENDOR="Apple" CONFIG_MAX_CPUS=2 -CONFIG_RAMTOP=0x200000 -CONFIG_HEAP_SIZE=0x4000 -CONFIG_RAMBASE=0x100000 CONFIG_VGA_BIOS_ID="8086,27a2" CONFIG_DRIVERS_PS2_KEYBOARD=y # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set @@ -123,16 +125,19 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc." # CONFIG_PCI_64BIT_PREF_MEM is not set CONFIG_UART_FOR_CONSOLE=0 CONFIG_ID_SECTION_OFFSET=0x80 -CONFIG_STACK_SIZE=0x1000 +# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set +# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set +# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set CONFIG_CACHE_ROM_SIZE_OVERRIDE=0 CONFIG_CBFS_SIZE=0x200000 CONFIG_POST_IO=y CONFIG_POST_DEVICE=y CONFIG_SEABIOS_PS2_TIMEOUT=0 -CONFIG_MAINBOARD_VERSION="1.0" +CONFIG_USBDEBUG_HCD_INDEX=0 CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 -# CONFIG_USBDEBUG is not set +CONFIG_USBDEBUG=y +CONFIG_MAINBOARD_VERSION="1.0" CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0 CONFIG_BOARD_ROMSIZE_KB_2048=y # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set @@ -147,8 +152,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_2048=y # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set CONFIG_COREBOOT_ROMSIZE_KB=2048 CONFIG_ROM_SIZE=0x200000 -CONFIG_MAINBOARD_SERIAL_NUMBER="W8724XXXXXX" -CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="MacBook2,1" CONFIG_ARCH_X86=y # CONFIG_ARCH_ARM is not set # CONFIG_ARCH_ARM64 is not set @@ -157,6 +160,8 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y CONFIG_AP_IN_SIPI_WAIT=y # CONFIG_SIPI_VECTOR_IN_ROM is not set +CONFIG_RAMBASE=0x100000 +CONFIG_STACK_SIZE=0x1000 CONFIG_NUM_IPI_STARTS=2 # CONFIG_ROMCC is not set CONFIG_PC80_SYSTEM=y @@ -186,10 +191,7 @@ CONFIG_HPET_ADDRESS=0xfed00000 # CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set # CONFIG_ARCH_RAMSTAGE_ARM_V8_64 is not set # CONFIG_MAINBOARD_HAS_CHROMEOS is not set -CONFIG_BOOTBLOCK_SIMPLE=y -# CONFIG_BOOTBLOCK_NORMAL is not set -CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c" -# CONFIG_UPDATE_IMAGE is not set +CONFIG_SYSTEM_TYPE_LAPTOP=y # # Chipset @@ -204,6 +206,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c" CONFIG_SOCKET_SPECIFIC_OPTIONS=y CONFIG_XIP_ROM_SIZE=0x10000 # CONFIG_CPU_AMD_AGESA is not set +# CONFIG_CPU_AMD_PI is not set CONFIG_CPU_INTEL_MODEL_6EX=y CONFIG_CPU_INTEL_MODEL_6FX=y CONFIG_SMM_TSEG_SIZE=0 @@ -240,10 +243,13 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y # # Northbridge # +CONFIG_HEAP_SIZE=0x4000 CONFIG_VIDEO_MB=0 +CONFIG_RAMTOP=0x200000 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set # CONFIG_AMD_NB_CIMX is not set # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set +# CONFIG_NORTHBRIDGE_AMD_PI is not set CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y CONFIG_NORTHBRIDGE_INTEL_I945=y # CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set @@ -288,6 +294,8 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y # CONFIG_VGA_ROM_RUN is not set # CONFIG_ON_DEVICE_ROM_RUN is not set +# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set +# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set # CONFIG_MULTIPLE_VGA_ADAPTERS is not set # CONFIG_SPD_CACHE is not set CONFIG_PCI=y @@ -301,23 +309,15 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y # CONFIG_PCIEXP_ASPM is not set CONFIG_PCI_BUS_SEGN_BITS=0 # CONFIG_EARLY_PCI_BRIDGE is not set - -# -# VGA BIOS -# +CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 +CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 +# CONFIG_PXE_ROM is not set # # Display # # CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set -# -# PXE ROM -# -# CONFIG_PXE_ROM is not set -CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 -CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 - # # Generic Drivers # @@ -344,7 +344,14 @@ CONFIG_DRIVERS_UART_8250IO=y # CONFIG_DRIVERS_UART_PL011 is not set CONFIG_HAVE_USBDEBUG=y # CONFIG_HAVE_USBDEBUG_OPTIONS is not set +CONFIG_USBDEBUG_IN_ROMSTAGE=y +CONFIG_USBDEBUG_DEFAULT_PORT=0 +# CONFIG_USBDEBUG_DONGLE_STD is not set +# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set +CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y +CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0 # CONFIG_DRIVER_XPOWERS_AXP209 is not set +# CONFIG_DRIVERS_RICOH_RCE822 is not set # CONFIG_TPM is not set CONFIG_MMCONF_SUPPORT_DEFAULT=y CONFIG_MMCONF_SUPPORT=y @@ -368,9 +375,10 @@ CONFIG_CONSOLE_SERIAL_115200=y CONFIG_TTYS0_BAUD=115200 CONFIG_TTYS0_LCS=3 # CONFIG_SPKMODEM is not set +# CONFIG_CONSOLE_USB is not set # CONFIG_CONSOLE_NE2K is not set CONFIG_CONSOLE_CBMEM=y -CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x10000 +CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set @@ -400,19 +408,20 @@ CONFIG_IOAPIC=y CONFIG_USE_WATCHDOG_ON_BOOT=y CONFIG_VGA=y # CONFIG_GFXUMA is not set -# CONFIG_RELOCATABLE_MODULES is not set CONFIG_HAVE_ACPI_TABLES=y CONFIG_HAVE_MP_TABLE=y CONFIG_HAVE_PIRQ_TABLE=y -# CONFIG_PER_DEVICE_ACPI_TABLES is not set +CONFIG_PER_DEVICE_ACPI_TABLES=y +CONFIG_COMMON_FADT=y # # System tables # -CONFIG_GENERATE_ACPI_TABLES=y CONFIG_GENERATE_MP_TABLE=y CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_SMBIOS_TABLES=y +CONFIG_MAINBOARD_SERIAL_NUMBER="W8724XXXXXX" +CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="MacBook2,1" # # Payload @@ -424,6 +433,8 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_FILO is not set # CONFIG_PAYLOAD_GRUB2 is not set # CONFIG_PAYLOAD_TIANOCORE is not set +# CONFIG_SEABIOS_STABLE is not set +# CONFIG_SEABIOS_MASTER is not set # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set # CONFIG_SEABIOS_VGA_COREBOOT is not set CONFIG_PAYLOAD_FILE="grub.elf" @@ -443,6 +454,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y # CONFIG_DEBUG_SMM_RELOCATION is not set # CONFIG_DEBUG_MALLOC is not set # CONFIG_DEBUG_ACPI is not set +# CONFIG_DEBUG_USBDEBUG is not set # CONFIG_TRACE is not set # CONFIG_ENABLE_APIC_EXT_ID is not set CONFIG_WARNINGS_ARE_ERRORS=y @@ -451,5 +463,5 @@ CONFIG_WARNINGS_ARE_ERRORS=y # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set -CONFIG_REG_SCRIPT=y +# CONFIG_REG_SCRIPT is not set CONFIG_MAX_REBOOT_CNT=3 diff --git a/resources/libreboot/config/t60/config b/resources/libreboot/config/t60/config index d2c1c68..9beea69 100644 --- a/resources/libreboot/config/t60/config +++ b/resources/libreboot/config/t60/config @@ -23,6 +23,11 @@ CONFIG_DYNAMIC_CBMEM=y # CONFIG_COLLECT_TIMESTAMPS is not set # CONFIG_USE_BLOBS is not set # CONFIG_COVERAGE is not set +# CONFIG_RELOCATABLE_MODULES is not set +CONFIG_BOOTBLOCK_SIMPLE=y +# CONFIG_BOOTBLOCK_NORMAL is not set +CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c" +# CONFIG_UPDATE_IMAGE is not set # # Mainboard @@ -100,13 +105,10 @@ CONFIG_VENDOR_LENOVO=y # CONFIG_VENDOR_WYSE is not set CONFIG_BOARD_SPECIFIC_OPTIONS=y CONFIG_MAINBOARD_DIR="lenovo/t60" -CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T60 / T60p" +CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T60" CONFIG_IRQ_SLOT_COUNT=18 -CONFIG_MAINBOARD_VENDOR="Lenovo" +CONFIG_MAINBOARD_VENDOR="LENOVO" CONFIG_MAX_CPUS=2 -CONFIG_RAMTOP=0x200000 -CONFIG_HEAP_SIZE=0x4000 -CONFIG_RAMBASE=0x100000 CONFIG_VGA_BIOS_ID="8086,27a2" CONFIG_DRIVERS_PS2_KEYBOARD=y # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set @@ -121,7 +123,9 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO" # CONFIG_PCI_64BIT_PREF_MEM is not set CONFIG_UART_FOR_CONSOLE=0 CONFIG_ID_SECTION_OFFSET=0x80 -CONFIG_STACK_SIZE=0x1000 +# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set +# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set +# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set CONFIG_CACHE_ROM_SIZE_OVERRIDE=0 CONFIG_CBFS_SIZE=0x200000 CONFIG_POST_IO=y @@ -135,10 +139,12 @@ CONFIG_POST_DEVICE=y # CONFIG_BOARD_LENOVO_T530 is not set CONFIG_BOARD_LENOVO_T60=y CONFIG_SEABIOS_PS2_TIMEOUT=3000 -CONFIG_MAINBOARD_VERSION="ThinkPad T60" +CONFIG_USBDEBUG_HCD_INDEX=0 CONFIG_CPU_ADDR_BITS=36 +# CONFIG_BOARD_LINUTOP_LINUTOP1 is not set CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 -# CONFIG_USBDEBUG is not set +CONFIG_USBDEBUG=y +CONFIG_MAINBOARD_VERSION="ThinkPad T60" CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0 CONFIG_BOARD_ROMSIZE_KB_2048=y # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set @@ -153,8 +159,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_2048=y # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set CONFIG_COREBOOT_ROMSIZE_KB=2048 CONFIG_ROM_SIZE=0x200000 -CONFIG_MAINBOARD_SERIAL_NUMBER="L3DKE06" -CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="1951FEG" CONFIG_ARCH_X86=y # CONFIG_ARCH_ARM is not set # CONFIG_ARCH_ARM64 is not set @@ -163,6 +167,8 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y CONFIG_AP_IN_SIPI_WAIT=y # CONFIG_SIPI_VECTOR_IN_ROM is not set +CONFIG_RAMBASE=0x100000 +CONFIG_STACK_SIZE=0x1000 CONFIG_NUM_IPI_STARTS=2 # CONFIG_ROMCC is not set CONFIG_PC80_SYSTEM=y @@ -192,10 +198,7 @@ CONFIG_HPET_ADDRESS=0xfed00000 # CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set # CONFIG_ARCH_RAMSTAGE_ARM_V8_64 is not set # CONFIG_MAINBOARD_HAS_CHROMEOS is not set -CONFIG_BOOTBLOCK_SIMPLE=y -# CONFIG_BOOTBLOCK_NORMAL is not set -CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c" -# CONFIG_UPDATE_IMAGE is not set +CONFIG_SYSTEM_TYPE_LAPTOP=y # # Chipset @@ -210,6 +213,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c" CONFIG_SOCKET_SPECIFIC_OPTIONS=y CONFIG_XIP_ROM_SIZE=0x10000 # CONFIG_CPU_AMD_AGESA is not set +# CONFIG_CPU_AMD_PI is not set CONFIG_CPU_INTEL_MODEL_6EX=y CONFIG_CPU_INTEL_MODEL_6FX=y CONFIG_SMM_TSEG_SIZE=0 @@ -246,10 +250,13 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y # # Northbridge # +CONFIG_HEAP_SIZE=0x4000 CONFIG_VIDEO_MB=0 +CONFIG_RAMTOP=0x200000 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set # CONFIG_AMD_NB_CIMX is not set # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set +# CONFIG_NORTHBRIDGE_AMD_PI is not set CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y CONFIG_NORTHBRIDGE_INTEL_I945=y # CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set @@ -301,6 +308,8 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y # CONFIG_VGA_ROM_RUN is not set # CONFIG_ON_DEVICE_ROM_RUN is not set +# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set +# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set # CONFIG_MULTIPLE_VGA_ADAPTERS is not set # CONFIG_SPD_CACHE is not set CONFIG_PCI=y @@ -314,23 +323,15 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y # CONFIG_PCIEXP_ASPM is not set CONFIG_PCI_BUS_SEGN_BITS=0 # CONFIG_EARLY_PCI_BRIDGE is not set - -# -# VGA BIOS -# +CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 +CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 +# CONFIG_PXE_ROM is not set # # Display # # CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set -# -# PXE ROM -# -# CONFIG_PXE_ROM is not set -CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 -CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 - # # Generic Drivers # @@ -358,7 +359,14 @@ CONFIG_DRIVERS_UART_8250IO=y # CONFIG_DRIVERS_UART_PL011 is not set CONFIG_HAVE_USBDEBUG=y # CONFIG_HAVE_USBDEBUG_OPTIONS is not set +CONFIG_USBDEBUG_IN_ROMSTAGE=y +CONFIG_USBDEBUG_DEFAULT_PORT=0 +# CONFIG_USBDEBUG_DONGLE_STD is not set +# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set +CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y +CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0 # CONFIG_DRIVER_XPOWERS_AXP209 is not set +# CONFIG_DRIVERS_RICOH_RCE822 is not set # CONFIG_TPM is not set CONFIG_MMCONF_SUPPORT_DEFAULT=y CONFIG_MMCONF_SUPPORT=y @@ -382,9 +390,10 @@ CONFIG_CONSOLE_SERIAL_115200=y CONFIG_TTYS0_BAUD=115200 CONFIG_TTYS0_LCS=3 # CONFIG_SPKMODEM is not set +# CONFIG_CONSOLE_USB is not set # CONFIG_CONSOLE_NE2K is not set CONFIG_CONSOLE_CBMEM=y -CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x10000 +CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set @@ -414,19 +423,20 @@ CONFIG_IOAPIC=y CONFIG_USE_WATCHDOG_ON_BOOT=y CONFIG_VGA=y # CONFIG_GFXUMA is not set -# CONFIG_RELOCATABLE_MODULES is not set CONFIG_HAVE_ACPI_TABLES=y CONFIG_HAVE_MP_TABLE=y CONFIG_HAVE_PIRQ_TABLE=y -# CONFIG_PER_DEVICE_ACPI_TABLES is not set +CONFIG_PER_DEVICE_ACPI_TABLES=y +CONFIG_COMMON_FADT=y # # System tables # -CONFIG_GENERATE_ACPI_TABLES=y CONFIG_GENERATE_MP_TABLE=y CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_SMBIOS_TABLES=y +CONFIG_MAINBOARD_SERIAL_NUMBER="L3DKE06" +CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="1951FEG" # # Payload @@ -438,6 +448,8 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_FILO is not set # CONFIG_PAYLOAD_GRUB2 is not set # CONFIG_PAYLOAD_TIANOCORE is not set +# CONFIG_SEABIOS_STABLE is not set +# CONFIG_SEABIOS_MASTER is not set # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set # CONFIG_SEABIOS_VGA_COREBOOT is not set CONFIG_PAYLOAD_FILE="grub.elf" @@ -457,6 +469,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y # CONFIG_DEBUG_SMM_RELOCATION is not set # CONFIG_DEBUG_MALLOC is not set # CONFIG_DEBUG_ACPI is not set +# CONFIG_DEBUG_USBDEBUG is not set # CONFIG_TRACE is not set # CONFIG_ENABLE_APIC_EXT_ID is not set CONFIG_WARNINGS_ARE_ERRORS=y @@ -465,5 +478,5 @@ CONFIG_WARNINGS_ARE_ERRORS=y # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set -CONFIG_REG_SCRIPT=y +# CONFIG_REG_SCRIPT is not set CONFIG_MAX_REBOOT_CNT=3 diff --git a/resources/libreboot/config/x60/config b/resources/libreboot/config/x60/config index 1757aeb..04f0862 100644 --- a/resources/libreboot/config/x60/config +++ b/resources/libreboot/config/x60/config @@ -23,6 +23,11 @@ CONFIG_DYNAMIC_CBMEM=y # CONFIG_COLLECT_TIMESTAMPS is not set # CONFIG_USE_BLOBS is not set # CONFIG_COVERAGE is not set +# CONFIG_RELOCATABLE_MODULES is not set +CONFIG_BOOTBLOCK_SIMPLE=y +# CONFIG_BOOTBLOCK_NORMAL is not set +CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c" +# CONFIG_UPDATE_IMAGE is not set # # Mainboard @@ -100,13 +105,10 @@ CONFIG_VENDOR_LENOVO=y # CONFIG_VENDOR_WYSE is not set CONFIG_BOARD_SPECIFIC_OPTIONS=y CONFIG_MAINBOARD_DIR="lenovo/x60" -CONFIG_MAINBOARD_PART_NUMBER="ThinkPad X60 / X60s / X60t" +CONFIG_MAINBOARD_PART_NUMBER="ThinkPad X60" CONFIG_IRQ_SLOT_COUNT=18 -CONFIG_MAINBOARD_VENDOR="Lenovo" +CONFIG_MAINBOARD_VENDOR="LENOVO" CONFIG_MAX_CPUS=2 -CONFIG_RAMTOP=0x200000 -CONFIG_HEAP_SIZE=0x4000 -CONFIG_RAMBASE=0x100000 CONFIG_VGA_BIOS_ID="8086,27a2" CONFIG_DRIVERS_PS2_KEYBOARD=y # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set @@ -121,7 +123,9 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO" # CONFIG_PCI_64BIT_PREF_MEM is not set CONFIG_UART_FOR_CONSOLE=0 CONFIG_ID_SECTION_OFFSET=0x80 -CONFIG_STACK_SIZE=0x1000 +# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set +# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set +# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set CONFIG_CACHE_ROM_SIZE_OVERRIDE=0 CONFIG_CBFS_SIZE=0x200000 CONFIG_POST_IO=y @@ -135,10 +139,11 @@ CONFIG_BOARD_LENOVO_X60=y # CONFIG_BOARD_LENOVO_T530 is not set # CONFIG_BOARD_LENOVO_T60 is not set CONFIG_SEABIOS_PS2_TIMEOUT=3000 -CONFIG_MAINBOARD_VERSION="ThinkPad X60s" +CONFIG_USBDEBUG_HCD_INDEX=0 CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 -# CONFIG_USBDEBUG is not set +CONFIG_USBDEBUG=y +CONFIG_MAINBOARD_VERSION="ThinkPad X60s" CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0 CONFIG_BOARD_ROMSIZE_KB_2048=y # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set @@ -153,8 +158,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_2048=y # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set CONFIG_COREBOOT_ROMSIZE_KB=2048 CONFIG_ROM_SIZE=0x200000 -CONFIG_MAINBOARD_SERIAL_NUMBER="L3BH242" -CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="1702L8G" CONFIG_ARCH_X86=y # CONFIG_ARCH_ARM is not set # CONFIG_ARCH_ARM64 is not set @@ -163,6 +166,8 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y CONFIG_AP_IN_SIPI_WAIT=y # CONFIG_SIPI_VECTOR_IN_ROM is not set +CONFIG_RAMBASE=0x100000 +CONFIG_STACK_SIZE=0x1000 CONFIG_NUM_IPI_STARTS=2 # CONFIG_ROMCC is not set CONFIG_PC80_SYSTEM=y @@ -192,10 +197,7 @@ CONFIG_HPET_ADDRESS=0xfed00000 # CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set # CONFIG_ARCH_RAMSTAGE_ARM_V8_64 is not set # CONFIG_MAINBOARD_HAS_CHROMEOS is not set -CONFIG_BOOTBLOCK_SIMPLE=y -# CONFIG_BOOTBLOCK_NORMAL is not set -CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c" -# CONFIG_UPDATE_IMAGE is not set +CONFIG_SYSTEM_TYPE_LAPTOP=y # # Chipset @@ -210,6 +212,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c" CONFIG_SOCKET_SPECIFIC_OPTIONS=y CONFIG_XIP_ROM_SIZE=0x10000 # CONFIG_CPU_AMD_AGESA is not set +# CONFIG_CPU_AMD_PI is not set CONFIG_CPU_INTEL_MODEL_6EX=y CONFIG_CPU_INTEL_MODEL_6FX=y CONFIG_SMM_TSEG_SIZE=0 @@ -246,10 +249,13 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y # # Northbridge # +CONFIG_HEAP_SIZE=0x4000 CONFIG_VIDEO_MB=0 +CONFIG_RAMTOP=0x200000 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set # CONFIG_AMD_NB_CIMX is not set # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set +# CONFIG_NORTHBRIDGE_AMD_PI is not set CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y CONFIG_NORTHBRIDGE_INTEL_I945=y # CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set @@ -301,6 +307,8 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y # CONFIG_VGA_ROM_RUN is not set # CONFIG_ON_DEVICE_ROM_RUN is not set +# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set +# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set # CONFIG_MULTIPLE_VGA_ADAPTERS is not set # CONFIG_SPD_CACHE is not set CONFIG_PCI=y @@ -314,23 +322,15 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y # CONFIG_PCIEXP_ASPM is not set CONFIG_PCI_BUS_SEGN_BITS=0 # CONFIG_EARLY_PCI_BRIDGE is not set - -# -# VGA BIOS -# +CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 +CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 +# CONFIG_PXE_ROM is not set # # Display # # CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set -# -# PXE ROM -# -# CONFIG_PXE_ROM is not set -CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 -CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 - # # Generic Drivers # @@ -361,7 +361,14 @@ CONFIG_DRIVERS_UART_8250IO=y # CONFIG_DRIVERS_UART_PL011 is not set CONFIG_HAVE_USBDEBUG=y # CONFIG_HAVE_USBDEBUG_OPTIONS is not set +CONFIG_USBDEBUG_IN_ROMSTAGE=y +CONFIG_USBDEBUG_DEFAULT_PORT=0 +# CONFIG_USBDEBUG_DONGLE_STD is not set +# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set +CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y +CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0 # CONFIG_DRIVER_XPOWERS_AXP209 is not set +# CONFIG_DRIVERS_RICOH_RCE822 is not set # CONFIG_TPM is not set CONFIG_MMCONF_SUPPORT_DEFAULT=y CONFIG_MMCONF_SUPPORT=y @@ -385,9 +392,10 @@ CONFIG_CONSOLE_SERIAL_115200=y CONFIG_TTYS0_BAUD=115200 CONFIG_TTYS0_LCS=3 # CONFIG_SPKMODEM is not set +# CONFIG_CONSOLE_USB is not set # CONFIG_CONSOLE_NE2K is not set CONFIG_CONSOLE_CBMEM=y -CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x10000 +CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set @@ -417,19 +425,20 @@ CONFIG_IOAPIC=y CONFIG_USE_WATCHDOG_ON_BOOT=y CONFIG_VGA=y # CONFIG_GFXUMA is not set -# CONFIG_RELOCATABLE_MODULES is not set CONFIG_HAVE_ACPI_TABLES=y CONFIG_HAVE_MP_TABLE=y CONFIG_HAVE_PIRQ_TABLE=y -# CONFIG_PER_DEVICE_ACPI_TABLES is not set +CONFIG_PER_DEVICE_ACPI_TABLES=y +CONFIG_COMMON_FADT=y # # System tables # -CONFIG_GENERATE_ACPI_TABLES=y CONFIG_GENERATE_MP_TABLE=y CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_SMBIOS_TABLES=y +CONFIG_MAINBOARD_SERIAL_NUMBER="L3BH242" +CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="1702L8G" # # Payload @@ -441,6 +450,8 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_FILO is not set # CONFIG_PAYLOAD_GRUB2 is not set # CONFIG_PAYLOAD_TIANOCORE is not set +# CONFIG_SEABIOS_STABLE is not set +# CONFIG_SEABIOS_MASTER is not set # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set # CONFIG_SEABIOS_VGA_COREBOOT is not set CONFIG_PAYLOAD_FILE="grub.elf" @@ -460,6 +471,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y # CONFIG_DEBUG_SMM_RELOCATION is not set # CONFIG_DEBUG_MALLOC is not set # CONFIG_DEBUG_ACPI is not set +# CONFIG_DEBUG_USBDEBUG is not set # CONFIG_TRACE is not set # CONFIG_ENABLE_APIC_EXT_ID is not set CONFIG_WARNINGS_ARE_ERRORS=y @@ -468,5 +480,5 @@ CONFIG_WARNINGS_ARE_ERRORS=y # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set -CONFIG_REG_SCRIPT=y +# CONFIG_REG_SCRIPT is not set CONFIG_MAX_REBOOT_CNT=3 diff --git a/resources/libreboot/config/x60t/config b/resources/libreboot/config/x60t/config index e5b6f19..e0f2f90 100644 --- a/resources/libreboot/config/x60t/config +++ b/resources/libreboot/config/x60t/config @@ -23,6 +23,11 @@ CONFIG_DYNAMIC_CBMEM=y # CONFIG_COLLECT_TIMESTAMPS is not set # CONFIG_USE_BLOBS is not set # CONFIG_COVERAGE is not set +# CONFIG_RELOCATABLE_MODULES is not set +CONFIG_BOOTBLOCK_SIMPLE=y +# CONFIG_BOOTBLOCK_NORMAL is not set +CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c" +# CONFIG_UPDATE_IMAGE is not set # # Mainboard @@ -100,13 +105,10 @@ CONFIG_VENDOR_LENOVO=y # CONFIG_VENDOR_WYSE is not set CONFIG_BOARD_SPECIFIC_OPTIONS=y CONFIG_MAINBOARD_DIR="lenovo/x60" -CONFIG_MAINBOARD_PART_NUMBER="ThinkPad X60 / X60s / X60t" +CONFIG_MAINBOARD_PART_NUMBER="ThinkPad X60" CONFIG_IRQ_SLOT_COUNT=18 -CONFIG_MAINBOARD_VENDOR="Lenovo" +CONFIG_MAINBOARD_VENDOR="LENOVO" CONFIG_MAX_CPUS=2 -CONFIG_RAMTOP=0x200000 -CONFIG_HEAP_SIZE=0x4000 -CONFIG_RAMBASE=0x100000 CONFIG_VGA_BIOS_ID="8086,27a2" CONFIG_DRIVERS_PS2_KEYBOARD=y # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set @@ -121,7 +123,9 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO" # CONFIG_PCI_64BIT_PREF_MEM is not set CONFIG_UART_FOR_CONSOLE=0 CONFIG_ID_SECTION_OFFSET=0x80 -CONFIG_STACK_SIZE=0x1000 +# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set +# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set +# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set CONFIG_CACHE_ROM_SIZE_OVERRIDE=0 CONFIG_CBFS_SIZE=0x200000 CONFIG_POST_IO=y @@ -135,10 +139,11 @@ CONFIG_BOARD_LENOVO_X60=y # CONFIG_BOARD_LENOVO_T530 is not set # CONFIG_BOARD_LENOVO_T60 is not set CONFIG_SEABIOS_PS2_TIMEOUT=3000 -CONFIG_MAINBOARD_VERSION="ThinkPad X60 Tablet" +CONFIG_USBDEBUG_HCD_INDEX=0 CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 -# CONFIG_USBDEBUG is not set +CONFIG_USBDEBUG=y +CONFIG_MAINBOARD_VERSION="ThinkPad X60 Tablet" CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0 CONFIG_BOARD_ROMSIZE_KB_2048=y # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set @@ -153,8 +158,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_2048=y # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set CONFIG_COREBOOT_ROMSIZE_KB=2048 CONFIG_ROM_SIZE=0x200000 -CONFIG_MAINBOARD_SERIAL_NUMBER="L3B8281" -CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="6364WJ1" CONFIG_ARCH_X86=y # CONFIG_ARCH_ARM is not set # CONFIG_ARCH_ARM64 is not set @@ -163,6 +166,8 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y CONFIG_AP_IN_SIPI_WAIT=y # CONFIG_SIPI_VECTOR_IN_ROM is not set +CONFIG_RAMBASE=0x100000 +CONFIG_STACK_SIZE=0x1000 CONFIG_NUM_IPI_STARTS=2 # CONFIG_ROMCC is not set CONFIG_PC80_SYSTEM=y @@ -192,10 +197,7 @@ CONFIG_HPET_ADDRESS=0xfed00000 # CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set # CONFIG_ARCH_RAMSTAGE_ARM_V8_64 is not set # CONFIG_MAINBOARD_HAS_CHROMEOS is not set -CONFIG_BOOTBLOCK_SIMPLE=y -# CONFIG_BOOTBLOCK_NORMAL is not set -CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c" -# CONFIG_UPDATE_IMAGE is not set +CONFIG_SYSTEM_TYPE_LAPTOP=y # # Chipset @@ -210,6 +212,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c" CONFIG_SOCKET_SPECIFIC_OPTIONS=y CONFIG_XIP_ROM_SIZE=0x10000 # CONFIG_CPU_AMD_AGESA is not set +# CONFIG_CPU_AMD_PI is not set CONFIG_CPU_INTEL_MODEL_6EX=y CONFIG_CPU_INTEL_MODEL_6FX=y CONFIG_SMM_TSEG_SIZE=0 @@ -246,10 +249,13 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y # # Northbridge # +CONFIG_HEAP_SIZE=0x4000 CONFIG_VIDEO_MB=0 +CONFIG_RAMTOP=0x200000 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set # CONFIG_AMD_NB_CIMX is not set # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set +# CONFIG_NORTHBRIDGE_AMD_PI is not set CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y CONFIG_NORTHBRIDGE_INTEL_I945=y # CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set @@ -301,6 +307,8 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y # CONFIG_VGA_ROM_RUN is not set # CONFIG_ON_DEVICE_ROM_RUN is not set +# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set +# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set # CONFIG_MULTIPLE_VGA_ADAPTERS is not set # CONFIG_SPD_CACHE is not set CONFIG_PCI=y @@ -314,23 +322,15 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y # CONFIG_PCIEXP_ASPM is not set CONFIG_PCI_BUS_SEGN_BITS=0 # CONFIG_EARLY_PCI_BRIDGE is not set - -# -# VGA BIOS -# +CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 +CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 +# CONFIG_PXE_ROM is not set # # Display # # CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set -# -# PXE ROM -# -# CONFIG_PXE_ROM is not set -CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 -CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 - # # Generic Drivers # @@ -361,7 +361,14 @@ CONFIG_DRIVERS_UART_8250IO=y # CONFIG_DRIVERS_UART_PL011 is not set CONFIG_HAVE_USBDEBUG=y # CONFIG_HAVE_USBDEBUG_OPTIONS is not set +CONFIG_USBDEBUG_IN_ROMSTAGE=y +CONFIG_USBDEBUG_DEFAULT_PORT=0 +# CONFIG_USBDEBUG_DONGLE_STD is not set +# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set +CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y +CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0 # CONFIG_DRIVER_XPOWERS_AXP209 is not set +# CONFIG_DRIVERS_RICOH_RCE822 is not set # CONFIG_TPM is not set CONFIG_MMCONF_SUPPORT_DEFAULT=y CONFIG_MMCONF_SUPPORT=y @@ -385,9 +392,10 @@ CONFIG_CONSOLE_SERIAL_115200=y CONFIG_TTYS0_BAUD=115200 CONFIG_TTYS0_LCS=3 # CONFIG_SPKMODEM is not set +# CONFIG_CONSOLE_USB is not set # CONFIG_CONSOLE_NE2K is not set CONFIG_CONSOLE_CBMEM=y -CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x10000 +CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set @@ -417,19 +425,20 @@ CONFIG_IOAPIC=y CONFIG_USE_WATCHDOG_ON_BOOT=y CONFIG_VGA=y # CONFIG_GFXUMA is not set -# CONFIG_RELOCATABLE_MODULES is not set CONFIG_HAVE_ACPI_TABLES=y CONFIG_HAVE_MP_TABLE=y CONFIG_HAVE_PIRQ_TABLE=y -# CONFIG_PER_DEVICE_ACPI_TABLES is not set +CONFIG_PER_DEVICE_ACPI_TABLES=y +CONFIG_COMMON_FADT=y # # System tables # -CONFIG_GENERATE_ACPI_TABLES=y CONFIG_GENERATE_MP_TABLE=y CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_SMBIOS_TABLES=y +CONFIG_MAINBOARD_SERIAL_NUMBER="L3B8281" +CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="6364WJ1" # # Payload @@ -441,6 +450,8 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_FILO is not set # CONFIG_PAYLOAD_GRUB2 is not set # CONFIG_PAYLOAD_TIANOCORE is not set +# CONFIG_SEABIOS_STABLE is not set +# CONFIG_SEABIOS_MASTER is not set # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set # CONFIG_SEABIOS_VGA_COREBOOT is not set CONFIG_PAYLOAD_FILE="grub.elf" @@ -460,6 +471,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y # CONFIG_DEBUG_SMM_RELOCATION is not set # CONFIG_DEBUG_MALLOC is not set # CONFIG_DEBUG_ACPI is not set +# CONFIG_DEBUG_USBDEBUG is not set # CONFIG_TRACE is not set # CONFIG_ENABLE_APIC_EXT_ID is not set CONFIG_WARNINGS_ARE_ERRORS=y @@ -468,5 +480,5 @@ CONFIG_WARNINGS_ARE_ERRORS=y # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set -CONFIG_REG_SCRIPT=y +# CONFIG_REG_SCRIPT is not set CONFIG_MAX_REBOOT_CNT=3 diff --git a/resources/libreboot/patch/COPYING b/resources/libreboot/patch/COPYING deleted file mode 100644 index 06f4f25..0000000 --- a/resources/libreboot/patch/COPYING +++ /dev/null @@ -1,6 +0,0 @@ -The "gitdiff" file is a patch for the coreboot project. Look at coreboot's copyright information -therefore to see what conditions the patch falls under. - -Also, look at "getcb" script in a text editor in libreboot_src.tar.gz for this version of libreboot (go to ../../../docs/RELEASE.html -to find out how to get libreboot_src.tar.gz for this version of libreboot) for attribution (acknowledgement) of -the links to the original patches, since the gitdiff contains changes originally written by other people. diff --git a/resources/libreboot/patch/t60_6731buildfix.diff b/resources/libreboot/patch/t60_6731buildfix.diff deleted file mode 100644 index 4e36a6c..0000000 --- a/resources/libreboot/patch/t60_6731buildfix.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb -index 54b7da3..f187bfb 100644 ---- a/src/mainboard/lenovo/t60/devicetree.cb -+++ b/src/mainboard/lenovo/t60/devicetree.cb -@@ -25,7 +25,6 @@ chip northbridge/intel/i945 - register "gpu_hotplug" = "0x00000220" - register "gpu_lvds_use_spread_spectrum_clock" = "1" - register "gpu_lvds_is_dual_channel" = "1" -- register "gpu_backlight" = "0x1280128" - - device cpu_cluster 0 on - chip cpu/intel/socket_mFCPGA478 -- cgit v1.2.3