From 6deca755cc63d109ee6492c3951ca028f2861a33 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Sat, 13 Dec 2014 17:19:38 -0500
Subject: Update coreboot (again)

Also improve the deblob utilities
---
(limited to 'resources/libreboot/config/x200_4mb')

diff --git a/resources/libreboot/config/x200_4mb/config b/resources/libreboot/config/x200_4mb/config
index a58ca2f..c6bea27 100644
--- a/resources/libreboot/config/x200_4mb/config
+++ b/resources/libreboot/config/x200_4mb/config
@@ -106,7 +106,6 @@ CONFIG_VENDOR_LENOVO=y
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/x200"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad X200"
-CONFIG_IRQ_SLOT_COUNT=18
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
 CONFIG_VGA_BIOS_ID="8086,2a42"
@@ -117,12 +116,14 @@ CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_UDELAY_IO=y
 CONFIG_DCACHE_RAM_BASE=0xffaf8000
 CONFIG_DCACHE_RAM_SIZE=0x8000
-CONFIG_ACPI_SSDTX_NUM=0
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
+CONFIG_RAMTOP=0x200000
+CONFIG_STACK_SIZE=0x1000
+CONFIG_USBDEBUG_HCD_INDEX=2
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x3FD000
 CONFIG_POST_IO=y
@@ -135,8 +136,8 @@ CONFIG_BOARD_LENOVO_X200=y
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_G505S is not set
 CONFIG_SEABIOS_PS2_TIMEOUT=0
-CONFIG_USBDEBUG_HCD_INDEX=2
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_USBDEBUG=y
@@ -158,13 +159,13 @@ CONFIG_ROM_SIZE=0x400000
 CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
+# CONFIG_ARCH_RISCV is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_AP_IN_SIPI_WAIT is not set
 # 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
@@ -193,6 +194,10 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_BOOTBLOCK_ARM_V8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM_V8_64 is not set
+# CONFIG_ARCH_BOOTBLOCK_RISCV is not set
+# CONFIG_ARCH_ROMSTAGE_RISCV is not set
+# CONFIG_ARCH_RAMSTAGE_RISCV is not set
+# CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -245,7 +250,6 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 #
 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
@@ -283,6 +287,7 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
+# CONFIG_SOC_UCB_RISCV is not set
 
 #
 # Devices
--
cgit v0.9.1