summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin K Wong <kevin.k.wong@intel.com>2015-05-21 14:08:27 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-05-27 19:40:05 +0000
commit11df27d5f7335f96affb689899758f2adbac4d0d (patch)
treec2d9000aac5a288b3468724cafd1168c7297f84e
parent1b2f6b64510c061ddabd8d6a3d5e01fc71a68712 (diff)
downloadchrome-ec-11df27d5f7335f96affb689899758f2adbac4d0d.tar.gz
cyan: Added board version support.
BUG=none TEST=Verified correct board version is returned via "version" console command. BRANCH=none Change-Id: I97cf9911e3279ea7b6ad2f3bb383cde43c5114ba Signed-off-by: Kevin K Wong <kevin.k.wong@intel.com> Reviewed-on: https://chromium-review.googlesource.com/272985 Reviewed-by: Shawn N <shawnn@chromium.org>
-rw-r--r--board/cyan/board.h1
-rw-r--r--board/cyan/gpio.inc6
2 files changed, 4 insertions, 3 deletions
diff --git a/board/cyan/board.h b/board/cyan/board.h
index 320aa798a0..7dceea0f73 100644
--- a/board/cyan/board.h
+++ b/board/cyan/board.h
@@ -11,6 +11,7 @@
/* Optional features */
#define CONFIG_SYSTEM_UNLOCKED /* Allow dangerous commands */
#define CONFIG_WATCHDOG_HELP
+#define CONFIG_BOARD_VERSION
#define CONFIG_CLOCK_CRYSTAL
#define CONFIG_CHIPSET_BRASWELL
#define CONFIG_SCI_GPIO GPIO_PCH_SCI_L
diff --git a/board/cyan/gpio.inc b/board/cyan/gpio.inc
index ab3410b33c..a93562b22a 100644
--- a/board/cyan/gpio.inc
+++ b/board/cyan/gpio.inc
@@ -18,7 +18,7 @@ GPIO(NC_012, PIN(12), GPIO_INPUT | GPIO_PULL_UP) /* NC */
GPIO(USB_ILIM_SEL, PIN(13), GPIO_OUT_HIGH) /* USB current control */
GPIO(I2C0_0_SCL, PIN(15), GPIO_ODR_HIGH)
GPIO(I2C0_0_SDA, PIN(16), GPIO_ODR_HIGH)
-GPIO(BOARD_ID2, PIN(17), GPIO_INPUT) /* Board ID */
+GPIO(BOARD_VERSION3, PIN(17), GPIO_INPUT) /* Board ID */
GPIO(I2C2_SCL, PIN(20), GPIO_ODR_HIGH)
GPIO(I2C2_SDA, PIN(21), GPIO_ODR_HIGH)
@@ -66,7 +66,7 @@ GPIO(GYRO_INT2, PIN(127), GPIO_INT_FALLING) /* Gyro senso
GPIO(NC_132, PIN(132), GPIO_INPUT | GPIO_PULL_UP) /* NC */
GPIO(BAT_LED0_L, PIN(133), GPIO_ODR_HIGH) /* Battery charging LED - blue */
-GPIO(BOARD_ID1, PIN(134), GPIO_INPUT) /* Board ID */
+GPIO(BOARD_VERSION2, PIN(134), GPIO_INPUT) /* Board ID */
GPIO(WWAN_PWREN, PIN(135), GPIO_OUT_HIGH) /* Enable power for WWAN - PROBE_DETECT_L */
GPIO(BAT_LED1_L, PIN(136), GPIO_ODR_HIGH) /* Battery charging LED - orange */
@@ -80,7 +80,7 @@ GPIO(EC_KBD_ALERT, PIN(147), GPIO_OUT_HIGH)
GPIO(WLAN_OFF_L, PIN(150), GPIO_ODR_HIGH) /* Wireless LAN */
GPIO(CPU_PROCHOT, PIN(151), GPIO_OUT_LOW)
GPIO(KBD_IRQ_L, PIN(152), GPIO_ODR_HIGH) /* Negative edge triggered irq. */
-GPIO(BOARD_ID0, PIN(154), GPIO_INPUT) /* Board ID */
+GPIO(BOARD_VERSION1, PIN(154), GPIO_INPUT) /* Board ID */
GPIO(CORE_PWROK, PIN(155), GPIO_ODR_HIGH) /* CORE_PWR_OK_R */
GPIO(LID_OPEN2, PIN(156), GPIO_INT_BOTH_DSLEEP) /* LID_OPEN_OUT2_R */
GPIO(PCH_SUSPWRDNACK, PIN(157), GPIO_INT_FALLING) /* PMC SUSPWRDNACK signal from SOC to EC */