coreboot August 2012

coreboot@coreboot.org

30 participants
321 discussions

Patch merged into coreboot/master: 629ebf4 AMD and GFXUMA: move setup_uma_memory() to northbridge
by gerrit＠coreboot.org 02 Aug '12

02 Aug '12

the following patch was just integrated into master: commit 629ebf423d20fc56c4e8ae1828192162b3bc9b72 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Thu Jul 19 19:26:43 2012 +0300 AMD and GFXUMA: move setup_uma_memory() to northbridge UMA region can be determined at any time after the amount of RAM is known and before the uma_resource() call. Change-Id: I2a0bf2d3cad55ee70e889c88846f962b7faa0c7e Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Build-Tested: build bot (Jenkins) at Thu Aug 2 12:07:56 2012, giving +1 Reviewed-By: Anton Kochkov <anton.kochkov(a)gmail.com> at Thu Aug 2 12:56:09 2012, giving +2 See http://review.coreboot.org/1379 for details. -gerrit

1 0

Patch merged into coreboot/master: a54defe AMD Agesa and GFXUMA: drop use of uma_memory_base
by gerrit＠coreboot.org 02 Aug '12

02 Aug '12

the following patch was just integrated into master: commit a54defe30fa86f01a1b02907594ef4a08217544b Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Fri Jul 20 08:31:37 2012 +0300 AMD Agesa and GFXUMA: drop use of uma_memory_base Without GFXUMA, variables were not referenced anywhere. Fail builds on Family10 if GFXUMA is selected, because the northbridge code does not set UMA base or size. Change-Id: I15b91cf6241e9a890398eed03824b753828a0a51 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Build-Tested: build bot (Jenkins) at Thu Aug 2 11:50:32 2012, giving +1 Reviewed-By: Anton Kochkov <anton.kochkov(a)gmail.com> at Thu Aug 2 12:55:25 2012, giving +2 See http://review.coreboot.org/1247 for details. -gerrit

1 0

Patch merged into coreboot/master: 3ae2587 AMD K8 and AMDFAM10, GFXUMA: drop use of uma_memory_base
by gerrit＠coreboot.org 02 Aug '12

02 Aug '12

the following patch was just integrated into master: commit 3ae258787d3392a671a62ca3d94f10dce5eeb4a0 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Fri Jul 20 08:24:49 2012 +0300 AMD K8 and AMDFAM10, GFXUMA: drop use of uma_memory_base The code in rs690 or rs780 is always used with K8 or AMDFAM10 northbridge. Without GFXUMA, both of these set the same static value indirectly using the variable uma_memory_base. Make the register setting with immediate value, to remove the obscure use of variable uma_memory_base. Change-Id: I5354684457a76e73013b4e34a4538a6d122eee8d Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Build-Tested: build bot (Jenkins) at Thu Aug 2 11:34:54 2012, giving +1 Reviewed-By: Anton Kochkov <anton.kochkov(a)gmail.com> at Thu Aug 2 12:54:55 2012, giving +2 See http://review.coreboot.org/1246 for details. -gerrit

1 0

Patch merged into coreboot/master: ade868c x86emu: Respect the LEA 67h address size prefix
by gerrit＠coreboot.org 02 Aug '12

02 Aug '12

the following patch was just integrated into master: commit ade868c0ad60486a911b98037e59bc5726bdc0df Author: Stefan Reinauer <reinauer(a)chromium.org> Date: Thu Jul 26 15:40:06 2012 -0700 x86emu: Respect the LEA 67h address size prefix From http://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/x86emu?id=f57bc0… Change-Id: Ibdcaa27e936464cec512edb46447aa6284a34975 Signed-off-by: Stefan Reinauer <reinauer(a)google.com> Signed-off-by: Christian Zander <chzander(a)nvidia.com> Signed-off-by: Aaron Plattner <aplattner(a)nvidia.com> Tested-by: Tiago Vignatti <tiago.vignatti(a)nokia.com> Signed-off-by: Keith Packard <keithp(a)keithp.com> Reviewed-By: Patrick Georgi <patrick(a)georgi-clan.de> at Thu Aug 2 12:35:42 2012, giving +2 See http://review.coreboot.org/1364 for details. -gerrit

1 0

New patch to review for coreboot: ccc2f80 Coreboot table cleanup [notformerge]
by Kyösti Mälkki 02 Aug '12

02 Aug '12

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1391 -gerrit commit ccc2f808c30389d9f6120c1e5e2a21e58e01307d Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Thu Aug 2 11:52:22 2012 +0300 Coreboot table cleanup [notformerge] Single Jenkins build test to catch flaws and typos. Change-Id: Ie6c0d4ef55c2225aa709cf3fbad30ff1080e3610 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/Kconfig | 4 ---- src/arch/x86/boot/coreboot_table.c | 9 ++------- src/arch/x86/include/arch/coreboot_tables.h | 7 ------- src/boot/hardwaremain.c | 3 +++ src/include/boot/tables.h | 3 --- src/include/device/device.h | 1 + src/mainboard/advansus/a785e-i/Kconfig | 1 - src/mainboard/advansus/a785e-i/mainboard.c | 6 ------ src/mainboard/amd/bimini_fam10/Kconfig | 1 - src/mainboard/amd/bimini_fam10/mainboard.c | 6 ------ src/mainboard/amd/dbm690t/Kconfig | 1 - src/mainboard/amd/dbm690t/mainboard.c | 6 ------ src/mainboard/amd/dinar/Kconfig | 1 - src/mainboard/amd/dinar/mainboard.c | 5 ----- src/mainboard/amd/inagua/Kconfig | 1 - src/mainboard/amd/inagua/mainboard.c | 5 ----- src/mainboard/amd/mahogany/Kconfig | 1 - src/mainboard/amd/mahogany/mainboard.c | 6 ------ src/mainboard/amd/mahogany_fam10/Kconfig | 1 - src/mainboard/amd/mahogany_fam10/mainboard.c | 6 ------ src/mainboard/amd/parmer/Kconfig | 1 - src/mainboard/amd/parmer/mainboard.c | 5 ----- src/mainboard/amd/persimmon/Kconfig | 1 - src/mainboard/amd/persimmon/mainboard.c | 6 ------ src/mainboard/amd/pistachio/mainboard.c | 6 ------ src/mainboard/amd/south_station/Kconfig | 1 - src/mainboard/amd/south_station/mainboard.c | 5 ----- src/mainboard/amd/tilapia_fam10/Kconfig | 1 - src/mainboard/amd/tilapia_fam10/mainboard.c | 6 ------ src/mainboard/amd/torpedo/Kconfig | 1 - src/mainboard/amd/torpedo/mainboard.c | 5 ----- src/mainboard/amd/union_station/Kconfig | 1 - src/mainboard/amd/union_station/mainboard.c | 5 ----- src/mainboard/asrock/939a785gmh/Kconfig | 1 - src/mainboard/asrock/939a785gmh/mainboard.c | 6 ------ src/mainboard/asrock/e350m1/Kconfig | 1 - src/mainboard/asrock/e350m1/mainboard.c | 5 ----- src/mainboard/asus/dsbf/mainboard.c | 2 -- src/mainboard/asus/m2v-mx_se/Kconfig | 1 - src/mainboard/asus/m2v-mx_se/mainboard.c | 6 ------ src/mainboard/asus/m5a88-v/Kconfig | 1 - src/mainboard/asus/m5a88-v/mainboard.c | 6 ------ src/mainboard/asus/mew-am/Kconfig | 1 - src/mainboard/asus/mew-am/mainboard.c | 6 ------ src/mainboard/asus/mew-vm/Kconfig | 1 - src/mainboard/asus/mew-vm/mainboard.c | 6 ------ src/mainboard/avalue/eax-785e/Kconfig | 1 - src/mainboard/avalue/eax-785e/mainboard.c | 6 ------ src/mainboard/ecs/p6iwp-fe/Kconfig | 1 - src/mainboard/ecs/p6iwp-fe/mainboard.c | 6 ------ src/mainboard/getac/p470/mainboard.c | 1 - src/mainboard/gigabyte/ma785gm/Kconfig | 1 - src/mainboard/gigabyte/ma785gm/mainboard.c | 6 ------ src/mainboard/gigabyte/ma785gmt/Kconfig | 1 - src/mainboard/gigabyte/ma785gmt/mainboard.c | 6 ------ src/mainboard/gigabyte/ma78gm/Kconfig | 1 - src/mainboard/gigabyte/ma78gm/mainboard.c | 6 ------ src/mainboard/hp/e_vectra_p2706t/Kconfig | 1 - src/mainboard/hp/e_vectra_p2706t/mainboard.c | 6 ------ src/mainboard/ibase/mb899/mainboard.c | 2 -- src/mainboard/iei/kino-780am2-fam10/Kconfig | 1 - src/mainboard/iei/kino-780am2-fam10/mainboard.c | 6 ------ src/mainboard/intel/d810e2cb/Kconfig | 1 - src/mainboard/intel/d810e2cb/mainboard.c | 6 ------ src/mainboard/intel/d945gclf/mainboard.c | 2 -- src/mainboard/intel/eagleheights/mainboard.c | 7 ------- src/mainboard/intel/emeraldlake2/Kconfig | 1 - src/mainboard/intel/emeraldlake2/chromeos.c | 1 - src/mainboard/intel/emeraldlake2/mainboard.c | 5 ----- src/mainboard/iwave/iWRainbowG6/mainboard.c | 1 - src/mainboard/jetway/pa78vm5/Kconfig | 1 - src/mainboard/jetway/pa78vm5/mainboard.c | 6 ------ src/mainboard/kontron/kt690/Kconfig | 1 - src/mainboard/kontron/kt690/mainboard.c | 6 ------ src/mainboard/lenovo/t60/dock.c | 1 - src/mainboard/lenovo/t60/mainboard.c | 2 -- src/mainboard/lenovo/x60/dock.c | 1 - src/mainboard/lenovo/x60/mainboard.c | 2 -- src/mainboard/mitac/6513wu/Kconfig | 1 - src/mainboard/mitac/6513wu/mainboard.c | 6 ------ src/mainboard/msi/ms6178/Kconfig | 1 - src/mainboard/msi/ms6178/mainboard.c | 6 ------ src/mainboard/nec/powermate2000/Kconfig | 1 - src/mainboard/nec/powermate2000/mainboard.c | 6 ------ src/mainboard/rca/rm4100/Kconfig | 1 - src/mainboard/rca/rm4100/mainboard.c | 7 ------- src/mainboard/roda/rk886ex/mainboard.c | 2 -- src/mainboard/samsung/lumpy/Kconfig | 1 - src/mainboard/samsung/lumpy/chromeos.c | 1 - src/mainboard/samsung/lumpy/mainboard.c | 5 ----- src/mainboard/samsung/stumpy/Kconfig | 1 - src/mainboard/samsung/stumpy/chromeos.c | 1 - src/mainboard/samsung/stumpy/mainboard.c | 5 ----- src/mainboard/siemens/sitemp_g1p1/Kconfig | 1 - src/mainboard/siemens/sitemp_g1p1/mainboard.c | 21 --------------------- src/mainboard/supermicro/h8qgi/mainboard.c | 8 -------- src/mainboard/supermicro/h8scm_fam10/mainboard.c | 8 -------- src/mainboard/supermicro/x7db8/mainboard.c | 2 -- src/mainboard/technexion/tim5690/Kconfig | 1 - src/mainboard/technexion/tim5690/mainboard.c | 4 +--- src/mainboard/technexion/tim8690/mainboard.c | 6 ------ src/mainboard/thomson/ip1000/Kconfig | 1 - src/mainboard/thomson/ip1000/mainboard.c | 7 ------- src/mainboard/via/epia-n/mainboard.c | 19 ------------------- src/northbridge/intel/i5000/northbridge.c | 1 - src/northbridge/intel/i82810/northbridge.c | 1 - src/northbridge/intel/i82830/northbridge.c | 1 - src/northbridge/intel/i945/northbridge.c | 1 - src/northbridge/intel/sandybridge/northbridge.c | 1 - src/northbridge/intel/sch/northbridge.c | 1 - src/southbridge/amd/rs690/cmn.c | 1 - src/southbridge/amd/rs690/ht.c | 3 ++- src/southbridge/amd/rs780/cmn.c | 1 - 113 files changed, 9 insertions(+), 382 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 3453614..ccf8665 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -292,10 +292,6 @@ config HIGH_SCRATCH_MEMORY_SIZE hex default 0x0 -config HAVE_MAINBOARD_RESOURCES - bool - default n - config USE_OPTION_TABLE bool default n diff --git a/src/arch/x86/boot/coreboot_table.c b/src/arch/x86/boot/coreboot_table.c index 5b5834a..d056837 100644 --- a/src/arch/x86/boot/coreboot_table.c +++ b/src/arch/x86/boot/coreboot_table.c @@ -338,7 +338,7 @@ static struct lb_forward *lb_forward(struct lb_header *header, struct lb_header } #endif -void lb_memory_range(struct lb_memory *mem, +static void lb_memory_range(struct lb_memory *mem, uint32_t type, uint64_t start, uint64_t size) { int entries; @@ -503,8 +503,7 @@ static void lb_remove_memory_range(struct lb_memory *mem, } } -/* This function is used in mainboard specific code, too */ -void lb_add_memory_range(struct lb_memory *mem, +static void lb_add_memory_range(struct lb_memory *mem, uint32_t type, uint64_t start, uint64_t size) { lb_remove_memory_range(mem, start, size); @@ -667,10 +666,6 @@ unsigned long write_coreboot_table( /* Add reserved regions */ add_lb_reserved(mem); -#if CONFIG_HAVE_MAINBOARD_RESOURCES - add_mainboard_resources(mem); -#endif - lb_dump_memory_ranges(mem); /* Note: diff --git a/src/arch/x86/include/arch/coreboot_tables.h b/src/arch/x86/include/arch/coreboot_tables.h index b177949..e9790db 100644 --- a/src/arch/x86/include/arch/coreboot_tables.h +++ b/src/arch/x86/include/arch/coreboot_tables.h @@ -8,18 +8,11 @@ unsigned long write_coreboot_table( unsigned long low_table_start, unsigned long low_table_end, unsigned long rom_table_start, unsigned long rom_table_end); -void lb_memory_range(struct lb_memory *mem, - uint32_t type, uint64_t start, uint64_t size); - /* Routines to extract part so the coreboot table or information * from the coreboot table. */ struct lb_memory *get_lb_mem(void); -/* 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); - void fill_lb_gpios(struct lb_gpios *gpios); #endif /* COREBOOT_TABLE_H */ diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c index bb7f264..57a01f0 100644 --- a/src/boot/hardwaremain.c +++ b/src/boot/hardwaremain.c @@ -150,6 +150,9 @@ void hardwaremain(int boot_complete) if (! payload) die("Could not find a payload\n"); + if (mainboard_coreboot_completed) + mainboard_coreboot_completed(); + printk(BIOS_DEBUG, "Got a payload\n"); /* Before we go off to run the payload, see if * we stayed within our bounds. diff --git a/src/include/boot/tables.h b/src/include/boot/tables.h index 4b3f70c..869da26 100644 --- a/src/include/boot/tables.h +++ b/src/include/boot/tables.h @@ -4,9 +4,6 @@ #include <boot/coreboot_tables.h> #include <arch/coreboot_tables.h> -void lb_add_memory_range(struct lb_memory *mem, - uint32_t type, uint64_t start, uint64_t size); - struct lb_memory *write_tables(void); #endif /* BOOT_TABLES_H */ diff --git a/src/include/device/device.h b/src/include/device/device.h index eaf84c6..ceae6aa 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -123,6 +123,7 @@ void dev_configure(void); void dev_enable(void); void dev_initialize(void); void dev_optimize(void); +void __attribute__((weak)) mainboard_coreboot_completed(void); /* Generic device helper functions */ int reset_bus(struct bus *bus); diff --git a/src/mainboard/advansus/a785e-i/Kconfig b/src/mainboard/advansus/a785e-i/Kconfig index 7f1d136..327a84c 100644 --- a/src/mainboard/advansus/a785e-i/Kconfig +++ b/src/mainboard/advansus/a785e-i/Kconfig @@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_BUS_CONFIG select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE - select HAVE_MAINBOARD_RESOURCES select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select LIFT_BSP_APIC_ID diff --git a/src/mainboard/advansus/a785e-i/mainboard.c b/src/mainboard/advansus/a785e-i/mainboard.c index 6c190f0..66627dc 100644 --- a/src/mainboard/advansus/a785e-i/mainboard.c +++ b/src/mainboard/advansus/a785e-i/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -84,11 +83,6 @@ static void a785e_i_enable(device_t dev) enable_int_gfx(); } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - struct chip_operations mainboard_ops = { CHIP_NAME("ADVANSUS A785E-I Mainboard") .enable_dev = a785e_i_enable, diff --git a/src/mainboard/amd/bimini_fam10/Kconfig b/src/mainboard/amd/bimini_fam10/Kconfig index 06ed977..e38fc50 100644 --- a/src/mainboard/amd/bimini_fam10/Kconfig +++ b/src/mainboard/amd/bimini_fam10/Kconfig @@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select GENERATE_MP_TABLE - select HAVE_MAINBOARD_RESOURCES select SB_HT_CHAIN_UNITID_OFFSET_ONLY select LIFT_BSP_APIC_ID select SERIAL_CPU_INIT diff --git a/src/mainboard/amd/bimini_fam10/mainboard.c b/src/mainboard/amd/bimini_fam10/mainboard.c index f587ac1..125d316 100644 --- a/src/mainboard/amd/bimini_fam10/mainboard.c +++ b/src/mainboard/amd/bimini_fam10/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -135,11 +134,6 @@ static void bimini_enable(device_t dev) /* get_ide_dma66(); */ } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - struct chip_operations mainboard_ops = { CHIP_NAME("AMD Bimini Mainboard") .enable_dev = bimini_enable, diff --git a/src/mainboard/amd/dbm690t/Kconfig b/src/mainboard/amd/dbm690t/Kconfig index d1bf72f..9f0afa1 100644 --- a/src/mainboard/amd/dbm690t/Kconfig +++ b/src/mainboard/amd/dbm690t/Kconfig @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_MP_TABLE select HAVE_PIRQ_TABLE select HAVE_OPTION_TABLE - select HAVE_MAINBOARD_RESOURCES select HAVE_BUS_CONFIG select SB_HT_CHAIN_UNITID_OFFSET_ONLY select BOARD_ROMSIZE_KB_1024 diff --git a/src/mainboard/amd/dbm690t/mainboard.c b/src/mainboard/amd/dbm690t/mainboard.c index fbff55b..1f3e3f2 100644 --- a/src/mainboard/amd/dbm690t/mainboard.c +++ b/src/mainboard/amd/dbm690t/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -192,11 +191,6 @@ static void dbm690t_enable(device_t dev) set_thermal_config(); } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - struct chip_operations mainboard_ops = { CHIP_NAME("AMD DBM690T Mainboard") .enable_dev = dbm690t_enable, diff --git a/src/mainboard/amd/dinar/Kconfig b/src/mainboard/amd/dinar/Kconfig index c81ccfa..1c123ec 100644 --- a/src/mainboard/amd/dinar/Kconfig +++ b/src/mainboard/amd/dinar/Kconfig @@ -38,7 +38,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select HAVE_MAINBOARD_RESOURCES select HAVE_HARD_RESET select HAVE_ACPI_TABLES #TODO select HAVE_ACPI_RESUME diff --git a/src/mainboard/amd/dinar/mainboard.c b/src/mainboard/amd/dinar/mainboard.c index 6301b4f..e9d9b93 100644 --- a/src/mainboard/amd/dinar/mainboard.c +++ b/src/mainboard/amd/dinar/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -75,10 +74,6 @@ static void dinar_enable(device_t dev) setup_uma_memory(); } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} struct chip_operations mainboard_ops = { CHIP_NAME("AMD DINAR Mainboard") .enable_dev = dinar_enable, diff --git a/src/mainboard/amd/inagua/Kconfig b/src/mainboard/amd/inagua/Kconfig index a9c2de4..d2c42f4 100644 --- a/src/mainboard/amd/inagua/Kconfig +++ b/src/mainboard/amd/inagua/Kconfig @@ -31,7 +31,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select HAVE_MAINBOARD_RESOURCES select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select LIFT_BSP_APIC_ID diff --git a/src/mainboard/amd/inagua/mainboard.c b/src/mainboard/amd/inagua/mainboard.c index dc83258..41f3533 100644 --- a/src/mainboard/amd/inagua/mainboard.c +++ b/src/mainboard/amd/inagua/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -84,10 +83,6 @@ static void inagua_enable(device_t dev) set_pcie_dereset(); } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} struct chip_operations mainboard_ops = { CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER " Mainboard") .enable_dev = inagua_enable, diff --git a/src/mainboard/amd/mahogany/Kconfig b/src/mainboard/amd/mahogany/Kconfig index 7c91b7d..20fc190 100644 --- a/src/mainboard/amd/mahogany/Kconfig +++ b/src/mainboard/amd/mahogany/Kconfig @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_MP_TABLE select HAVE_PIRQ_TABLE select HAVE_OPTION_TABLE - select HAVE_MAINBOARD_RESOURCES select HAVE_BUS_CONFIG select LIFT_BSP_APIC_ID select SB_HT_CHAIN_UNITID_OFFSET_ONLY diff --git a/src/mainboard/amd/mahogany/mainboard.c b/src/mainboard/amd/mahogany/mainboard.c index 43ea66f..242b618 100644 --- a/src/mainboard/amd/mahogany/mainboard.c +++ b/src/mainboard/amd/mahogany/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -107,11 +106,6 @@ static void mahogany_enable(device_t dev) /* get_ide_dma66(); */ } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - struct chip_operations mainboard_ops = { CHIP_NAME("AMD MAHOGANY Mainboard") .enable_dev = mahogany_enable, diff --git a/src/mainboard/amd/mahogany_fam10/Kconfig b/src/mainboard/amd/mahogany_fam10/Kconfig index 8343fca..eed5ab2 100644 --- a/src/mainboard/amd/mahogany_fam10/Kconfig +++ b/src/mainboard/amd/mahogany_fam10/Kconfig @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select HAVE_MAINBOARD_RESOURCES select SB_HT_CHAIN_UNITID_OFFSET_ONLY select LIFT_BSP_APIC_ID select SERIAL_CPU_INIT diff --git a/src/mainboard/amd/mahogany_fam10/mainboard.c b/src/mainboard/amd/mahogany_fam10/mainboard.c index b47cdff..d0bf907 100644 --- a/src/mainboard/amd/mahogany_fam10/mainboard.c +++ b/src/mainboard/amd/mahogany_fam10/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -109,11 +108,6 @@ static void mahogany_enable(device_t dev) /* get_ide_dma66(); */ } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - struct chip_operations mainboard_ops = { CHIP_NAME("AMD MAHOGANY Mainboard") .enable_dev = mahogany_enable, diff --git a/src/mainboard/amd/parmer/Kconfig b/src/mainboard/amd/parmer/Kconfig index 3212c44..a5a875f 100644 --- a/src/mainboard/amd/parmer/Kconfig +++ b/src/mainboard/amd/parmer/Kconfig @@ -30,7 +30,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select HAVE_MAINBOARD_RESOURCES select HAVE_ACPI_RESUME select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY diff --git a/src/mainboard/amd/parmer/mainboard.c b/src/mainboard/amd/parmer/mainboard.c index 0d73a4c..738ecc0 100644 --- a/src/mainboard/amd/parmer/mainboard.c +++ b/src/mainboard/amd/parmer/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -49,10 +48,6 @@ static void parmer_enable(device_t dev) setup_uma_memory(); } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} struct chip_operations mainboard_ops = { CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER " Mainboard") .enable_dev = parmer_enable, diff --git a/src/mainboard/amd/persimmon/Kconfig b/src/mainboard/amd/persimmon/Kconfig index e1f43b1..714d1fa 100644 --- a/src/mainboard/amd/persimmon/Kconfig +++ b/src/mainboard/amd/persimmon/Kconfig @@ -31,7 +31,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select HAVE_MAINBOARD_RESOURCES select HAVE_ACPI_RESUME select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY diff --git a/src/mainboard/amd/persimmon/mainboard.c b/src/mainboard/amd/persimmon/mainboard.c index aa3bc1b..2e015da 100644 --- a/src/mainboard/amd/persimmon/mainboard.c +++ b/src/mainboard/amd/persimmon/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <device/pci_def.h> #include <southbridge/amd/sb800/sb800.h> @@ -69,11 +68,6 @@ static void persimmon_enable(device_t dev) } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - struct chip_operations mainboard_ops = { CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER " Mainboard") .enable_dev = persimmon_enable, diff --git a/src/mainboard/amd/pistachio/mainboard.c b/src/mainboard/amd/pistachio/mainboard.c index 1355c37..c2db3d7 100644 --- a/src/mainboard/amd/pistachio/mainboard.c +++ b/src/mainboard/amd/pistachio/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -262,11 +261,6 @@ static void pistachio_enable(device_t dev) set_thermal_config(); } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - struct chip_operations mainboard_ops = { CHIP_NAME("AMD Pistachio Mainboard") .enable_dev = pistachio_enable, diff --git a/src/mainboard/amd/south_station/Kconfig b/src/mainboard/amd/south_station/Kconfig index c482ab0..19b295b 100644 --- a/src/mainboard/amd/south_station/Kconfig +++ b/src/mainboard/amd/south_station/Kconfig @@ -31,7 +31,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select HAVE_MAINBOARD_RESOURCES select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select LIFT_BSP_APIC_ID diff --git a/src/mainboard/amd/south_station/mainboard.c b/src/mainboard/amd/south_station/mainboard.c index 715b40a..2e6ff5a 100644 --- a/src/mainboard/amd/south_station/mainboard.c +++ b/src/mainboard/amd/south_station/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -84,10 +83,6 @@ static void southstation_enable(device_t dev) southstation_led_init(); } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} struct chip_operations mainboard_ops = { CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER " Mainboard") .enable_dev = southstation_enable, diff --git a/src/mainboard/amd/tilapia_fam10/Kconfig b/src/mainboard/amd/tilapia_fam10/Kconfig index 2c29f45..75e22b3 100644 --- a/src/mainboard/amd/tilapia_fam10/Kconfig +++ b/src/mainboard/amd/tilapia_fam10/Kconfig @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select HAVE_MAINBOARD_RESOURCES select SB_HT_CHAIN_UNITID_OFFSET_ONLY select LIFT_BSP_APIC_ID select SERIAL_CPU_INIT diff --git a/src/mainboard/amd/tilapia_fam10/mainboard.c b/src/mainboard/amd/tilapia_fam10/mainboard.c index cf3e3d3..ea3fe79 100644 --- a/src/mainboard/amd/tilapia_fam10/mainboard.c +++ b/src/mainboard/amd/tilapia_fam10/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -286,11 +285,6 @@ static void tilapia_enable(device_t dev) set_gpio40_gfx(); } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - struct chip_operations mainboard_ops = { CHIP_NAME("AMD TILAPIA Mainboard") .enable_dev = tilapia_enable, diff --git a/src/mainboard/amd/torpedo/Kconfig b/src/mainboard/amd/torpedo/Kconfig index bc4030c..9be8df2 100644 --- a/src/mainboard/amd/torpedo/Kconfig +++ b/src/mainboard/amd/torpedo/Kconfig @@ -34,7 +34,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select HAVE_MAINBOARD_RESOURCES select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select LIFT_BSP_APIC_ID diff --git a/src/mainboard/amd/torpedo/mainboard.c b/src/mainboard/amd/torpedo/mainboard.c index 839ec5c..399c9bc 100644 --- a/src/mainboard/amd/torpedo/mainboard.c +++ b/src/mainboard/amd/torpedo/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -59,10 +58,6 @@ static void torpedo_enable(device_t dev) setup_uma_memory(); } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} struct chip_operations mainboard_ops = { CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER " Mainboard") .enable_dev = torpedo_enable, diff --git a/src/mainboard/amd/union_station/Kconfig b/src/mainboard/amd/union_station/Kconfig index e7c2150..73f4839 100644 --- a/src/mainboard/amd/union_station/Kconfig +++ b/src/mainboard/amd/union_station/Kconfig @@ -30,7 +30,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select HAVE_MAINBOARD_RESOURCES select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select LIFT_BSP_APIC_ID diff --git a/src/mainboard/amd/union_station/mainboard.c b/src/mainboard/amd/union_station/mainboard.c index f0f610a..dc3aecc 100644 --- a/src/mainboard/amd/union_station/mainboard.c +++ b/src/mainboard/amd/union_station/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -57,10 +56,6 @@ static void unionstation_enable(device_t dev) setup_uma_memory(); } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} struct chip_operations mainboard_ops = { CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER " Mainboard") .enable_dev = unionstation_enable, diff --git a/src/mainboard/asrock/939a785gmh/Kconfig b/src/mainboard/asrock/939a785gmh/Kconfig index 245b845..2c23d45 100644 --- a/src/mainboard/asrock/939a785gmh/Kconfig +++ b/src/mainboard/asrock/939a785gmh/Kconfig @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_RESUME select HAVE_MP_TABLE select HAVE_PIRQ_TABLE - select HAVE_MAINBOARD_RESOURCES select HAVE_OPTION_TABLE select HAVE_BUS_CONFIG select LIFT_BSP_APIC_ID diff --git a/src/mainboard/asrock/939a785gmh/mainboard.c b/src/mainboard/asrock/939a785gmh/mainboard.c index d3ea27e..577677f 100644 --- a/src/mainboard/asrock/939a785gmh/mainboard.c +++ b/src/mainboard/asrock/939a785gmh/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -106,11 +105,6 @@ static void mb_enable(device_t dev) /* get_ide_dma66(); */ } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - struct chip_operations mainboard_ops = { CHIP_NAME("Asrock 939A785GMH/128M Mainboard") .enable_dev = mb_enable, diff --git a/src/mainboard/asrock/e350m1/Kconfig b/src/mainboard/asrock/e350m1/Kconfig index 6f4ce0f..60de486 100644 --- a/src/mainboard/asrock/e350m1/Kconfig +++ b/src/mainboard/asrock/e350m1/Kconfig @@ -32,7 +32,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select HAVE_MAINBOARD_RESOURCES select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select LIFT_BSP_APIC_ID diff --git a/src/mainboard/asrock/e350m1/mainboard.c b/src/mainboard/asrock/e350m1/mainboard.c index d0151be..01d1c5e 100644 --- a/src/mainboard/asrock/e350m1/mainboard.c +++ b/src/mainboard/asrock/e350m1/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -55,10 +54,6 @@ static void e350m1_enable(device_t dev) setup_uma_memory(); } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} struct chip_operations mainboard_ops = { CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER " Mainboard") .enable_dev = e350m1_enable, diff --git a/src/mainboard/asus/dsbf/mainboard.c b/src/mainboard/asus/dsbf/mainboard.c index 618eca9..e4057e5 100644 --- a/src/mainboard/asus/dsbf/mainboard.c +++ b/src/mainboard/asus/dsbf/mainboard.c @@ -22,9 +22,7 @@ #include <console/console.h> #include <device/device.h> #include <arch/io.h> -#include <boot/tables.h> #include <delay.h> -#include <arch/coreboot_tables.h> #include <device/pci_def.h> #include <device/pci_ops.h> #include <arch/io.h> diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig index 72fa803..de5511e 100644 --- a/src/mainboard/asus/m2v-mx_se/Kconfig +++ b/src/mainboard/asus/m2v-mx_se/Kconfig @@ -36,7 +36,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select RAMINIT_SYSINFO select VGA select HAVE_ACPI_RESUME - select HAVE_MAINBOARD_RESOURCES select QRANK_DIMM_SUPPORT select SET_FIDVID # TODO test on multicore machines and enable if it works: diff --git a/src/mainboard/asus/m2v-mx_se/mainboard.c b/src/mainboard/asus/m2v-mx_se/mainboard.c index 5e3c720..4cb562b 100644 --- a/src/mainboard/asus/m2v-mx_se/mainboard.c +++ b/src/mainboard/asus/m2v-mx_se/mainboard.c @@ -20,14 +20,8 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <boot/tables.h> #include <southbridge/via/k8t890/k8t890.h> -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - struct chip_operations mainboard_ops = { CHIP_NAME("ASUS M2V-MX SE Mainboard") }; diff --git a/src/mainboard/asus/m5a88-v/Kconfig b/src/mainboard/asus/m5a88-v/Kconfig index 9cadcde..86fe51a 100644 --- a/src/mainboard/asus/m5a88-v/Kconfig +++ b/src/mainboard/asus/m5a88-v/Kconfig @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_BUS_CONFIG select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE - select HAVE_MAINBOARD_RESOURCES select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select LIFT_BSP_APIC_ID diff --git a/src/mainboard/asus/m5a88-v/mainboard.c b/src/mainboard/asus/m5a88-v/mainboard.c index 866e8c2..f24f80d 100644 --- a/src/mainboard/asus/m5a88-v/mainboard.c +++ b/src/mainboard/asus/m5a88-v/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -85,11 +84,6 @@ static void m5a88pm_v_enable(device_t dev) enable_int_gfx(); } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - struct chip_operations mainboard_ops = { CHIP_NAME("ASUS M5A88-V Mainboard") .enable_dev = m5a88pm_v_enable, diff --git a/src/mainboard/asus/mew-am/Kconfig b/src/mainboard/asus/mew-am/Kconfig index 68ac160..fe90d22 100644 --- a/src/mainboard/asus/mew-am/Kconfig +++ b/src/mainboard/asus/mew-am/Kconfig @@ -28,7 +28,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_PIRQ_TABLE select UDELAY_TSC select BOARD_ROMSIZE_KB_512 - select HAVE_MAINBOARD_RESOURCES select GFXUMA config MAINBOARD_DIR diff --git a/src/mainboard/asus/mew-am/mainboard.c b/src/mainboard/asus/mew-am/mainboard.c index 6409dab..09b6533 100644 --- a/src/mainboard/asus/mew-am/mainboard.c +++ b/src/mainboard/asus/mew-am/mainboard.c @@ -19,12 +19,6 @@ */ #include <device/device.h> -#include <boot/tables.h> - -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} struct chip_operations mainboard_ops = { CHIP_NAME("ASUS MEW-AM Mainboard") diff --git a/src/mainboard/asus/mew-vm/Kconfig b/src/mainboard/asus/mew-vm/Kconfig index 4e46192..21b7311 100644 --- a/src/mainboard/asus/mew-vm/Kconfig +++ b/src/mainboard/asus/mew-vm/Kconfig @@ -29,7 +29,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_PIRQ_TABLE select UDELAY_TSC select BOARD_ROMSIZE_KB_512 - select HAVE_MAINBOARD_RESOURCES select GFXUMA config MAINBOARD_DIR diff --git a/src/mainboard/asus/mew-vm/mainboard.c b/src/mainboard/asus/mew-vm/mainboard.c index 2e43be2..6705927 100644 --- a/src/mainboard/asus/mew-vm/mainboard.c +++ b/src/mainboard/asus/mew-vm/mainboard.c @@ -1,10 +1,4 @@ #include <device/device.h> -#include <boot/tables.h> - -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} struct chip_operations mainboard_ops = { CHIP_NAME("ASUS MEW-VM Mainboard") diff --git a/src/mainboard/avalue/eax-785e/Kconfig b/src/mainboard/avalue/eax-785e/Kconfig index aabd724..2b4182b 100644 --- a/src/mainboard/avalue/eax-785e/Kconfig +++ b/src/mainboard/avalue/eax-785e/Kconfig @@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_BUS_CONFIG select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE - select HAVE_MAINBOARD_RESOURCES select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select LIFT_BSP_APIC_ID diff --git a/src/mainboard/avalue/eax-785e/mainboard.c b/src/mainboard/avalue/eax-785e/mainboard.c index 5e50efa..42b3cb4 100644 --- a/src/mainboard/avalue/eax-785e/mainboard.c +++ b/src/mainboard/avalue/eax-785e/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -84,11 +83,6 @@ static void eax_785e(device_t dev) enable_int_gfx(); } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - struct chip_operations mainboard_ops = { CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER " Mainboard") .enable_dev = eax_785e, diff --git a/src/mainboard/ecs/p6iwp-fe/Kconfig b/src/mainboard/ecs/p6iwp-fe/Kconfig index 7d377f4..95bd1c5 100644 --- a/src/mainboard/ecs/p6iwp-fe/Kconfig +++ b/src/mainboard/ecs/p6iwp-fe/Kconfig @@ -29,7 +29,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_PIRQ_TABLE select UDELAY_TSC select BOARD_ROMSIZE_KB_512 - select HAVE_MAINBOARD_RESOURCES select GFXUMA config MAINBOARD_DIR diff --git a/src/mainboard/ecs/p6iwp-fe/mainboard.c b/src/mainboard/ecs/p6iwp-fe/mainboard.c index 667ac5e..c576e47 100644 --- a/src/mainboard/ecs/p6iwp-fe/mainboard.c +++ b/src/mainboard/ecs/p6iwp-fe/mainboard.c @@ -19,12 +19,6 @@ */ #include <device/device.h> -#include <boot/tables.h> - -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} struct chip_operations mainboard_ops = { CHIP_NAME("ECS P6IWP-Fe Mainboard") diff --git a/src/mainboard/getac/p470/mainboard.c b/src/mainboard/getac/p470/mainboard.c index 83b4718..1c408db 100644 --- a/src/mainboard/getac/p470/mainboard.c +++ b/src/mainboard/getac/p470/mainboard.c @@ -23,7 +23,6 @@ #include <device/device.h> #include <device/pci_def.h> #include <arch/io.h> -#include <boot/tables.h> #include <delay.h> #include "hda_verb.h" diff --git a/src/mainboard/gigabyte/ma785gm/Kconfig b/src/mainboard/gigabyte/ma785gm/Kconfig index 0e8011b..f4603f8 100644 --- a/src/mainboard/gigabyte/ma785gm/Kconfig +++ b/src/mainboard/gigabyte/ma785gm/Kconfig @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select HAVE_MAINBOARD_RESOURCES select SB_HT_CHAIN_UNITID_OFFSET_ONLY select LIFT_BSP_APIC_ID select SERIAL_CPU_INIT diff --git a/src/mainboard/gigabyte/ma785gm/mainboard.c b/src/mainboard/gigabyte/ma785gm/mainboard.c index 680bb2e..d160c06 100644 --- a/src/mainboard/gigabyte/ma785gm/mainboard.c +++ b/src/mainboard/gigabyte/ma785gm/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -146,11 +145,6 @@ static void ma785gm_enable(device_t dev) set_gpio40_gfx(); } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - struct chip_operations mainboard_ops = { CHIP_NAME("GIGABYTE MA785GM-US2H Mainboard") .enable_dev = ma785gm_enable, diff --git a/src/mainboard/gigabyte/ma785gmt/Kconfig b/src/mainboard/gigabyte/ma785gmt/Kconfig index 0605a39..ebe1e57 100644 --- a/src/mainboard/gigabyte/ma785gmt/Kconfig +++ b/src/mainboard/gigabyte/ma785gmt/Kconfig @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select HAVE_MAINBOARD_RESOURCES select SB_HT_CHAIN_UNITID_OFFSET_ONLY select LIFT_BSP_APIC_ID select SERIAL_CPU_INIT diff --git a/src/mainboard/gigabyte/ma785gmt/mainboard.c b/src/mainboard/gigabyte/ma785gmt/mainboard.c index b7ecf9f..cdfa191 100644 --- a/src/mainboard/gigabyte/ma785gmt/mainboard.c +++ b/src/mainboard/gigabyte/ma785gmt/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -257,11 +256,6 @@ static void ma785gmt_enable(device_t dev) set_gpio40_gfx(); } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - struct chip_operations mainboard_ops = { CHIP_NAME("GIGABYTE MA785GMT-UD2H Mainboard") .enable_dev = ma785gmt_enable, diff --git a/src/mainboard/gigabyte/ma78gm/Kconfig b/src/mainboard/gigabyte/ma78gm/Kconfig index 1b6966e..dcba4af 100644 --- a/src/mainboard/gigabyte/ma78gm/Kconfig +++ b/src/mainboard/gigabyte/ma78gm/Kconfig @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select HAVE_MAINBOARD_RESOURCES select SB_HT_CHAIN_UNITID_OFFSET_ONLY select LIFT_BSP_APIC_ID select SERIAL_CPU_INIT diff --git a/src/mainboard/gigabyte/ma78gm/mainboard.c b/src/mainboard/gigabyte/ma78gm/mainboard.c index 6756690..cb706e4 100644 --- a/src/mainboard/gigabyte/ma78gm/mainboard.c +++ b/src/mainboard/gigabyte/ma78gm/mainboard.c @@ -22,7 +22,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -82,11 +81,6 @@ static void ma78gm_enable(device_t dev) /* get_ide_dma66(); */ } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - struct chip_operations mainboard_ops = { CHIP_NAME("GIGABYTE MA78GM-US2H") .enable_dev = ma78gm_enable, diff --git a/src/mainboard/hp/e_vectra_p2706t/Kconfig b/src/mainboard/hp/e_vectra_p2706t/Kconfig index 5fab95a..18ff961 100644 --- a/src/mainboard/hp/e_vectra_p2706t/Kconfig +++ b/src/mainboard/hp/e_vectra_p2706t/Kconfig @@ -32,7 +32,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_PIRQ_TABLE select UDELAY_TSC select BOARD_ROMSIZE_KB_512 - select HAVE_MAINBOARD_RESOURCES select GFXUMA config MAINBOARD_DIR diff --git a/src/mainboard/hp/e_vectra_p2706t/mainboard.c b/src/mainboard/hp/e_vectra_p2706t/mainboard.c index 80e6f61..aa9cc7a 100644 --- a/src/mainboard/hp/e_vectra_p2706t/mainboard.c +++ b/src/mainboard/hp/e_vectra_p2706t/mainboard.c @@ -19,12 +19,6 @@ */ #include <device/device.h> -#include <boot/tables.h> - -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} struct chip_operations mainboard_ops = { CHIP_NAME("HP e-Vectra P2706T Mainboard") diff --git a/src/mainboard/ibase/mb899/mainboard.c b/src/mainboard/ibase/mb899/mainboard.c index 4e3d606..086d456 100644 --- a/src/mainboard/ibase/mb899/mainboard.c +++ b/src/mainboard/ibase/mb899/mainboard.c @@ -20,13 +20,11 @@ #include <types.h> #include <device/device.h> #include <console/console.h> -#include <boot/tables.h> #if CONFIG_PCI_OPTION_ROM_RUN_YABEL #include <x86emu/x86emu.h> #endif #include <pc80/mc146818rtc.h> #include <arch/io.h> -#include <arch/coreboot_tables.h> #if CONFIG_PCI_OPTION_ROM_RUN_YABEL static int int15_handler(void) diff --git a/src/mainboard/iei/kino-780am2-fam10/Kconfig b/src/mainboard/iei/kino-780am2-fam10/Kconfig index 01a2429..73279bc 100644 --- a/src/mainboard/iei/kino-780am2-fam10/Kconfig +++ b/src/mainboard/iei/kino-780am2-fam10/Kconfig @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select HAVE_MAINBOARD_RESOURCES select SB_HT_CHAIN_UNITID_OFFSET_ONLY select LIFT_BSP_APIC_ID select SERIAL_CPU_INIT diff --git a/src/mainboard/iei/kino-780am2-fam10/mainboard.c b/src/mainboard/iei/kino-780am2-fam10/mainboard.c index e9ef596..5f9eea2 100644 --- a/src/mainboard/iei/kino-780am2-fam10/mainboard.c +++ b/src/mainboard/iei/kino-780am2-fam10/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -64,11 +63,6 @@ static void kino_enable(device_t dev) /* get_ide_dma66(); */ } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - struct chip_operations mainboard_ops = { CHIP_NAME("IEI Kino-780AM2 Mainboard") .enable_dev = kino_enable, diff --git a/src/mainboard/intel/d810e2cb/Kconfig b/src/mainboard/intel/d810e2cb/Kconfig index 8c6c76b..0725c58 100644 --- a/src/mainboard/intel/d810e2cb/Kconfig +++ b/src/mainboard/intel/d810e2cb/Kconfig @@ -29,7 +29,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select USE_WATCHDOG_ON_BOOT select UDELAY_TSC select BOARD_ROMSIZE_KB_512 - select HAVE_MAINBOARD_RESOURCES select GFXUMA config MAINBOARD_DIR diff --git a/src/mainboard/intel/d810e2cb/mainboard.c b/src/mainboard/intel/d810e2cb/mainboard.c index 8455377..bf2c902 100644 --- a/src/mainboard/intel/d810e2cb/mainboard.c +++ b/src/mainboard/intel/d810e2cb/mainboard.c @@ -18,12 +18,6 @@ */ #include <device/device.h> -#include <boot/tables.h> - -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} struct chip_operations mainboard_ops = { CHIP_NAME("Intel D810E2CB Mainboard") diff --git a/src/mainboard/intel/d945gclf/mainboard.c b/src/mainboard/intel/d945gclf/mainboard.c index ca920bc..2e25fa3 100644 --- a/src/mainboard/intel/d945gclf/mainboard.c +++ b/src/mainboard/intel/d945gclf/mainboard.c @@ -19,8 +19,6 @@ #include <device/device.h> #include <console/console.h> -#include <boot/tables.h> -#include <arch/coreboot_tables.h> struct chip_operations mainboard_ops = { CHIP_NAME("Intel D945GCLF Mainboard") diff --git a/src/mainboard/intel/eagleheights/mainboard.c b/src/mainboard/intel/eagleheights/mainboard.c index d6bc10f..dbe76b2 100644 --- a/src/mainboard/intel/eagleheights/mainboard.c +++ b/src/mainboard/intel/eagleheights/mainboard.c @@ -21,13 +21,6 @@ #include <device/device.h> -#include <boot/tables.h> -#include <arch/coreboot_tables.h> - -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} struct chip_operations mainboard_ops = { CHIP_NAME("Intel Eagle Heights Mainboard") diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig index 873d273..aaca694 100644 --- a/src/mainboard/intel/emeraldlake2/Kconfig +++ b/src/mainboard/intel/emeraldlake2/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/intel/emeraldlake2/chromeos.c b/src/mainboard/intel/emeraldlake2/chromeos.c index 850af7b..6077ac7 100644 --- a/src/mainboard/intel/emeraldlake2/chromeos.c +++ b/src/mainboard/intel/emeraldlake2/chromeos.c @@ -29,7 +29,6 @@ #include <southbridge/intel/bd82x6x/pch.h> #ifndef __PRE_RAM__ -#include <boot/coreboot_tables.h> #include <arch/coreboot_tables.h> #define GPIO_COUNT 5 diff --git a/src/mainboard/intel/emeraldlake2/mainboard.c b/src/mainboard/intel/emeraldlake2/mainboard.c index 796f71e..71832e7 100644 --- a/src/mainboard/intel/emeraldlake2/mainboard.c +++ b/src/mainboard/intel/emeraldlake2/mainboard.c @@ -42,11 +42,6 @@ void mainboard_suspend_resume(void) outb(0xcb, 0xb2); } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - #if defined(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) && CONFIG_PCI_OPTION_ROM_RUN_REALMODE static int int15_handler(struct eregs *regs) { diff --git a/src/mainboard/iwave/iWRainbowG6/mainboard.c b/src/mainboard/iwave/iWRainbowG6/mainboard.c index f3fc20f..38847e2 100644 --- a/src/mainboard/iwave/iWRainbowG6/mainboard.c +++ b/src/mainboard/iwave/iWRainbowG6/mainboard.c @@ -20,7 +20,6 @@ #include <device/device.h> #include <console/console.h> -#include <boot/tables.h> #include "hda_verb.h" static void verb_setup(void) diff --git a/src/mainboard/jetway/pa78vm5/Kconfig b/src/mainboard/jetway/pa78vm5/Kconfig index fa39039..08f4355 100644 --- a/src/mainboard/jetway/pa78vm5/Kconfig +++ b/src/mainboard/jetway/pa78vm5/Kconfig @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select HAVE_MAINBOARD_RESOURCES select SB_HT_CHAIN_UNITID_OFFSET_ONLY select LIFT_BSP_APIC_ID select SERIAL_CPU_INIT diff --git a/src/mainboard/jetway/pa78vm5/mainboard.c b/src/mainboard/jetway/pa78vm5/mainboard.c index cb37c11..12e68b0 100644 --- a/src/mainboard/jetway/pa78vm5/mainboard.c +++ b/src/mainboard/jetway/pa78vm5/mainboard.c @@ -22,7 +22,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -111,11 +110,6 @@ static void pa78vm5_enable(device_t dev) /* get_ide_dma66(); */ } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - struct chip_operations mainboard_ops = { CHIP_NAME("AMD PA78VM5 Mainboard") .enable_dev = pa78vm5_enable, diff --git a/src/mainboard/kontron/kt690/Kconfig b/src/mainboard/kontron/kt690/Kconfig index 6a1909f..bac8b60 100644 --- a/src/mainboard/kontron/kt690/Kconfig +++ b/src/mainboard/kontron/kt690/Kconfig @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select HAVE_MAINBOARD_RESOURCES select GFXUMA select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_1024 diff --git a/src/mainboard/kontron/kt690/mainboard.c b/src/mainboard/kontron/kt690/mainboard.c index dbd4141..be75ab0 100644 --- a/src/mainboard/kontron/kt690/mainboard.c +++ b/src/mainboard/kontron/kt690/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -192,11 +191,6 @@ static void kt690_enable(device_t dev) set_thermal_config(); } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - struct chip_operations mainboard_ops = { CHIP_NAME("Kontron KT690/mITX Mainboard") .enable_dev = kt690_enable, diff --git a/src/mainboard/lenovo/t60/dock.c b/src/mainboard/lenovo/t60/dock.c index 5cd8997..426286d 100644 --- a/src/mainboard/lenovo/t60/dock.c +++ b/src/mainboard/lenovo/t60/dock.c @@ -22,7 +22,6 @@ #include <console/console.h> #include <device/device.h> #include <arch/io.h> -#include <boot/tables.h> #include <delay.h> #include <arch/io.h> #include "dock.h" diff --git a/src/mainboard/lenovo/t60/mainboard.c b/src/mainboard/lenovo/t60/mainboard.c index bd4c4a7..6f00069 100644 --- a/src/mainboard/lenovo/t60/mainboard.c +++ b/src/mainboard/lenovo/t60/mainboard.c @@ -23,9 +23,7 @@ #include <console/console.h> #include <device/device.h> #include <arch/io.h> -#include <boot/tables.h> #include <delay.h> -#include <arch/coreboot_tables.h> #include <device/pci_def.h> #include <device/pci_ops.h> #include <arch/io.h> diff --git a/src/mainboard/lenovo/x60/dock.c b/src/mainboard/lenovo/x60/dock.c index 37d5b76..1b15a6c 100644 --- a/src/mainboard/lenovo/x60/dock.c +++ b/src/mainboard/lenovo/x60/dock.c @@ -22,7 +22,6 @@ #include <console/console.h> #include <device/device.h> #include <arch/io.h> -#include <boot/tables.h> #include <delay.h> #include <arch/io.h> #include "dock.h" diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c index 4ded239..e28fa10 100644 --- a/src/mainboard/lenovo/x60/mainboard.c +++ b/src/mainboard/lenovo/x60/mainboard.c @@ -23,9 +23,7 @@ #include <console/console.h> #include <device/device.h> #include <arch/io.h> -#include <boot/tables.h> #include <delay.h> -#include <arch/coreboot_tables.h> #include <device/pci_def.h> #include <device/pci_ops.h> #include <device/pci_ids.h> diff --git a/src/mainboard/mitac/6513wu/Kconfig b/src/mainboard/mitac/6513wu/Kconfig index fac565e..f09f54f 100644 --- a/src/mainboard/mitac/6513wu/Kconfig +++ b/src/mainboard/mitac/6513wu/Kconfig @@ -28,7 +28,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_PIRQ_TABLE select UDELAY_TSC select BOARD_ROMSIZE_KB_512 - select HAVE_MAINBOARD_RESOURCES select GFXUMA config MAINBOARD_DIR diff --git a/src/mainboard/mitac/6513wu/mainboard.c b/src/mainboard/mitac/6513wu/mainboard.c index 04af449..e9d80c4 100644 --- a/src/mainboard/mitac/6513wu/mainboard.c +++ b/src/mainboard/mitac/6513wu/mainboard.c @@ -19,12 +19,6 @@ */ #include <device/device.h> -#include <boot/tables.h> - -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} struct chip_operations mainboard_ops = { CHIP_NAME("Mitac 6513WU Mainboard") diff --git a/src/mainboard/msi/ms6178/Kconfig b/src/mainboard/msi/ms6178/Kconfig index 1d45464..38ca830 100644 --- a/src/mainboard/msi/ms6178/Kconfig +++ b/src/mainboard/msi/ms6178/Kconfig @@ -27,7 +27,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SUPERIO_WINBOND_W83627HF select HAVE_PIRQ_TABLE select BOARD_ROMSIZE_KB_512 - select HAVE_MAINBOARD_RESOURCES select GFXUMA config MAINBOARD_DIR diff --git a/src/mainboard/msi/ms6178/mainboard.c b/src/mainboard/msi/ms6178/mainboard.c index 76c8c04..009c134 100644 --- a/src/mainboard/msi/ms6178/mainboard.c +++ b/src/mainboard/msi/ms6178/mainboard.c @@ -19,12 +19,6 @@ */ #include <device/device.h> -#include <boot/tables.h> - -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} struct chip_operations mainboard_ops = { CHIP_NAME("MSI MS-6178 Mainboard") diff --git a/src/mainboard/nec/powermate2000/Kconfig b/src/mainboard/nec/powermate2000/Kconfig index 55050c0..8c2070a 100644 --- a/src/mainboard/nec/powermate2000/Kconfig +++ b/src/mainboard/nec/powermate2000/Kconfig @@ -28,7 +28,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_PIRQ_TABLE select UDELAY_TSC select BOARD_ROMSIZE_KB_512 - select HAVE_MAINBOARD_RESOURCES select GFXUMA config MAINBOARD_DIR diff --git a/src/mainboard/nec/powermate2000/mainboard.c b/src/mainboard/nec/powermate2000/mainboard.c index 3bbaa11..1536b70 100644 --- a/src/mainboard/nec/powermate2000/mainboard.c +++ b/src/mainboard/nec/powermate2000/mainboard.c @@ -19,12 +19,6 @@ */ #include <device/device.h> -#include <boot/tables.h> - -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} struct chip_operations mainboard_ops = { CHIP_NAME("NEC PowerMate 2000 Mainboard") diff --git a/src/mainboard/rca/rm4100/Kconfig b/src/mainboard/rca/rm4100/Kconfig index 1e4498a..5247a8c 100644 --- a/src/mainboard/rca/rm4100/Kconfig +++ b/src/mainboard/rca/rm4100/Kconfig @@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_PIRQ_TABLE select UDELAY_TSC select BOARD_ROMSIZE_KB_1024 - select HAVE_MAINBOARD_RESOURCES select HAVE_SMI_HANDLER select GFXUMA diff --git a/src/mainboard/rca/rm4100/mainboard.c b/src/mainboard/rca/rm4100/mainboard.c index ff98977..29885b0 100644 --- a/src/mainboard/rca/rm4100/mainboard.c +++ b/src/mainboard/rca/rm4100/mainboard.c @@ -19,13 +19,6 @@ */ #include <device/device.h> -#include <boot/tables.h> -#include <arch/coreboot_tables.h> - -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} static void mainboard_init(device_t dev) { diff --git a/src/mainboard/roda/rk886ex/mainboard.c b/src/mainboard/roda/rk886ex/mainboard.c index 1f4ebc7..e2ca2ef 100644 --- a/src/mainboard/roda/rk886ex/mainboard.c +++ b/src/mainboard/roda/rk886ex/mainboard.c @@ -23,12 +23,10 @@ #include <device/device.h> #include <arch/io.h> #include <arch/interrupt.h> -#include <boot/tables.h> #include <delay.h> #if CONFIG_PCI_OPTION_ROM_RUN_YABEL #include <x86emu/x86emu.h> #endif -#include <arch/coreboot_tables.h> #include <ec/acpi/ec.h> #include "m3885.h" diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig index 0835012..86cb31b 100644 --- a/src/mainboard/samsung/lumpy/Kconfig +++ b/src/mainboard/samsung/lumpy/Kconfig @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select GFXUMA select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES - select HAVE_MAINBOARD_RESOURCES select HAVE_OPTION_TABLE select HAVE_SMI_HANDLER select MMCONF_SUPPORT diff --git a/src/mainboard/samsung/lumpy/chromeos.c b/src/mainboard/samsung/lumpy/chromeos.c index 6d93470..6c86720 100644 --- a/src/mainboard/samsung/lumpy/chromeos.c +++ b/src/mainboard/samsung/lumpy/chromeos.c @@ -38,7 +38,6 @@ #define FLAG_DEV_MODE 2 #ifndef __PRE_RAM__ -#include <boot/coreboot_tables.h> #include <arch/coreboot_tables.h> #include "ec.h" #include <ec/smsc/mec1308/ec.h> diff --git a/src/mainboard/samsung/lumpy/mainboard.c b/src/mainboard/samsung/lumpy/mainboard.c index e83516a..b2fcb51 100644 --- a/src/mainboard/samsung/lumpy/mainboard.c +++ b/src/mainboard/samsung/lumpy/mainboard.c @@ -49,11 +49,6 @@ void mainboard_suspend_resume(void) send_ec_command(EC_ACPI_ENABLE); } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - #if defined(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) && CONFIG_PCI_OPTION_ROM_RUN_REALMODE static int int15_handler(struct eregs *regs) { diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig index 18094cf..f16809f 100644 --- a/src/mainboard/samsung/stumpy/Kconfig +++ b/src/mainboard/samsung/stumpy/Kconfig @@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select GFXUMA select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES - select HAVE_MAINBOARD_RESOURCES select HAVE_OPTION_TABLE select HAVE_SMI_HANDLER select MMCONF_SUPPORT diff --git a/src/mainboard/samsung/stumpy/chromeos.c b/src/mainboard/samsung/stumpy/chromeos.c index 510d737..61bc18c 100644 --- a/src/mainboard/samsung/stumpy/chromeos.c +++ b/src/mainboard/samsung/stumpy/chromeos.c @@ -37,7 +37,6 @@ #define FLAG_DEV_MODE 2 #ifndef __PRE_RAM__ -#include <boot/coreboot_tables.h> #include <arch/coreboot_tables.h> #define GPIO_COUNT 5 diff --git a/src/mainboard/samsung/stumpy/mainboard.c b/src/mainboard/samsung/stumpy/mainboard.c index 246b261..2f8f5da 100644 --- a/src/mainboard/samsung/stumpy/mainboard.c +++ b/src/mainboard/samsung/stumpy/mainboard.c @@ -42,11 +42,6 @@ void mainboard_suspend_resume(void) outb(0xcb, 0xb2); } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - #if defined(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) && CONFIG_PCI_OPTION_ROM_RUN_REALMODE static int int15_handler(struct eregs *regs) { diff --git a/src/mainboard/siemens/sitemp_g1p1/Kconfig b/src/mainboard/siemens/sitemp_g1p1/Kconfig index b2cae03..dc761cf 100644 --- a/src/mainboard/siemens/sitemp_g1p1/Kconfig +++ b/src/mainboard/siemens/sitemp_g1p1/Kconfig @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_MP_TABLE select HAVE_PIRQ_TABLE select HAVE_OPTION_TABLE - select HAVE_MAINBOARD_RESOURCES select HAVE_BUS_CONFIG select SB_HT_CHAIN_UNITID_OFFSET_ONLY select BOARD_ROMSIZE_KB_1024 diff --git a/src/mainboard/siemens/sitemp_g1p1/mainboard.c b/src/mainboard/siemens/sitemp_g1p1/mainboard.c index 905d23f..437a48a 100644 --- a/src/mainboard/siemens/sitemp_g1p1/mainboard.c +++ b/src/mainboard/siemens/sitemp_g1p1/mainboard.c @@ -24,7 +24,6 @@ #include <device/pci.h> #include <arch/io.h> #include <delay.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -856,26 +855,6 @@ static void enable_dev(device_t dev) dev->ops->init = init; // rest of mainboard init later } - /** - * @brief - * - * @param - */ - -int add_mainboard_resources(struct lb_memory *mem) -{ - device_t dev; - struct resource *res; - - dev = dev_find_slot(0, PCI_DEVFN(0,0)); - res = probe_resource(dev, 0x1C); - if( res ) { - printk(BIOS_INFO, "mmconf: base=%0llx size=%0llx\n", res->base, res->size); - lb_add_memory_range(mem, LB_MEM_RESERVED, res->base, res->size); - } - return 0; -} - struct chip_operations mainboard_ops = { CHIP_NAME(CONFIG_MAINBOARD_PART_NUMBER) .enable_dev = enable_dev, diff --git a/src/mainboard/supermicro/h8qgi/mainboard.c b/src/mainboard/supermicro/h8qgi/mainboard.c index 1f02c73..e1d3cdb 100644 --- a/src/mainboard/supermicro/h8qgi/mainboard.c +++ b/src/mainboard/supermicro/h8qgi/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -71,13 +70,6 @@ static void h8qgi_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 = { CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER " Mainboard") .enable_dev = h8qgi_enable, diff --git a/src/mainboard/supermicro/h8scm_fam10/mainboard.c b/src/mainboard/supermicro/h8scm_fam10/mainboard.c index e5a58fe..3d71996 100644 --- a/src/mainboard/supermicro/h8scm_fam10/mainboard.c +++ b/src/mainboard/supermicro/h8scm_fam10/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -92,13 +91,6 @@ static void h8scm_enable(device_t dev) /* get_ide_dma66(); */ } -#if CONFIG_HAVE_MAINBOARD_RESOURCES -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} -#endif - struct chip_operations mainboard_ops = { CHIP_NAME("AMD H8SCM Mainboard") .enable_dev = h8scm_enable, diff --git a/src/mainboard/supermicro/x7db8/mainboard.c b/src/mainboard/supermicro/x7db8/mainboard.c index 618eca9..e4057e5 100644 --- a/src/mainboard/supermicro/x7db8/mainboard.c +++ b/src/mainboard/supermicro/x7db8/mainboard.c @@ -22,9 +22,7 @@ #include <console/console.h> #include <device/device.h> #include <arch/io.h> -#include <boot/tables.h> #include <delay.h> -#include <arch/coreboot_tables.h> #include <device/pci_def.h> #include <device/pci_ops.h> #include <arch/io.h> diff --git a/src/mainboard/technexion/tim5690/Kconfig b/src/mainboard/technexion/tim5690/Kconfig index 404ddfe..172b478 100644 --- a/src/mainboard/technexion/tim5690/Kconfig +++ b/src/mainboard/technexion/tim5690/Kconfig @@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SB_HT_CHAIN_UNITID_OFFSET_ONLY select HAVE_ACPI_TABLES select GFXUMA - select HAVE_MAINBOARD_RESOURCES select BOARD_ROMSIZE_KB_512 select RAMINIT_SYSINFO select QRANK_DIMM_SUPPORT diff --git a/src/mainboard/technexion/tim5690/mainboard.c b/src/mainboard/technexion/tim5690/mainboard.c index 2975e86..5209786 100644 --- a/src/mainboard/technexion/tim5690/mainboard.c +++ b/src/mainboard/technexion/tim5690/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -244,10 +243,9 @@ static void tim5690_enable(device_t dev) set_thermal_config(); } -int add_mainboard_resources(struct lb_memory *mem) +void mainboard_coreboot_completed(void) { technexion_post_code(LED_MESSAGE_FINISH); - return 0; } struct chip_operations mainboard_ops = { diff --git a/src/mainboard/technexion/tim8690/mainboard.c b/src/mainboard/technexion/tim8690/mainboard.c index 40ab345..3741405 100644 --- a/src/mainboard/technexion/tim8690/mainboard.c +++ b/src/mainboard/technexion/tim8690/mainboard.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pci.h> #include <arch/io.h> -#include <boot/tables.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> @@ -151,11 +150,6 @@ static void tim8690_enable(device_t dev) set_thermal_config(); } -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - struct chip_operations mainboard_ops = { CHIP_NAME("TechNexion TIM-8690 Mainboard") .enable_dev = tim8690_enable, diff --git a/src/mainboard/thomson/ip1000/Kconfig b/src/mainboard/thomson/ip1000/Kconfig index 3bdfb8e..f9bbfa5 100644 --- a/src/mainboard/thomson/ip1000/Kconfig +++ b/src/mainboard/thomson/ip1000/Kconfig @@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_PIRQ_TABLE select UDELAY_TSC select BOARD_ROMSIZE_KB_512 - select HAVE_MAINBOARD_RESOURCES select HAVE_SMI_HANDLER select GFXUMA diff --git a/src/mainboard/thomson/ip1000/mainboard.c b/src/mainboard/thomson/ip1000/mainboard.c index ae5872d..b7e3270 100644 --- a/src/mainboard/thomson/ip1000/mainboard.c +++ b/src/mainboard/thomson/ip1000/mainboard.c @@ -20,19 +20,12 @@ #include <console/console.h> #include <device/device.h> -#include <boot/tables.h> #include <delay.h> #if CONFIG_PCI_OPTION_ROM_RUN_YABEL #include <x86emu/x86emu.h> #endif -#include <arch/coreboot_tables.h> #include <arch/io.h> -int add_mainboard_resources(struct lb_memory *mem) -{ - return 0; -} - // setting the bit disables the led. #define PARPORT_GPIO_LED_GREEN (1 << 0) #define PARPORT_GPIO_LED_ORANGE (1 << 1) diff --git a/src/mainboard/via/epia-n/mainboard.c b/src/mainboard/via/epia-n/mainboard.c index 0dfbd3c..528e891 100644 --- a/src/mainboard/via/epia-n/mainboard.c +++ b/src/mainboard/via/epia-n/mainboard.c @@ -20,25 +20,6 @@ */ #include <device/device.h> -#include <device/pci.h> -#include <device/pci_ids.h> -#include <boot/tables.h> -#include <arch/ioapic.h> -#include <southbridge/via/vt8237r/vt8237r.h> -#include <cpu/x86/lapic_def.h> - -int add_mainboard_resources(struct lb_memory *mem) -{ -#if CONFIG_IOAPIC - lb_add_memory_range(mem, LB_MEM_RESERVED, - IO_APIC_ADDR, 0x1000); - lb_add_memory_range(mem, LB_MEM_RESERVED, - LOCAL_APIC_ADDR, 0x1000); - lb_add_memory_range(mem, LB_MEM_RESERVED, - 0xFFFF0000ULL, 0x10000); -#endif - return 0; -} struct chip_operations mainboard_ops = { CHIP_NAME("VIA EPIA-N Mainboard") diff --git a/src/northbridge/intel/i5000/northbridge.c b/src/northbridge/intel/i5000/northbridge.c index d3e00c5..ea3665c 100644 --- a/src/northbridge/intel/i5000/northbridge.c +++ b/src/northbridge/intel/i5000/northbridge.c @@ -27,7 +27,6 @@ #include <string.h> #include <bitops.h> #include <cpu/cpu.h> -#include <boot/tables.h> #include <arch/acpi.h> #include <cbmem.h> #include "chip.h" diff --git a/src/northbridge/intel/i82810/northbridge.c b/src/northbridge/intel/i82810/northbridge.c index c738de7..5c51b9a 100644 --- a/src/northbridge/intel/i82810/northbridge.c +++ b/src/northbridge/intel/i82810/northbridge.c @@ -30,7 +30,6 @@ #include <bitops.h> #include <cpu/cpu.h> #include "chip.h" -#include <boot/tables.h> #include "northbridge.h" #include "i82810.h" diff --git a/src/northbridge/intel/i82830/northbridge.c b/src/northbridge/intel/i82830/northbridge.c index 4951c4f..f3341d4 100644 --- a/src/northbridge/intel/i82830/northbridge.c +++ b/src/northbridge/intel/i82830/northbridge.c @@ -28,7 +28,6 @@ #include <stdlib.h> #include <string.h> #include <bitops.h> -#include <boot/tables.h> #include "chip.h" #include "i82830.h" diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c index 9d6d0df..41b15cf 100644 --- a/src/northbridge/intel/i945/northbridge.c +++ b/src/northbridge/intel/i945/northbridge.c @@ -28,7 +28,6 @@ #include <string.h> #include <bitops.h> #include <cpu/cpu.h> -#include <boot/tables.h> #include <arch/acpi.h> #include "chip.h" #include "i945.h" diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c index b447d52..59a8cf8 100644 --- a/src/northbridge/intel/sandybridge/northbridge.c +++ b/src/northbridge/intel/sandybridge/northbridge.c @@ -33,7 +33,6 @@ #include <string.h> #include <bitops.h> #include <cpu/cpu.h> -#include <boot/tables.h> #include <cbmem.h> #include "chip.h" #include "sandybridge.h" diff --git a/src/northbridge/intel/sch/northbridge.c b/src/northbridge/intel/sch/northbridge.c index 419a82c..48556e2 100644 --- a/src/northbridge/intel/sch/northbridge.c +++ b/src/northbridge/intel/sch/northbridge.c @@ -28,7 +28,6 @@ #include <string.h> #include <bitops.h> #include <cpu/cpu.h> -#include <boot/tables.h> #include <arch/acpi.h> #include "chip.h" #include "sch.h" diff --git a/src/southbridge/amd/rs690/cmn.c b/src/southbridge/amd/rs690/cmn.c index 68c46e9..0aa4d76 100644 --- a/src/southbridge/amd/rs690/cmn.c +++ b/src/southbridge/amd/rs690/cmn.c @@ -27,7 +27,6 @@ #include <device/pci_ops.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> -#include <boot/coreboot_tables.h> #include <delay.h> #include "rs690.h" diff --git a/src/southbridge/amd/rs690/ht.c b/src/southbridge/amd/rs690/ht.c index 9eb47bb..e3145f7 100644 --- a/src/southbridge/amd/rs690/ht.c +++ b/src/southbridge/amd/rs690/ht.c @@ -103,7 +103,8 @@ static void ht_dev_read_resources(device_t dev) res->align = log2(res->size); res->gran = log2(res->size); res->limit = 0xffffffffffffffffULL; /* 64bit */ - res->flags = IORESOURCE_FIXED | IORESOURCE_MEM | IORESOURCE_PCI64 | IORESOURCE_ASSIGNED; + res->flags = IORESOURCE_FIXED | IORESOURCE_MEM | IORESOURCE_PCI64 | + IORESOURCE_ASSIGNED | IORESOURCE_RESERVE; compact_resources(dev); #endif diff --git a/src/southbridge/amd/rs780/cmn.c b/src/southbridge/amd/rs780/cmn.c index 5c72a04..d7dca2b 100644 --- a/src/southbridge/amd/rs780/cmn.c +++ b/src/southbridge/amd/rs780/cmn.c @@ -27,7 +27,6 @@ #include <device/pci_ops.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> -#include <boot/coreboot_tables.h> #include <delay.h> #include <cpu/cpu.h> #include "rs780.h"

1 0

Patch set updated for coreboot: 13a2dfa AMD hudson: Call the rtc update if needed.
by Zheng Bao 02 Aug '12

02 Aug '12

Zheng Bao (zheng.bao(a)amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1390 -gerrit commit 13a2dfaa787e56cc159dbbf98c55cafa575177eb Author: zbao <fishbaozi(a)gmail.com> Date: Thu Aug 2 19:03:44 2012 +0800 AMD hudson: Call the rtc update if needed. Parmer and thather hang at windows 7 booting process. Setting the valid date in CMOS can fix that. Change-Id: I5e427cfb42430ebebdb4c1e48bd25860c0fec45f Signed-off-by: Zheng Bao <zheng.bao(a)amd.com> Signed-off-by: zbao <fishbaozi(a)gmail.com> --- src/southbridge/amd/agesa/hudson/lpc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/southbridge/amd/agesa/hudson/lpc.c b/src/southbridge/amd/agesa/hudson/lpc.c index 4dd6083..97f27d0 100644 --- a/src/southbridge/amd/agesa/hudson/lpc.c +++ b/src/southbridge/amd/agesa/hudson/lpc.c @@ -67,6 +67,8 @@ static void lpc_init(device_t dev) byte = pci_read_config8(dev, 0xBB); byte |= 1 << 0 | 1 << 3; pci_write_config8(dev, 0xBB, byte); + + rtc_check_update_cmos_date(RTC_HAS_ALTCENTURY); } static void hudson_lpc_read_resources(device_t dev)

1 0

Patch set updated for coreboot: 31b06e2 RTC: Add a routine to check if the CMOS date is valid
by Zheng Bao 02 Aug '12

02 Aug '12

Zheng Bao (zheng.bao(a)amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1389 -gerrit commit 31b06e2259ccfd84e8fe1f5f0bc1b2bcb58c6a28 Author: zbao <fishbaozi(a)gmail.com> Date: Thu Aug 2 19:02:26 2012 +0800 RTC: Add a routine to check if the CMOS date is valid If the CMOS is cleared or someone writes some random date/time on purpose, the CMOS date register has a invalid date. This will hurts some OS, like Windows 7, which hangs at MS logo forever. When we detect that, we need to write a reasonable date in CMOS. Alexandru Gagniuc: Hmm, it would be interesting to use the date the coreboot image was built and set that as the default date. At least until time travel is invented. Change-Id: Ic1c7a2d60e711265686441c77bdf7891a7efb42e Signed-off-by: Zheng Bao <zheng.bao(a)amd.com> Signed-off-by: zbao <fishbaozi(a)gmail.com> --- src/drivers/pc80/mc146818rtc.c | 43 ++++++++++++++++++++++++++++++++------- src/include/pc80/mc146818rtc.h | 5 ++++ 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/src/drivers/pc80/mc146818rtc.c b/src/drivers/pc80/mc146818rtc.c index 99d670d..cc14a41 100644 --- a/src/drivers/pc80/mc146818rtc.c +++ b/src/drivers/pc80/mc146818rtc.c @@ -77,6 +77,20 @@ # define RTC_VRT 0x80 /* valid RAM and time */ /**********************************************************************/ +static void rtc_update_cmos_date(u8 has_century) +{ + /* Now setup a default date of Sat 1 January 2000 */ + /* TODO: Set the time as building time? Is it reasonable? */ + cmos_write(0, RTC_CLK_SECOND); + cmos_write(0, RTC_CLK_MINUTE); + cmos_write(1, RTC_CLK_HOUR); + cmos_write(7, RTC_CLK_DAYOFWEEK); + cmos_write(1, RTC_CLK_DAYOFMONTH); + cmos_write(1, RTC_CLK_MINUTE); + cmos_write(0, RTC_CLK_YEAR); + if (has_century) cmos_write(0x20, RTC_CLK_ALTCENTURY); +} + #if CONFIG_USE_OPTION_TABLE static int rtc_checksum_valid(int range_start, int range_end, int cks_loc) { @@ -147,14 +161,7 @@ void rtc_init(int invalid) } if (cmos_invalid) { - /* Now setup a default date of Sat 1 January 2000 */ - cmos_write(0, 0x00); /* seconds */ - cmos_write(0, 0x02); /* minutes */ - cmos_write(1, 0x04); /* hours */ - cmos_write(7, 0x06); /* day of week */ - cmos_write(1, 0x07); /* day of month */ - cmos_write(1, 0x08); /* month */ - cmos_write(0, 0x09); /* year */ + rtc_update_cmos_date(RTC_HAS_NO_ALTCENTURY); } #endif } @@ -338,3 +345,23 @@ int set_option(const char *name, void *value) return 0; } #endif /* CONFIG_USE_OPTION_TABLE */ + +/* + * If the CMOS is cleared, the rtc_reg has the invalid date. That + * hurts some OSes. Even if we don't set USE_OPTION_TABLE, we need + * to make sure the date is valid. + */ +void rtc_check_update_cmos_date(u8 has_century) +{ + u8 year, century; + + /* Note: We need to check if the hardware supports RTC_CLK_ALTCENTURY. */ + century = has_century ? cmos_read(RTC_CLK_ALTCENTURY) : 0; + year = cmos_read(RTC_CLK_YEAR); + + /* TODO: If century is 0xFF, 100% that the cmos is cleared. + * Other than that, so far rtc_year is the only entry to check if the date is valid. */ + if (century > 0x99 || year > 0x99) { /* Invalid date */ + rtc_update_cmos_date(has_century); + } +} diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h index 9f18ba4..a916761 100644 --- a/src/include/pc80/mc146818rtc.h +++ b/src/include/pc80/mc146818rtc.h @@ -87,6 +87,10 @@ #define RTC_CLK_DAYOFMONTH 7 #define RTC_CLK_MONTH 8 #define RTC_CLK_YEAR 9 +#define RTC_CLK_ALTCENTURY 0x32 + +#define RTC_HAS_ALTCENTURY 1 +#define RTC_HAS_NO_ALTCENTURY 0 /* On PCs, the checksum is built only over bytes 16..45 */ #define PC_CKS_RANGE_START 16 @@ -136,6 +140,7 @@ static inline void cmos_write32(u8 offset, u32 value) #if !defined(__ROMCC__) void rtc_init(int invalid); +void rtc_check_update_cmos_date(u8 has_century); #if CONFIG_USE_OPTION_TABLE int set_option(const char *name, void *val); int get_option(void *dest, const char *name);

1 0

Patch set updated for coreboot: 629ebf4 AMD and GFXUMA: move setup_uma_memory() to northbridge
by Zheng Bao 02 Aug '12

02 Aug '12

Zheng Bao (zheng.bao(a)amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1379 -gerrit commit 629ebf423d20fc56c4e8ae1828192162b3bc9b72 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Thu Jul 19 19:26:43 2012 +0300 AMD and GFXUMA: move setup_uma_memory() to northbridge UMA region can be determined at any time after the amount of RAM is known and before the uma_resource() call. Change-Id: I2a0bf2d3cad55ee70e889c88846f962b7faa0c7e Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/include/device/device.h | 1 - src/mainboard/advansus/a785e-i/mainboard.c | 2 -- src/mainboard/amd/bimini_fam10/mainboard.c | 2 -- src/mainboard/amd/dbm690t/mainboard.c | 2 -- src/mainboard/amd/dinar/mainboard.c | 1 - src/mainboard/amd/inagua/mainboard.c | 2 -- src/mainboard/amd/mahogany/mainboard.c | 1 - src/mainboard/amd/mahogany_fam10/mainboard.c | 2 -- src/mainboard/amd/parmer/mainboard.c | 2 -- src/mainboard/amd/persimmon/mainboard.c | 3 --- src/mainboard/amd/pistachio/mainboard.c | 3 --- src/mainboard/amd/south_station/mainboard.c | 2 -- src/mainboard/amd/tilapia_fam10/mainboard.c | 2 -- src/mainboard/amd/torpedo/mainboard.c | 1 - src/mainboard/amd/union_station/mainboard.c | 2 -- src/mainboard/asrock/939a785gmh/mainboard.c | 2 -- src/mainboard/asrock/e350m1/mainboard.c | 1 - src/mainboard/asus/m4a78-em/mainboard.c | 2 -- src/mainboard/asus/m4a785-m/mainboard.c | 2 -- src/mainboard/asus/m5a88-v/mainboard.c | 2 -- src/mainboard/avalue/eax-785e/mainboard.c | 2 -- src/mainboard/gigabyte/ma785gm/mainboard.c | 2 -- src/mainboard/gigabyte/ma785gmt/mainboard.c | 2 -- src/mainboard/gigabyte/ma78gm/mainboard.c | 2 -- src/mainboard/iei/kino-780am2-fam10/mainboard.c | 2 -- src/mainboard/jetway/pa78vm5/mainboard.c | 2 -- src/mainboard/kontron/kt690/mainboard.c | 2 -- src/mainboard/siemens/sitemp_g1p1/mainboard.c | 1 - src/mainboard/technexion/tim5690/mainboard.c | 2 -- src/mainboard/technexion/tim8690/mainboard.c | 2 -- src/northbridge/amd/agesa/family12/northbridge.c | 4 +++- src/northbridge/amd/agesa/family14/northbridge.c | 4 +++- src/northbridge/amd/agesa/family15/northbridge.c | 4 +++- src/northbridge/amd/agesa/family15tn/northbridge.c | 4 +++- src/northbridge/amd/amdfam10/northbridge.c | 4 +++- src/northbridge/amd/amdk8/northbridge.c | 4 +++- 36 files changed, 18 insertions(+), 62 deletions(-) diff --git a/src/include/device/device.h b/src/include/device/device.h index eaf84c6..9e9d000 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -112,7 +112,6 @@ extern struct resource *free_resources; extern struct bus *free_links; /* IGD UMA memory */ -void setup_uma_memory(void); extern uint64_t uma_memory_base; extern uint64_t uma_memory_size; diff --git a/src/mainboard/advansus/a785e-i/mainboard.c b/src/mainboard/advansus/a785e-i/mainboard.c index 6c190f0..356ea1c 100644 --- a/src/mainboard/advansus/a785e-i/mainboard.c +++ b/src/mainboard/advansus/a785e-i/mainboard.c @@ -78,8 +78,6 @@ static void a785e_i_enable(device_t dev) { printk(BIOS_INFO, "Mainboard A785E-I Enable. dev=0x%p\n", dev); - setup_uma_memory(); - set_pcie_dereset(); enable_int_gfx(); } diff --git a/src/mainboard/amd/bimini_fam10/mainboard.c b/src/mainboard/amd/bimini_fam10/mainboard.c index f587ac1..aecb036 100644 --- a/src/mainboard/amd/bimini_fam10/mainboard.c +++ b/src/mainboard/amd/bimini_fam10/mainboard.c @@ -128,8 +128,6 @@ static void bimini_enable(device_t dev) { printk(BIOS_INFO, "Mainboard BIMINI Enable. dev=0x%p\n", dev); - setup_uma_memory(); - set_pcie_dereset(); enable_int_gfx(); /* get_ide_dma66(); */ diff --git a/src/mainboard/amd/dbm690t/mainboard.c b/src/mainboard/amd/dbm690t/mainboard.c index fbff55b..0121879 100644 --- a/src/mainboard/amd/dbm690t/mainboard.c +++ b/src/mainboard/amd/dbm690t/mainboard.c @@ -185,8 +185,6 @@ static void dbm690t_enable(device_t dev) { printk(BIOS_INFO, "Mainboard DBM690T Enable. dev=0x%p\n", dev); - setup_uma_memory(); - enable_onboard_nic(); get_ide_dma66(); set_thermal_config(); diff --git a/src/mainboard/amd/dinar/mainboard.c b/src/mainboard/amd/dinar/mainboard.c index 6301b4f..af70ddc 100644 --- a/src/mainboard/amd/dinar/mainboard.c +++ b/src/mainboard/amd/dinar/mainboard.c @@ -72,7 +72,6 @@ void set_pcie_dereset(void *nbconfig) static void dinar_enable(device_t dev) { printk(BIOS_INFO, "Mainboard Dinar Enable. dev=0x%p\n", dev); - setup_uma_memory(); } int add_mainboard_resources(struct lb_memory *mem) diff --git a/src/mainboard/amd/inagua/mainboard.c b/src/mainboard/amd/inagua/mainboard.c index dc83258..9099a4d 100644 --- a/src/mainboard/amd/inagua/mainboard.c +++ b/src/mainboard/amd/inagua/mainboard.c @@ -78,8 +78,6 @@ static void inagua_enable(device_t dev) { printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n"); - setup_uma_memory(); - /* Inagua mainboard specific setting */ set_pcie_dereset(); } diff --git a/src/mainboard/amd/mahogany/mainboard.c b/src/mainboard/amd/mahogany/mainboard.c index 43ea66f..66d0d28 100644 --- a/src/mainboard/amd/mahogany/mainboard.c +++ b/src/mainboard/amd/mahogany/mainboard.c @@ -101,7 +101,6 @@ u8 is_dev3_present(void) static void mahogany_enable(device_t dev) { printk(BIOS_INFO, "Mainboard MAHOGANY Enable. dev=0x%p\n", dev); - setup_uma_memory(); set_pcie_dereset(); /* get_ide_dma66(); */ diff --git a/src/mainboard/amd/mahogany_fam10/mainboard.c b/src/mainboard/amd/mahogany_fam10/mainboard.c index b47cdff..d1701fd 100644 --- a/src/mainboard/amd/mahogany_fam10/mainboard.c +++ b/src/mainboard/amd/mahogany_fam10/mainboard.c @@ -103,8 +103,6 @@ static void mahogany_enable(device_t dev) { printk(BIOS_INFO, "Mainboard MAHOGANY Enable. dev=0x%p\n", dev); - setup_uma_memory(); - set_pcie_dereset(); /* get_ide_dma66(); */ } diff --git a/src/mainboard/amd/parmer/mainboard.c b/src/mainboard/amd/parmer/mainboard.c index 0d73a4c..095f02f 100644 --- a/src/mainboard/amd/parmer/mainboard.c +++ b/src/mainboard/amd/parmer/mainboard.c @@ -44,9 +44,7 @@ static void parmer_enable(device_t dev) acpi_slp_type = acpi_get_sleep_type(); if (acpi_slp_type == 3) agesawrapper_fchs3earlyrestore(); - #endif - setup_uma_memory(); } int add_mainboard_resources(struct lb_memory *mem) diff --git a/src/mainboard/amd/persimmon/mainboard.c b/src/mainboard/amd/persimmon/mainboard.c index aa3bc1b..3bf05db 100644 --- a/src/mainboard/amd/persimmon/mainboard.c +++ b/src/mainboard/amd/persimmon/mainboard.c @@ -64,9 +64,6 @@ static void persimmon_enable(device_t dev) #if CONFIG_HAVE_ACPI_RESUME acpi_slp_type = acpi_get_sleep_type(); #endif - - setup_uma_memory(); - } int add_mainboard_resources(struct lb_memory *mem) diff --git a/src/mainboard/amd/pistachio/mainboard.c b/src/mainboard/amd/pistachio/mainboard.c index 1355c37..32912f4 100644 --- a/src/mainboard/amd/pistachio/mainboard.c +++ b/src/mainboard/amd/pistachio/mainboard.c @@ -255,10 +255,7 @@ static void pistachio_enable(device_t dev) { printk(BIOS_INFO, "Mainboard Pistachio Enable. dev=0x%p\n", dev); - setup_uma_memory(); - enable_onboard_nic(); - set_thermal_config(); } diff --git a/src/mainboard/amd/south_station/mainboard.c b/src/mainboard/amd/south_station/mainboard.c index 715b40a..dbfce2b 100644 --- a/src/mainboard/amd/south_station/mainboard.c +++ b/src/mainboard/amd/south_station/mainboard.c @@ -79,8 +79,6 @@ static void southstation_led_init(void) static void southstation_enable(device_t dev) { printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n"); - setup_uma_memory(); - southstation_led_init(); } diff --git a/src/mainboard/amd/tilapia_fam10/mainboard.c b/src/mainboard/amd/tilapia_fam10/mainboard.c index cf3e3d3..f655513 100644 --- a/src/mainboard/amd/tilapia_fam10/mainboard.c +++ b/src/mainboard/amd/tilapia_fam10/mainboard.c @@ -278,8 +278,6 @@ static void tilapia_enable(device_t dev) { printk(BIOS_INFO, "Mainboard TILAPIA Enable. dev=0x%p\n", dev); - setup_uma_memory(); - set_pcie_dereset(); /* get_ide_dma66(); */ set_thermal_config(); diff --git a/src/mainboard/amd/torpedo/mainboard.c b/src/mainboard/amd/torpedo/mainboard.c index 839ec5c..91e3ead 100644 --- a/src/mainboard/amd/torpedo/mainboard.c +++ b/src/mainboard/amd/torpedo/mainboard.c @@ -56,7 +56,6 @@ void set_pcie_dereset(void) static void torpedo_enable(device_t dev) { printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable. dev=0x%p\n", dev); - setup_uma_memory(); } int add_mainboard_resources(struct lb_memory *mem) diff --git a/src/mainboard/amd/union_station/mainboard.c b/src/mainboard/amd/union_station/mainboard.c index f0f610a..d8324bc 100644 --- a/src/mainboard/amd/union_station/mainboard.c +++ b/src/mainboard/amd/union_station/mainboard.c @@ -53,8 +53,6 @@ void set_pcie_dereset(void) static void unionstation_enable(device_t dev) { printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n"); - - setup_uma_memory(); } int add_mainboard_resources(struct lb_memory *mem) diff --git a/src/mainboard/asrock/939a785gmh/mainboard.c b/src/mainboard/asrock/939a785gmh/mainboard.c index d3ea27e..7526c6b 100644 --- a/src/mainboard/asrock/939a785gmh/mainboard.c +++ b/src/mainboard/asrock/939a785gmh/mainboard.c @@ -100,8 +100,6 @@ static void mb_enable(device_t dev) { printk(BIOS_INFO, "Mainboard 939A785GMH/128M Enable. dev=0x%p\n", dev); - setup_uma_memory(); - set_pcie_dereset(); /* get_ide_dma66(); */ } diff --git a/src/mainboard/asrock/e350m1/mainboard.c b/src/mainboard/asrock/e350m1/mainboard.c index d0151be..9a76cce 100644 --- a/src/mainboard/asrock/e350m1/mainboard.c +++ b/src/mainboard/asrock/e350m1/mainboard.c @@ -52,7 +52,6 @@ void set_pcie_dereset(void) static void e350m1_enable(device_t dev) { printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n"); - setup_uma_memory(); } int add_mainboard_resources(struct lb_memory *mem) diff --git a/src/mainboard/asus/m4a78-em/mainboard.c b/src/mainboard/asus/m4a78-em/mainboard.c index eea8c0d..738e854 100644 --- a/src/mainboard/asus/m4a78-em/mainboard.c +++ b/src/mainboard/asus/m4a78-em/mainboard.c @@ -122,8 +122,6 @@ static void m4a78em_enable(device_t dev) { printk(BIOS_INFO, "Mainboard enable. dev=0x%p\n", dev); - setup_uma_memory(); - set_pcie_dereset(); /* get_ide_dma66(); */ /* set_thermal_config(); */ diff --git a/src/mainboard/asus/m4a785-m/mainboard.c b/src/mainboard/asus/m4a785-m/mainboard.c index 45af025..5230f84 100644 --- a/src/mainboard/asus/m4a785-m/mainboard.c +++ b/src/mainboard/asus/m4a785-m/mainboard.c @@ -194,8 +194,6 @@ static void m4a785m_enable(device_t dev) { printk(BIOS_INFO, "Mainboard enable. dev=0x%p\n", dev); - setup_uma_memory(); - set_pcie_dereset(); /* get_ide_dma66(); */ set_thermal_config(); diff --git a/src/mainboard/asus/m5a88-v/mainboard.c b/src/mainboard/asus/m5a88-v/mainboard.c index 866e8c2..bbb1482 100644 --- a/src/mainboard/asus/m5a88-v/mainboard.c +++ b/src/mainboard/asus/m5a88-v/mainboard.c @@ -79,8 +79,6 @@ static void m5a88pm_v_enable(device_t dev) printk(BIOS_INFO, "Mainboard ASUS M5A88-V Enable. dev=0x%p\n", dev); - setup_uma_memory(); - set_pcie_dereset(); enable_int_gfx(); } diff --git a/src/mainboard/avalue/eax-785e/mainboard.c b/src/mainboard/avalue/eax-785e/mainboard.c index 5e50efa..0cc655e 100644 --- a/src/mainboard/avalue/eax-785e/mainboard.c +++ b/src/mainboard/avalue/eax-785e/mainboard.c @@ -78,8 +78,6 @@ static void eax_785e(device_t dev) { printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n"); - setup_uma_memory(); - set_pcie_dereset(); enable_int_gfx(); } diff --git a/src/mainboard/gigabyte/ma785gm/mainboard.c b/src/mainboard/gigabyte/ma785gm/mainboard.c index 680bb2e..c65fbb6 100644 --- a/src/mainboard/gigabyte/ma785gm/mainboard.c +++ b/src/mainboard/gigabyte/ma785gm/mainboard.c @@ -139,8 +139,6 @@ static void ma785gm_enable(device_t dev) { printk(BIOS_INFO, "Mainboard MA785GM-US2H Enable. dev=0x%p\n", dev); - setup_uma_memory(); - set_pcie_dereset(); /* get_ide_dma66(); */ set_gpio40_gfx(); diff --git a/src/mainboard/gigabyte/ma785gmt/mainboard.c b/src/mainboard/gigabyte/ma785gmt/mainboard.c index b7ecf9f..3c26c6a 100644 --- a/src/mainboard/gigabyte/ma785gmt/mainboard.c +++ b/src/mainboard/gigabyte/ma785gmt/mainboard.c @@ -249,8 +249,6 @@ static void ma785gmt_enable(device_t dev) { printk(BIOS_INFO, "Mainboard MA785GMT-UD2H Enable. dev=0x%p\n", dev); - setup_uma_memory(); - set_pcie_dereset(); /* get_ide_dma66(); */ set_thermal_config(); diff --git a/src/mainboard/gigabyte/ma78gm/mainboard.c b/src/mainboard/gigabyte/ma78gm/mainboard.c index 6756690..ba9baf4 100644 --- a/src/mainboard/gigabyte/ma78gm/mainboard.c +++ b/src/mainboard/gigabyte/ma78gm/mainboard.c @@ -76,8 +76,6 @@ static void ma78gm_enable(device_t dev) { printk(BIOS_INFO, "Mainboard MA78GM-US2H Enable. dev=0x%p\n", dev); - setup_uma_memory(); - set_pcie_dereset(); /* get_ide_dma66(); */ } diff --git a/src/mainboard/iei/kino-780am2-fam10/mainboard.c b/src/mainboard/iei/kino-780am2-fam10/mainboard.c index e9ef596..44cbfcd 100644 --- a/src/mainboard/iei/kino-780am2-fam10/mainboard.c +++ b/src/mainboard/iei/kino-780am2-fam10/mainboard.c @@ -58,8 +58,6 @@ static void kino_enable(device_t dev) { printk(BIOS_INFO, "Mainboard Kino Enable. dev=0x%p\n", dev); - setup_uma_memory(); - set_pcie_dereset(); /* get_ide_dma66(); */ } diff --git a/src/mainboard/jetway/pa78vm5/mainboard.c b/src/mainboard/jetway/pa78vm5/mainboard.c index cb37c11..3c4d872 100644 --- a/src/mainboard/jetway/pa78vm5/mainboard.c +++ b/src/mainboard/jetway/pa78vm5/mainboard.c @@ -105,8 +105,6 @@ static void pa78vm5_enable(device_t dev) { printk(BIOS_INFO, "Mainboard PA78VM5 Enable. dev=0x%p\n", dev); - setup_uma_memory(); - set_pcie_dereset(); /* get_ide_dma66(); */ } diff --git a/src/mainboard/kontron/kt690/mainboard.c b/src/mainboard/kontron/kt690/mainboard.c index dbd4141..4eb638f 100644 --- a/src/mainboard/kontron/kt690/mainboard.c +++ b/src/mainboard/kontron/kt690/mainboard.c @@ -185,8 +185,6 @@ static void kt690_enable(device_t dev) { printk(BIOS_INFO, "Mainboard KT690 Enable. dev=0x%p\n", dev); - setup_uma_memory(); - enable_onboard_nic(); get_ide_dma66(); set_thermal_config(); diff --git a/src/mainboard/siemens/sitemp_g1p1/mainboard.c b/src/mainboard/siemens/sitemp_g1p1/mainboard.c index 905d23f..e4d88db 100644 --- a/src/mainboard/siemens/sitemp_g1p1/mainboard.c +++ b/src/mainboard/siemens/sitemp_g1p1/mainboard.c @@ -851,7 +851,6 @@ static void enable_dev(device_t dev) detect_hw_variant(dev); update_subsystemid(dev); - setup_uma_memory(); dev->ops->init = init; // rest of mainboard init later } diff --git a/src/mainboard/technexion/tim5690/mainboard.c b/src/mainboard/technexion/tim5690/mainboard.c index 2975e86..41147cd 100644 --- a/src/mainboard/technexion/tim5690/mainboard.c +++ b/src/mainboard/technexion/tim5690/mainboard.c @@ -239,8 +239,6 @@ static void tim5690_enable(device_t dev) vbios_regs.int15_regs.fun05_tv_standard = TV_MODE_NO; vgabios_init(&vbios_regs); - setup_uma_memory(); - set_thermal_config(); } diff --git a/src/mainboard/technexion/tim8690/mainboard.c b/src/mainboard/technexion/tim8690/mainboard.c index 40ab345..298132b 100644 --- a/src/mainboard/technexion/tim8690/mainboard.c +++ b/src/mainboard/technexion/tim8690/mainboard.c @@ -145,8 +145,6 @@ static void tim8690_enable(device_t dev) { printk(BIOS_INFO, "Mainboard tim8690 Enable. dev=0x%p\n", dev); - setup_uma_memory(); - enable_onboard_nic(); set_thermal_config(); } diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c index 7ac8996..f3f03a4 100644 --- a/src/northbridge/amd/agesa/family12/northbridge.c +++ b/src/northbridge/amd/agesa/family12/northbridge.c @@ -469,7 +469,7 @@ static void set_resources(device_t dev) printk(BIOS_DEBUG, "Fam12h - northbridge.c - set_resources - End.\n"); } -void setup_uma_memory(void) +static void setup_uma_memory(void) { #if CONFIG_GFXUMA msr_t msr, msr2; @@ -611,6 +611,8 @@ static void domain_set_resources(device_t dev) u32 reset_memhole = 1; #endif + setup_uma_memory(); + #if CONFIG_PCI_64BIT_PREF_MEM printk(BIOS_DEBUG, "adsr - CONFIG_PCI_64BIT_PREF_MEM is true.\n"); diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c index 6cdff27..af6dfcc 100644 --- a/src/northbridge/amd/agesa/family14/northbridge.c +++ b/src/northbridge/amd/agesa/family14/northbridge.c @@ -517,7 +517,7 @@ static void domain_read_resources(device_t dev) #endif } -void setup_uma_memory(void) +static void setup_uma_memory(void) { #if CONFIG_GFXUMA msr_t msr, msr2; @@ -574,6 +574,8 @@ static void domain_set_resources(device_t dev) u32 reset_memhole = 1; #endif + setup_uma_memory(); + #if CONFIG_PCI_64BIT_PREF_MEM printk(BIOS_DEBUG, "adsr - CONFIG_PCI_64BIT_PREF_MEM is true.\n"); diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c index be86fda..a080293 100644 --- a/src/northbridge/amd/agesa/family15/northbridge.c +++ b/src/northbridge/amd/agesa/family15/northbridge.c @@ -629,7 +629,7 @@ static struct hw_mem_hole_info get_hw_mem_hole_info(void) #define ONE_MB 0x100000 -void setup_uma_memory(void) +static void setup_uma_memory(void) { #if CONFIG_GFXUMA msr_t msr, msr2; @@ -686,6 +686,8 @@ static void domain_set_resources(device_t dev) u32 reset_memhole = 1; #endif + setup_uma_memory(); + #if CONFIG_PCI_64BIT_PREF_MEM for (link = dev->link_list; link; link = link->next) { diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c index b572e24..9a31751 100644 --- a/src/northbridge/amd/agesa/family15tn/northbridge.c +++ b/src/northbridge/amd/agesa/family15tn/northbridge.c @@ -638,7 +638,7 @@ static struct hw_mem_hole_info get_hw_mem_hole_info(void) #define ONE_MB_SHIFT 20 -void setup_uma_memory(void) +static void setup_uma_memory(void) { #if CONFIG_GFXUMA msr_t msr, msr2; @@ -696,6 +696,8 @@ static void domain_set_resources(device_t dev) u32 reset_memhole = 1; #endif + setup_uma_memory(); + #if CONFIG_PCI_64BIT_PREF_MEM for (link = dev->link_list; link; link = link->next) { diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c index 68e79ad..15b29f6 100644 --- a/src/northbridge/amd/amdfam10/northbridge.c +++ b/src/northbridge/amd/amdfam10/northbridge.c @@ -848,7 +848,7 @@ static void disable_hoist_memory(unsigned long hole_startk, int node_id) #include <cbmem.h> #endif -void setup_uma_memory(void) +static void setup_uma_memory(void) { #if CONFIG_GFXUMA msr_t msr, msr2; @@ -903,6 +903,8 @@ static void amdfam10_domain_set_resources(device_t dev) u32 reset_memhole = 1; #endif + setup_uma_memory(); + #if CONFIG_PCI_64BIT_PREF_MEM for(link = dev->link_list; link; link = link->next) { diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c index 21f2808..bec02f0 100644 --- a/src/northbridge/amd/amdk8/northbridge.c +++ b/src/northbridge/amd/amdk8/northbridge.c @@ -823,7 +823,7 @@ static u32 hoist_memory(unsigned long hole_startk, int node_id) #include <cbmem.h> #endif -void setup_uma_memory(void) +static void setup_uma_memory(void) { #if CONFIG_GFXUMA msr_t msr, msr2; @@ -896,6 +896,8 @@ static void amdk8_domain_set_resources(device_t dev) u32 reset_memhole = 1; #endif + setup_uma_memory(); + #if 0 /* Place the IO devices somewhere safe */ io = find_resource(dev, 0);

1 0

Patch set updated for coreboot: a54defe AMD Agesa and GFXUMA: drop use of uma_memory_base
by Zheng Bao 02 Aug '12

02 Aug '12

Zheng Bao (zheng.bao(a)amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1247 -gerrit commit a54defe30fa86f01a1b02907594ef4a08217544b Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Fri Jul 20 08:31:37 2012 +0300 AMD Agesa and GFXUMA: drop use of uma_memory_base Without GFXUMA, variables were not referenced anywhere. Fail builds on Family10 if GFXUMA is selected, because the northbridge code does not set UMA base or size. Change-Id: I15b91cf6241e9a890398eed03824b753828a0a51 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/northbridge/amd/agesa/family10/northbridge.c | 4 ++++ src/northbridge/amd/agesa/family12/northbridge.c | 3 --- src/northbridge/amd/agesa/family14/northbridge.c | 3 --- src/northbridge/amd/agesa/family15/northbridge.c | 3 --- src/northbridge/amd/agesa/family15tn/northbridge.c | 3 --- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/northbridge/amd/agesa/family10/northbridge.c b/src/northbridge/amd/agesa/family10/northbridge.c index c4acedf..831aec0 100644 --- a/src/northbridge/amd/agesa/family10/northbridge.c +++ b/src/northbridge/amd/agesa/family10/northbridge.c @@ -923,6 +923,10 @@ static void amdfam10_domain_set_resources(device_t dev) u32 reset_memhole = 1; #endif +#if CONFIG_GFXUMA +#error Northbridge does not set uma_memory_base or uma_memory_size. +#endif + #if CONFIG_PCI_64BIT_PREF_MEM for (link = dev->link_list; link; link = link->next) { diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c index d7458ff..7ac8996 100644 --- a/src/northbridge/amd/agesa/family12/northbridge.c +++ b/src/northbridge/amd/agesa/family12/northbridge.c @@ -508,9 +508,6 @@ void setup_uma_memory(void) __func__, uma_memory_size, uma_memory_base); /* TODO: TOP_MEM2 */ -#else - uma_memory_size = 0x10000000; /* 256M recommended UMA */ - uma_memory_base = 0x30000000; /* 1GB system memory supported */ #endif } diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c index dbc432a..6cdff27 100644 --- a/src/northbridge/amd/agesa/family14/northbridge.c +++ b/src/northbridge/amd/agesa/family14/northbridge.c @@ -553,9 +553,6 @@ void setup_uma_memory(void) __func__, uma_memory_size, uma_memory_base); /* TODO: TOP_MEM2 */ -#else - uma_memory_size = 0x10000000; /* 256M recommended UMA */ - uma_memory_base = 0x30000000; /* 1GB system memory supported */ #endif } diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c index 2036dbf..be86fda 100644 --- a/src/northbridge/amd/agesa/family15/northbridge.c +++ b/src/northbridge/amd/agesa/family15/northbridge.c @@ -668,9 +668,6 @@ void setup_uma_memory(void) __func__, uma_memory_size, uma_memory_base); /* TODO: TOP_MEM2 */ -#else - uma_memory_size = 256 * ONE_MB; /* 256M recommended UMA */ - uma_memory_base = 768 * ONE_MB; /* 1GB system memory supported */ #endif } diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c index fc4115e..b572e24 100644 --- a/src/northbridge/amd/agesa/family15tn/northbridge.c +++ b/src/northbridge/amd/agesa/family15tn/northbridge.c @@ -677,9 +677,6 @@ void setup_uma_memory(void) __func__, uma_memory_size, uma_memory_base); /* TODO: TOP_MEM2 */ -#else - uma_memory_size = 256 << ONE_MB_SHIFT; /* 256M recommended UMA */ - uma_memory_base = 768 << ONE_MB_SHIFT; /* 1GB system memory supported */ #endif }

1 0

Patch set updated for coreboot: 3ae2587 AMD K8 and AMDFAM10, GFXUMA: drop use of uma_memory_base
by Zheng Bao 02 Aug '12

02 Aug '12

Zheng Bao (zheng.bao(a)amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1246 -gerrit commit 3ae258787d3392a671a62ca3d94f10dce5eeb4a0 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Fri Jul 20 08:24:49 2012 +0300 AMD K8 and AMDFAM10, GFXUMA: drop use of uma_memory_base The code in rs690 or rs780 is always used with K8 or AMDFAM10 northbridge. Without GFXUMA, both of these set the same static value indirectly using the variable uma_memory_base. Make the register setting with immediate value, to remove the obscure use of variable uma_memory_base. Change-Id: I5354684457a76e73013b4e34a4538a6d122eee8d Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/northbridge/amd/amdfam10/northbridge.c | 3 --- src/northbridge/amd/amdk8/northbridge.c | 3 --- src/southbridge/amd/rs690/cmn.c | 6 ++++++ src/southbridge/amd/rs780/cmn.c | 6 ++++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c index c53da22..68e79ad 100644 --- a/src/northbridge/amd/amdfam10/northbridge.c +++ b/src/northbridge/amd/amdfam10/northbridge.c @@ -885,9 +885,6 @@ void setup_uma_memory(void) __func__, uma_memory_size, uma_memory_base); /* TODO: TOP_MEM2 */ -#else - uma_memory_size = 0x8000000; /* 128M recommended UMA */ - uma_memory_base = 0x38000000; /* 1GB system memory supposed */ #endif } diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c index c4a8acd..21f2808 100644 --- a/src/northbridge/amd/amdk8/northbridge.c +++ b/src/northbridge/amd/amdk8/northbridge.c @@ -879,9 +879,6 @@ void setup_uma_memory(void) __func__, uma_memory_size, uma_memory_base); /* TODO: TOP_MEM2 */ -#else - uma_memory_size = 0x8000000; /* 128M recommended UMA */ - uma_memory_base = 0x38000000; /* 1GB system memory supposed */ #endif } diff --git a/src/southbridge/amd/rs690/cmn.c b/src/southbridge/amd/rs690/cmn.c index 68c46e9..004cf78 100644 --- a/src/southbridge/amd/rs690/cmn.c +++ b/src/southbridge/amd/rs690/cmn.c @@ -316,7 +316,13 @@ u8 PcieTrainPort(device_t nb_dev, device_t dev, u32 port) void rs690_set_tom(device_t nb_dev) { /* set TOM */ +#if CONFIG_GFXUMA pci_write_config32(nb_dev, 0x90, uma_memory_base); nbmc_write_index(nb_dev, 0x1e, uma_memory_base); +#else + /* 1GB system memory supposed */ + pci_write_config32(nb_dev, 0x90, 0x38000000); + nbmc_write_index(nb_dev, 0x1e, 0x38000000); +#endif } diff --git a/src/southbridge/amd/rs780/cmn.c b/src/southbridge/amd/rs780/cmn.c index 5c72a04..30da675 100644 --- a/src/southbridge/amd/rs780/cmn.c +++ b/src/southbridge/amd/rs780/cmn.c @@ -357,8 +357,14 @@ u8 PcieTrainPort(device_t nb_dev, device_t dev, u32 port) void rs780_set_tom(device_t nb_dev) { /* set TOM */ +#if CONFIG_GFXUMA pci_write_config32(nb_dev, 0x90, uma_memory_base); //nbmc_write_index(nb_dev, 0x1e, uma_memory_base); +#else + /* 1GB system memory supposed */ + pci_write_config32(nb_dev, 0x90, 0x38000000); + //nbmc_write_index(nb_dev, 0x1e, 0x38000000); +#endif } // extract single bit

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot August 2012