Keith Hui has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37457 )
Change subject: [RFC] asus/p2b-d: Fold into asus/p2b-ds as a variant ......................................................................
[RFC] asus/p2b-d: Fold into asus/p2b-ds as a variant
The two boards already share the exact same romstage.c and only small differences exist in mptable, irq table, devicetree. Share what they could and put what cannot be into subfolders of asus/p2b-ds.
Lines split and spaces added to pass lint.
The structure is based on google/auron but isn't a full blown board variant setup because the overhead isn't worth it.
Build tested. Comments welcome.
Change-Id: Ibcb2e80c968c65523ff40cbd9c19fe15e9527e0d Signed-off-by: Keith Hui buurin@gmail.com --- D src/mainboard/asus/p2b-d/Kconfig D src/mainboard/asus/p2b-d/Kconfig.name D src/mainboard/asus/p2b-d/board_info.txt D src/mainboard/asus/p2b-d/irq_tables.c D src/mainboard/asus/p2b-d/mptable.c D src/mainboard/asus/p2b-d/romstage.c M src/mainboard/asus/p2b-ds/Kconfig M src/mainboard/asus/p2b-ds/Kconfig.name M src/mainboard/asus/p2b-ds/irq_tables.c M src/mainboard/asus/p2b-ds/mptable.c R src/mainboard/asus/p2b-ds/p2b-d/devicetree.cb A src/mainboard/asus/p2b-ds/p2b-d/irq_tables.h R src/mainboard/asus/p2b-ds/p2b-ds/devicetree.cb A src/mainboard/asus/p2b-ds/p2b-ds/irq_tables.h 14 files changed, 121 insertions(+), 206 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/37457/1
diff --git a/src/mainboard/asus/p2b-d/Kconfig b/src/mainboard/asus/p2b-d/Kconfig deleted file mode 100644 index 8db9b7a..0000000 --- a/src/mainboard/asus/p2b-d/Kconfig +++ /dev/null @@ -1,46 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2009 Uwe Hermann uwe@hermann-uwe.de -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -if BOARD_ASUS_P2B_D - -config BOARD_SPECIFIC_OPTIONS - def_bool y - select CPU_INTEL_SLOT_1 - select NORTHBRIDGE_INTEL_I440BX - select SOUTHBRIDGE_INTEL_I82371EB - select SUPERIO_WINBOND_W83977TF - select HAVE_PIRQ_TABLE - select HAVE_MP_TABLE - select SMP - select IOAPIC - select BOARD_ROMSIZE_KB_256 - select SDRAMPWR_4DIMM - -config MAINBOARD_DIR - string - default "asus/p2b-d" - -config MAINBOARD_PART_NUMBER - string - default "P2B-D" - -config IRQ_SLOT_COUNT - int - default 6 - -config MAX_CPUS - int - default 2 - -endif # BOARD_ASUS_P2B_D diff --git a/src/mainboard/asus/p2b-d/Kconfig.name b/src/mainboard/asus/p2b-d/Kconfig.name deleted file mode 100644 index 23e7808..0000000 --- a/src/mainboard/asus/p2b-d/Kconfig.name +++ /dev/null @@ -1,2 +0,0 @@ -config BOARD_ASUS_P2B_D - bool "P2B-D" diff --git a/src/mainboard/asus/p2b-d/board_info.txt b/src/mainboard/asus/p2b-d/board_info.txt deleted file mode 100644 index fdee74e..0000000 --- a/src/mainboard/asus/p2b-d/board_info.txt +++ /dev/null @@ -1,7 +0,0 @@ -Category: desktop -Board URL: ftp://ftp.asus.com.tw/pub/ASUS/mb/slot1/440bx/p2b-d/ -ROM package: DIP32 -ROM protocol: Parallel -ROM socketed: y -Flashrom support: y -Release year: 1998 diff --git a/src/mainboard/asus/p2b-d/irq_tables.c b/src/mainboard/asus/p2b-d/irq_tables.c deleted file mode 100644 index cb72254..0000000 --- a/src/mainboard/asus/p2b-d/irq_tables.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2009 Uwe Hermann uwe@hermann-uwe.de - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <arch/pirq_routing.h> - -static const struct irq_routing_table intel_irq_routing_table = { - PIRQ_SIGNATURE, - PIRQ_VERSION, - 32 + 16 * CONFIG_IRQ_SLOT_COUNT,/* Max. number of devices on the bus */ - 0x00, /* Interrupt router bus */ - (0x04 << 3) | 0x0, /* Interrupt router device */ - 0, /* IRQs devoted exclusively to PCI usage */ - 0x8086, /* Vendor */ - 0x122e, /* Device */ - 0, /* Miniport data */ - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* u8 rfu[11] */ - 0x54, /* Checksum */ - { - /* bus, dev | fn, {link, bitmap}, {link, bitmap}, {link, bitmap}, {link, bitmap}, slot, rfu */ - {0x00, (0x0c << 3) | 0x0, {{0x60, 0x1eb8}, {0x61, 0x1eb8}, {0x62, 0x1eb8}, {0x63, 0x1eb8}}, 0x1, 0x0}, - {0x00, (0x0b << 3) | 0x0, {{0x61, 0x1eb8}, {0x62, 0x1eb8}, {0x63, 0x1eb8}, {0x60, 0x1eb8}}, 0x2, 0x0}, - {0x00, (0x0a << 3) | 0x0, {{0x62, 0x1eb8}, {0x63, 0x1eb8}, {0x60, 0x1eb8}, {0x61, 0x1eb8}}, 0x3, 0x0}, - {0x00, (0x09 << 3) | 0x0, {{0x63, 0x1eb8}, {0x60, 0x1eb8}, {0x61, 0x1eb8}, {0x62, 0x1eb8}}, 0x4, 0x0}, - {0x00, (0x04 << 3) | 0x0, {{0x60, 0x1eb8}, {0x61, 0x1eb8}, {0x62, 0x1eb8}, {0x63, 0x1eb8}}, 0x0, 0x0}, - {0x00, (0x01 << 3) | 0x0, {{0x60, 0x1eb8}, {0x61, 0x1eb8}, {0x62, 0x1eb8}, {0x63, 0x1eb8}}, 0x0, 0x0}, - } -}; - -unsigned long write_pirq_routing_table(unsigned long addr) -{ - return copy_pirq_routing_table(addr, &intel_irq_routing_table); -} diff --git a/src/mainboard/asus/p2b-d/mptable.c b/src/mainboard/asus/p2b-d/mptable.c deleted file mode 100644 index fde1281..0000000 --- a/src/mainboard/asus/p2b-d/mptable.c +++ /dev/null @@ -1,57 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2009 Uwe Hermann uwe@hermann-uwe.de - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <arch/smp/mpspec.h> -#include <arch/ioapic.h> -#include <device/pci.h> -#include <stdint.h> - -static void *smp_write_config_table(void *v) -{ - int ioapic_id, ioapic_ver, isa_bus; - struct mp_config_table *mc; - - mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN); - - mptable_init(mc, LOCAL_APIC_ADDR); - - smp_write_processors(mc); - - mptable_write_buses(mc, NULL, &isa_bus); - - ioapic_id = 2; - ioapic_ver = 0x11; /* External Intel 82093AA IOAPIC. */ - smp_write_ioapic(mc, ioapic_id, ioapic_ver, VIO_APIC_VADDR); - - /* Legacy Interrupts */ - mptable_add_isa_interrupts(mc, isa_bus, ioapic_id, 0); - - /* I/O Ints: Type Trigger Polarity Bus ID IRQ APIC ID PIN# */ - smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_LOW, 0x0, 0x13, ioapic_id, 0x13); /* UHCI */ - - /* Local Ints: Type Trigger Polarity Bus ID IRQ APIC ID PIN# */ - mptable_lintsrc(mc, isa_bus); - - /* Compute the checksums. */ - return mptable_finalize(mc); -} - -unsigned long write_smp_table(unsigned long addr) -{ - void *v; - v = smp_write_floating_table(addr, 0); - return (unsigned long)smp_write_config_table(v); -} diff --git a/src/mainboard/asus/p2b-d/romstage.c b/src/mainboard/asus/p2b-d/romstage.c deleted file mode 100644 index 7fad06b..0000000 --- a/src/mainboard/asus/p2b-d/romstage.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2009 Uwe Hermann uwe@hermann-uwe.de - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/* Shares romstage with P2B-DS */ -#include "../p2b-ds/romstage.c" diff --git a/src/mainboard/asus/p2b-ds/Kconfig b/src/mainboard/asus/p2b-ds/Kconfig index 8b55174..d7b77db 100644 --- a/src/mainboard/asus/p2b-ds/Kconfig +++ b/src/mainboard/asus/p2b-ds/Kconfig @@ -12,10 +12,9 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## -if BOARD_ASUS_P2B_DS
-config BOARD_SPECIFIC_OPTIONS - def_bool y +config BOARD_ASUS_BASEBOARD_P2B_DS + def_bool n select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX select SOUTHBRIDGE_INTEL_I82371EB @@ -27,20 +26,33 @@ select BOARD_ROMSIZE_KB_256 select SDRAMPWR_4DIMM
+if BOARD_ASUS_BASEBOARD_P2B_DS + config MAINBOARD_DIR string default "asus/p2b-ds"
+config VARIANT_DIR + string + default "p2b-d" if BOARD_ASUS_P2B_D + default "p2b-ds" if BOARD_ASUS_P2B_DS + config MAINBOARD_PART_NUMBER string - default "P2B-DS" + default "P2B-D" if BOARD_ASUS_P2B_D + default "P2B-DS" if BOARD_ASUS_P2B_DS + +config DEVICETREE + string + default "$(CONFIG_VARIANT_DIR)/devicetree.cb"
config IRQ_SLOT_COUNT int - default 7 + default 6 if BOARD_ASUS_P2B_D + default 7 if BOARD_ASUS_P2B_DS
config MAX_CPUS int default 2
-endif # BOARD_ASUS_P2B_DS +endif # BOARD_ASUS_BASEBOARD_P2B_DS diff --git a/src/mainboard/asus/p2b-ds/Kconfig.name b/src/mainboard/asus/p2b-ds/Kconfig.name index 0335139..740d4e5 100644 --- a/src/mainboard/asus/p2b-ds/Kconfig.name +++ b/src/mainboard/asus/p2b-ds/Kconfig.name @@ -1,2 +1,7 @@ +config BOARD_ASUS_P2B_D + bool "P2B-D" + select BOARD_ASUS_BASEBOARD_P2B_DS + config BOARD_ASUS_P2B_DS bool "P2B-DS" + select BOARD_ASUS_BASEBOARD_P2B_DS diff --git a/src/mainboard/asus/p2b-ds/irq_tables.c b/src/mainboard/asus/p2b-ds/irq_tables.c index 2240b44..0966a22 100644 --- a/src/mainboard/asus/p2b-ds/irq_tables.c +++ b/src/mainboard/asus/p2b-ds/irq_tables.c @@ -16,29 +16,12 @@
#include <arch/pirq_routing.h>
-static const struct irq_routing_table intel_irq_routing_table = { - PIRQ_SIGNATURE, - PIRQ_VERSION, - 32 + 16 * CONFIG_IRQ_SLOT_COUNT,/* Max. number of devices on the bus */ - 0x00, /* Interrupt router bus */ - (0x04 << 3) | 0x0, /* Interrupt router device */ - 0, /* IRQs devoted exclusively to PCI usage */ - 0x8086, /* Vendor */ - 0x122e, /* Device */ - 0, /* Miniport data */ - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* u8 rfu[11] */ - 0x36, /* Checksum */ - { - /* bus, dev | fn, {link, bitmap}, {link, bitmap}, {link, bitmap}, {link, bitmap}, slot, rfu */ - {0x00, (0x0c << 3) | 0x0, {{0x60, 0x1eb8}, {0x61, 0x1eb8}, {0x62, 0x1eb8}, {0x63, 0x1eb8}}, 0x1, 0x0}, - {0x00, (0x0b << 3) | 0x0, {{0x61, 0x1eb8}, {0x62, 0x1eb8}, {0x63, 0x1eb8}, {0x60, 0x1eb8}}, 0x2, 0x0}, - {0x00, (0x0a << 3) | 0x0, {{0x62, 0x1eb8}, {0x63, 0x1eb8}, {0x60, 0x1eb8}, {0x61, 0x1eb8}}, 0x3, 0x0}, - {0x00, (0x09 << 3) | 0x0, {{0x63, 0x1eb8}, {0x60, 0x1eb8}, {0x61, 0x1eb8}, {0x62, 0x1eb8}}, 0x4, 0x0}, - {0x00, (0x04 << 3) | 0x0, {{0x60, 0x1eb8}, {0x61, 0x1eb8}, {0x62, 0x1eb8}, {0x63, 0x1eb8}}, 0x0, 0x0}, - {0x00, (0x01 << 3) | 0x0, {{0x60, 0x1eb8}, {0x61, 0x1eb8}, {0x62, 0x1eb8}, {0x63, 0x1eb8}}, 0x0, 0x0}, - {0x00, (0x06 << 3) | 0x0, {{0x63, 0x1eb8}, {0x60, 0x1eb8}, {0x61, 0x1eb8}, {0x62, 0x1eb8}}, 0x0, 0x0}, - } -}; +#if CONFIG(BOARD_ASUS_P2B_DS) +#include "p2b-ds/irq_tables.h" +#endif +#if CONFIG(BOARD_ASUS_P2B_D) +#include "p2b-d/irq_tables.h" +#endif
unsigned long write_pirq_routing_table(unsigned long addr) { diff --git a/src/mainboard/asus/p2b-ds/mptable.c b/src/mainboard/asus/p2b-ds/mptable.c index 4e085b1..aeeaa48 100644 --- a/src/mainboard/asus/p2b-ds/mptable.c +++ b/src/mainboard/asus/p2b-ds/mptable.c @@ -41,10 +41,12 @@
/* I/O Ints: Type Trigger Polarity Bus ID IRQ APIC ID PIN# */ smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_LOW, 0x0, 0x13, ioapic_id, 0x13); - smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_LOW, 0x0, 0x18, ioapic_id, 0x13); + if (CONFIG(BOARD_ASUS_P2B_DS)) + smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL | + MP_IRQ_POLARITY_LOW, 0x0, 0x18, ioapic_id, 0x13);
/* Local Ints: Type Trigger Polarity Bus ID IRQ APIC ID PIN# */ - mptable_lintsrc(mc, 0x1); + mptable_lintsrc(mc, isa_bus);
/* Compute the checksums. */ return mptable_finalize(mc); diff --git a/src/mainboard/asus/p2b-d/devicetree.cb b/src/mainboard/asus/p2b-ds/p2b-d/devicetree.cb similarity index 100% rename from src/mainboard/asus/p2b-d/devicetree.cb rename to src/mainboard/asus/p2b-ds/p2b-d/devicetree.cb diff --git a/src/mainboard/asus/p2b-ds/p2b-d/irq_tables.h b/src/mainboard/asus/p2b-ds/p2b-d/irq_tables.h new file mode 100644 index 0000000..0cf6fc1 --- /dev/null +++ b/src/mainboard/asus/p2b-ds/p2b-d/irq_tables.h @@ -0,0 +1,43 @@ +/* + * This file is part of the coreboot project. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +static const struct irq_routing_table intel_irq_routing_table = { + PIRQ_SIGNATURE, + PIRQ_VERSION, + 32 + 16 * CONFIG_IRQ_SLOT_COUNT,/* Max. number of devices on the bus */ + 0x00, /* Interrupt router bus */ + (0x04 << 3) | 0x0, /* Interrupt router device */ + 0, /* IRQs devoted exclusively to PCI usage */ + 0x8086, /* Vendor */ + 0x122e, /* Device */ + 0, /* Miniport data */ + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* u8 rfu[11] */ + 0x54, /* Checksum */ + { + /* bus, dev | fn, {link, bitmap}, {link, bitmap}, + {link, bitmap}, {link, bitmap}, slot, rfu */ + {0x00, (0x0c << 3) | 0x0, {{0x60, 0x1eb8}, {0x61, 0x1eb8}, + {0x62, 0x1eb8}, {0x63, 0x1eb8} }, 0x1, 0x0}, + {0x00, (0x0b << 3) | 0x0, {{0x61, 0x1eb8}, {0x62, 0x1eb8}, + {0x63, 0x1eb8}, {0x60, 0x1eb8} }, 0x2, 0x0}, + {0x00, (0x0a << 3) | 0x0, {{0x62, 0x1eb8}, {0x63, 0x1eb8}, + {0x60, 0x1eb8}, {0x61, 0x1eb8} }, 0x3, 0x0}, + {0x00, (0x09 << 3) | 0x0, {{0x63, 0x1eb8}, {0x60, 0x1eb8}, + {0x61, 0x1eb8}, {0x62, 0x1eb8} }, 0x4, 0x0}, + {0x00, (0x04 << 3) | 0x0, {{0x60, 0x1eb8}, {0x61, 0x1eb8}, + {0x62, 0x1eb8}, {0x63, 0x1eb8} }, 0x0, 0x0}, + {0x00, (0x01 << 3) | 0x0, {{0x60, 0x1eb8}, {0x61, 0x1eb8}, + {0x62, 0x1eb8}, {0x63, 0x1eb8} }, 0x0, 0x0}, + } +}; diff --git a/src/mainboard/asus/p2b-ds/devicetree.cb b/src/mainboard/asus/p2b-ds/p2b-ds/devicetree.cb similarity index 100% rename from src/mainboard/asus/p2b-ds/devicetree.cb rename to src/mainboard/asus/p2b-ds/p2b-ds/devicetree.cb diff --git a/src/mainboard/asus/p2b-ds/p2b-ds/irq_tables.h b/src/mainboard/asus/p2b-ds/p2b-ds/irq_tables.h new file mode 100644 index 0000000..ee40690 --- /dev/null +++ b/src/mainboard/asus/p2b-ds/p2b-ds/irq_tables.h @@ -0,0 +1,45 @@ +/* + * This file is part of the coreboot project. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +static const struct irq_routing_table intel_irq_routing_table = { + PIRQ_SIGNATURE, + PIRQ_VERSION, + 32 + 16 * CONFIG_IRQ_SLOT_COUNT,/* Max. number of devices on the bus */ + 0x00, /* Interrupt router bus */ + (0x04 << 3) | 0x0, /* Interrupt router device */ + 0, /* IRQs devoted exclusively to PCI usage */ + 0x8086, /* Vendor */ + 0x122e, /* Device */ + 0, /* Miniport data */ + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* u8 rfu[11] */ + 0x36, /* Checksum */ + { + /* bus, dev | fn, {link, bitmap}, {link, bitmap}, + {link, bitmap}, {link, bitmap}, slot, rfu */ + {0x00, (0x0c << 3) | 0x0, {{0x60, 0x1eb8}, {0x61, 0x1eb8}, + {0x62, 0x1eb8}, {0x63, 0x1eb8} }, 0x1, 0x0}, + {0x00, (0x0b << 3) | 0x0, {{0x61, 0x1eb8}, {0x62, 0x1eb8}, + {0x63, 0x1eb8}, {0x60, 0x1eb8} }, 0x2, 0x0}, + {0x00, (0x0a << 3) | 0x0, {{0x62, 0x1eb8}, {0x63, 0x1eb8}, + {0x60, 0x1eb8}, {0x61, 0x1eb8} }, 0x3, 0x0}, + {0x00, (0x09 << 3) | 0x0, {{0x63, 0x1eb8}, {0x60, 0x1eb8}, + {0x61, 0x1eb8}, {0x62, 0x1eb8} }, 0x4, 0x0}, + {0x00, (0x04 << 3) | 0x0, {{0x60, 0x1eb8}, {0x61, 0x1eb8}, + {0x62, 0x1eb8}, {0x63, 0x1eb8} }, 0x0, 0x0}, + {0x00, (0x01 << 3) | 0x0, {{0x60, 0x1eb8}, {0x61, 0x1eb8}, + {0x62, 0x1eb8}, {0x63, 0x1eb8} }, 0x0, 0x0}, + {0x00, (0x06 << 3) | 0x0, {{0x63, 0x1eb8}, {0x60, 0x1eb8}, + {0x61, 0x1eb8}, {0x62, 0x1eb8} }, 0x0, 0x0}, + } +};
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37457 )
Change subject: [RFC] asus/p2b-d: Fold into asus/p2b-ds as a variant ......................................................................
Patch Set 1:
(7 comments)
https://review.coreboot.org/c/coreboot/+/37457/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/37457/1//COMMIT_MSG@6 PS1, Line 6: : [RFC] asus/p2b-d: Fold into asus/p2b-ds as a variant Only these two? I'd try to do the entire group of i440bx boards
https://review.coreboot.org/c/coreboot/+/37457/1//COMMIT_MSG@10 PS1, Line 10: devicetree Should use overridetree to handle these.
https://review.coreboot.org/c/coreboot/+/37457/1//COMMIT_MSG@10 PS1, Line 10: mptable, irq table, As these files are nicely formatted, I'd try to preserve them. Even if similar, a lot is already gained just with sharing the devicetree and romstage.c
https://review.coreboot.org/c/coreboot/+/37457/1//COMMIT_MSG@13 PS1, Line 13: Lines split and spaces added to pass lint. You don't need to pass lint. What's more: the less changes to the files while switching to a variants setup, the better.
https://review.coreboot.org/c/coreboot/+/37457/1//COMMIT_MSG@18 PS1, Line 18: Comments welcome I'd suggest using gigabyte/ga-h61m-s2pv as a reference. It's also using a variant setup, but does not have the concept of 'baseboard'
https://review.coreboot.org/c/coreboot/+/37457/1//COMMIT_MSG@18 PS1, Line 18: Build tested. Use `make BUILD_TIMELESS=1 -j$(nproc)` to build a coreboot image of the relevant boards before and after this change. Then, diff both. There should be no changes.
This is a great way to test changes: if the resulting binary does not change, then one can be sure that nothing got broken by accident :)
https://review.coreboot.org/c/coreboot/+/37457/1/src/mainboard/asus/p2b-ds/i... File src/mainboard/asus/p2b-ds/irq_tables.c:
https://review.coreboot.org/c/coreboot/+/37457/1/src/mainboard/asus/p2b-ds/i... PS1, Line 19: #if CONFIG(BOARD_ASUS_P2B_DS) : #include "p2b-ds/irq_tables.h" : #endif : #if CONFIG(BOARD_ASUS_P2B_D) : #include "p2b-d/irq_tables.h" : #endif I'd rather try to add a Makefile.inc so that $(CONFIG_VARIANT_DIR) can be used
Keith Hui has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/37457 )
Change subject: [RFC] asus/p2b-d: Fold into asus/p2b-ds as a variant ......................................................................
Abandoned
See CB:38621
-
Angel Pons (Code Review) -
Keith Hui (Code Review)