From 72001e79e9856488d38c0cb176820a70fbd5578e Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Wed, 10 Sep 2014 15:30:49 -0700 Subject: [PATCH] veyron_pinky: Add board ID support This patch adds code to read the board ID from Pinky and put it into the coreboot table. (Note: This implementation differs slightly from Tegra since it pinmuxes the GPIOs inside board_id(). That means the pinmuxing might be set more than once if called in multiple stages, which is perfectly harmless and in my opinion cleaner than having to (remember to) do it manually in one of the per-stage files.) BUG=chrome-os-partner:30167 TEST=With depthcharge patch, select -rev1 device tree for board ID 0. Change-Id: I265fafcb176a31a46f7792ecf352f1671be7dd41 Signed-off-by: Patrick Georgi Original-Commit-Id: 9da10ce8b62ec98243fc7c82544b3004316799a8 Original-Change-Id: I5b5689373e1e47b1e0944b5fe5f2e70a285b931f Original-Signed-off-by: Julius Werner Original-Reviewed-on: https://chromium-review.googlesource.com/217675 Original-Reviewed-by: David Hendricks Reviewed-on: http://review.coreboot.org/8870 Reviewed-by: Stefan Reinauer Tested-by: build bot (Jenkins) --- src/mainboard/google/veyron_pinky/Kconfig | 1 + .../google/veyron_pinky/Makefile.inc | 3 +- src/mainboard/google/veyron_pinky/boardid.c | 48 +++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 src/mainboard/google/veyron_pinky/boardid.c diff --git a/src/mainboard/google/veyron_pinky/Kconfig b/src/mainboard/google/veyron_pinky/Kconfig index ae616c7abc..56537575a9 100644 --- a/src/mainboard/google/veyron_pinky/Kconfig +++ b/src/mainboard/google/veyron_pinky/Kconfig @@ -21,6 +21,7 @@ if BOARD_GOOGLE_VEYRON_PINKY config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select BOARD_ID_SUPPORT select CHROMEOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI diff --git a/src/mainboard/google/veyron_pinky/Makefile.inc b/src/mainboard/google/veyron_pinky/Makefile.inc index 0b0e328ec8..3ae8763907 100644 --- a/src/mainboard/google/veyron_pinky/Makefile.inc +++ b/src/mainboard/google/veyron_pinky/Makefile.inc @@ -20,8 +20,9 @@ romstage-y += romstage.c romstage-y += chromeos.c romstage-y += sdram_configs.c + +ramstage-y += boardid.c ramstage-y += chromeos.c ramstage-y += mainboard.c -ramstage-y += chromeos.c ramstage-y += pmic.c diff --git a/src/mainboard/google/veyron_pinky/boardid.c b/src/mainboard/google/veyron_pinky/boardid.c new file mode 100644 index 0000000000..ca446a18ae --- /dev/null +++ b/src/mainboard/google/veyron_pinky/boardid.c @@ -0,0 +1,48 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2014 Google 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include +#include + +#include + +uint8_t board_id(void) +{ + static int id = -1; + static const gpio_t pins[] = { + { .port = 2, .bank = GPIO_A, .idx = 0 }, + { .port = 2, .bank = GPIO_A, .idx = 1 }, + { .port = 2, .bank = GPIO_A, .idx = 2 }, + { .port = 2, .bank = GPIO_A, .idx = 7 }, + }; + + if (id < 0) { + int i; + + id = 0; + for (i = 0; i < ARRAY_SIZE(pins); i++) { + gpio_input(pins[i]); + id |= gpio_get_in_value(pins[i]) << i; + } + printk(BIOS_SPEW, "Board ID: %#x.\n", id); + } + + return id; +}