[coreboot-gerrit] Patch set updated for coreboot: 2c7cd92 Drop add_mainboard_resources and HAVE_MAINBOARD_RESOURCES again

Stefan Reinauer (stefan.reinauer@coreboot.org) gerrit at coreboot.org
Fri Mar 22 16:32:58 CET 2013


Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2707

-gerrit

commit 2c7cd925836fce24b5fafc878ddd96209c96fb03
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Wed Mar 13 11:44:39 2013 +0200

    Drop add_mainboard_resources and HAVE_MAINBOARD_RESOURCES again
    
    These are not defined since commit »Drop HAVE_MAINBOARD_RESOURCES«
    (1c5071d1) [1] but were unfortunately introduced again in new ports.
    
    [1] http://review.coreboot.org/1414
    
    Change-Id: I5eb61628141aefd08779615702d51ca155fa632a
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/arch/armv7/include/arch/coreboot_tables.h | 4 ----
 src/mainboard/google/butterfly/Kconfig        | 1 -
 src/mainboard/google/link/Kconfig             | 1 -
 src/mainboard/google/parrot/Kconfig           | 1 -
 src/mainboard/supermicro/h8scm/mainboard.c    | 7 -------
 5 files changed, 14 deletions(-)

diff --git a/src/arch/armv7/include/arch/coreboot_tables.h b/src/arch/armv7/include/arch/coreboot_tables.h
index 4c2a013..d8955ba 100644
--- a/src/arch/armv7/include/arch/coreboot_tables.h
+++ b/src/arch/armv7/include/arch/coreboot_tables.h
@@ -21,8 +21,4 @@ struct lb_memory *get_lb_mem(void);
 
 extern struct cmos_option_table option_table;
 
-/* defined by mainboard.c if the mainboard requires extra resources */
-int add_mainboard_resources(struct lb_memory *mem);
-int add_northbridge_resources(struct lb_memory *mem);
-
 #endif /* COREBOOT_TABLE_H */
diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig
index 0813042..feafff0 100644
--- a/src/mainboard/google/butterfly/Kconfig
+++ b/src/mainboard/google/butterfly/Kconfig
@@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_RESUME
-	select HAVE_MAINBOARD_RESOURCES
 	select MMCONF_SUPPORT
 	select HAVE_SMI_HANDLER
 	select GFXUMA
diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig
index c171390..db3bf32 100644
--- a/src/mainboard/google/link/Kconfig
+++ b/src/mainboard/google/link/Kconfig
@@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_RESUME
-	select HAVE_MAINBOARD_RESOURCES
 	select MMCONF_SUPPORT
 	select HAVE_SMI_HANDLER
 	select GFXUMA
diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig
index 96f1b4f..f1957e0 100644
--- a/src/mainboard/google/parrot/Kconfig
+++ b/src/mainboard/google/parrot/Kconfig
@@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_RESUME
-	select HAVE_MAINBOARD_RESOURCES
 	select MMCONF_SUPPORT
 	select HAVE_SMI_HANDLER
 	select GFXUMA
diff --git a/src/mainboard/supermicro/h8scm/mainboard.c b/src/mainboard/supermicro/h8scm/mainboard.c
index 819208c..23b1d72 100644
--- a/src/mainboard/supermicro/h8scm/mainboard.c
+++ b/src/mainboard/supermicro/h8scm/mainboard.c
@@ -72,13 +72,6 @@ static void mainboard_enable(device_t dev)
 	printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
 }
 
-#if CONFIG_HAVE_MAINBOARD_RESOURCES
-int add_mainboard_resources(struct lb_memory *mem)
-{
-	return 0;
-}
-#endif
-
 struct chip_operations mainboard_ops = {
 		.enable_dev = mainboard_enable,
 };



More information about the coreboot-gerrit mailing list