Update coreboot-libre configs (forgot to do it earlier)

20 files changed, 53 insertions, 34 deletions

diff --git a/resources/libreboot/config/depthcharge/veyron_speedy/config b/resources/libreboot/config/depthcharge/veyron_speedy/config
index 9647cff..81dcfab 100644
--- a/resources/libreboot/config/depthcharge/veyron_speedy/config
+++ b/resources/libreboot/config/depthcharge/veyron_speedy/config
@@ -356,7 +356,7 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
 CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 # CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
-# CONFIG_SMBUS_HAS_AUX is not set
+# CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 # CONFIG_SPD_CACHE is not set
 # CONFIG_PCI is not set
 # CONFIG_PXE_ROM is not set
diff --git a/resources/libreboot/config/grub/kfsn4-dre/config b/resources/libreboot/config/grub/kfsn4-dre/config
index 2a1307f..2373449 100644
--- a/resources/libreboot/config/grub/kfsn4-dre/config
+++ b/resources/libreboot/config/grub/kfsn4-dre/config
@@ -8,6 +8,7 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
+# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -164,6 +165,7 @@ CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_TTYS0_LCS=3
 CONFIG_CBFS_SIZE=0x100000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_UDELAY_LAPIC_FIXED_FSB=200
 CONFIG_POST_DEVICE=y
 CONFIG_CPU_ADDR_BITS=48
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
@@ -215,7 +217,7 @@ CONFIG_HEAP_SIZE=0xc0000
 #
 # CONFIG_CPU_ALLWINNER_A10 is not set
 CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
-CONFIG_DCACHE_BSP_STACK_SLUSH=0x4000
+CONFIG_DCACHE_BSP_STACK_SLUSH=0x1000
 CONFIG_DCACHE_AP_STACK_SIZE=0x400
 CONFIG_CPU_SOCKET_TYPE=0x10
 # CONFIG_EXT_RT_TBL_SUPPORT is not set
@@ -226,11 +228,11 @@ CONFIG_CPU_AMD_SOCKET_F_1207=y
 CONFIG_DIMM_SUPPORT=0x0104
 CONFIG_LIFT_BSP_APIC_ID=y
 CONFIG_SET_FIDVID=y
-CONFIG_UDELAY_LAPIC_FIXED_FSB=200
 CONFIG_SET_FIDVID_DEBUG=y
 # CONFIG_SET_FIDVID_CORE0_ONLY is not set
 CONFIG_SET_FIDVID_STORE_AP_APICID_AT_FIRST=y
 CONFIG_CPU_AMD_MODEL_10XXX=y
+# CONFIG_USE_LARGE_DCACHE is not set
 CONFIG_NUM_IPI_STARTS=1
 CONFIG_SET_FIDVID_CORE_RANGE=0
 # CONFIG_CPU_AMD_AGESA is not set
@@ -263,7 +265,6 @@ CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
 # CONFIG_CPU_MICROCODE_CBFS_GENERATE is not set
 # CONFIG_CPU_MICROCODE_CBFS_EXTERNAL is not set
 CONFIG_CPU_MICROCODE_CBFS_NONE=y
-CONFIG_CPU_MICROCODE_MULTIPLE_FILES=y
 
 #
 # Northbridge
@@ -386,7 +387,7 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_ON_DEVICE_ROM_RUN is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
-# CONFIG_SMBUS_HAS_AUX is not set
+# CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
 CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT=y
diff --git a/resources/libreboot/config/grub/kfsn4-dre_2mb/config b/resources/libreboot/config/grub/kfsn4-dre_2mb/config
index 91f51f4..6b8721a 100644
--- a/resources/libreboot/config/grub/kfsn4-dre_2mb/config
+++ b/resources/libreboot/config/grub/kfsn4-dre_2mb/config
@@ -8,6 +8,7 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
+# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -164,6 +165,7 @@ CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_TTYS0_LCS=3
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_UDELAY_LAPIC_FIXED_FSB=200
 CONFIG_POST_DEVICE=y
 CONFIG_CPU_ADDR_BITS=48
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
@@ -215,7 +217,7 @@ CONFIG_HEAP_SIZE=0xc0000
 #
 # CONFIG_CPU_ALLWINNER_A10 is not set
 CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
-CONFIG_DCACHE_BSP_STACK_SLUSH=0x4000
+CONFIG_DCACHE_BSP_STACK_SLUSH=0x1000
 CONFIG_DCACHE_AP_STACK_SIZE=0x400
 CONFIG_CPU_SOCKET_TYPE=0x10
 # CONFIG_EXT_RT_TBL_SUPPORT is not set
@@ -226,11 +228,11 @@ CONFIG_CPU_AMD_SOCKET_F_1207=y
 CONFIG_DIMM_SUPPORT=0x0104
 CONFIG_LIFT_BSP_APIC_ID=y
 CONFIG_SET_FIDVID=y
-CONFIG_UDELAY_LAPIC_FIXED_FSB=200
 CONFIG_SET_FIDVID_DEBUG=y
 # CONFIG_SET_FIDVID_CORE0_ONLY is not set
 CONFIG_SET_FIDVID_STORE_AP_APICID_AT_FIRST=y
 CONFIG_CPU_AMD_MODEL_10XXX=y
+# CONFIG_USE_LARGE_DCACHE is not set
 CONFIG_NUM_IPI_STARTS=1
 CONFIG_SET_FIDVID_CORE_RANGE=0
 # CONFIG_CPU_AMD_AGESA is not set
@@ -263,7 +265,6 @@ CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
 # CONFIG_CPU_MICROCODE_CBFS_GENERATE is not set
 # CONFIG_CPU_MICROCODE_CBFS_EXTERNAL is not set
 CONFIG_CPU_MICROCODE_CBFS_NONE=y
-CONFIG_CPU_MICROCODE_MULTIPLE_FILES=y
 
 #
 # Northbridge
@@ -386,7 +387,7 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_ON_DEVICE_ROM_RUN is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
-# CONFIG_SMBUS_HAS_AUX is not set
+# CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
 CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT=y
diff --git a/resources/libreboot/config/grub/kgpe-d16_16mb/config b/resources/libreboot/config/grub/kgpe-d16_16mb/config
index 5a314df..e584fbf 100644
--- a/resources/libreboot/config/grub/kgpe-d16_16mb/config
+++ b/resources/libreboot/config/grub/kgpe-d16_16mb/config
@@ -8,6 +8,7 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
+# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -164,6 +165,7 @@ CONFIG_BOOT_MEDIA_SPI_BUS=0
 CONFIG_TTYS0_LCS=3
 CONFIG_CBFS_SIZE=0x1000000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_UDELAY_LAPIC_FIXED_FSB=200
 CONFIG_POST_DEVICE=y
 CONFIG_CPU_ADDR_BITS=48
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
@@ -224,11 +226,11 @@ CONFIG_CPU_AMD_SOCKET_G34_NON_AGESA=y
 CONFIG_DIMM_SUPPORT=0x0005
 CONFIG_LIFT_BSP_APIC_ID=y
 CONFIG_SET_FIDVID=y
-CONFIG_UDELAY_LAPIC_FIXED_FSB=200
 CONFIG_SET_FIDVID_DEBUG=y
 # CONFIG_SET_FIDVID_CORE0_ONLY is not set
 CONFIG_SET_FIDVID_STORE_AP_APICID_AT_FIRST=y
 CONFIG_CPU_AMD_MODEL_10XXX=y
+CONFIG_USE_LARGE_DCACHE=y
 CONFIG_NUM_IPI_STARTS=1
 CONFIG_SET_FIDVID_CORE_RANGE=0
 # CONFIG_CPU_AMD_AGESA is not set
@@ -262,7 +264,6 @@ CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
 # CONFIG_CPU_MICROCODE_CBFS_GENERATE is not set
 # CONFIG_CPU_MICROCODE_CBFS_EXTERNAL is not set
 CONFIG_CPU_MICROCODE_CBFS_NONE=y
-CONFIG_CPU_MICROCODE_MULTIPLE_FILES=y
 
 #
 # Northbridge
@@ -387,7 +388,7 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
-CONFIG_SMBUS_HAS_AUX=y
+CONFIG_SMBUS_HAS_AUX_CHANNELS=y
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
 CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT=y
diff --git a/resources/libreboot/config/grub/kgpe-d16_2mb/config b/resources/libreboot/config/grub/kgpe-d16_2mb/config
index 6426f5f..fd57e17 100644
--- a/resources/libreboot/config/grub/kgpe-d16_2mb/config
+++ b/resources/libreboot/config/grub/kgpe-d16_2mb/config
@@ -8,6 +8,7 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
+# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -164,6 +165,7 @@ CONFIG_BOOT_MEDIA_SPI_BUS=0
 CONFIG_TTYS0_LCS=3
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_UDELAY_LAPIC_FIXED_FSB=200
 CONFIG_POST_DEVICE=y
 CONFIG_CPU_ADDR_BITS=48
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
@@ -224,11 +226,11 @@ CONFIG_CPU_AMD_SOCKET_G34_NON_AGESA=y
 CONFIG_DIMM_SUPPORT=0x0005
 CONFIG_LIFT_BSP_APIC_ID=y
 CONFIG_SET_FIDVID=y
-CONFIG_UDELAY_LAPIC_FIXED_FSB=200
 CONFIG_SET_FIDVID_DEBUG=y
 # CONFIG_SET_FIDVID_CORE0_ONLY is not set
 CONFIG_SET_FIDVID_STORE_AP_APICID_AT_FIRST=y
 CONFIG_CPU_AMD_MODEL_10XXX=y
+CONFIG_USE_LARGE_DCACHE=y
 CONFIG_NUM_IPI_STARTS=1
 CONFIG_SET_FIDVID_CORE_RANGE=0
 # CONFIG_CPU_AMD_AGESA is not set
@@ -262,7 +264,6 @@ CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
 # CONFIG_CPU_MICROCODE_CBFS_GENERATE is not set
 # CONFIG_CPU_MICROCODE_CBFS_EXTERNAL is not set
 CONFIG_CPU_MICROCODE_CBFS_NONE=y
-CONFIG_CPU_MICROCODE_MULTIPLE_FILES=y
 
 #
 # Northbridge
@@ -387,7 +388,7 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
-CONFIG_SMBUS_HAS_AUX=y
+CONFIG_SMBUS_HAS_AUX_CHANNELS=y
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
 CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT=y
diff --git a/resources/libreboot/config/grub/kgpe-d16_4mb/config b/resources/libreboot/config/grub/kgpe-d16_4mb/config
index 88fddac..ae063cb 100644
--- a/resources/libreboot/config/grub/kgpe-d16_4mb/config
+++ b/resources/libreboot/config/grub/kgpe-d16_4mb/config
@@ -8,6 +8,7 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
+# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -164,6 +165,7 @@ CONFIG_BOOT_MEDIA_SPI_BUS=0
 CONFIG_TTYS0_LCS=3
 CONFIG_CBFS_SIZE=0x400000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_UDELAY_LAPIC_FIXED_FSB=200
 CONFIG_POST_DEVICE=y
 CONFIG_CPU_ADDR_BITS=48
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
@@ -224,11 +226,11 @@ CONFIG_CPU_AMD_SOCKET_G34_NON_AGESA=y
 CONFIG_DIMM_SUPPORT=0x0005
 CONFIG_LIFT_BSP_APIC_ID=y
 CONFIG_SET_FIDVID=y
-CONFIG_UDELAY_LAPIC_FIXED_FSB=200
 CONFIG_SET_FIDVID_DEBUG=y
 # CONFIG_SET_FIDVID_CORE0_ONLY is not set
 CONFIG_SET_FIDVID_STORE_AP_APICID_AT_FIRST=y
 CONFIG_CPU_AMD_MODEL_10XXX=y
+CONFIG_USE_LARGE_DCACHE=y
 CONFIG_NUM_IPI_STARTS=1
 CONFIG_SET_FIDVID_CORE_RANGE=0
 # CONFIG_CPU_AMD_AGESA is not set
@@ -262,7 +264,6 @@ CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
 # CONFIG_CPU_MICROCODE_CBFS_GENERATE is not set
 # CONFIG_CPU_MICROCODE_CBFS_EXTERNAL is not set
 CONFIG_CPU_MICROCODE_CBFS_NONE=y
-CONFIG_CPU_MICROCODE_MULTIPLE_FILES=y
 
 #
 # Northbridge
@@ -387,7 +388,7 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
-CONFIG_SMBUS_HAS_AUX=y
+CONFIG_SMBUS_HAS_AUX_CHANNELS=y
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
 CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT=y
diff --git a/resources/libreboot/config/grub/kgpe-d16_8mb/config b/resources/libreboot/config/grub/kgpe-d16_8mb/config
index 3304e29..4322fcb 100644
--- a/resources/libreboot/config/grub/kgpe-d16_8mb/config
+++ b/resources/libreboot/config/grub/kgpe-d16_8mb/config
@@ -8,6 +8,7 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
+# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -164,6 +165,7 @@ CONFIG_BOOT_MEDIA_SPI_BUS=0
 CONFIG_TTYS0_LCS=3
 CONFIG_CBFS_SIZE=0x800000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_UDELAY_LAPIC_FIXED_FSB=200
 CONFIG_POST_DEVICE=y
 CONFIG_CPU_ADDR_BITS=48
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
@@ -224,11 +226,11 @@ CONFIG_CPU_AMD_SOCKET_G34_NON_AGESA=y
 CONFIG_DIMM_SUPPORT=0x0005
 CONFIG_LIFT_BSP_APIC_ID=y
 CONFIG_SET_FIDVID=y
-CONFIG_UDELAY_LAPIC_FIXED_FSB=200
 CONFIG_SET_FIDVID_DEBUG=y
 # CONFIG_SET_FIDVID_CORE0_ONLY is not set
 CONFIG_SET_FIDVID_STORE_AP_APICID_AT_FIRST=y
 CONFIG_CPU_AMD_MODEL_10XXX=y
+CONFIG_USE_LARGE_DCACHE=y
 CONFIG_NUM_IPI_STARTS=1
 CONFIG_SET_FIDVID_CORE_RANGE=0
 # CONFIG_CPU_AMD_AGESA is not set
@@ -262,7 +264,6 @@ CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
 # CONFIG_CPU_MICROCODE_CBFS_GENERATE is not set
 # CONFIG_CPU_MICROCODE_CBFS_EXTERNAL is not set
 CONFIG_CPU_MICROCODE_CBFS_NONE=y
-CONFIG_CPU_MICROCODE_MULTIPLE_FILES=y
 
 #
 # Northbridge
@@ -387,7 +388,7 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
-CONFIG_SMBUS_HAS_AUX=y
+CONFIG_SMBUS_HAS_AUX_CHANNELS=y
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
 CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT=y
diff --git a/resources/libreboot/config/grub/macbook21/config b/resources/libreboot/config/grub/macbook21/config
index 940b475..dd7b95f 100644
--- a/resources/libreboot/config/grub/macbook21/config
+++ b/resources/libreboot/config/grub/macbook21/config
@@ -8,6 +8,7 @@
 #
 CONFIG_LOCALVERSION="    MB21.88Z.00A5.B07.0706270922"
 CONFIG_CBFS_PREFIX="fallback"
+# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -324,7 +325,7 @@ CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_ON_DEVICE_ROM_RUN is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
-# CONFIG_SMBUS_HAS_AUX is not set
+# CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
diff --git a/resources/libreboot/config/grub/qemu_i440fx_piix4/config b/resources/libreboot/config/grub/qemu_i440fx_piix4/config
index 764e3c3..58c1406 100644
--- a/resources/libreboot/config/grub/qemu_i440fx_piix4/config
+++ b/resources/libreboot/config/grub/qemu_i440fx_piix4/config
@@ -8,6 +8,7 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
+# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -303,7 +304,7 @@ CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_ON_DEVICE_ROM_RUN is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
-# CONFIG_SMBUS_HAS_AUX is not set
+# CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
diff --git a/resources/libreboot/config/grub/qemu_q35_ich9/config b/resources/libreboot/config/grub/qemu_q35_ich9/config
index 0a87709..d377f92 100644
--- a/resources/libreboot/config/grub/qemu_q35_ich9/config
+++ b/resources/libreboot/config/grub/qemu_q35_ich9/config
@@ -8,6 +8,7 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
+# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -305,7 +306,7 @@ CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_ON_DEVICE_ROM_RUN is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
-# CONFIG_SMBUS_HAS_AUX is not set
+# CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
diff --git a/resources/libreboot/config/grub/r400_4mb/config b/resources/libreboot/config/grub/r400_4mb/config
index b905276..326ef82 100644
--- a/resources/libreboot/config/grub/r400_4mb/config
+++ b/resources/libreboot/config/grub/r400_4mb/config
@@ -8,6 +8,7 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
+# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -326,7 +327,7 @@ CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_ON_DEVICE_ROM_RUN is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
-# CONFIG_SMBUS_HAS_AUX is not set
+# CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
diff --git a/resources/libreboot/config/grub/r400_8mb/config b/resources/libreboot/config/grub/r400_8mb/config
index 051476e..3a9cc39 100644
--- a/resources/libreboot/config/grub/r400_8mb/config
+++ b/resources/libreboot/config/grub/r400_8mb/config
@@ -8,6 +8,7 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
+# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -326,7 +327,7 @@ CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_ON_DEVICE_ROM_RUN is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
-# CONFIG_SMBUS_HAS_AUX is not set
+# CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
diff --git a/resources/libreboot/config/grub/t400_4mb/config b/resources/libreboot/config/grub/t400_4mb/config
index e5c44c8..eae64b9 100644
--- a/resources/libreboot/config/grub/t400_4mb/config
+++ b/resources/libreboot/config/grub/t400_4mb/config
@@ -8,6 +8,7 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
+# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -326,7 +327,7 @@ CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_ON_DEVICE_ROM_RUN is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
-# CONFIG_SMBUS_HAS_AUX is not set
+# CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
diff --git a/resources/libreboot/config/grub/t400_8mb/config b/resources/libreboot/config/grub/t400_8mb/config
index f9bcfde..26f4aee 100644
--- a/resources/libreboot/config/grub/t400_8mb/config
+++ b/resources/libreboot/config/grub/t400_8mb/config
@@ -8,6 +8,7 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
+# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -326,7 +327,7 @@ CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_ON_DEVICE_ROM_RUN is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
-# CONFIG_SMBUS_HAS_AUX is not set
+# CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
diff --git a/resources/libreboot/config/grub/t500_4mb/config b/resources/libreboot/config/grub/t500_4mb/config
index af94d7f..36e1f22 100644
--- a/resources/libreboot/config/grub/t500_4mb/config
+++ b/resources/libreboot/config/grub/t500_4mb/config
@@ -8,6 +8,7 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
+# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -326,7 +327,7 @@ CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_ON_DEVICE_ROM_RUN is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
-# CONFIG_SMBUS_HAS_AUX is not set
+# CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
diff --git a/resources/libreboot/config/grub/t500_8mb/config b/resources/libreboot/config/grub/t500_8mb/config
index c72401e..24614a4 100644
--- a/resources/libreboot/config/grub/t500_8mb/config
+++ b/resources/libreboot/config/grub/t500_8mb/config
@@ -8,6 +8,7 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
+# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -326,7 +327,7 @@ CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_ON_DEVICE_ROM_RUN is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
-# CONFIG_SMBUS_HAS_AUX is not set
+# CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
diff --git a/resources/libreboot/config/grub/t60/config b/resources/libreboot/config/grub/t60/config
index 23873c9..7167a63 100644
--- a/resources/libreboot/config/grub/t60/config
+++ b/resources/libreboot/config/grub/t60/config
@@ -8,6 +8,7 @@
 #
 CONFIG_LOCALVERSION="79ETE7WW (2.27 )"
 CONFIG_CBFS_PREFIX="fallback"
+# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -339,7 +340,7 @@ CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_ON_DEVICE_ROM_RUN is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
-# CONFIG_SMBUS_HAS_AUX is not set
+# CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
diff --git a/resources/libreboot/config/grub/x200_4mb/config b/resources/libreboot/config/grub/x200_4mb/config
index 357a9d8..5dc2f05 100644
--- a/resources/libreboot/config/grub/x200_4mb/config
+++ b/resources/libreboot/config/grub/x200_4mb/config
@@ -8,6 +8,7 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
+# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -323,7 +324,7 @@ CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_ON_DEVICE_ROM_RUN is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
-# CONFIG_SMBUS_HAS_AUX is not set
+# CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
diff --git a/resources/libreboot/config/grub/x200_8mb/config b/resources/libreboot/config/grub/x200_8mb/config
index 87d9feb..4bb6864 100644
--- a/resources/libreboot/config/grub/x200_8mb/config
+++ b/resources/libreboot/config/grub/x200_8mb/config
@@ -8,6 +8,7 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
+# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -323,7 +324,7 @@ CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_ON_DEVICE_ROM_RUN is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
-# CONFIG_SMBUS_HAS_AUX is not set
+# CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
diff --git a/resources/libreboot/config/grub/x60/config b/resources/libreboot/config/grub/x60/config
index 0f4774e..af58ed6 100644
--- a/resources/libreboot/config/grub/x60/config
+++ b/resources/libreboot/config/grub/x60/config
@@ -8,6 +8,7 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
+# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -340,7 +341,7 @@ CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_ON_DEVICE_ROM_RUN is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
-# CONFIG_SMBUS_HAS_AUX is not set
+# CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set