3 files changed, 13 insertions, 15 deletions
diff --git a/resources/coreboot/macbook11/board.cfg b/resources/coreboot/macbook11/board.cfg
index 234d6a95..68d0f0fa 100644
--- a/resources/coreboot/macbook11/board.cfg
+++ b/resources/coreboot/macbook11/board.cfg
@@ -1,9 +1,7 @@
-cbtree="macbook21"
+cbtree="default"
 romtype="i945 laptop"
 arch="x86_32"
 payload_grub="y"
 payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
 payload_seabios="y"
-payload_tianocore="n"
 payload_memtest="y"
diff --git a/resources/coreboot/macbook11/config/libgfxinit_corebootfb b/resources/coreboot/macbook11/config/libgfxinit_corebootfb
index 1cbb9231..59c31b65 100644
--- a/resources/coreboot/macbook11/config/libgfxinit_corebootfb
+++ b/resources/coreboot/macbook11/config/libgfxinit_corebootfb
@@ -131,8 +131,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x8000
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
 CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
@@ -186,11 +186,11 @@ CONFIG_CBFS_MCACHE_SIZE=0x4000
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
 CONFIG_SMM_RESERVED_SIZE=0x100000
 CONFIG_SMM_MODULE_STACK_SIZE=0x400
 CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
 CONFIG_EHCI_BAR=0xfef00000
+CONFIG_CBFS_CACHE_ALIGN=8
 CONFIG_STACK_SIZE=0x1000
 CONFIG_VBT_DATA_SIZE_KB=8
 CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
@@ -200,12 +200,12 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
 CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
 CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
 CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=3
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_COMMON_CLOCK is not set
 CONFIG_TTYS0_BASE=0x3f8
 CONFIG_TTYS0_LCS=3
 CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
 CONFIG_INTEL_HAS_TOP_SWAP=y
 # CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
 CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
@@ -333,12 +333,12 @@ CONFIG_LINEAR_FRAMEBUFFER=y
 # end of Display
 
 CONFIG_PCI=y
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
 CONFIG_PCIX_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_AZALIA_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
 CONFIG_PCI_ALLOW_BUS_MASTER=y
 CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
 CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
diff --git a/resources/coreboot/macbook11/config/libgfxinit_txtmode b/resources/coreboot/macbook11/config/libgfxinit_txtmode
index 58f34beb..ed467789 100644
--- a/resources/coreboot/macbook11/config/libgfxinit_txtmode
+++ b/resources/coreboot/macbook11/config/libgfxinit_txtmode
@@ -131,8 +131,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x8000
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
 CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
@@ -186,11 +186,11 @@ CONFIG_CBFS_MCACHE_SIZE=0x4000
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
 CONFIG_SMM_RESERVED_SIZE=0x100000
 CONFIG_SMM_MODULE_STACK_SIZE=0x400
 CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
 CONFIG_EHCI_BAR=0xfef00000
+CONFIG_CBFS_CACHE_ALIGN=8
 CONFIG_STACK_SIZE=0x1000
 CONFIG_VBT_DATA_SIZE_KB=8
 CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
@@ -200,12 +200,12 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
 CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
 CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
 CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=3
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_COMMON_CLOCK is not set
 CONFIG_TTYS0_BASE=0x3f8
 CONFIG_TTYS0_LCS=3
 CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
 CONFIG_INTEL_HAS_TOP_SWAP=y
 # CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
 CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
@@ -331,12 +331,12 @@ CONFIG_VGA_TEXT_FRAMEBUFFER=y
 # end of Display
 
 CONFIG_PCI=y
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
 CONFIG_PCIX_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_AZALIA_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
 CONFIG_PCI_ALLOW_BUS_MASTER=y
 CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
 CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y