From d045e6c59f79de80ce5508b9b54cb76941756152 Mon Sep 17 00:00:00 2001 From: Martin Kepplinger Date: Fri, 18 Jan 2019 14:00:50 +0100 Subject: [PATCH] x230: update coreboot to current master --- ...fig-bbd237702a0 => free-config-cd97982e2e} | 27 ++++++++++++------- ...-bbd237702a0 => nonfree-config-cd97982e2e} | 16 ++++++----- 2 files changed, 26 insertions(+), 17 deletions(-) rename x230/{free-config-bbd237702a0 => free-config-cd97982e2e} (97%) rename x230/{nonfree-config-bbd237702a0 => nonfree-config-cd97982e2e} (98%) diff --git a/x230/free-config-bbd237702a0 b/x230/free-config-cd97982e2e similarity index 97% rename from x230/free-config-bbd237702a0 rename to x230/free-config-cd97982e2e index d3366d4..4a9173d 100644 --- a/x230/free-config-bbd237702a0 +++ b/x230/free-config-cd97982e2e @@ -141,6 +141,7 @@ CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00 # CONFIG_BOARD_LENOVO_X201 is not set # CONFIG_BOARD_LENOVO_X220 is not set # CONFIG_BOARD_LENOVO_X220I is not set +# CONFIG_BOARD_LENOVO_X1 is not set CONFIG_BOARD_LENOVO_X230=y # CONFIG_BOARD_LENOVO_X60 is not set # CONFIG_BOARD_LENOVO_Z61T is not set @@ -151,7 +152,6 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 # CONFIG_USBDEBUG is not set # CONFIG_DRIVERS_PS2_KEYBOARD is not set # CONFIG_PCIEXP_L1_SUB_STATE is not set -CONFIG_NO_POST=y CONFIG_SMBIOS_ENCLOSURE_TYPE=0x09 CONFIG_BOARD_ROMSIZE_KB_12288=y # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set @@ -291,8 +291,6 @@ CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE=y CONFIG_USE_NATIVE_RAMINIT=y # CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set # CONFIG_NATIVE_RAMINIT_IGNORE_XMP_MAX_DIMMS is not set -CONFIG_SANDYBRIDGE_IVYBRIDGE_LVDS=y -CONFIG_IF_NATIVE_VGA_INIT=y CONFIG_MAX_PIRQ_LINKS=4 # @@ -402,6 +400,12 @@ CONFIG_UDK_VERSION=2013 # CONFIG_ARCH_ROMSTAGE_PPC64 is not set # CONFIG_ARCH_RAMSTAGE_PPC64 is not set # CONFIG_ARCH_RISCV is not set +CONFIG_ARCH_RISCV_M=y +# CONFIG_ARCH_RISCV_S is not set +# CONFIG_ARCH_RISCV_U is not set +# CONFIG_ARCH_RISCV_RV64 is not set +# CONFIG_ARCH_RISCV_RV32 is not set +# CONFIG_ARCH_RISCV_PMP is not set # CONFIG_ARCH_BOOTBLOCK_RISCV is not set # CONFIG_ARCH_VERSTAGE_RISCV is not set # CONFIG_ARCH_ROMSTAGE_RISCV is not set @@ -452,11 +456,10 @@ CONFIG_HAVE_CF9_RESET=y # CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y CONFIG_HAVE_LINEAR_FRAMEBUFFER=y -CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y +# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set # CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set CONFIG_MAINBOARD_HAS_LIBGFXINIT=y -CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y -# CONFIG_MAINBOARD_USE_LIBGFXINIT is not set +CONFIG_MAINBOARD_USE_LIBGFXINIT=y # CONFIG_VGA_ROM_RUN is not set # CONFIG_NO_GFX_INIT is not set # CONFIG_MULTIPLE_VGA_ADAPTERS is not set @@ -545,7 +548,7 @@ CONFIG_SMBIOS_PROVIDED_BY_MOBO=y # CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set # CONFIG_PLATFORM_USES_FSP2_0 is not set # CONFIG_INTEL_DDI is not set -CONFIG_INTEL_EDID=y +# CONFIG_INTEL_EDID is not set CONFIG_INTEL_INT15=y CONFIG_INTEL_GMA_ACPI=y # CONFIG_INTEL_GMA_SSC_ALTERNATE_REF is not set @@ -568,7 +571,6 @@ CONFIG_DRIVERS_MC146818=y CONFIG_LPC_TPM=y CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000 CONFIG_MAINBOARD_HAS_LPC_TPM=y -CONFIG_VGA=y CONFIG_DRIVERS_RICOH_RCE822=y # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set # CONFIG_NC_FPGA_NOTIFY_CB_READY is not set @@ -625,6 +627,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set +CONFIG_NO_POST=y # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set CONFIG_HWBASE_DEBUG_CB=y CONFIG_HAVE_ACPI_RESUME=y @@ -725,6 +728,12 @@ CONFIG_HAVE_DEBUG_SMBUS=y # CONFIG_DEBUG_BOOT_STATE is not set # CONFIG_DEBUG_ADA_CODE is not set # CONFIG_HAVE_EM100_SUPPORT is not set +CONFIG_NO_EDID_FILL_FB=y +CONFIG_RAMSTAGE_ADA=y +CONFIG_RAMSTAGE_LIBHWBASE=y +CONFIG_HWBASE_DYNAMIC_MMIO=y +CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000 +CONFIG_HWBASE_DIRECT_PCIDEV=y # CONFIG_ENABLE_APIC_EXT_ID is not set CONFIG_WARNINGS_ARE_ERRORS=y # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set @@ -733,8 +742,6 @@ CONFIG_WARNINGS_ARE_ERRORS=y # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set # CONFIG_REG_SCRIPT is not set -# CONFIG_CREATE_BOARD_CHECKLIST is not set -# CONFIG_MAKE_CHECKLIST_PUBLIC is not set # CONFIG_NO_XIP_EARLY_STAGES is not set # CONFIG_EARLY_CBMEM_LIST is not set CONFIG_RELOCATABLE_MODULES=y diff --git a/x230/nonfree-config-bbd237702a0 b/x230/nonfree-config-cd97982e2e similarity index 98% rename from x230/nonfree-config-bbd237702a0 rename to x230/nonfree-config-cd97982e2e index a32c743..b3ebd13 100644 --- a/x230/nonfree-config-bbd237702a0 +++ b/x230/nonfree-config-cd97982e2e @@ -142,6 +142,7 @@ CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00 # CONFIG_BOARD_LENOVO_X201 is not set # CONFIG_BOARD_LENOVO_X220 is not set # CONFIG_BOARD_LENOVO_X220I is not set +# CONFIG_BOARD_LENOVO_X1 is not set CONFIG_BOARD_LENOVO_X230=y # CONFIG_BOARD_LENOVO_X60 is not set # CONFIG_BOARD_LENOVO_Z61T is not set @@ -152,7 +153,6 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 # CONFIG_USBDEBUG is not set # CONFIG_DRIVERS_PS2_KEYBOARD is not set # CONFIG_PCIEXP_L1_SUB_STATE is not set -CONFIG_NO_POST=y CONFIG_SMBIOS_ENCLOSURE_TYPE=0x09 CONFIG_BOARD_ROMSIZE_KB_12288=y # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set @@ -293,7 +293,6 @@ CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE=y CONFIG_USE_NATIVE_RAMINIT=y # CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set # CONFIG_NATIVE_RAMINIT_IGNORE_XMP_MAX_DIMMS is not set -CONFIG_SANDYBRIDGE_IVYBRIDGE_LVDS=y CONFIG_MAX_PIRQ_LINKS=4 # @@ -403,6 +402,12 @@ CONFIG_UDK_VERSION=2013 # CONFIG_ARCH_ROMSTAGE_PPC64 is not set # CONFIG_ARCH_RAMSTAGE_PPC64 is not set # CONFIG_ARCH_RISCV is not set +CONFIG_ARCH_RISCV_M=y +# CONFIG_ARCH_RISCV_S is not set +# CONFIG_ARCH_RISCV_U is not set +# CONFIG_ARCH_RISCV_RV64 is not set +# CONFIG_ARCH_RISCV_RV32 is not set +# CONFIG_ARCH_RISCV_PMP is not set # CONFIG_ARCH_BOOTBLOCK_RISCV is not set # CONFIG_ARCH_VERSTAGE_RISCV is not set # CONFIG_ARCH_ROMSTAGE_RISCV is not set @@ -453,10 +458,9 @@ CONFIG_HAVE_CF9_RESET=y # CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y CONFIG_HAVE_VBE_LINEAR_FRAMEBUFFER=y -CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y +# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set # CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set CONFIG_MAINBOARD_HAS_LIBGFXINIT=y -# CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT is not set # CONFIG_MAINBOARD_USE_LIBGFXINIT is not set CONFIG_VGA_ROM_RUN=y # CONFIG_NO_GFX_INIT is not set @@ -608,7 +612,6 @@ CONFIG_DRIVERS_MC146818=y CONFIG_LPC_TPM=y CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000 CONFIG_MAINBOARD_HAS_LPC_TPM=y -CONFIG_VGA=y CONFIG_DRIVERS_RICOH_RCE822=y # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set # CONFIG_NC_FPGA_NOTIFY_CB_READY is not set @@ -665,6 +668,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set +CONFIG_NO_POST=y # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set CONFIG_HWBASE_DEBUG_CB=y CONFIG_HAVE_ACPI_RESUME=y @@ -773,8 +777,6 @@ CONFIG_WARNINGS_ARE_ERRORS=y # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set # CONFIG_REG_SCRIPT is not set -# CONFIG_CREATE_BOARD_CHECKLIST is not set -# CONFIG_MAKE_CHECKLIST_PUBLIC is not set # CONFIG_NO_XIP_EARLY_STAGES is not set # CONFIG_EARLY_CBMEM_LIST is not set CONFIG_RELOCATABLE_MODULES=y