From bccaafc677c3b51c730baebf83073f8db166550d Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Tue, 28 Apr 2009 12:57:25 +0000 Subject: add_mainboard_resources is necessary for some boards (eg. kontron), but this generic code could be added to the caller of add_mainboard_resources (wrapped in HAVE_HIGH_TABLES, of course). That way, boards that really need it (for other things) can use this function, while others don't have to do anything to use HAVE_HIGH_TABLES. Signed-off-by: Patrick Georgi Acked-by: Stefan Reinauer Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4223 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/tyan/s2891/Options.lb | 4 +--- src/mainboard/tyan/s2891/mainboard.c | 16 ---------------- src/mainboard/tyan/s2892/Options.lb | 4 +--- src/mainboard/tyan/s2892/mainboard.c | 16 ---------------- src/mainboard/tyan/s2895/Options.lb | 4 +--- src/mainboard/tyan/s2895/mainboard.c | 16 ---------------- 6 files changed, 3 insertions(+), 57 deletions(-) (limited to 'src/mainboard/tyan') diff --git a/src/mainboard/tyan/s2891/Options.lb b/src/mainboard/tyan/s2891/Options.lb index b0250fc850..12f3c42256 100644 --- a/src/mainboard/tyan/s2891/Options.lb +++ b/src/mainboard/tyan/s2891/Options.lb @@ -33,7 +33,6 @@ uses LB_CKS_RANGE_END uses LB_CKS_LOC uses HAVE_ACPI_TABLES uses HAVE_ACPI_RESUME -uses HAVE_MAINBOARD_RESOURCES uses HAVE_HIGH_TABLES uses HAVE_LOW_TABLES uses CONFIG_MULTIBOOT @@ -130,8 +129,7 @@ default HAVE_MP_TABLE=1 ## default HAVE_ACPI_TABLES=1 default HAVE_LOW_TABLES=1 -default HAVE_MAINBOARD_RESOURCES=1 -default HAVE_HIGH_TABLES=0 +default HAVE_HIGH_TABLES=1 default CONFIG_MULTIBOOT=0 ## diff --git a/src/mainboard/tyan/s2891/mainboard.c b/src/mainboard/tyan/s2891/mainboard.c index cb6aea15cc..c529c0a5a4 100644 --- a/src/mainboard/tyan/s2891/mainboard.c +++ b/src/mainboard/tyan/s2891/mainboard.c @@ -1,22 +1,6 @@ #include -#include -#include #include "chip.h" -/* in arch/i386/boot/tables.c */ -extern uint64_t high_tables_base, high_tables_size; - -int add_mainboard_resources(struct lb_memory *mem) -{ -#if HAVE_HIGH_TABLES == 1 - printk_debug("Adding high table area\n"); - lb_add_memory_range(mem, LB_MEM_TABLE, - high_tables_base, high_tables_size); -#endif - return 0; -} - - struct chip_operations mainboard_ops = { CHIP_NAME("Tyan S2891 Mainboard") }; diff --git a/src/mainboard/tyan/s2892/Options.lb b/src/mainboard/tyan/s2892/Options.lb index e50806f57e..5cf2ad8c3f 100644 --- a/src/mainboard/tyan/s2892/Options.lb +++ b/src/mainboard/tyan/s2892/Options.lb @@ -33,7 +33,6 @@ uses LB_CKS_RANGE_END uses LB_CKS_LOC uses HAVE_ACPI_TABLES uses HAVE_ACPI_RESUME -uses HAVE_MAINBOARD_RESOURCES uses HAVE_HIGH_TABLES uses HAVE_LOW_TABLES uses CONFIG_MULTIBOOT @@ -124,8 +123,7 @@ default HAVE_MP_TABLE=1 ## default HAVE_ACPI_TABLES=1 default HAVE_LOW_TABLES=1 -default HAVE_MAINBOARD_RESOURCES=1 -default HAVE_HIGH_TABLES=0 +default HAVE_HIGH_TABLES=1 default CONFIG_MULTIBOOT=0 ## diff --git a/src/mainboard/tyan/s2892/mainboard.c b/src/mainboard/tyan/s2892/mainboard.c index eba339f480..299f8360d2 100644 --- a/src/mainboard/tyan/s2892/mainboard.c +++ b/src/mainboard/tyan/s2892/mainboard.c @@ -1,22 +1,6 @@ #include -#include -#include #include "chip.h" -/* in arch/i386/boot/tables.c */ -extern uint64_t high_tables_base, high_tables_size; - -int add_mainboard_resources(struct lb_memory *mem) -{ -#if HAVE_HIGH_TABLES == 1 - printk_debug("Adding high table area\n"); - lb_add_memory_range(mem, LB_MEM_TABLE, - high_tables_base, high_tables_size); -#endif - return 0; -} - - struct chip_operations mainboard_ops = { CHIP_NAME("Tyan S2892 Mainboard") }; diff --git a/src/mainboard/tyan/s2895/Options.lb b/src/mainboard/tyan/s2895/Options.lb index df0b2ea3b5..da6aa5bde2 100644 --- a/src/mainboard/tyan/s2895/Options.lb +++ b/src/mainboard/tyan/s2895/Options.lb @@ -36,7 +36,6 @@ uses LB_CKS_RANGE_END uses LB_CKS_LOC uses HAVE_ACPI_TABLES uses HAVE_ACPI_RESUME -uses HAVE_MAINBOARD_RESOURCES uses HAVE_HIGH_TABLES uses HAVE_LOW_TABLES uses CONFIG_MULTIBOOT @@ -137,8 +136,7 @@ default HAVE_MP_TABLE=1 ## default HAVE_ACPI_TABLES=1 default HAVE_LOW_TABLES=1 -default HAVE_MAINBOARD_RESOURCES=1 -default HAVE_HIGH_TABLES=0 +default HAVE_HIGH_TABLES=1 default CONFIG_MULTIBOOT=0 ## diff --git a/src/mainboard/tyan/s2895/mainboard.c b/src/mainboard/tyan/s2895/mainboard.c index 08be91f9f1..f152eae943 100644 --- a/src/mainboard/tyan/s2895/mainboard.c +++ b/src/mainboard/tyan/s2895/mainboard.c @@ -1,22 +1,6 @@ #include -#include -#include #include "chip.h" -/* in arch/i386/boot/tables.c */ -extern uint64_t high_tables_base, high_tables_size; - -int add_mainboard_resources(struct lb_memory *mem) -{ -#if HAVE_HIGH_TABLES == 1 - printk_debug("Adding high table area\n"); - lb_add_memory_range(mem, LB_MEM_TABLE, - high_tables_base, high_tables_size); -#endif - return 0; -} - - struct chip_operations mainboard_ops = { CHIP_NAME("Tyan S2895 Mainboard") }; -- cgit v1.2.3