Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/49277 )
Change subject: i82801jx boards: Factor out GNVS initialisation ......................................................................
i82801jx boards: Factor out GNVS initialisation
All boards use the same values.
Change-Id: If473373bf093a438a80a58039472d288a28c41ef Signed-off-by: Angel Pons th3fanbus@gmail.com --- D src/mainboard/acer/g43t-am3/acpi_tables.c D src/mainboard/asus/p5qc/acpi_tables.c M src/mainboard/asus/p5ql-em/Makefile.inc D src/mainboard/asus/p5ql-em/acpi_tables.c A src/mainboard/asus/p5ql-em/cstates.c D src/mainboard/intel/dg43gt/acpi_tables.c M src/southbridge/intel/i82801jx/lpc.c 7 files changed, 16 insertions(+), 55 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/77/49277/1
diff --git a/src/mainboard/acer/g43t-am3/acpi_tables.c b/src/mainboard/acer/g43t-am3/acpi_tables.c deleted file mode 100644 index 2bdb744..0000000 --- a/src/mainboard/acer/g43t-am3/acpi_tables.c +++ /dev/null @@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <acpi/acpi_gnvs.h> -#include <southbridge/intel/i82801jx/nvs.h> - -void mainboard_fill_gnvs(struct global_nvs *gnvs) -{ - gnvs->pwrs = 1; /* Power state (AC = 1) */ - gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */ - gnvs->apic = 1; /* Enable APIC */ - gnvs->mpen = 1; /* Enable Multi Processing */ -} diff --git a/src/mainboard/asus/p5qc/acpi_tables.c b/src/mainboard/asus/p5qc/acpi_tables.c deleted file mode 100644 index c9e4a5e..0000000 --- a/src/mainboard/asus/p5qc/acpi_tables.c +++ /dev/null @@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <acpi/acpi_gnvs.h> -#include <southbridge/intel/i82801jx/nvs.h> - -void mainboard_fill_gnvs(struct global_nvs *gnvs) -{ - gnvs->pwrs = 1; /* Power state (AC = 1) */ - gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */ - gnvs->apic = 1; /* Enable APIC */ - gnvs->mpen = 1; /* Enable Multi Processing */ -} diff --git a/src/mainboard/asus/p5ql-em/Makefile.inc b/src/mainboard/asus/p5ql-em/Makefile.inc index 097c9f9..4a5e88d 100644 --- a/src/mainboard/asus/p5ql-em/Makefile.inc +++ b/src/mainboard/asus/p5ql-em/Makefile.inc @@ -5,4 +5,6 @@ romstage-y += gpio.c romstage-y += early_init.c
+ramstage-y += cstates.c + ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads diff --git a/src/mainboard/asus/p5ql-em/acpi_tables.c b/src/mainboard/asus/p5ql-em/acpi_tables.c deleted file mode 100644 index 37af4b5..0000000 --- a/src/mainboard/asus/p5ql-em/acpi_tables.c +++ /dev/null @@ -1,19 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <acpi/acpigen.h> -#include <acpi/acpi_gnvs.h> -#include <southbridge/intel/i82801jx/nvs.h> - -void mainboard_fill_gnvs(struct global_nvs *gnvs) -{ - gnvs->pwrs = 1; /* Power state (AC = 1) */ - gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */ - gnvs->apic = 1; /* Enable APIC */ - gnvs->mpen = 1; /* Enable Multi Processing */ -} - -/* TODO: Could work... */ -int get_cst_entries(acpi_cstate_t **entries) -{ - return 0; -} diff --git a/src/mainboard/asus/p5ql-em/cstates.c b/src/mainboard/asus/p5ql-em/cstates.c new file mode 100644 index 0000000..791f78e --- /dev/null +++ b/src/mainboard/asus/p5ql-em/cstates.c @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <acpi/acpigen.h> + +/* TODO: Could work... */ +int get_cst_entries(acpi_cstate_t **entries) +{ + return 0; +} diff --git a/src/mainboard/intel/dg43gt/acpi_tables.c b/src/mainboard/intel/dg43gt/acpi_tables.c deleted file mode 100644 index c9e4a5e..0000000 --- a/src/mainboard/intel/dg43gt/acpi_tables.c +++ /dev/null @@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <acpi/acpi_gnvs.h> -#include <southbridge/intel/i82801jx/nvs.h> - -void mainboard_fill_gnvs(struct global_nvs *gnvs) -{ - gnvs->pwrs = 1; /* Power state (AC = 1) */ - gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */ - gnvs->apic = 1; /* Enable APIC */ - gnvs->mpen = 1; /* Enable Multi Processing */ -} diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c index 86478fa..5c3a2df 100644 --- a/src/southbridge/intel/i82801jx/lpc.c +++ b/src/southbridge/intel/i82801jx/lpc.c @@ -487,6 +487,11 @@ if (!gnvs) return;
+ gnvs->pwrs = 1; /* Power state (AC = 1) */ + gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */ + gnvs->apic = 1; /* Enable APIC */ + gnvs->mpen = 1; /* Enable Multi Processing */ + mainboard_fill_gnvs(gnvs); acpi_inject_nvsa(); }
-
Angel Pons (Code Review)