9 files changed, 70 insertions, 36 deletions
diff --git a/src/mainboard/google/gru/Makefile.inc b/src/mainboard/google/gru/Makefile.inc
index a0839e0207..07b27a760b 100644
--- a/src/mainboard/google/gru/Makefile.inc
+++ b/src/mainboard/google/gru/Makefile.inc
@@ -13,6 +13,8 @@
 ## GNU General Public License for more details.
 ##
 
+subdirs-y += sdram_params/
+
 bootblock-y += bootblock.c
 bootblock-y += chromeos.c
 bootblock-y += memlayout.ld
diff --git a/src/mainboard/google/gru/sdram_configs.c b/src/mainboard/google/gru/sdram_configs.c
index f34ebf182c..2ececdfd03 100644
--- a/src/mainboard/google/gru/sdram_configs.c
+++ b/src/mainboard/google/gru/sdram_configs.c
@@ -15,31 +15,24 @@
 
 #include <arch/io.h>
 #include <boardid.h>
+#include <cbfs.h>
 #include <console/console.h>
 #include <gpio.h>
 #include <soc/sdram.h>
 #include <string.h>
 #include <types.h>
 
-static struct rk3399_sdram_params sdram_configs[] = {
-#include "sdram_inf/sdram-lpddr3-hynix-4GB-200.inc"
-
-/* 666MHz, enable odt 120o */
-#include "sdram_inf/sdram-lpddr3-hynix-4GB-666.inc"
-
-/* 800MHz, enable odt 120o */
-#include "sdram_inf/sdram-lpddr3-hynix-4GB-800.inc"
-
-/* 666MHz, disable odt */
-#include "sdram_inf/sdram-lpddr3-hynix-4GB-666-no-odt.inc"
-
-/* 800MHz, disable odt */
-#include "sdram_inf/sdram-lpddr3-hynix-4GB-800-no-odt.inc"
-
-/* 933MHz, enable odt 120o */
-#include "sdram_inf/sdram-lpddr3-hynix-4GB-933.inc"
+static const char *sdram_configs[] = {
+	"sdram-lpddr3-hynix-4GB-200",
+	"sdram-lpddr3-hynix-4GB-666",
+	"sdram-lpddr3-hynix-4GB-800",
+	"sdram-lpddr3-hynix-4GB-666-no-odt",
+	"sdram-lpddr3-hynix-4GB-800-no-odt",
+	"sdram-lpddr3-hynix-4GB-933",
 };
 
+static struct rk3399_sdram_params params;
+
 enum dram_speeds {
 	dram_200MHz = 0,
 	dram_666MHz = 1,
@@ -80,11 +73,8 @@ static enum dram_speeds get_sdram_index(void)
 
 const struct rk3399_sdram_params *get_sdram_config()
 {
-
-	enum dram_speeds speed = get_sdram_index();
-
-	printk(BIOS_INFO, "Using SDRAM configuration for %d MHz\n",
-	       sdram_configs[speed].ddr_freq / (1000 * 1000));
-
-	return &sdram_configs[speed];
+	if (cbfs_boot_load_struct(sdram_configs[get_sdram_index()],
+				  &params, sizeof(params)) != sizeof(params))
+		die("Cannot load SDRAM parameter file!");
+	return &params;
 }
diff --git a/src/mainboard/google/gru/sdram_params/Makefile.inc b/src/mainboard/google/gru/sdram_params/Makefile.inc
new file mode 100644
index 0000000000..a05cf79159
--- /dev/null
+++ b/src/mainboard/google/gru/sdram_params/Makefile.inc
@@ -0,0 +1,30 @@
+##
+## 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.
+##
+
+sdram-params :=
+
+sdram-params += sdram-lpddr3-hynix-4GB-200
+sdram-params += sdram-lpddr3-hynix-4GB-666
+sdram-params += sdram-lpddr3-hynix-4GB-666-no-odt
+sdram-params += sdram-lpddr3-hynix-4GB-800
+sdram-params += sdram-lpddr3-hynix-4GB-800-no-odt
+sdram-params += sdram-lpddr3-hynix-4GB-933
+
+$(foreach params,$(sdram-params), \
+	$(eval cbfs-files-y += $(params)) \
+	$(eval $(params)-file := $(params).c:struct) \
+	$(eval $(params)-type := struct) \
+	$(eval $(params)-compression := $(CBFS_COMPRESS_FLAG)) \
+)
diff --git a/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-200.inc b/src/mainboard/google/gru/sdram_params/sdram-lpddr3-hynix-4GB-200.c
index 253364097d..dda6d98449 100644
--- a/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-200.inc
+++ b/src/mainboard/google/gru/sdram_params/sdram-lpddr3-hynix-4GB-200.c
@@ -11,7 +11,9 @@
  * GNU General Public License for more details.
  */
 
-{
+#include <soc/sdram.h>
+
+struct rk3399_sdram_params params = {
 	{
 		{
 			.rank = 0x2,
@@ -1560,4 +1562,4 @@
 			0x00000000	/* DENALI_PHY_958_DATA */
 		}
 	},
-},
+};
diff --git a/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-666-no-odt.inc b/src/mainboard/google/gru/sdram_params/sdram-lpddr3-hynix-4GB-666-no-odt.c
index dc5a78f6bd..9b0bfe7fd1 100644
--- a/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-666-no-odt.inc
+++ b/src/mainboard/google/gru/sdram_params/sdram-lpddr3-hynix-4GB-666-no-odt.c
@@ -11,7 +11,9 @@
  * GNU General Public License for more details.
  */
 
-{
+#include <soc/sdram.h>
+
+struct rk3399_sdram_params params = {
 	{
 		{
 			.rank = 0x2,
@@ -1560,4 +1562,4 @@
 			0x00000000	/* DENALI_PHY_958_DATA */
 		}
 	},
-},
+};
diff --git a/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-666.inc b/src/mainboard/google/gru/sdram_params/sdram-lpddr3-hynix-4GB-666.c
index 96c1cb8991..d5d67611dd 100644
--- a/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-666.inc
+++ b/src/mainboard/google/gru/sdram_params/sdram-lpddr3-hynix-4GB-666.c
@@ -11,7 +11,9 @@
  * GNU General Public License for more details.
  */
 
-{
+#include <soc/sdram.h>
+
+struct rk3399_sdram_params params = {
 	{
 		{
 			.rank = 0x2,
@@ -1560,4 +1562,4 @@
 			0x00000000	/* DENALI_PHY_958_DATA */
 		}
 	},
-},
+};
diff --git a/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-800-no-odt.inc b/src/mainboard/google/gru/sdram_params/sdram-lpddr3-hynix-4GB-800-no-odt.c
index 4b02679611..866759b772 100644
--- a/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-800-no-odt.inc
+++ b/src/mainboard/google/gru/sdram_params/sdram-lpddr3-hynix-4GB-800-no-odt.c
@@ -11,7 +11,9 @@
  * GNU General Public License for more details.
  */
 
-{
+#include <soc/sdram.h>
+
+struct rk3399_sdram_params params = {
 	{
 		{
 			.rank = 0x2,
@@ -1560,4 +1562,4 @@
 			0x00000000	/* DENALI_PHY_958_DATA */
 		}
 	},
-},
+};
diff --git a/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-800.inc b/src/mainboard/google/gru/sdram_params/sdram-lpddr3-hynix-4GB-800.c
index f4a9b3dfd7..3a937bff7d 100644
--- a/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-800.inc
+++ b/src/mainboard/google/gru/sdram_params/sdram-lpddr3-hynix-4GB-800.c
@@ -11,7 +11,9 @@
  * GNU General Public License for more details.
  */
 
-{
+#include <soc/sdram.h>
+
+struct rk3399_sdram_params params = {
 	{
 		{
 			.rank = 0x2,
@@ -1560,4 +1562,4 @@
 			0x00000000	/* DENALI_PHY_958_DATA */
 		}
 	},
-},
+};
diff --git a/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-933.inc b/src/mainboard/google/gru/sdram_params/sdram-lpddr3-hynix-4GB-933.c
index fe1949e526..2ef9d0c593 100644
--- a/src/mainboard/google/gru/sdram_inf/sdram-lpddr3-hynix-4GB-933.inc
+++ b/src/mainboard/google/gru/sdram_params/sdram-lpddr3-hynix-4GB-933.c
@@ -11,7 +11,9 @@
  * GNU General Public License for more details.
  */
 
-{
+#include <soc/sdram.h>
+
+struct rk3399_sdram_params params = {
 	{
 		{
 			.rank = 0x2,
@@ -1560,4 +1562,4 @@
 			0x00000000	/* DENALI_PHY_958_DATA */
 		}
 	},
-},
+};