[coreboot-gerrit] New patch to review for coreboot: f1479e2 rk3288: add media

[Patrick Georgi (pgeorgi@google.com)]

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

-gerrit

commit f1479e2c1245e492550493e319ac9e62c86a6f3c
Author: huang lin <hl at rock-chips.com>
Date:   Wed Jul 30 10:58:37 2014 -0700

    rk3288: add media
    
    BUG=chrome-os-partner:29778
    TEST=Build coreboot
    
    Change-Id: I74b30ecfe40c039855b835db0dfd0cd25adf960e
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: a30378a3152c930029a5b170cc6bf46180b5c7b8
    Original-Change-Id: I5105e5277b8072c06bb41b39479373697ef81c67
    Original-Signed-off-by: Jeffy Chen <jeffy.chen at rock-chips.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/209468
    Original-Reviewed-by: David Hendricks <dhendrix at chromium.org>
    Original-Reviewed-by: Julius Werner <jwerner at chromium.org>
    Original-Tested-by: Lin Huang <hl at rock-chips.com>
    Original-Commit-Queue: Julius Werner <jwerner at chromium.org>
---
 src/soc/rockchip/rk3288/Makefile.inc |  2 +-
 src/soc/rockchip/rk3288/media.c      | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/soc/rockchip/rk3288/Makefile.inc b/src/soc/rockchip/rk3288/Makefile.inc
index 05003a2..e0f3224 100644
--- a/src/soc/rockchip/rk3288/Makefile.inc
+++ b/src/soc/rockchip/rk3288/Makefile.inc
@@ -31,10 +31,10 @@ bootblock-y += spi.c
 romstage-y += cbmem.c
 romstage-y += timer.c
 romstage-y += monotonic_timer.c
-romstage-y += media.c
 romstage-$(CONFIG_DRIVERS_UART) += uart.c
 romstage-y += clock.c
 romstage-y += spi.c
+romstage-y += media.c
 
 ramstage-y += cbmem.c
 ramstage-y += timer.c
diff --git a/src/soc/rockchip/rk3288/media.c b/src/soc/rockchip/rk3288/media.c
index 75713eb..1389eb2 100644
--- a/src/soc/rockchip/rk3288/media.c
+++ b/src/soc/rockchip/rk3288/media.c
@@ -20,8 +20,17 @@
 #include <cbfs.h>
 #include <string.h>
 #include <console/console.h>
+#include "soc/rockchip/rk3288/spi.h"
 
 int init_default_cbfs_media(struct cbfs_media *media)
 {
-	return 0;
+#if defined(__BOOT_BLOCK__)
+	return initialize_rockchip_spi_cbfs_media(media,
+		(void *)CONFIG_CBFS_SRAM_CACHE_ADDRESS,
+		CONFIG_CBFS_SRAM_CACHE_SIZE);
+#else
+	return initialize_rockchip_spi_cbfs_media(media,
+		(void *)CONFIG_CBFS_DRAM_CACHE_ADDRESS,
+		CONFIG_CBFS_DRAM_CACHE_SIZE);
+#endif
 }