From a9fe29f076ae5e73730c0d80e1a9ce9cb6517404 Mon Sep 17 00:00:00 2001 From: Leah Woods Date: Mon, 16 May 2016 12:23:16 +0100 Subject: update configs (fix build errors) --- resources/libreboot/config/grub/kcma-d8/config | 71 ++++++++++----------- resources/libreboot/config/grub/kgpe-d16/config | 71 ++++++++++----------- resources/libreboot/config/grub/macbook21/config | 10 ++- resources/libreboot/config/grub/r400_16mb/config | 2 +- resources/libreboot/config/grub/t400_16mb/config | 2 +- resources/libreboot/config/grub/t500_16mb/config | 2 +- resources/libreboot/config/grub/t60/config | 10 ++- resources/libreboot/config/grub/x200_16mb/config | 2 +- resources/libreboot/config/grub/x60/config | 78 ++++++++++-------------- 9 files changed, 115 insertions(+), 133 deletions(-) (limited to 'resources/libreboot/config') diff --git a/resources/libreboot/config/grub/kcma-d8/config b/resources/libreboot/config/grub/kcma-d8/config index 2983412f..26c8c9c3 100644 --- a/resources/libreboot/config/grub/kcma-d8/config +++ b/resources/libreboot/config/grub/kcma-d8/config @@ -166,16 +166,16 @@ CONFIG_RAMTOP=0x400000 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0 CONFIG_CBFS_SIZE=0x200000 # CONFIG_POST_DEVICE is not set -CONFIG_USBDEBUG_HCD_INDEX=0 CONFIG_BOOT_MEDIA_SPI_BUS=0 CONFIG_TTYS0_LCS=3 +CONFIG_CONSOLE_POST=y +CONFIG_DRIVERS_UART_8250IO=y CONFIG_UDELAY_LAPIC_FIXED_FSB=200 CONFIG_CPU_ADDR_BITS=48 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 # CONFIG_USBDEBUG is not set CONFIG_MAINBOARD_VERSION="1.0" CONFIG_DRIVERS_PS2_KEYBOARD=y -CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_POST is not set CONFIG_BOARD_ROMSIZE_KB_2048=y # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set @@ -211,6 +211,7 @@ CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/amd/sb700/bootblock.c" CONFIG_TTYS0_BASE=0x3f8 CONFIG_EHCI_BAR=0xfef00000 CONFIG_HEAP_SIZE=0xc0000 +CONFIG_CONSOLE_CBMEM=y # CONFIG_SOC_MARVELL_ARMADA38X is not set # CONFIG_SOC_MARVELL_BG4CD is not set # CONFIG_SOC_MEDIATEK_MT8173 is not set @@ -219,6 +220,7 @@ CONFIG_HEAP_SIZE=0xc0000 # CONFIG_SOC_NVIDIA_TEGRA210 is not set # CONFIG_SOC_QC_IPQ806X is not set # CONFIG_SOC_ROCKCHIP_RK3288 is not set +# CONFIG_SOC_ROCKCHIP_RK3399 is not set # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set # CONFIG_SOC_UCB_RISCV is not set @@ -340,6 +342,7 @@ CONFIG_SUPERIO_WINBOND_W83667HG_A=y # # CONFIG_MAINBOARD_HAS_CHROMEOS is not set # CONFIG_UEFI_2_4_BINDING is not set +# CONFIG_USE_SIEMENS_HWILIB is not set # CONFIG_ARCH_ARM is not set # CONFIG_ARCH_BOOTBLOCK_ARM is not set # CONFIG_ARCH_VERSTAGE_ARM is not set @@ -400,8 +403,8 @@ CONFIG_HAVE_CMOS_DEFAULT=y CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default" CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set -# CONFIG_COMPILE_IN_DSDT is not set CONFIG_VERSTAGE_ADDR=0x2000000 +# CONFIG_POSTCAR_STAGE is not set # # Devices @@ -427,36 +430,16 @@ CONFIG_PCIEXP_CLK_PM=y CONFIG_PCIEXP_L1_SUB_STATE=y CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 -# CONFIG_PXE_ROM is not set # CONFIG_SOFTWARE_I2C is not set # # Generic Drivers # # CONFIG_DRIVERS_AS3722_RTC is not set -CONFIG_DRIVERS_ASPEED_AST_COMMON=y -CONFIG_DEVICE_SPECIFIC_OPTIONS=y -CONFIG_DRIVERS_ASPEED_AST2050=y # CONFIG_ELOG is not set # CONFIG_GIC is not set -# CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set -# CONFIG_DRIVERS_I2C_RTD2132 is not set -CONFIG_DRIVERS_I2C_W83795=y -# CONFIG_INTEL_DP is not set -# CONFIG_INTEL_DDI is not set -# CONFIG_INTEL_EDID is not set -# CONFIG_INTEL_INT15 is not set -# CONFIG_INTEL_GMA_ACPI is not set -# CONFIG_DRIVER_INTEL_I210 is not set # CONFIG_IPMI_KCS is not set # CONFIG_DRIVERS_LENOVO_WACOM is not set -# CONFIG_DRIVER_MAXIM_MAX77686 is not set -# CONFIG_DRIVER_PARADE_PS8625 is not set -# CONFIG_DRIVER_PARADE_PS8640 is not set -CONFIG_DRIVERS_MC146818=y -# CONFIG_MAINBOARD_HAS_LPC_TPM is not set -# CONFIG_DRIVERS_RICOH_RCE822 is not set -# CONFIG_DRIVERS_SIL_3114 is not set CONFIG_SPI_FLASH=y CONFIG_SPI_ATOMIC_SEQUENCING=y CONFIG_SPI_FLASH_MEMORY_MAPPED=y @@ -473,9 +456,6 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B is not set # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set -# CONFIG_DRIVER_TI_TPS65090 is not set -# CONFIG_DRIVERS_TI_TPS65913 is not set -# CONFIG_DRIVERS_TI_TPS65913_RTC is not set CONFIG_DRIVERS_UART=y # CONFIG_NO_UART_ON_SUPERIO is not set # CONFIG_DRIVERS_UART_8250MEM is not set @@ -483,17 +463,32 @@ CONFIG_DRIVERS_UART=y # CONFIG_HAVE_UART_SPECIAL is not set # CONFIG_DRIVERS_UART_OXPCIE is not set # CONFIG_DRIVERS_UART_PL011 is not set -CONFIG_HAVE_USBDEBUG=n -CONFIG_HAVE_USBDEBUG_OPTIONS=n -CONFIG_USBDEBUG_IN_ROMSTAGE=n -CONFIG_USBDEBUG_DEFAULT_PORT=0 -# CONFIG_USBDEBUG_DONGLE_STD is not set -# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set -# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set -# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set -CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0 +CONFIG_HAVE_USBDEBUG=y +CONFIG_HAVE_USBDEBUG_OPTIONS=y # CONFIG_DRIVER_XPOWERS_AXP209 is not set -CONFIG_RTC=y +CONFIG_DRIVERS_ASPEED_AST2050=y +CONFIG_DEVICE_SPECIFIC_OPTIONS=y +CONFIG_DRIVERS_ASPEED_AST_COMMON=y +# CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set +# CONFIG_DRIVERS_I2C_RTD2132 is not set +CONFIG_DRIVERS_I2C_W83795=y +# CONFIG_INTEL_DP is not set +# CONFIG_INTEL_DDI is not set +# CONFIG_INTEL_EDID is not set +# CONFIG_INTEL_INT15 is not set +# CONFIG_INTEL_GMA_ACPI is not set +# CONFIG_DRIVER_INTEL_I210 is not set +# CONFIG_DRIVER_MAXIM_MAX77686 is not set +# CONFIG_DRIVER_PARADE_PS8625 is not set +# CONFIG_DRIVER_PARADE_PS8640 is not set +CONFIG_DRIVERS_MC146818=y +# CONFIG_MAINBOARD_HAS_LPC_TPM is not set +# CONFIG_DRIVERS_RICOH_RCE822 is not set +# CONFIG_DRIVERS_SIL_3114 is not set +# CONFIG_DRIVER_TI_TPS65090 is not set +# CONFIG_DRIVERS_TI_TPS65913 is not set +# CONFIG_DRIVERS_TI_TPS65913_RTC is not set +# CONFIG_RTC is not set # CONFIG_TPM is not set CONFIG_STACK_SIZE=0x1000 CONFIG_MMCONF_SUPPORT_DEFAULT=y @@ -523,9 +518,7 @@ CONFIG_CONSOLE_SERIAL_115200=y # CONFIG_CONSOLE_SERIAL_9600 is not set CONFIG_TTYS0_BAUD=115200 # CONFIG_SPKMODEM is not set -CONFIG_CONSOLE_USB=y # CONFIG_CONSOLE_NE2K is not set -CONFIG_CONSOLE_CBMEM=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set @@ -537,7 +530,6 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set # CONFIG_CMOS_POST is not set -CONFIG_CONSOLE_POST=y # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set CONFIG_HAVE_ACPI_RESUME=y CONFIG_RESUME_PATH_SAME_AS_BOOT=y @@ -609,7 +601,6 @@ CONFIG_HAVE_DEBUG_SMBUS=y # CONFIG_DEBUG_MALLOC is not set # CONFIG_DEBUG_ACPI is not set # CONFIG_DEBUG_SPI_FLASH is not set -# CONFIG_DEBUG_USBDEBUG is not set # CONFIG_TRACE is not set CONFIG_ENABLE_APIC_EXT_ID=y CONFIG_WARNINGS_ARE_ERRORS=y diff --git a/resources/libreboot/config/grub/kgpe-d16/config b/resources/libreboot/config/grub/kgpe-d16/config index b7fab97e..862614fb 100644 --- a/resources/libreboot/config/grub/kgpe-d16/config +++ b/resources/libreboot/config/grub/kgpe-d16/config @@ -166,16 +166,16 @@ CONFIG_RAMTOP=0x400000 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0 CONFIG_CBFS_SIZE=0x200000 # CONFIG_POST_DEVICE is not set -CONFIG_USBDEBUG_HCD_INDEX=0 CONFIG_BOOT_MEDIA_SPI_BUS=0 CONFIG_TTYS0_LCS=3 +CONFIG_CONSOLE_POST=y +CONFIG_DRIVERS_UART_8250IO=y CONFIG_UDELAY_LAPIC_FIXED_FSB=200 CONFIG_CPU_ADDR_BITS=48 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 # CONFIG_USBDEBUG is not set CONFIG_MAINBOARD_VERSION="1.0" CONFIG_DRIVERS_PS2_KEYBOARD=y -CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_POST is not set CONFIG_BOARD_ROMSIZE_KB_2048=y # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set @@ -211,6 +211,7 @@ CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/amd/sb700/bootblock.c" CONFIG_TTYS0_BASE=0x3f8 CONFIG_EHCI_BAR=0xfef00000 CONFIG_HEAP_SIZE=0xc0000 +CONFIG_CONSOLE_CBMEM=y # CONFIG_SOC_MARVELL_ARMADA38X is not set # CONFIG_SOC_MARVELL_BG4CD is not set # CONFIG_SOC_MEDIATEK_MT8173 is not set @@ -219,6 +220,7 @@ CONFIG_HEAP_SIZE=0xc0000 # CONFIG_SOC_NVIDIA_TEGRA210 is not set # CONFIG_SOC_QC_IPQ806X is not set # CONFIG_SOC_ROCKCHIP_RK3288 is not set +# CONFIG_SOC_ROCKCHIP_RK3399 is not set # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set # CONFIG_SOC_UCB_RISCV is not set @@ -340,6 +342,7 @@ CONFIG_SUPERIO_WINBOND_W83667HG_A=y # # CONFIG_MAINBOARD_HAS_CHROMEOS is not set # CONFIG_UEFI_2_4_BINDING is not set +# CONFIG_USE_SIEMENS_HWILIB is not set # CONFIG_ARCH_ARM is not set # CONFIG_ARCH_BOOTBLOCK_ARM is not set # CONFIG_ARCH_VERSTAGE_ARM is not set @@ -400,8 +403,8 @@ CONFIG_HAVE_CMOS_DEFAULT=y CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default" CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set -# CONFIG_COMPILE_IN_DSDT is not set CONFIG_VERSTAGE_ADDR=0x2000000 +# CONFIG_POSTCAR_STAGE is not set # # Devices @@ -427,36 +430,16 @@ CONFIG_PCIEXP_CLK_PM=y CONFIG_PCIEXP_L1_SUB_STATE=y CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 -# CONFIG_PXE_ROM is not set # CONFIG_SOFTWARE_I2C is not set # # Generic Drivers # # CONFIG_DRIVERS_AS3722_RTC is not set -CONFIG_DRIVERS_ASPEED_AST_COMMON=y -CONFIG_DEVICE_SPECIFIC_OPTIONS=y -CONFIG_DRIVERS_ASPEED_AST2050=y # CONFIG_ELOG is not set # CONFIG_GIC is not set -# CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set -# CONFIG_DRIVERS_I2C_RTD2132 is not set -CONFIG_DRIVERS_I2C_W83795=y -# CONFIG_INTEL_DP is not set -# CONFIG_INTEL_DDI is not set -# CONFIG_INTEL_EDID is not set -# CONFIG_INTEL_INT15 is not set -# CONFIG_INTEL_GMA_ACPI is not set -# CONFIG_DRIVER_INTEL_I210 is not set # CONFIG_IPMI_KCS is not set # CONFIG_DRIVERS_LENOVO_WACOM is not set -# CONFIG_DRIVER_MAXIM_MAX77686 is not set -# CONFIG_DRIVER_PARADE_PS8625 is not set -# CONFIG_DRIVER_PARADE_PS8640 is not set -CONFIG_DRIVERS_MC146818=y -# CONFIG_MAINBOARD_HAS_LPC_TPM is not set -# CONFIG_DRIVERS_RICOH_RCE822 is not set -# CONFIG_DRIVERS_SIL_3114 is not set CONFIG_SPI_FLASH=y CONFIG_SPI_ATOMIC_SEQUENCING=y CONFIG_SPI_FLASH_MEMORY_MAPPED=y @@ -473,9 +456,6 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B is not set # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set -# CONFIG_DRIVER_TI_TPS65090 is not set -# CONFIG_DRIVERS_TI_TPS65913 is not set -# CONFIG_DRIVERS_TI_TPS65913_RTC is not set CONFIG_DRIVERS_UART=y # CONFIG_NO_UART_ON_SUPERIO is not set # CONFIG_DRIVERS_UART_8250MEM is not set @@ -483,17 +463,32 @@ CONFIG_DRIVERS_UART=y # CONFIG_HAVE_UART_SPECIAL is not set # CONFIG_DRIVERS_UART_OXPCIE is not set # CONFIG_DRIVERS_UART_PL011 is not set -CONFIG_HAVE_USBDEBUG=n -CONFIG_HAVE_USBDEBUG_OPTIONS=n -CONFIG_USBDEBUG_IN_ROMSTAGE=n -CONFIG_USBDEBUG_DEFAULT_PORT=0 -# CONFIG_USBDEBUG_DONGLE_STD is not set -# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set -# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set -# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set -CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0 +CONFIG_HAVE_USBDEBUG=y +CONFIG_HAVE_USBDEBUG_OPTIONS=y # CONFIG_DRIVER_XPOWERS_AXP209 is not set -CONFIG_RTC=y +CONFIG_DRIVERS_ASPEED_AST2050=y +CONFIG_DEVICE_SPECIFIC_OPTIONS=y +CONFIG_DRIVERS_ASPEED_AST_COMMON=y +# CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set +# CONFIG_DRIVERS_I2C_RTD2132 is not set +CONFIG_DRIVERS_I2C_W83795=y +# CONFIG_INTEL_DP is not set +# CONFIG_INTEL_DDI is not set +# CONFIG_INTEL_EDID is not set +# CONFIG_INTEL_INT15 is not set +# CONFIG_INTEL_GMA_ACPI is not set +# CONFIG_DRIVER_INTEL_I210 is not set +# CONFIG_DRIVER_MAXIM_MAX77686 is not set +# CONFIG_DRIVER_PARADE_PS8625 is not set +# CONFIG_DRIVER_PARADE_PS8640 is not set +CONFIG_DRIVERS_MC146818=y +# CONFIG_MAINBOARD_HAS_LPC_TPM is not set +# CONFIG_DRIVERS_RICOH_RCE822 is not set +# CONFIG_DRIVERS_SIL_3114 is not set +# CONFIG_DRIVER_TI_TPS65090 is not set +# CONFIG_DRIVERS_TI_TPS65913 is not set +# CONFIG_DRIVERS_TI_TPS65913_RTC is not set +# CONFIG_RTC is not set # CONFIG_TPM is not set CONFIG_STACK_SIZE=0x1000 CONFIG_MMCONF_SUPPORT_DEFAULT=y @@ -523,9 +518,7 @@ CONFIG_CONSOLE_SERIAL_115200=y # CONFIG_CONSOLE_SERIAL_9600 is not set CONFIG_TTYS0_BAUD=115200 # CONFIG_SPKMODEM is not set -CONFIG_CONSOLE_USB=y # CONFIG_CONSOLE_NE2K is not set -CONFIG_CONSOLE_CBMEM=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set @@ -537,7 +530,6 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set # CONFIG_CMOS_POST is not set -CONFIG_CONSOLE_POST=y # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set CONFIG_HAVE_ACPI_RESUME=y CONFIG_RESUME_PATH_SAME_AS_BOOT=y @@ -609,7 +601,6 @@ CONFIG_HAVE_DEBUG_SMBUS=y # CONFIG_DEBUG_MALLOC is not set # CONFIG_DEBUG_ACPI is not set # CONFIG_DEBUG_SPI_FLASH is not set -# CONFIG_DEBUG_USBDEBUG is not set # CONFIG_TRACE is not set CONFIG_ENABLE_APIC_EXT_ID=y CONFIG_WARNINGS_ARE_ERRORS=y diff --git a/resources/libreboot/config/grub/macbook21/config b/resources/libreboot/config/grub/macbook21/config index 7f46fbff..e59e9ee3 100644 --- a/resources/libreboot/config/grub/macbook21/config +++ b/resources/libreboot/config/grub/macbook21/config @@ -249,11 +249,17 @@ CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y CONFIG_CHANNEL_XOR_RANDOMIZATION=y # CONFIG_OVERRIDE_CLOCK_DISABLE is not set # CONFIG_CHECK_SLFRCS_ON_RESUME is not set +# CONFIG_VRAM_SIZE_1MB is not set +# CONFIG_VRAM_SIZE_4MB is not set +# CONFIG_VRAM_SIZE_8MB is not set +# CONFIG_VRAM_SIZE_16MB is not set +# CONFIG_VRAM_SIZE_32MB is not set +# CONFIG_VRAM_SIZE_48MB is not set +CONFIG_VRAM_SIZE_64MB=y +CONFIG_VRAM_SIZE=0x70 CONFIG_HPET_ADDRESS=0xfed00000 CONFIG_HPET_MIN_TICKS=0x80 CONFIG_MAX_PIRQ_LINKS=4 -CONFIG_VRAM_SIZE_64MB=y -CONFIG_VRAM_SIZE=0x70 # # Southbridge diff --git a/resources/libreboot/config/grub/r400_16mb/config b/resources/libreboot/config/grub/r400_16mb/config index b015723f..65101104 100644 --- a/resources/libreboot/config/grub/r400_16mb/config +++ b/resources/libreboot/config/grub/r400_16mb/config @@ -153,7 +153,7 @@ CONFIG_USBDEBUG=y CONFIG_DRIVERS_PS2_KEYBOARD=y CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_POST is not set -CONFIG_BOARD_ROMSIZE_KB_16384=y +CONFIG_BOARD_ROMSIZE_KB_8192=y # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set diff --git a/resources/libreboot/config/grub/t400_16mb/config b/resources/libreboot/config/grub/t400_16mb/config index 11a85727..09efb568 100644 --- a/resources/libreboot/config/grub/t400_16mb/config +++ b/resources/libreboot/config/grub/t400_16mb/config @@ -153,7 +153,7 @@ CONFIG_USBDEBUG=y CONFIG_DRIVERS_PS2_KEYBOARD=y CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_POST is not set -CONFIG_BOARD_ROMSIZE_KB_16384=y +CONFIG_BOARD_ROMSIZE_KB_8192=y # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set diff --git a/resources/libreboot/config/grub/t500_16mb/config b/resources/libreboot/config/grub/t500_16mb/config index 9700b0c5..6b869a6e 100644 --- a/resources/libreboot/config/grub/t500_16mb/config +++ b/resources/libreboot/config/grub/t500_16mb/config @@ -153,7 +153,7 @@ CONFIG_USBDEBUG=y CONFIG_DRIVERS_PS2_KEYBOARD=y CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_POST is not set -CONFIG_BOARD_ROMSIZE_KB_16384=y +CONFIG_BOARD_ROMSIZE_KB_8192=y # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set diff --git a/resources/libreboot/config/grub/t60/config b/resources/libreboot/config/grub/t60/config index 7833a152..f22eec20 100644 --- a/resources/libreboot/config/grub/t60/config +++ b/resources/libreboot/config/grub/t60/config @@ -259,11 +259,17 @@ CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y CONFIG_CHANNEL_XOR_RANDOMIZATION=y # CONFIG_OVERRIDE_CLOCK_DISABLE is not set # CONFIG_CHECK_SLFRCS_ON_RESUME is not set +# CONFIG_VRAM_SIZE_1MB is not set +# CONFIG_VRAM_SIZE_4MB is not set +# CONFIG_VRAM_SIZE_8MB is not set +# CONFIG_VRAM_SIZE_16MB is not set +# CONFIG_VRAM_SIZE_32MB is not set +# CONFIG_VRAM_SIZE_48MB is not set +CONFIG_VRAM_SIZE_64MB=y +CONFIG_VRAM_SIZE=0x70 CONFIG_HPET_ADDRESS=0xfed00000 CONFIG_HPET_MIN_TICKS=0x80 CONFIG_MAX_PIRQ_LINKS=4 -CONFIG_VRAM_SIZE_64MB=y -CONFIG_VRAM_SIZE=0x70 # # Southbridge diff --git a/resources/libreboot/config/grub/x200_16mb/config b/resources/libreboot/config/grub/x200_16mb/config index 9f46e067..e454616f 100644 --- a/resources/libreboot/config/grub/x200_16mb/config +++ b/resources/libreboot/config/grub/x200_16mb/config @@ -151,7 +151,7 @@ CONFIG_USBDEBUG=y CONFIG_DRIVERS_PS2_KEYBOARD=y # CONFIG_DRIVERS_UART_8250IO is not set # CONFIG_NO_POST is not set -CONFIG_BOARD_ROMSIZE_KB_16384=y +CONFIG_BOARD_ROMSIZE_KB_8192=y # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set diff --git a/resources/libreboot/config/grub/x60/config b/resources/libreboot/config/grub/x60/config index d6cd2d29..c67487fe 100644 --- a/resources/libreboot/config/grub/x60/config +++ b/resources/libreboot/config/grub/x60/config @@ -19,15 +19,15 @@ CONFIG_USE_OPTION_TABLE=y # CONFIG_STATIC_OPTION_TABLE is not set # CONFIG_UNCOMPRESSED_RAMSTAGE is not set CONFIG_COMPRESS_RAMSTAGE=y +# CONFIG_COMPRESS_PRERAM_STAGES is not set CONFIG_INCLUDE_CONFIG_FILE=y -# CONFIG_NO_XIP_EARLY_STAGES is not set CONFIG_EARLY_CBMEM_INIT=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_RELOCATABLE_RAMSTAGE is not set -# CONFIG_NO_STAGE_CACHE is not set +CONFIG_FLASHMAP_OFFSET=0x0 CONFIG_BOOTBLOCK_SIMPLE=y # CONFIG_BOOTBLOCK_NORMAL is not set CONFIG_BOOTBLOCK_CUSTOM=y @@ -118,6 +118,7 @@ CONFIG_MAX_CPUS=2 CONFIG_VGA_BIOS_ID="8086,27a2" # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set # CONFIG_VGA_BIOS is not set +# CONFIG_UDELAY_IO is not set CONFIG_DCACHE_RAM_BASE=0xffdf8000 CONFIG_DCACHE_RAM_SIZE=0x8000 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000 @@ -132,12 +133,9 @@ CONFIG_CBFS_SIZE=0x200000 CONFIG_POST_DEVICE=y CONFIG_USBDEBUG_HCD_INDEX=0 CONFIG_TTYS0_LCS=3 -# CONFIG_CONSOLE_POST is not set -CONFIG_DRIVERS_UART_8250IO=y # CONFIG_BOARD_LENOVO_G505S is not set # CONFIG_BOARD_LENOVO_R400 is not set # CONFIG_BOARD_LENOVO_T400 is not set -# CONFIG_BOARD_LENOVO_T420 is not set # CONFIG_BOARD_LENOVO_T420S is not set # CONFIG_BOARD_LENOVO_T430S is not set # CONFIG_BOARD_LENOVO_T500 is not set @@ -155,6 +153,7 @@ CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 CONFIG_USBDEBUG=y CONFIG_DRIVERS_PS2_KEYBOARD=y +CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_POST is not set CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0 CONFIG_BOARD_ROMSIZE_KB_2048=y @@ -183,25 +182,19 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y # # CONFIG_SOC_BROADCOM_CYGNUS is not set CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000 -CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y -CONFIG_ROMSTAGE_ADDR=0x2000000 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/i945/bootblock.c" CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c" CONFIG_TTYS0_BASE=0x3f8 CONFIG_EHCI_BAR=0xfef00000 CONFIG_HEAP_SIZE=0x4000 -CONFIG_CONSOLE_CBMEM=y -CONFIG_UART_PCI_ADDR=0 # CONFIG_SOC_MARVELL_ARMADA38X is not set # CONFIG_SOC_MARVELL_BG4CD is not set # CONFIG_SOC_MEDIATEK_MT8173 is not set # CONFIG_SOC_NVIDIA_TEGRA124 is not set # CONFIG_SOC_NVIDIA_TEGRA132 is not set # CONFIG_SOC_NVIDIA_TEGRA210 is not set -# CONFIG_SOC_QC_IPQ40XX is not set # CONFIG_SOC_QC_IPQ806X is not set # CONFIG_SOC_ROCKCHIP_RK3288 is not set -# CONFIG_SOC_ROCKCHIP_RK3399 is not set # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set # CONFIG_SOC_UCB_RISCV is not set @@ -224,21 +217,21 @@ CONFIG_SSE2=y # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set # CONFIG_CPU_TI_AM335X is not set # CONFIG_PARALLEL_CPU_INIT is not set -# CONFIG_PARALLEL_MP is not set -# CONFIG_UDELAY_IO is not set CONFIG_UDELAY_LAPIC=y CONFIG_LAPIC_MONOTONIC_TIMER=y # CONFIG_UDELAY_TSC is not set # CONFIG_UDELAY_TIMER2 is not set +# CONFIG_TSC_CALIBRATE_WITH_IO is not set # CONFIG_TSC_SYNC_LFENCE is not set CONFIG_TSC_SYNC_MFENCE=y -# CONFIG_NO_FIXED_XIP_ROM_SIZE is not set CONFIG_LOGICAL_CPUS=y # CONFIG_SMM_TSEG is not set CONFIG_SMM_LAPIC_REMAP_MITIGATION=y # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set # CONFIG_X86_AMD_FIXED_MTRRS is not set # CONFIG_PLATFORM_USES_FSP1_0 is not set +# CONFIG_PARALLEL_MP is not set +# CONFIG_BACKUP_DEFAULT_SMM_REGION is not set # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set CONFIG_CACHE_AS_RAM=y CONFIG_SMP=y @@ -260,7 +253,6 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y CONFIG_VIDEO_MB=0 # CONFIG_NORTHBRIDGE_AMD_PI is not set CONFIG_RAMBASE=0x100000 -# CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y CONFIG_NORTHBRIDGE_INTEL_I945=y # CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set @@ -273,6 +265,7 @@ CONFIG_CHANNEL_XOR_RANDOMIZATION=y # CONFIG_VRAM_SIZE_8MB is not set # CONFIG_VRAM_SIZE_16MB is not set # CONFIG_VRAM_SIZE_32MB is not set +# CONFIG_VRAM_SIZE_48MB is not set CONFIG_VRAM_SIZE_64MB=y CONFIG_VRAM_SIZE=0x70 CONFIG_HPET_ADDRESS=0xfed00000 @@ -305,7 +298,6 @@ CONFIG_H8_DOCK_EARLY_INIT=y CONFIG_EC_LENOVO_PMH7=y # CONFIG_MAINBOARD_HAS_CHROMEOS is not set # CONFIG_UEFI_2_4_BINDING is not set -# CONFIG_USE_SIEMENS_HWILIB is not set # CONFIG_ARCH_ARM is not set # CONFIG_ARCH_BOOTBLOCK_ARM is not set # CONFIG_ARCH_VERSTAGE_ARM is not set @@ -359,6 +351,7 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y # CONFIG_USE_MARCH_586 is not set CONFIG_AP_IN_SIPI_WAIT=y # CONFIG_SIPI_VECTOR_IN_ROM is not set +CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y # CONFIG_ROMCC is not set # CONFIG_LATE_CBMEM_INIT is not set CONFIG_PC80_SYSTEM=y @@ -366,8 +359,9 @@ CONFIG_HAVE_CMOS_DEFAULT=y CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default" CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set +# CONFIG_COMPILE_IN_DSDT is not set +CONFIG_ROMSTAGE_ADDR=0x2000000 CONFIG_VERSTAGE_ADDR=0x2000000 -# CONFIG_POSTCAR_STAGE is not set # # Devices @@ -392,6 +386,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y # CONFIG_PCIEXP_L1_SUB_STATE is not set CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 +# CONFIG_PXE_ROM is not set # CONFIG_SOFTWARE_I2C is not set # @@ -404,23 +399,38 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 # # CONFIG_DRIVERS_AS3722_RTC is not set # CONFIG_GIC is not set +CONFIG_SMBIOS_PROVIDED_BY_MOBO=y +# CONFIG_DRIVERS_I2C_RTD2132 is not set +CONFIG_DRIVERS_ICS_954309=y +# CONFIG_INTEL_DP is not set +# CONFIG_INTEL_DDI is not set +CONFIG_INTEL_EDID=y +CONFIG_INTEL_INT15=y +CONFIG_INTEL_GMA_ACPI=y +# CONFIG_DRIVER_INTEL_I210 is not set # CONFIG_IPMI_KCS is not set CONFIG_DRIVERS_LENOVO_WACOM=y # CONFIG_DIGITIZER_AUTODETECT is not set CONFIG_DIGITIZER_PRESENT=y # CONFIG_DIGITIZER_ABSENT is not set +# CONFIG_DRIVER_MAXIM_MAX77686 is not set +# CONFIG_DRIVER_PARADE_PS8625 is not set +CONFIG_DRIVERS_MC146818=y +# CONFIG_MAINBOARD_HAS_LPC_TPM is not set +# CONFIG_DRIVERS_RICOH_RCE822 is not set +# CONFIG_DRIVERS_SIL_3114 is not set # CONFIG_SPI_FLASH is not set # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set +# CONFIG_DRIVER_TI_TPS65090 is not set +# CONFIG_DRIVERS_TI_TPS65913 is not set +# CONFIG_DRIVERS_TI_TPS65913_RTC is not set CONFIG_DRIVERS_UART=y # CONFIG_NO_UART_ON_SUPERIO is not set -# CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set -# CONFIG_UART_OVERRIDE_REFCLK is not set # CONFIG_DRIVERS_UART_8250MEM is not set # CONFIG_DRIVERS_UART_8250MEM_32 is not set # CONFIG_HAVE_UART_SPECIAL is not set # CONFIG_DRIVERS_UART_OXPCIE is not set # CONFIG_DRIVERS_UART_PL011 is not set -# CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set CONFIG_HAVE_USBDEBUG=y # CONFIG_HAVE_USBDEBUG_OPTIONS is not set CONFIG_USBDEBUG_IN_ROMSTAGE=y @@ -430,27 +440,8 @@ CONFIG_USBDEBUG_DONGLE_STD=y # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set # CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0 -CONFIG_SMBIOS_PROVIDED_BY_MOBO=y -# CONFIG_DRIVERS_I2C_RTD2132 is not set -CONFIG_DRIVERS_ICS_954309=y -# CONFIG_INTEL_DP is not set -# CONFIG_INTEL_DDI is not set -CONFIG_INTEL_EDID=y -CONFIG_INTEL_INT15=y -CONFIG_INTEL_GMA_ACPI=y -# CONFIG_DRIVER_INTEL_I210 is not set -# CONFIG_DRIVER_MAXIM_MAX77686 is not set -# CONFIG_DRIVER_PARADE_PS8625 is not set -# CONFIG_DRIVER_PARADE_PS8640 is not set -CONFIG_DRIVERS_MC146818=y -# CONFIG_MAINBOARD_HAS_LPC_TPM is not set -# CONFIG_DRIVERS_RICOH_RCE822 is not set -# CONFIG_DRIVERS_SIL_3114 is not set -# CONFIG_DRIVER_TI_TPS65090 is not set -# CONFIG_DRIVERS_TI_TPS65913 is not set -# CONFIG_DRIVERS_TI_TPS65913_RTC is not set # CONFIG_DRIVER_XPOWERS_AXP209 is not set -# CONFIG_RTC is not set +CONFIG_RTC=y # CONFIG_TPM is not set CONFIG_STACK_SIZE=0x1000 CONFIG_MMCONF_SUPPORT_DEFAULT=y @@ -482,6 +473,7 @@ CONFIG_TTYS0_BAUD=115200 # CONFIG_SPKMODEM is not set CONFIG_CONSOLE_USB=y # CONFIG_CONSOLE_NE2K is not set +CONFIG_CONSOLE_CBMEM=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set @@ -493,6 +485,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set # CONFIG_CMOS_POST is not set +# CONFIG_CONSOLE_POST is not set CONFIG_POST_DEVICE_NONE=y # CONFIG_POST_DEVICE_LPC is not set # CONFIG_POST_DEVICE_PCI_PCIE is not set @@ -543,13 +536,8 @@ CONFIG_PAYLOAD_FILE="grub.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set - -# -# Secondary Payloads -# # CONFIG_COREINFO_SECONDARY_PAYLOAD is not set # CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set -# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set # # Debugging -- cgit v1.2.3-70-g09d2