mb/emulation: Drop cbmem_recovery(0) call in ramstage

Calling cbmem_recovery(0) late in ramstage would appear to remove all CBMEM entries created so far. Change-Id: I2abb079844c4b41be09354d603ad36e4a56ea2e1 Signed-off-by: Kyösti Mälkki <[email protected]> Reviewed-on: https://review.coreboot.org/c/coreboot/+/50841 Reviewed-by: Angel Pons <[email protected]> Tested-by: build bot (Jenkins) <[email protected]>
pcengines · Feb 22, 2021 · c79fc47 · c79fc47
1 parent 70243cd
commit c79fc47
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 10 deletions.
diff --git a/src/mainboard/emulation/qemu-armv7/mainboard.c b/src/mainboard/emulation/qemu-armv7/mainboard.c
@@ -2,7 +2,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <cbmem.h>
 #include <halt.h>
 #include <device/mmio.h>
 #include <ramdetect.h>
@@ -41,7 +40,6 @@ static void mainboard_enable(struct device *dev)
 	discovered = probe_ramsize((uintptr_t)_dram, CONFIG_DRAM_SIZE_MB);
 	printk(BIOS_DEBUG, "%d MiB of RAM discovered\n", discovered);
 	ram_resource(dev, 0, 0x60000000 >> 10, discovered << 10);
-	cbmem_recovery(0);
 	init_gfx();
 }
 

diff --git a/src/mainboard/emulation/qemu-power8/mainboard.c b/src/mainboard/emulation/qemu-power8/mainboard.c
@@ -2,7 +2,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <cbmem.h>
 
 static void mainboard_enable(struct device *dev)
 {
@@ -13,7 +12,6 @@ static void mainboard_enable(struct device *dev)
 
 	/* Where does RAM live? */
 	ram_resource(dev, 0, 2048, 32768);
-	cbmem_recovery(0);
 }
 
 struct chip_operations mainboard_ops = {

diff --git a/src/mainboard/emulation/qemu-riscv/mainboard.c b/src/mainboard/emulation/qemu-riscv/mainboard.c
@@ -2,7 +2,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <cbmem.h>
 #include <symbols.h>
 #include <ramdetect.h>
 
@@ -16,8 +15,6 @@ static void mainboard_enable(struct device *dev)
 
 	dram_mb_detected = probe_ramsize((uintptr_t)_dram, CONFIG_DRAM_SIZE_MB);
 	ram_resource(dev, 0, (uintptr_t)_dram / KiB, dram_mb_detected * MiB / KiB);
-
-	cbmem_recovery(0);
 }
 
 struct chip_operations mainboard_ops = {

diff --git a/src/mainboard/emulation/spike-riscv/mainboard.c b/src/mainboard/emulation/spike-riscv/mainboard.c
@@ -2,7 +2,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <cbmem.h>
 
 static void mainboard_enable(struct device *dev)
 {
@@ -19,8 +18,6 @@ static void mainboard_enable(struct device *dev)
 	}
 
 	ram_resource(dev, 0, 0x80000000/KiB, ram_size/KiB);
-
-	cbmem_recovery(0);
 }
 
 struct chip_operations mainboard_ops = {