[coreboot-gerrit] New patch to review for coreboot: rockchip: rk3399: add simplest sdram to fix compiling error

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14703

-gerrit

commit d4eaf9cd46f5474fc7f37fb6ea58b82778f9a063
Author: Shunqian Zheng <zhengsq at rock-chips.com>
Date:   Wed Apr 13 21:34:12 2016 +0800

    rockchip: rk3399: add simplest sdram to fix compiling error
    
    This patch is only to make building happy, the real sdram driver
    comes later.
    
    BRANCH=none
    BUG=none
    TEST=emerge-kevin coreboot
    
    Change-Id: I4123c3a6627d7264c615fefbb89e16c4dfb9a423
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: 5b992a7895a72c83f57228d3abd1ae37d55e7e7b
    Original-Change-Id: Ie340877e828ae760169ccfa9a7099e7472d2fc26
    Original-Signed-off-by: Shunqian Zheng <zhengsq at rock-chips.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/338944
    Original-Commit-Ready: Vadim Bendebury <vbendeb at chromium.org>
    Original-Tested-by: Vadim Bendebury <vbendeb at chromium.org>
    Original-Reviewed-by: Vadim Bendebury <vbendeb at chromium.org>
---
 src/soc/rockchip/rk3399/Makefile.inc        |  3 +++
 src/soc/rockchip/rk3399/include/soc/sdram.h | 15 +++++++++------
 src/soc/rockchip/rk3399/sdram.c             | 21 +++++++++++++++++++++
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/soc/rockchip/rk3399/Makefile.inc b/src/soc/rockchip/rk3399/Makefile.inc
index 957124e..718426b 100644
--- a/src/soc/rockchip/rk3399/Makefile.inc
+++ b/src/soc/rockchip/rk3399/Makefile.inc
@@ -26,6 +26,7 @@ bootblock-y += clock.c
 bootblock-y += timer.c
 
 verstage-y += ../common/cbmem.c
+verstage-y += sdram.c
 verstage-y += ../common/spi.c
 verstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c
 verstage-y += clock.c
@@ -34,6 +35,7 @@ verstage-y += timer.c
 ################################################################################
 
 romstage-y += ../common/cbmem.c
+romstage-y += sdram.c
 romstage-y += ../common/spi.c
 romstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c
 romstage-y += clock.c
@@ -43,6 +45,7 @@ romstage-y += romstage.c
 ################################################################################
 
 ramstage-y += ../common/cbmem.c
+ramstage-y += sdram.c
 ramstage-y += ../common/spi.c
 ramstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c
 ramstage-y += clock.c
diff --git a/src/soc/rockchip/rk3399/include/soc/sdram.h b/src/soc/rockchip/rk3399/include/soc/sdram.h
index 808393c..fb5d8cd 100644
--- a/src/soc/rockchip/rk3399/include/soc/sdram.h
+++ b/src/soc/rockchip/rk3399/include/soc/sdram.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the coreboot project.
  *
- * Copyright 2016 Google Inc.
+ * Copyright 2016 Rockchip Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,8 +13,11 @@
  * GNU General Public License for more details.
  */
 
-/* dummy until the RAM init implementation passed review */
-static int sdram_size_mb(void)
-{
-	return 0;
-}
+#ifndef __SOC_ROCKCHIP_RK3399_SDRAM_H__
+#define __SOC_ROCKCHIP_RK3399_SDRAM_H__
+
+#include <stddef.h>
+
+size_t sdram_size_mb(void);
+
+#endif
diff --git a/src/soc/rockchip/rk3399/sdram.c b/src/soc/rockchip/rk3399/sdram.c
new file mode 100644
index 0000000..00adc9e
--- /dev/null
+++ b/src/soc/rockchip/rk3399/sdram.c
@@ -0,0 +1,21 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2016 Rockchip Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <soc/sdram.h>
+
+size_t sdram_size_mb(void)
+{
+	return CONFIG_DRAM_SIZE_MB;
+}