erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

veyron*: sdram_get_ram_code() -> ram_code()

Browse source 
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

Signed-off-by: David Hendricks <dhendrix@chromium.org>
Change-Id: Ibc4c61687f1c59311cbf6b48371f9a9125dbe115
Reviewed-on: https://chromium-review.googlesource.com/227249
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
David Hendricks 2014-11-06 16:51:02 -08:00 • committed by chrome-internal-fetch
commit a325b204ff
6 changed files with 30 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/mainboard/google/veyron_jerry/Kconfig
View file

@ -27,6 +27,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_BOOTBLOCK_INIT

12
src/mainboard/google/veyron_jerry/boardid.c
View file

@ -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;
}

25
src/mainboard/google/veyron_jerry/sdram_configs.c
View file

@ -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)

1
src/mainboard/google/veyron_pinky/Kconfig
View file

@ -27,6 +27,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_BOOTBLOCK_INIT

12
src/mainboard/google/veyron_pinky/boardid.c
View file

@ -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;
}

25
src/mainboard/google/veyron_pinky/sdram_configs.c
View file

@ -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)