From 5e29f00c5598942b3f57813f90fbbb73f82e969b Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Wed, 18 Jul 2012 14:38:54 +0300 Subject: Intel and GFXUMA: drop redundant use of lb_add_memory_range() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use of uma_resource() in northbridge code created a memory resource marked as reserved. Such resources are removed from system memory in write_coreboot_table(). Change-Id: I14bfd560140d8d30ec156562f23072bfae747bde Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/1238 Tested-by: build bot (Jenkins) Reviewed-by: Anton Kochkov --- src/mainboard/asus/mew-am/mainboard.c | 2 +- src/mainboard/asus/mew-vm/mainboard.c | 2 +- src/mainboard/ecs/p6iwp-fe/mainboard.c | 2 +- src/mainboard/hp/e_vectra_p2706t/mainboard.c | 2 +- src/mainboard/intel/d810e2cb/mainboard.c | 2 +- src/mainboard/intel/emeraldlake2/mainboard.c | 2 +- src/mainboard/mitac/6513wu/mainboard.c | 2 +- src/mainboard/msi/ms6178/mainboard.c | 2 +- src/mainboard/nec/powermate2000/mainboard.c | 2 +- src/mainboard/rca/rm4100/mainboard.c | 2 +- src/mainboard/samsung/lumpy/mainboard.c | 2 +- src/mainboard/samsung/stumpy/mainboard.c | 2 +- src/mainboard/thomson/ip1000/mainboard.c | 2 +- src/northbridge/intel/i82810/northbridge.c | 9 --------- src/northbridge/intel/i82830/northbridge.c | 9 --------- src/northbridge/intel/sandybridge/northbridge.c | 5 ----- 16 files changed, 13 insertions(+), 36 deletions(-) (limited to 'src') diff --git a/src/mainboard/asus/mew-am/mainboard.c b/src/mainboard/asus/mew-am/mainboard.c index 8887218b3d..6409dabe0e 100644 --- a/src/mainboard/asus/mew-am/mainboard.c +++ b/src/mainboard/asus/mew-am/mainboard.c @@ -23,7 +23,7 @@ int add_mainboard_resources(struct lb_memory *mem) { - return add_northbridge_resources(mem); + return 0; } struct chip_operations mainboard_ops = { diff --git a/src/mainboard/asus/mew-vm/mainboard.c b/src/mainboard/asus/mew-vm/mainboard.c index e278565dc0..2e43be2087 100644 --- a/src/mainboard/asus/mew-vm/mainboard.c +++ b/src/mainboard/asus/mew-vm/mainboard.c @@ -3,7 +3,7 @@ int add_mainboard_resources(struct lb_memory *mem) { - return add_northbridge_resources(mem); + return 0; } struct chip_operations mainboard_ops = { diff --git a/src/mainboard/ecs/p6iwp-fe/mainboard.c b/src/mainboard/ecs/p6iwp-fe/mainboard.c index 9031ac7f93..667ac5e695 100644 --- a/src/mainboard/ecs/p6iwp-fe/mainboard.c +++ b/src/mainboard/ecs/p6iwp-fe/mainboard.c @@ -23,7 +23,7 @@ int add_mainboard_resources(struct lb_memory *mem) { - return add_northbridge_resources(mem); + return 0; } struct chip_operations mainboard_ops = { diff --git a/src/mainboard/hp/e_vectra_p2706t/mainboard.c b/src/mainboard/hp/e_vectra_p2706t/mainboard.c index 0f9b75ea0d..80e6f617f7 100644 --- a/src/mainboard/hp/e_vectra_p2706t/mainboard.c +++ b/src/mainboard/hp/e_vectra_p2706t/mainboard.c @@ -23,7 +23,7 @@ int add_mainboard_resources(struct lb_memory *mem) { - return add_northbridge_resources(mem); + return 0; } struct chip_operations mainboard_ops = { diff --git a/src/mainboard/intel/d810e2cb/mainboard.c b/src/mainboard/intel/d810e2cb/mainboard.c index 7589d6e735..8455377473 100644 --- a/src/mainboard/intel/d810e2cb/mainboard.c +++ b/src/mainboard/intel/d810e2cb/mainboard.c @@ -22,7 +22,7 @@ int add_mainboard_resources(struct lb_memory *mem) { - return add_northbridge_resources(mem); + return 0; } struct chip_operations mainboard_ops = { diff --git a/src/mainboard/intel/emeraldlake2/mainboard.c b/src/mainboard/intel/emeraldlake2/mainboard.c index 5717edf9ce..796f71e4e7 100644 --- a/src/mainboard/intel/emeraldlake2/mainboard.c +++ b/src/mainboard/intel/emeraldlake2/mainboard.c @@ -44,7 +44,7 @@ void mainboard_suspend_resume(void) int add_mainboard_resources(struct lb_memory *mem) { - return add_northbridge_resources(mem); + return 0; } #if defined(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) && CONFIG_PCI_OPTION_ROM_RUN_REALMODE diff --git a/src/mainboard/mitac/6513wu/mainboard.c b/src/mainboard/mitac/6513wu/mainboard.c index 968b9e9e0f..04af449c52 100644 --- a/src/mainboard/mitac/6513wu/mainboard.c +++ b/src/mainboard/mitac/6513wu/mainboard.c @@ -23,7 +23,7 @@ int add_mainboard_resources(struct lb_memory *mem) { - return add_northbridge_resources(mem); + return 0; } struct chip_operations mainboard_ops = { diff --git a/src/mainboard/msi/ms6178/mainboard.c b/src/mainboard/msi/ms6178/mainboard.c index 0aeedb89d9..76c8c04d4a 100644 --- a/src/mainboard/msi/ms6178/mainboard.c +++ b/src/mainboard/msi/ms6178/mainboard.c @@ -23,7 +23,7 @@ int add_mainboard_resources(struct lb_memory *mem) { - return add_northbridge_resources(mem); + return 0; } struct chip_operations mainboard_ops = { diff --git a/src/mainboard/nec/powermate2000/mainboard.c b/src/mainboard/nec/powermate2000/mainboard.c index 3b29c7c8b9..3bbaa11314 100644 --- a/src/mainboard/nec/powermate2000/mainboard.c +++ b/src/mainboard/nec/powermate2000/mainboard.c @@ -23,7 +23,7 @@ int add_mainboard_resources(struct lb_memory *mem) { - return add_northbridge_resources(mem); + return 0; } struct chip_operations mainboard_ops = { diff --git a/src/mainboard/rca/rm4100/mainboard.c b/src/mainboard/rca/rm4100/mainboard.c index 613c1d7000..ff98977280 100644 --- a/src/mainboard/rca/rm4100/mainboard.c +++ b/src/mainboard/rca/rm4100/mainboard.c @@ -24,7 +24,7 @@ int add_mainboard_resources(struct lb_memory *mem) { - return add_northbridge_resources(mem); + return 0; } static void mainboard_init(device_t dev) diff --git a/src/mainboard/samsung/lumpy/mainboard.c b/src/mainboard/samsung/lumpy/mainboard.c index 20b59b7421..e83516a7ef 100644 --- a/src/mainboard/samsung/lumpy/mainboard.c +++ b/src/mainboard/samsung/lumpy/mainboard.c @@ -51,7 +51,7 @@ void mainboard_suspend_resume(void) int add_mainboard_resources(struct lb_memory *mem) { - return add_northbridge_resources(mem); + return 0; } #if defined(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) && CONFIG_PCI_OPTION_ROM_RUN_REALMODE diff --git a/src/mainboard/samsung/stumpy/mainboard.c b/src/mainboard/samsung/stumpy/mainboard.c index 2456e70fea..246b261eb9 100644 --- a/src/mainboard/samsung/stumpy/mainboard.c +++ b/src/mainboard/samsung/stumpy/mainboard.c @@ -44,7 +44,7 @@ void mainboard_suspend_resume(void) int add_mainboard_resources(struct lb_memory *mem) { - return add_northbridge_resources(mem); + return 0; } #if defined(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) && CONFIG_PCI_OPTION_ROM_RUN_REALMODE diff --git a/src/mainboard/thomson/ip1000/mainboard.c b/src/mainboard/thomson/ip1000/mainboard.c index e5c3ea1272..ae5872d52b 100644 --- a/src/mainboard/thomson/ip1000/mainboard.c +++ b/src/mainboard/thomson/ip1000/mainboard.c @@ -30,7 +30,7 @@ int add_mainboard_resources(struct lb_memory *mem) { - return add_northbridge_resources(mem); + return 0; } // setting the bit disables the led. diff --git a/src/northbridge/intel/i82810/northbridge.c b/src/northbridge/intel/i82810/northbridge.c index f6d14e0bd2..c738de7916 100644 --- a/src/northbridge/intel/i82810/northbridge.c +++ b/src/northbridge/intel/i82810/northbridge.c @@ -62,15 +62,6 @@ static const struct pci_driver i810e_northbridge_driver __pci_driver = { .device = 0x7124, }; -int add_northbridge_resources(struct lb_memory *mem) -{ - printk(BIOS_DEBUG, "Adding IGD UMA memory area\n"); - lb_add_memory_range(mem, LB_MEM_RESERVED, - uma_memory_base, uma_memory_size); - - return 0; -} - /* Table which returns the RAM size in MB when fed the DRP[7:4] or [3:0] value. * Note that 2 is a value which the DRP should never be programmed to. * Some size values appear twice, due to single-sided vs dual-sided banks. diff --git a/src/northbridge/intel/i82830/northbridge.c b/src/northbridge/intel/i82830/northbridge.c index 649a203aca..4951c4f617 100644 --- a/src/northbridge/intel/i82830/northbridge.c +++ b/src/northbridge/intel/i82830/northbridge.c @@ -52,15 +52,6 @@ static const struct pci_driver northbridge_driver __pci_driver = { .device = 0x3575, }; -int add_northbridge_resources(struct lb_memory *mem) -{ - printk(BIOS_DEBUG, "Adding IGD UMA memory area\n"); - lb_add_memory_range(mem, LB_MEM_RESERVED, - uma_memory_base, uma_memory_size); - - return 0; -} - #if CONFIG_WRITE_HIGH_TABLES #include #endif diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c index 2d948eaaef..b447d52dab 100644 --- a/src/northbridge/intel/sandybridge/northbridge.c +++ b/src/northbridge/intel/sandybridge/northbridge.c @@ -61,11 +61,6 @@ int bridge_silicon_revision(void) static const int legacy_hole_base_k = 0xa0000 / 1024; static const int legacy_hole_size_k = 384; -int add_northbridge_resources(struct lb_memory *mem) -{ - return 0; -} - void cbmem_post_handling(void) { update_mrc_cache(); -- cgit v1.2.3