diff options
103 files changed, 58 insertions, 134 deletions
diff --git a/config/coreboot/d510mo/target.cfg b/config/coreboot/d510mo/target.cfg index 2b1d1a7c..ca09f0b9 100644 --- a/config/coreboot/d510mo/target.cfg +++ b/config/coreboot/d510mo/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="n" payload_grub_withseabios="n" diff --git a/config/coreboot/d510mo_16mb/target.cfg b/config/coreboot/d510mo_16mb/target.cfg index 8b1e41ba..38e21a33 100644 --- a/config/coreboot/d510mo_16mb/target.cfg +++ b/config/coreboot/d510mo_16mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_seabios="y" payload_seabios_withgrub="y" diff --git a/config/coreboot/d945gclf_512kb/target.cfg b/config/coreboot/d945gclf_512kb/target.cfg index 153cd806..8e8e0428 100644 --- a/config/coreboot/d945gclf_512kb/target.cfg +++ b/config/coreboot/d945gclf_512kb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="n" payload_grub_withseabios="n" diff --git a/config/coreboot/d945gclf_8mb/target.cfg b/config/coreboot/d945gclf_8mb/target.cfg index 153cd806..8e8e0428 100644 --- a/config/coreboot/d945gclf_8mb/target.cfg +++ b/config/coreboot/d945gclf_8mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="n" payload_grub_withseabios="n" diff --git a/config/coreboot/default/target.cfg b/config/coreboot/default/target.cfg index 23f93b09..19672664 100644 --- a/config/coreboot/default/target.cfg +++ b/config/coreboot/default/target.cfg @@ -1,4 +1,3 @@ tree="default" -romtype="normal" rev="d862695f5f432b5c78dada5f16c293a4c3f9fce6" arch="i386-elf" diff --git a/config/coreboot/dell/target.cfg b/config/coreboot/dell/target.cfg index 19bd68be..eecaecfd 100644 --- a/config/coreboot/dell/target.cfg +++ b/config/coreboot/dell/target.cfg @@ -1,4 +1,3 @@ tree="dell" -romtype="normal" rev="d862695f5f432b5c78dada5f16c293a4c3f9fce6" arch="i386-elf" diff --git a/config/coreboot/e6400_4mb/target.cfg b/config/coreboot/e6400_4mb/target.cfg index 2a95482c..a8f122bd 100644 --- a/config/coreboot/e6400_4mb/target.cfg +++ b/config/coreboot/e6400_4mb/target.cfg @@ -1,5 +1,4 @@ tree="dell" -romtype="4MiB ICH9 IFD NOR flash" arch="i386-elf" payload_grub="n" payload_grub_withseabios="n" diff --git a/config/coreboot/e6430_12mb/target.cfg b/config/coreboot/e6430_12mb/target.cfg index 4feb9909..4f3dc92a 100644 --- a/config/coreboot/e6430_12mb/target.cfg +++ b/config/coreboot/e6430_12mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="n" payload_grub_withseabios="n" diff --git a/config/coreboot/e6530_12mb/target.cfg b/config/coreboot/e6530_12mb/target.cfg index 4feb9909..4f3dc92a 100644 --- a/config/coreboot/e6530_12mb/target.cfg +++ b/config/coreboot/e6530_12mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="n" payload_grub_withseabios="n" diff --git a/config/coreboot/fam15h_rdimm/target.cfg b/config/coreboot/fam15h_rdimm/target.cfg index 8d1f6a14..60827616 100644 --- a/config/coreboot/fam15h_rdimm/target.cfg +++ b/config/coreboot/fam15h_rdimm/target.cfg @@ -1,5 +1,4 @@ tree="fam15h_rdimm" -romtype="normal" rev="1c13f8d85c7306213cd525308ee8973e5663a3f8" arch="i386-elf" payload_grub="n" diff --git a/config/coreboot/fam15h_udimm/target.cfg b/config/coreboot/fam15h_udimm/target.cfg index 0e451af6..80565e90 100644 --- a/config/coreboot/fam15h_udimm/target.cfg +++ b/config/coreboot/fam15h_udimm/target.cfg @@ -1,5 +1,4 @@ tree="fam15h_udimm" -romtype="normal" rev="1c13f8d85c7306213cd525308ee8973e5663a3f8" arch="i386-elf" payload_grub="n" diff --git a/config/coreboot/g43t-am3/target.cfg b/config/coreboot/g43t-am3/target.cfg index 0308cf27..1aa5ccc8 100644 --- a/config/coreboot/g43t-am3/target.cfg +++ b/config/coreboot/g43t-am3/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_seabios="y" payload_memtest="y" diff --git a/config/coreboot/g43t-am3_16mb/target.cfg b/config/coreboot/g43t-am3_16mb/target.cfg index 0308cf27..1aa5ccc8 100644 --- a/config/coreboot/g43t-am3_16mb/target.cfg +++ b/config/coreboot/g43t-am3_16mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_seabios="y" payload_memtest="y" diff --git a/config/coreboot/ga-g41m-es2l/target.cfg b/config/coreboot/ga-g41m-es2l/target.cfg index 350c39d2..3672e404 100644 --- a/config/coreboot/ga-g41m-es2l/target.cfg +++ b/config/coreboot/ga-g41m-es2l/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_seabios="y" payload_memtest="y" diff --git a/config/coreboot/gru_bob/target.cfg b/config/coreboot/gru_bob/target.cfg index 10e1e969..2b7b0387 100644 --- a/config/coreboot/gru_bob/target.cfg +++ b/config/coreboot/gru_bob/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="aarch64-elf" payload_uboot="y" vendorfiles="n" diff --git a/config/coreboot/gru_kevin/target.cfg b/config/coreboot/gru_kevin/target.cfg index 10e1e969..2b7b0387 100644 --- a/config/coreboot/gru_kevin/target.cfg +++ b/config/coreboot/gru_kevin/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="aarch64-elf" payload_uboot="y" vendorfiles="n" diff --git a/config/coreboot/haswell/target.cfg b/config/coreboot/haswell/target.cfg index e9659265..08d2c6e2 100644 --- a/config/coreboot/haswell/target.cfg +++ b/config/coreboot/haswell/target.cfg @@ -1,4 +1,3 @@ tree="haswell" -romtype="normal" rev="1411ecf6f0b2c7395bcb96b856dcfdddb1b0c81b" arch="i386-elf" diff --git a/config/coreboot/hp2170p_16mb/target.cfg b/config/coreboot/hp2170p_16mb/target.cfg index bcdf9466..fdbb4f51 100644 --- a/config/coreboot/hp2170p_16mb/target.cfg +++ b/config/coreboot/hp2170p_16mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/hp2560p_8mb/target.cfg b/config/coreboot/hp2560p_8mb/target.cfg index bcdf9466..fdbb4f51 100644 --- a/config/coreboot/hp2560p_8mb/target.cfg +++ b/config/coreboot/hp2560p_8mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/hp2570p_16mb/target.cfg b/config/coreboot/hp2570p_16mb/target.cfg index bcdf9466..fdbb4f51 100644 --- a/config/coreboot/hp2570p_16mb/target.cfg +++ b/config/coreboot/hp2570p_16mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/hp8200sff_4mb/target.cfg b/config/coreboot/hp8200sff_4mb/target.cfg index 63112911..6433b508 100644 --- a/config/coreboot/hp8200sff_4mb/target.cfg +++ b/config/coreboot/hp8200sff_4mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_seabios="y" payload_seabios_withgrub="y" diff --git a/config/coreboot/hp8200sff_8mb/target.cfg b/config/coreboot/hp8200sff_8mb/target.cfg index 63112911..6433b508 100644 --- a/config/coreboot/hp8200sff_8mb/target.cfg +++ b/config/coreboot/hp8200sff_8mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_seabios="y" payload_seabios_withgrub="y" diff --git a/config/coreboot/hp8300usdt_16mb/target.cfg b/config/coreboot/hp8300usdt_16mb/target.cfg index 63112911..6433b508 100644 --- a/config/coreboot/hp8300usdt_16mb/target.cfg +++ b/config/coreboot/hp8300usdt_16mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_seabios="y" payload_seabios_withgrub="y" diff --git a/config/coreboot/hp8460pintel_8mb/target.cfg b/config/coreboot/hp8460pintel_8mb/target.cfg index bcdf9466..fdbb4f51 100644 --- a/config/coreboot/hp8460pintel_8mb/target.cfg +++ b/config/coreboot/hp8460pintel_8mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/hp8470pintel_16mb/target.cfg b/config/coreboot/hp8470pintel_16mb/target.cfg index bcdf9466..fdbb4f51 100644 --- a/config/coreboot/hp8470pintel_16mb/target.cfg +++ b/config/coreboot/hp8470pintel_16mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/hp9470m_16mb/target.cfg b/config/coreboot/hp9470m_16mb/target.cfg index bcdf9466..fdbb4f51 100644 --- a/config/coreboot/hp9470m_16mb/target.cfg +++ b/config/coreboot/hp9470m_16mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode b/config/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode index a7fe5603..a501619d 100644 --- a/config/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode +++ b/config/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode @@ -97,10 +97,12 @@ CONFIG_MAX_PHYSICAL_CPUS=2 CONFIG_HT_CHAIN_END_UNITID_BASE=0x20 CONFIG_HT_CHAIN_UNITID_BASE=0x0 CONFIG_IRQ_SLOT_COUNT=13 +CONFIG_VGA_BIOS_ID="1000,0072" CONFIG_ONBOARD_VGA_IS_PRIMARY=y CONFIG_DIMM_SPD_SIZE=256 -# CONFIG_VGA_BIOS is not set +CONFIG_VGA_BIOS=y CONFIG_MAINBOARD_SERIAL_NUMBER="123456789" +CONFIG_VGA_BIOS_FILE="/dev/null" CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS" CONFIG_DEVICETREE="devicetree.cb" @@ -431,6 +433,9 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y # CONFIG_AZALIA_PLUGIN_SUPPORT is not set CONFIG_PCIEXP_PLUGIN_SUPPORT=y # CONFIG_EARLY_PCI_BRIDGE is not set +CONFIG_VGA_BIOS_DGPU=y +CONFIG_VGA_BIOS_DGPU_FILE="/dev/null" +CONFIG_VGA_BIOS_DGPU_ID="1000,3050" # CONFIG_SOFTWARE_I2C is not set # diff --git a/config/coreboot/kcma-d8-rdimm_16mb/target.cfg b/config/coreboot/kcma-d8-rdimm_16mb/target.cfg index a71ab92b..7c913bdc 100644 --- a/config/coreboot/kcma-d8-rdimm_16mb/target.cfg +++ b/config/coreboot/kcma-d8-rdimm_16mb/target.cfg @@ -1,5 +1,4 @@ tree="fam15h_rdimm" -romtype="d8d16sas" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode b/config/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode index 972b5096..fc3074e3 100644 --- a/config/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode +++ b/config/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode @@ -97,10 +97,12 @@ CONFIG_MAX_PHYSICAL_CPUS=2 CONFIG_HT_CHAIN_END_UNITID_BASE=0x20 CONFIG_HT_CHAIN_UNITID_BASE=0x0 CONFIG_IRQ_SLOT_COUNT=13 +CONFIG_VGA_BIOS_ID="1000,0072" CONFIG_ONBOARD_VGA_IS_PRIMARY=y CONFIG_DIMM_SPD_SIZE=256 -# CONFIG_VGA_BIOS is not set +CONFIG_VGA_BIOS=y CONFIG_MAINBOARD_SERIAL_NUMBER="123456789" +CONFIG_VGA_BIOS_FILE="/dev/null" CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS" CONFIG_DEVICETREE="devicetree.cb" @@ -431,6 +433,9 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y # CONFIG_AZALIA_PLUGIN_SUPPORT is not set CONFIG_PCIEXP_PLUGIN_SUPPORT=y # CONFIG_EARLY_PCI_BRIDGE is not set +CONFIG_VGA_BIOS_DGPU=y +CONFIG_VGA_BIOS_DGPU_FILE="/dev/null" +CONFIG_VGA_BIOS_DGPU_ID="1000,3050" # CONFIG_SOFTWARE_I2C is not set # diff --git a/config/coreboot/kcma-d8-rdimm_2mb/target.cfg b/config/coreboot/kcma-d8-rdimm_2mb/target.cfg index a71ab92b..7c913bdc 100644 --- a/config/coreboot/kcma-d8-rdimm_2mb/target.cfg +++ b/config/coreboot/kcma-d8-rdimm_2mb/target.cfg @@ -1,5 +1,4 @@ tree="fam15h_rdimm" -romtype="d8d16sas" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode b/config/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode index a7fe5603..a501619d 100644 --- a/config/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode +++ b/config/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode @@ -97,10 +97,12 @@ CONFIG_MAX_PHYSICAL_CPUS=2 CONFIG_HT_CHAIN_END_UNITID_BASE=0x20 CONFIG_HT_CHAIN_UNITID_BASE=0x0 CONFIG_IRQ_SLOT_COUNT=13 +CONFIG_VGA_BIOS_ID="1000,0072" CONFIG_ONBOARD_VGA_IS_PRIMARY=y CONFIG_DIMM_SPD_SIZE=256 -# CONFIG_VGA_BIOS is not set +CONFIG_VGA_BIOS=y CONFIG_MAINBOARD_SERIAL_NUMBER="123456789" +CONFIG_VGA_BIOS_FILE="/dev/null" CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS" CONFIG_DEVICETREE="devicetree.cb" @@ -431,6 +433,9 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y # CONFIG_AZALIA_PLUGIN_SUPPORT is not set CONFIG_PCIEXP_PLUGIN_SUPPORT=y # CONFIG_EARLY_PCI_BRIDGE is not set +CONFIG_VGA_BIOS_DGPU=y +CONFIG_VGA_BIOS_DGPU_FILE="/dev/null" +CONFIG_VGA_BIOS_DGPU_ID="1000,3050" # CONFIG_SOFTWARE_I2C is not set # diff --git a/config/coreboot/kcma-d8-udimm_16mb/target.cfg b/config/coreboot/kcma-d8-udimm_16mb/target.cfg index 3f1f7c3e..1bb78ad5 100644 --- a/config/coreboot/kcma-d8-udimm_16mb/target.cfg +++ b/config/coreboot/kcma-d8-udimm_16mb/target.cfg @@ -1,5 +1,4 @@ tree="fam15h_udimm" -romtype="d8d16sas" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode b/config/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode index 972b5096..fc3074e3 100644 --- a/config/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode +++ b/config/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode @@ -97,10 +97,12 @@ CONFIG_MAX_PHYSICAL_CPUS=2 CONFIG_HT_CHAIN_END_UNITID_BASE=0x20 CONFIG_HT_CHAIN_UNITID_BASE=0x0 CONFIG_IRQ_SLOT_COUNT=13 +CONFIG_VGA_BIOS_ID="1000,0072" CONFIG_ONBOARD_VGA_IS_PRIMARY=y CONFIG_DIMM_SPD_SIZE=256 -# CONFIG_VGA_BIOS is not set +CONFIG_VGA_BIOS=y CONFIG_MAINBOARD_SERIAL_NUMBER="123456789" +CONFIG_VGA_BIOS_FILE="/dev/null" CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS" CONFIG_DEVICETREE="devicetree.cb" @@ -431,6 +433,9 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y # CONFIG_AZALIA_PLUGIN_SUPPORT is not set CONFIG_PCIEXP_PLUGIN_SUPPORT=y # CONFIG_EARLY_PCI_BRIDGE is not set +CONFIG_VGA_BIOS_DGPU=y +CONFIG_VGA_BIOS_DGPU_FILE="/dev/null" +CONFIG_VGA_BIOS_DGPU_ID="1000,3050" # CONFIG_SOFTWARE_I2C is not set # diff --git a/config/coreboot/kcma-d8-udimm_2mb/target.cfg b/config/coreboot/kcma-d8-udimm_2mb/target.cfg index 3f1f7c3e..1bb78ad5 100644 --- a/config/coreboot/kcma-d8-udimm_2mb/target.cfg +++ b/config/coreboot/kcma-d8-udimm_2mb/target.cfg @@ -1,5 +1,4 @@ tree="fam15h_udimm" -romtype="d8d16sas" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/kfsn4-dre_1mb/target.cfg b/config/coreboot/kfsn4-dre_1mb/target.cfg index c5cb67b1..41b63823 100644 --- a/config/coreboot/kfsn4-dre_1mb/target.cfg +++ b/config/coreboot/kfsn4-dre_1mb/target.cfg @@ -1,5 +1,4 @@ tree="fam15h_udimm" -romtype="normal" arch="i386-elf" payload_seabios="y" payload_memtest="y" diff --git a/config/coreboot/kfsn4-dre_2mb/target.cfg b/config/coreboot/kfsn4-dre_2mb/target.cfg index debe16fd..64c45daa 100644 --- a/config/coreboot/kfsn4-dre_2mb/target.cfg +++ b/config/coreboot/kfsn4-dre_2mb/target.cfg @@ -1,5 +1,4 @@ tree="fam15h_udimm" -romtype="normal" arch="i386-elf" payload_seabios="y" payload_seabios_withgrub="y" diff --git a/config/coreboot/kgpe-d16-rdimm_16mb/config/libgfxinit_txtmode b/config/coreboot/kgpe-d16-rdimm_16mb/config/libgfxinit_txtmode index cd302027..088360b1 100644 --- a/config/coreboot/kgpe-d16-rdimm_16mb/config/libgfxinit_txtmode +++ b/config/coreboot/kgpe-d16-rdimm_16mb/config/libgfxinit_txtmode @@ -97,11 +97,12 @@ CONFIG_MAX_PHYSICAL_CPUS=4 CONFIG_HT_CHAIN_END_UNITID_BASE=0x20 CONFIG_HT_CHAIN_UNITID_BASE=0x0 CONFIG_IRQ_SLOT_COUNT=13 -CONFIG_VGA_BIOS_ID="1a03,2000" +CONFIG_VGA_BIOS_ID="1000,0072" CONFIG_ONBOARD_VGA_IS_PRIMARY=y CONFIG_DIMM_SPD_SIZE=256 -# CONFIG_VGA_BIOS is not set +CONFIG_VGA_BIOS=y CONFIG_MAINBOARD_SERIAL_NUMBER="123456789" +CONFIG_VGA_BIOS_FILE="/dev/null" CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS" CONFIG_DEVICETREE="devicetree.cb" @@ -435,6 +436,9 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y # CONFIG_AZALIA_PLUGIN_SUPPORT is not set CONFIG_PCIEXP_PLUGIN_SUPPORT=y # CONFIG_EARLY_PCI_BRIDGE is not set +CONFIG_VGA_BIOS_DGPU=y +CONFIG_VGA_BIOS_DGPU_FILE="/dev/null" +CONFIG_VGA_BIOS_DGPU_ID="1000,3050" # CONFIG_SOFTWARE_I2C is not set # diff --git a/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg b/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg index 883d764f..d3ab97d1 100644 --- a/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg +++ b/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg @@ -1,5 +1,4 @@ tree="fam15h_rdimm" -romtype="d8d16sas" arch="i386-elf" payload_seabios="y" payload_seabios_withgrub="y" diff --git a/config/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode b/config/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode index 4ef96238..575501b3 100644 --- a/config/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode +++ b/config/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode @@ -97,11 +97,12 @@ CONFIG_MAX_PHYSICAL_CPUS=4 CONFIG_HT_CHAIN_END_UNITID_BASE=0x20 CONFIG_HT_CHAIN_UNITID_BASE=0x0 CONFIG_IRQ_SLOT_COUNT=13 -CONFIG_VGA_BIOS_ID="1a03,2000" +CONFIG_VGA_BIOS_ID="1000,0072" CONFIG_ONBOARD_VGA_IS_PRIMARY=y CONFIG_DIMM_SPD_SIZE=256 -# CONFIG_VGA_BIOS is not set +CONFIG_VGA_BIOS=y CONFIG_MAINBOARD_SERIAL_NUMBER="123456789" +CONFIG_VGA_BIOS_FILE="/dev/null" CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS" CONFIG_DEVICETREE="devicetree.cb" @@ -435,6 +436,9 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y # CONFIG_AZALIA_PLUGIN_SUPPORT is not set CONFIG_PCIEXP_PLUGIN_SUPPORT=y # CONFIG_EARLY_PCI_BRIDGE is not set +CONFIG_VGA_BIOS_DGPU=y +CONFIG_VGA_BIOS_DGPU_FILE="/dev/null" +CONFIG_VGA_BIOS_DGPU_ID="1000,3050" # CONFIG_SOFTWARE_I2C is not set # diff --git a/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg b/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg index 883d764f..d3ab97d1 100644 --- a/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg +++ b/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg @@ -1,5 +1,4 @@ tree="fam15h_rdimm" -romtype="d8d16sas" arch="i386-elf" payload_seabios="y" payload_seabios_withgrub="y" diff --git a/config/coreboot/kgpe-d16-udimm_16mb/config/libgfxinit_txtmode b/config/coreboot/kgpe-d16-udimm_16mb/config/libgfxinit_txtmode index cd302027..088360b1 100644 --- a/config/coreboot/kgpe-d16-udimm_16mb/config/libgfxinit_txtmode +++ b/config/coreboot/kgpe-d16-udimm_16mb/config/libgfxinit_txtmode @@ -97,11 +97,12 @@ CONFIG_MAX_PHYSICAL_CPUS=4 CONFIG_HT_CHAIN_END_UNITID_BASE=0x20 CONFIG_HT_CHAIN_UNITID_BASE=0x0 CONFIG_IRQ_SLOT_COUNT=13 -CONFIG_VGA_BIOS_ID="1a03,2000" +CONFIG_VGA_BIOS_ID="1000,0072" CONFIG_ONBOARD_VGA_IS_PRIMARY=y CONFIG_DIMM_SPD_SIZE=256 -# CONFIG_VGA_BIOS is not set +CONFIG_VGA_BIOS=y CONFIG_MAINBOARD_SERIAL_NUMBER="123456789" +CONFIG_VGA_BIOS_FILE="/dev/null" CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS" CONFIG_DEVICETREE="devicetree.cb" @@ -435,6 +436,9 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y # CONFIG_AZALIA_PLUGIN_SUPPORT is not set CONFIG_PCIEXP_PLUGIN_SUPPORT=y # CONFIG_EARLY_PCI_BRIDGE is not set +CONFIG_VGA_BIOS_DGPU=y +CONFIG_VGA_BIOS_DGPU_FILE="/dev/null" +CONFIG_VGA_BIOS_DGPU_ID="1000,3050" # CONFIG_SOFTWARE_I2C is not set # diff --git a/config/coreboot/kgpe-d16-udimm_16mb/target.cfg b/config/coreboot/kgpe-d16-udimm_16mb/target.cfg index d767dd7e..64c45daa 100644 --- a/config/coreboot/kgpe-d16-udimm_16mb/target.cfg +++ b/config/coreboot/kgpe-d16-udimm_16mb/target.cfg @@ -1,5 +1,4 @@ tree="fam15h_udimm" -romtype="d8d16sas" arch="i386-elf" payload_seabios="y" payload_seabios_withgrub="y" diff --git a/config/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode b/config/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode index 4ef96238..575501b3 100644 --- a/config/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode +++ b/config/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode @@ -97,11 +97,12 @@ CONFIG_MAX_PHYSICAL_CPUS=4 CONFIG_HT_CHAIN_END_UNITID_BASE=0x20 CONFIG_HT_CHAIN_UNITID_BASE=0x0 CONFIG_IRQ_SLOT_COUNT=13 -CONFIG_VGA_BIOS_ID="1a03,2000" +CONFIG_VGA_BIOS_ID="1000,0072" CONFIG_ONBOARD_VGA_IS_PRIMARY=y CONFIG_DIMM_SPD_SIZE=256 -# CONFIG_VGA_BIOS is not set +CONFIG_VGA_BIOS=y CONFIG_MAINBOARD_SERIAL_NUMBER="123456789" +CONFIG_VGA_BIOS_FILE="/dev/null" CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS" CONFIG_DEVICETREE="devicetree.cb" @@ -435,6 +436,9 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y # CONFIG_AZALIA_PLUGIN_SUPPORT is not set CONFIG_PCIEXP_PLUGIN_SUPPORT=y # CONFIG_EARLY_PCI_BRIDGE is not set +CONFIG_VGA_BIOS_DGPU=y +CONFIG_VGA_BIOS_DGPU_FILE="/dev/null" +CONFIG_VGA_BIOS_DGPU_ID="1000,3050" # CONFIG_SOFTWARE_I2C is not set # diff --git a/config/coreboot/kgpe-d16-udimm_2mb/target.cfg b/config/coreboot/kgpe-d16-udimm_2mb/target.cfg index d767dd7e..64c45daa 100644 --- a/config/coreboot/kgpe-d16-udimm_2mb/target.cfg +++ b/config/coreboot/kgpe-d16-udimm_2mb/target.cfg @@ -1,5 +1,4 @@ tree="fam15h_udimm" -romtype="d8d16sas" arch="i386-elf" payload_seabios="y" payload_seabios_withgrub="y" diff --git a/config/coreboot/macbook11/target.cfg b/config/coreboot/macbook11/target.cfg index ea9074ea..c883642f 100644 --- a/config/coreboot/macbook11/target.cfg +++ b/config/coreboot/macbook11/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="i945 laptop" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/macbook11_16mb/target.cfg b/config/coreboot/macbook11_16mb/target.cfg index ea9074ea..c883642f 100644 --- a/config/coreboot/macbook11_16mb/target.cfg +++ b/config/coreboot/macbook11_16mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="i945 laptop" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/macbook21/target.cfg b/config/coreboot/macbook21/target.cfg index 49a676da..8d1bf5b8 100644 --- a/config/coreboot/macbook21/target.cfg +++ b/config/coreboot/macbook21/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="i945 laptop" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/macbook21_16mb/target.cfg b/config/coreboot/macbook21_16mb/target.cfg index 49a676da..8d1bf5b8 100644 --- a/config/coreboot/macbook21_16mb/target.cfg +++ b/config/coreboot/macbook21_16mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="i945 laptop" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/qemu_arm64_12mb/target.cfg b/config/coreboot/qemu_arm64_12mb/target.cfg index 10e1e969..2b7b0387 100644 --- a/config/coreboot/qemu_arm64_12mb/target.cfg +++ b/config/coreboot/qemu_arm64_12mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="aarch64-elf" payload_uboot="y" vendorfiles="n" diff --git a/config/coreboot/qemu_x86_12mb/target.cfg b/config/coreboot/qemu_x86_12mb/target.cfg index a835bc4a..bc2c6f55 100644 --- a/config/coreboot/qemu_x86_12mb/target.cfg +++ b/config/coreboot/qemu_x86_12mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/r400_16mb/target.cfg b/config/coreboot/r400_16mb/target.cfg index 4269b2a5..8d1bf5b8 100644 --- a/config/coreboot/r400_16mb/target.cfg +++ b/config/coreboot/r400_16mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/r400_4mb/target.cfg b/config/coreboot/r400_4mb/target.cfg index 4269b2a5..8d1bf5b8 100644 --- a/config/coreboot/r400_4mb/target.cfg +++ b/config/coreboot/r400_4mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/r400_8mb/target.cfg b/config/coreboot/r400_8mb/target.cfg index 4269b2a5..8d1bf5b8 100644 --- a/config/coreboot/r400_8mb/target.cfg +++ b/config/coreboot/r400_8mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/r500_4mb/target.cfg b/config/coreboot/r500_4mb/target.cfg index 4269b2a5..8d1bf5b8 100644 --- a/config/coreboot/r500_4mb/target.cfg +++ b/config/coreboot/r500_4mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/t1650_12mb/target.cfg b/config/coreboot/t1650_12mb/target.cfg index ec12cd4f..e889d1ee 100644 --- a/config/coreboot/t1650_12mb/target.cfg +++ b/config/coreboot/t1650_12mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_seabios="y" payload_seabios_withgrub="y" diff --git a/config/coreboot/t400_16mb/target.cfg b/config/coreboot/t400_16mb/target.cfg index 4269b2a5..8d1bf5b8 100644 --- a/config/coreboot/t400_16mb/target.cfg +++ b/config/coreboot/t400_16mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/t400_4mb/target.cfg b/config/coreboot/t400_4mb/target.cfg index 4269b2a5..8d1bf5b8 100644 --- a/config/coreboot/t400_4mb/target.cfg +++ b/config/coreboot/t400_4mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/t400_8mb/target.cfg b/config/coreboot/t400_8mb/target.cfg index 4269b2a5..8d1bf5b8 100644 --- a/config/coreboot/t400_8mb/target.cfg +++ b/config/coreboot/t400_8mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/t420_8mb/target.cfg b/config/coreboot/t420_8mb/target.cfg index 0337af2c..981435d4 100644 --- a/config/coreboot/t420_8mb/target.cfg +++ b/config/coreboot/t420_8mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/t420s_8mb/target.cfg b/config/coreboot/t420s_8mb/target.cfg index 0337af2c..981435d4 100644 --- a/config/coreboot/t420s_8mb/target.cfg +++ b/config/coreboot/t420s_8mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/t430_12mb/target.cfg b/config/coreboot/t430_12mb/target.cfg index 0337af2c..981435d4 100644 --- a/config/coreboot/t430_12mb/target.cfg +++ b/config/coreboot/t430_12mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/t440plibremrc_12mb/target.cfg b/config/coreboot/t440plibremrc_12mb/target.cfg index 4b46a5a4..33790c67 100644 --- a/config/coreboot/t440plibremrc_12mb/target.cfg +++ b/config/coreboot/t440plibremrc_12mb/target.cfg @@ -1,5 +1,4 @@ tree="haswell" -romtype="t440p" arch="i386-elf" payload_grub="n" payload_grub_withseabios="n" diff --git a/config/coreboot/t440pmrc_12mb/target.cfg b/config/coreboot/t440pmrc_12mb/target.cfg index aca758d4..981435d4 100644 --- a/config/coreboot/t440pmrc_12mb/target.cfg +++ b/config/coreboot/t440pmrc_12mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="t440p" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/t500_16mb/target.cfg b/config/coreboot/t500_16mb/target.cfg index 4269b2a5..8d1bf5b8 100644 --- a/config/coreboot/t500_16mb/target.cfg +++ b/config/coreboot/t500_16mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/t500_4mb/target.cfg b/config/coreboot/t500_4mb/target.cfg index 4269b2a5..8d1bf5b8 100644 --- a/config/coreboot/t500_4mb/target.cfg +++ b/config/coreboot/t500_4mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/t500_8mb/target.cfg b/config/coreboot/t500_8mb/target.cfg index 4269b2a5..8d1bf5b8 100644 --- a/config/coreboot/t500_8mb/target.cfg +++ b/config/coreboot/t500_8mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/t520_8mb/target.cfg b/config/coreboot/t520_8mb/target.cfg index 0337af2c..981435d4 100644 --- a/config/coreboot/t520_8mb/target.cfg +++ b/config/coreboot/t520_8mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/t530_12mb/target.cfg b/config/coreboot/t530_12mb/target.cfg index 0337af2c..981435d4 100644 --- a/config/coreboot/t530_12mb/target.cfg +++ b/config/coreboot/t530_12mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb b/config/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb index 1cbfb098..111a87de 100644 --- a/config/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb +++ b/config/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb @@ -257,7 +257,7 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400 CONFIG_HPET_MIN_TICKS=0x80 CONFIG_CBFS_CACHE_ALIGN=8 CONFIG_INTEL_HAS_TOP_SWAP=y -# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set +CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK=y CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000 CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfe000000 diff --git a/config/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode b/config/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode index de378e16..49fae1a3 100644 --- a/config/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode +++ b/config/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode @@ -257,7 +257,7 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400 CONFIG_HPET_MIN_TICKS=0x80 CONFIG_CBFS_CACHE_ALIGN=8 CONFIG_INTEL_HAS_TOP_SWAP=y -# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set +CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK=y CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000 CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfe000000 diff --git a/config/coreboot/t60_16mb_intelgpu/target.cfg b/config/coreboot/t60_16mb_intelgpu/target.cfg index 3f803f95..0b6bb18c 100644 --- a/config/coreboot/t60_16mb_intelgpu/target.cfg +++ b/config/coreboot/t60_16mb_intelgpu/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="i945 laptop" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/t60_intelgpu/config/libgfxinit_corebootfb b/config/coreboot/t60_intelgpu/config/libgfxinit_corebootfb index 2786bbe6..dbbc9efe 100644 --- a/config/coreboot/t60_intelgpu/config/libgfxinit_corebootfb +++ b/config/coreboot/t60_intelgpu/config/libgfxinit_corebootfb @@ -257,7 +257,7 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400 CONFIG_HPET_MIN_TICKS=0x80 CONFIG_CBFS_CACHE_ALIGN=8 CONFIG_INTEL_HAS_TOP_SWAP=y -# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set +CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK=y CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000 CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfe000000 diff --git a/config/coreboot/t60_intelgpu/config/libgfxinit_txtmode b/config/coreboot/t60_intelgpu/config/libgfxinit_txtmode index 3a84be7a..28821550 100644 --- a/config/coreboot/t60_intelgpu/config/libgfxinit_txtmode +++ b/config/coreboot/t60_intelgpu/config/libgfxinit_txtmode @@ -257,7 +257,7 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400 CONFIG_HPET_MIN_TICKS=0x80 CONFIG_CBFS_CACHE_ALIGN=8 CONFIG_INTEL_HAS_TOP_SWAP=y -# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set +CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK=y CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000 CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfe000000 diff --git a/config/coreboot/t60_intelgpu/target.cfg b/config/coreboot/t60_intelgpu/target.cfg index 3f803f95..0b6bb18c 100644 --- a/config/coreboot/t60_intelgpu/target.cfg +++ b/config/coreboot/t60_intelgpu/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="i945 laptop" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/w500_16mb/target.cfg b/config/coreboot/w500_16mb/target.cfg index 4269b2a5..8d1bf5b8 100644 --- a/config/coreboot/w500_16mb/target.cfg +++ b/config/coreboot/w500_16mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/w500_4mb/target.cfg b/config/coreboot/w500_4mb/target.cfg index 4269b2a5..8d1bf5b8 100644 --- a/config/coreboot/w500_4mb/target.cfg +++ b/config/coreboot/w500_4mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/w500_8mb/target.cfg b/config/coreboot/w500_8mb/target.cfg index 4269b2a5..8d1bf5b8 100644 --- a/config/coreboot/w500_8mb/target.cfg +++ b/config/coreboot/w500_8mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/w530_12mb/target.cfg b/config/coreboot/w530_12mb/target.cfg index 0337af2c..981435d4 100644 --- a/config/coreboot/w530_12mb/target.cfg +++ b/config/coreboot/w530_12mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/w541_12mb/target.cfg b/config/coreboot/w541_12mb/target.cfg index 4b46a5a4..33790c67 100644 --- a/config/coreboot/w541_12mb/target.cfg +++ b/config/coreboot/w541_12mb/target.cfg @@ -1,5 +1,4 @@ tree="haswell" -romtype="t440p" arch="i386-elf" payload_grub="n" payload_grub_withseabios="n" diff --git a/config/coreboot/w541mrc_12mb/target.cfg b/config/coreboot/w541mrc_12mb/target.cfg index aca758d4..981435d4 100644 --- a/config/coreboot/w541mrc_12mb/target.cfg +++ b/config/coreboot/w541mrc_12mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="t440p" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/x200_16mb/target.cfg b/config/coreboot/x200_16mb/target.cfg index 4269b2a5..8d1bf5b8 100644 --- a/config/coreboot/x200_16mb/target.cfg +++ b/config/coreboot/x200_16mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/x200_4mb/target.cfg b/config/coreboot/x200_4mb/target.cfg index 4269b2a5..8d1bf5b8 100644 --- a/config/coreboot/x200_4mb/target.cfg +++ b/config/coreboot/x200_4mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/x200_8mb/target.cfg b/config/coreboot/x200_8mb/target.cfg index 4269b2a5..8d1bf5b8 100644 --- a/config/coreboot/x200_8mb/target.cfg +++ b/config/coreboot/x200_8mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/x201_8mb/target.cfg b/config/coreboot/x201_8mb/target.cfg index 0337af2c..981435d4 100644 --- a/config/coreboot/x201_8mb/target.cfg +++ b/config/coreboot/x201_8mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/x220_8mb/target.cfg b/config/coreboot/x220_8mb/target.cfg index 0337af2c..981435d4 100644 --- a/config/coreboot/x220_8mb/target.cfg +++ b/config/coreboot/x220_8mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/x220edp_8mb/target.cfg b/config/coreboot/x220edp_8mb/target.cfg index 0337af2c..981435d4 100644 --- a/config/coreboot/x220edp_8mb/target.cfg +++ b/config/coreboot/x220edp_8mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/x230_12mb/target.cfg b/config/coreboot/x230_12mb/target.cfg index 0337af2c..981435d4 100644 --- a/config/coreboot/x230_12mb/target.cfg +++ b/config/coreboot/x230_12mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/x230_16mb/target.cfg b/config/coreboot/x230_16mb/target.cfg index 0337af2c..981435d4 100644 --- a/config/coreboot/x230_16mb/target.cfg +++ b/config/coreboot/x230_16mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/x230edp_12mb/target.cfg b/config/coreboot/x230edp_12mb/target.cfg index 0337af2c..981435d4 100644 --- a/config/coreboot/x230edp_12mb/target.cfg +++ b/config/coreboot/x230edp_12mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/x230t_12mb/target.cfg b/config/coreboot/x230t_12mb/target.cfg index 0337af2c..981435d4 100644 --- a/config/coreboot/x230t_12mb/target.cfg +++ b/config/coreboot/x230t_12mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/x230t_16mb/target.cfg b/config/coreboot/x230t_16mb/target.cfg index 0337af2c..981435d4 100644 --- a/config/coreboot/x230t_16mb/target.cfg +++ b/config/coreboot/x230t_16mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/x301_16mb/target.cfg b/config/coreboot/x301_16mb/target.cfg index 4269b2a5..8d1bf5b8 100644 --- a/config/coreboot/x301_16mb/target.cfg +++ b/config/coreboot/x301_16mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/x301_4mb/target.cfg b/config/coreboot/x301_4mb/target.cfg index 4269b2a5..8d1bf5b8 100644 --- a/config/coreboot/x301_4mb/target.cfg +++ b/config/coreboot/x301_4mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/x301_8mb/target.cfg b/config/coreboot/x301_8mb/target.cfg index 4269b2a5..8d1bf5b8 100644 --- a/config/coreboot/x301_8mb/target.cfg +++ b/config/coreboot/x301_8mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="normal" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/x60/config/libgfxinit_corebootfb b/config/coreboot/x60/config/libgfxinit_corebootfb index ba95fbfe..9f75a921 100644 --- a/config/coreboot/x60/config/libgfxinit_corebootfb +++ b/config/coreboot/x60/config/libgfxinit_corebootfb @@ -258,7 +258,7 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400 CONFIG_HPET_MIN_TICKS=0x80 CONFIG_CBFS_CACHE_ALIGN=8 CONFIG_INTEL_HAS_TOP_SWAP=y -# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set +CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK=y CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000 CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfe000000 diff --git a/config/coreboot/x60/config/libgfxinit_txtmode b/config/coreboot/x60/config/libgfxinit_txtmode index 02e5fad4..5a3a8a5c 100644 --- a/config/coreboot/x60/config/libgfxinit_txtmode +++ b/config/coreboot/x60/config/libgfxinit_txtmode @@ -258,7 +258,7 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400 CONFIG_HPET_MIN_TICKS=0x80 CONFIG_CBFS_CACHE_ALIGN=8 CONFIG_INTEL_HAS_TOP_SWAP=y -# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set +CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK=y CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000 CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfe000000 diff --git a/config/coreboot/x60/target.cfg b/config/coreboot/x60/target.cfg index 3f803f95..0b6bb18c 100644 --- a/config/coreboot/x60/target.cfg +++ b/config/coreboot/x60/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="i945 laptop" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/config/coreboot/x60_16mb/config/libgfxinit_corebootfb b/config/coreboot/x60_16mb/config/libgfxinit_corebootfb index 7bab148e..79d79b20 100644 --- a/config/coreboot/x60_16mb/config/libgfxinit_corebootfb +++ b/config/coreboot/x60_16mb/config/libgfxinit_corebootfb @@ -258,7 +258,7 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400 CONFIG_HPET_MIN_TICKS=0x80 CONFIG_CBFS_CACHE_ALIGN=8 CONFIG_INTEL_HAS_TOP_SWAP=y -# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set +CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK=y CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000 CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfe000000 diff --git a/config/coreboot/x60_16mb/config/libgfxinit_txtmode b/config/coreboot/x60_16mb/config/libgfxinit_txtmode index 8ac47191..51e74dc6 100644 --- a/config/coreboot/x60_16mb/config/libgfxinit_txtmode +++ b/config/coreboot/x60_16mb/config/libgfxinit_txtmode @@ -258,7 +258,7 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400 CONFIG_HPET_MIN_TICKS=0x80 CONFIG_CBFS_CACHE_ALIGN=8 CONFIG_INTEL_HAS_TOP_SWAP=y -# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set +CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK=y CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000 CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfe000000 diff --git a/config/coreboot/x60_16mb/target.cfg b/config/coreboot/x60_16mb/target.cfg index 3f803f95..0b6bb18c 100644 --- a/config/coreboot/x60_16mb/target.cfg +++ b/config/coreboot/x60_16mb/target.cfg @@ -1,5 +1,4 @@ tree="default" -romtype="i945 laptop" arch="i386-elf" payload_grub="y" payload_grub_withseabios="y" diff --git a/script/build/roms b/script/build/roms index 229e295f..39808098 100755 --- a/script/build/roms +++ b/script/build/roms @@ -419,37 +419,9 @@ moverom() { printf "Creating target image: %s\n" "${newrom}" [ -d "${newrom%/*}" ] || x_ mkdir -p "${newrom%/*}/" - - x_ modify_coreboot_rom x_ cp "${rompath}" "${newrom}" } -modify_coreboot_rom() -{ - tmpmvrom="$(mktemp -t rom.XXXXXXXXXX)" - x_ rm -f "${tmpmvrom}" - - if [ "${romtype}" = "d8d16sas" ]; then - # pike2008 roms hang seabios. an empty rom will override - # the built-in one, thus disabling all execution of it - x_ touch "${tmpmvrom}" - for deviceID in "0072" "3050"; do - x_ "${cbfstool}" "${rompath}" add -f "${tmpmvrom}" \ - -n "pci1000,${deviceID}.rom" -t raw - done - elif [ "${romtype}" = "i945 laptop" ]; then - # for bucts-based installation method from factory bios - dd if="${rompath}" of="${tmpmvrom}" bs=1 \ - skip=$(($(stat -c %s "${rompath}") - 0x10000)) \ - count=64k || err "modrom 1, copy bootblock" - dd if="${tmpmvrom}" of="${rompath}" bs=1 \ - seek=$(($(stat -c %s "${rompath}") - 0x20000)) count=64k \ - conv=notrunc || err "modrom 2, insert new bootblock" - x_ rm -f "${tmpmvrom}" - fi - x_ rm -f "${tmpmvrom}" -} - usage() { cat <<- EOF diff --git a/script/update/trees b/script/update/trees index f046b027..6e98b370 100755 --- a/script/update/trees +++ b/script/update/trees @@ -13,7 +13,7 @@ set -u -e export LOCALVERSION="-${projectname}-${version%%-*}" eval "$(setvars "" arch cfgsdir codedir config config_name crossgcc_ada mode \ - elfdir listfile project romtype target target_dir targets tree _f target1)" + elfdir listfile project target target_dir targets tree _f target1)" main() { @@ -133,7 +133,6 @@ handle_defconfig() handle_src_tree() { - romtype="normal" target_dir="${cfgsdir}/${target}" if [ "${mode}" = "fetch" ]; then diff --git a/script/vendor/download b/script/vendor/download index 9431c441..736d8cc5 100755 --- a/script/vendor/download +++ b/script/vendor/download @@ -94,6 +94,7 @@ fetch() dl="${2}" dl_bkup="${3}" dlsum="${4}" + [ "${5}" = "/dev/null" ] && return 0 [ "${5# }" = "${5}" ] || err "fetch: space not allowed in _dest: '${5}'" [ "${5#/}" = "${5}" ] || err "fetch: absolute path not allowed: '${5}'" _dest="${5##*../}" |