[coreboot-gerrit] Patch set updated for coreboot: d9ab699 veyron*: sdram_get_ram_code() -> ram_code()
Patrick Georgi (pgeorgi@google.com)
gerrit at coreboot.org
Fri Apr 10 17:26:41 CEST 2015
Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9549
-gerrit
commit d9ab6991d44934fcc63bbe4f37f78a12b27154e8
Author: David Hendricks <dhendrix at chromium.org>
Date: Thu Nov 6 16:51:02 2014 -0800
veyron*: sdram_get_ram_code() -> ram_code()
This enables RAM_CODE_SUPPORT for veyron* platforms and uses the
generic gpio_get_binaries() function to read RAM_ID GPIOs.
BUG=chrome-os-partner:31728
BRANCH=none
TEST=built and booted on pinky
Change-Id: I7a03e42a270bec7036004375d36734bfdfe6e528
Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
Original-Commit-Id: a325b204ff88131dfb0bdd3dfedb3c007cd98010
Original-Signed-off-by: David Hendricks <dhendrix at chromium.org>
Original-Change-Id: Ibc4c61687f1c59311cbf6b48371f9a9125dbe115
Original-Reviewed-on: https://chromium-review.googlesource.com/227249
Original-Reviewed-by: Julius Werner <jwerner at chromium.org>
---
src/mainboard/google/veyron_jerry/Kconfig | 1 +
src/mainboard/google/veyron_jerry/boardid.c | 12 +++++++++++
src/mainboard/google/veyron_jerry/sdram_configs.c | 25 ++---------------------
src/mainboard/google/veyron_pinky/Kconfig | 1 +
src/mainboard/google/veyron_pinky/boardid.c | 12 +++++++++++
src/mainboard/google/veyron_pinky/sdram_configs.c | 25 ++---------------------
6 files changed, 30 insertions(+), 46 deletions(-)
diff --git a/src/mainboard/google/veyron_jerry/Kconfig b/src/mainboard/google/veyron_jerry/Kconfig
index 14c9f5c..d76e044 100644
--- a/src/mainboard/google/veyron_jerry/Kconfig
+++ b/src/mainboard/google/veyron_jerry/Kconfig
@@ -25,6 +25,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_SPI
select EC_SOFTWARE_SYNC
+ select RAM_CODE_SUPPORT
select SOC_ROCKCHIP_RK3288
select MAINBOARD_DO_NATIVE_VGA_INIT
select MAINBOARD_HAS_CHROMEOS
diff --git a/src/mainboard/google/veyron_jerry/boardid.c b/src/mainboard/google/veyron_jerry/boardid.c
index 66de276..513754f 100644
--- a/src/mainboard/google/veyron_jerry/boardid.c
+++ b/src/mainboard/google/veyron_jerry/boardid.c
@@ -35,3 +35,15 @@ uint8_t board_id(void)
return id;
}
+
+uint32_t ram_code(void)
+{
+ uint32_t code;
+ static gpio_t pins[] = {[3] = GPIO(8, A, 3), [2] = GPIO(8, A, 2),
+ [1] = GPIO(8, A, 1), [0] = GPIO(8, A, 0)}; /* GPIO8_A0 is LSB */
+
+ code = gpio_base2_value(pins, ARRAY_SIZE(pins));
+ printk(BIOS_SPEW, "RAM Config: %u.\n", code);
+
+ return code;
+}
diff --git a/src/mainboard/google/veyron_jerry/sdram_configs.c b/src/mainboard/google/veyron_jerry/sdram_configs.c
index a58c6dd..3593758 100644
--- a/src/mainboard/google/veyron_jerry/sdram_configs.c
+++ b/src/mainboard/google/veyron_jerry/sdram_configs.c
@@ -17,6 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <arch/io.h>
+#include <boardid.h>
#include <console/console.h>
#include <gpio.h>
#include <soc/sdram.h>
@@ -42,31 +43,9 @@ static struct rk3288_sdram_params sdram_configs[] = {
#include "sdram_inf/sdram-unused.inc" /* ram_code = 1111 */
};
-#define GPIO_RAMCODE0 GPIO(8, A, 0)
-#define GPIO_RAMCODE1 GPIO(8, A, 1)
-#define GPIO_RAMCODE2 GPIO(8, A, 2)
-#define GPIO_RAMCODE3 GPIO(8, A, 3)
-
-u32 sdram_get_ram_code(void)
-{
- u32 code = 0;
-
- gpio_input(GPIO_RAMCODE0);
- gpio_input(GPIO_RAMCODE1);
- gpio_input(GPIO_RAMCODE2);
- gpio_input(GPIO_RAMCODE3);
-
- code = gpio_get(GPIO_RAMCODE3) << 3
- | gpio_get(GPIO_RAMCODE2) << 2
- | gpio_get(GPIO_RAMCODE1) << 1
- | gpio_get(GPIO_RAMCODE0) << 0;
-
- return code;
-}
-
const struct rk3288_sdram_params *get_sdram_config()
{
- u32 ramcode = sdram_get_ram_code();
+ u32 ramcode = ram_code();
if (ramcode >= ARRAY_SIZE(sdram_configs)
|| sdram_configs[ramcode].dramtype == UNUSED)
diff --git a/src/mainboard/google/veyron_pinky/Kconfig b/src/mainboard/google/veyron_pinky/Kconfig
index 7c4f084..daef732 100644
--- a/src/mainboard/google/veyron_pinky/Kconfig
+++ b/src/mainboard/google/veyron_pinky/Kconfig
@@ -25,6 +25,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_SPI
select EC_SOFTWARE_SYNC
+ select RAM_CODE_SUPPORT
select SOC_ROCKCHIP_RK3288
select MAINBOARD_DO_NATIVE_VGA_INIT
select MAINBOARD_HAS_CHROMEOS
diff --git a/src/mainboard/google/veyron_pinky/boardid.c b/src/mainboard/google/veyron_pinky/boardid.c
index 66de276..513754f 100644
--- a/src/mainboard/google/veyron_pinky/boardid.c
+++ b/src/mainboard/google/veyron_pinky/boardid.c
@@ -35,3 +35,15 @@ uint8_t board_id(void)
return id;
}
+
+uint32_t ram_code(void)
+{
+ uint32_t code;
+ static gpio_t pins[] = {[3] = GPIO(8, A, 3), [2] = GPIO(8, A, 2),
+ [1] = GPIO(8, A, 1), [0] = GPIO(8, A, 0)}; /* GPIO8_A0 is LSB */
+
+ code = gpio_base2_value(pins, ARRAY_SIZE(pins));
+ printk(BIOS_SPEW, "RAM Config: %u.\n", code);
+
+ return code;
+}
diff --git a/src/mainboard/google/veyron_pinky/sdram_configs.c b/src/mainboard/google/veyron_pinky/sdram_configs.c
index a58c6dd..3593758 100644
--- a/src/mainboard/google/veyron_pinky/sdram_configs.c
+++ b/src/mainboard/google/veyron_pinky/sdram_configs.c
@@ -17,6 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <arch/io.h>
+#include <boardid.h>
#include <console/console.h>
#include <gpio.h>
#include <soc/sdram.h>
@@ -42,31 +43,9 @@ static struct rk3288_sdram_params sdram_configs[] = {
#include "sdram_inf/sdram-unused.inc" /* ram_code = 1111 */
};
-#define GPIO_RAMCODE0 GPIO(8, A, 0)
-#define GPIO_RAMCODE1 GPIO(8, A, 1)
-#define GPIO_RAMCODE2 GPIO(8, A, 2)
-#define GPIO_RAMCODE3 GPIO(8, A, 3)
-
-u32 sdram_get_ram_code(void)
-{
- u32 code = 0;
-
- gpio_input(GPIO_RAMCODE0);
- gpio_input(GPIO_RAMCODE1);
- gpio_input(GPIO_RAMCODE2);
- gpio_input(GPIO_RAMCODE3);
-
- code = gpio_get(GPIO_RAMCODE3) << 3
- | gpio_get(GPIO_RAMCODE2) << 2
- | gpio_get(GPIO_RAMCODE1) << 1
- | gpio_get(GPIO_RAMCODE0) << 0;
-
- return code;
-}
-
const struct rk3288_sdram_params *get_sdram_config()
{
- u32 ramcode = sdram_get_ram_code();
+ u32 ramcode = ram_code();
if (ramcode >= ARRAY_SIZE(sdram_configs)
|| sdram_configs[ramcode].dramtype == UNUSED)
More information about the coreboot-gerrit
mailing list