5 files changed, 1 insertions, 6 deletions
diff --git a/src/soc/nvidia/tegra124/Makefile.inc b/src/soc/nvidia/tegra124/Makefile.inc
index fb5389fa2f..e80125e953 100644
--- a/src/soc/nvidia/tegra124/Makefile.inc
+++ b/src/soc/nvidia/tegra124/Makefile.inc
@@ -46,7 +46,6 @@ romstage-y += ../tegra/pinmux.c
 romstage-y += cache.c
 romstage-y += uart.c
 
-ramstage-y += cbmem.c
 ramstage-y += clock.c
 ramstage-y += display.c
 ramstage-y += dma.c
diff --git a/src/soc/nvidia/tegra124/verstage.c b/src/soc/nvidia/tegra124/verstage.c
index 2495351f6c..7ecf31a84e 100644
--- a/src/soc/nvidia/tegra124/verstage.c
+++ b/src/soc/nvidia/tegra124/verstage.c
@@ -45,7 +45,7 @@ void verstage_mainboard_init(void)
 	early_mainboard_init();
 }
 
-void stage_entry(void)
+void stage_entry(uintptr_t unused)
 {
 	asm volatile ("bl arm_init_caches"
 		      : : : "r0", "r1", "r2", "r3", "r4", "r5", "ip");
diff --git a/src/soc/rockchip/rk3288/Makefile.inc b/src/soc/rockchip/rk3288/Makefile.inc
index 7e4c5b48ad..e7982f7492 100644
--- a/src/soc/rockchip/rk3288/Makefile.inc
+++ b/src/soc/rockchip/rk3288/Makefile.inc
@@ -18,7 +18,6 @@ ifeq ($(CONFIG_SOC_ROCKCHIP_RK3288),y)
 IDBTOOL = util/rockchip/make_idb.py
 
 bootblock-y += bootblock.c
-bootblock-y += ../common/cbmem.c
 bootblock-y += ../common/uart.c
 bootblock-y += timer.c
 bootblock-y += clock.c
@@ -55,7 +54,6 @@ romstage-y += tsadc.c
 romstage-y += ../common/i2c.c
 
 ramstage-y += soc.c
-ramstage-y += ../common/cbmem.c
 ramstage-y += timer.c
 ramstage-y += ../common/i2c.c
 ramstage-$(CONFIG_SOFTWARE_I2C) += software_i2c.c
diff --git a/src/soc/samsung/exynos5250/Makefile.inc b/src/soc/samsung/exynos5250/Makefile.inc
index a6eb9eea9b..6a595f4b82 100644
--- a/src/soc/samsung/exynos5250/Makefile.inc
+++ b/src/soc/samsung/exynos5250/Makefile.inc
@@ -40,7 +40,6 @@ ramstage-y += i2c.c
 ramstage-y += dp-reg.c
 ramstage-y += fb.c
 ramstage-y += usb.c
-ramstage-y += cbmem.c
 
 CPPFLAGS_common += -Isrc/soc/samsung/exynos5250/include/
 
diff --git a/src/soc/samsung/exynos5420/Makefile.inc b/src/soc/samsung/exynos5420/Makefile.inc
index b41e9f96f3..dc25919ff6 100644
--- a/src/soc/samsung/exynos5420/Makefile.inc
+++ b/src/soc/samsung/exynos5420/Makefile.inc
@@ -40,7 +40,6 @@ ramstage-y += gpio.c
 ramstage-y += i2c.c
 ramstage-y += dp.c dp_lowlevel.c fimd.c
 ramstage-y += usb.c
-ramstage-y += cbmem.c
 
 rmodules_$(ARCH-ROMSTAGE-y)-y += timer.c