diff options
| author | Rong Chang <rongchang@chromium.org> | 2015-08-17 20:09:38 +0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-08-21 08:10:23 +0000 |
| commit | c2ebc9e4773c89847165f4ca877e4448604ddfd5 (patch) | |
| tree | d60be828a754f75eb1c850f39393cf37c53363da /board/oak_pd | |
| parent | 9f146c7b8ae350179c55b47f9311d392969c6515 (diff) | |
| download | chrome-ec-c2ebc9e4773c89847165f4ca877e4448604ddfd5.tar.gz | |
oak: use EXTRA_CLFAGS instead of CONFIG_BOARD_OAK_REV
Oak board revisions are not global configs. Move them out of
include/config.h . This change also makes it easier to build EC
and PD image for different board revisions.
BRANCH=none
BUG=none
TEST=manual
build for board revision n and load on oak:
make BOARD=oak clean
make BOARD=oak_pd claen
make EXTRA_CFLAGS=-DBOARD_REV=n BOARD=oak -j
make EXTRA_CFLAGS=-DBOARD_REV=n BOARD=oak_pd -j
Change-Id: I331b4c5a1af94b179d7c6f7878a9c3939ea6025a
Signed-off-by: Rong Chang <rongchang@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/294441
Reviewed-by: Shawn N <shawnn@chromium.org>
Diffstat (limited to 'board/oak_pd')
| -rw-r--r-- | board/oak_pd/board.h | 4 | ||||
| l--------- | board/oak_pd/board_revs.h | 1 | ||||
| -rw-r--r-- | board/oak_pd/gpio.inc | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/board/oak_pd/board.h b/board/oak_pd/board.h index 945dd2f57e..c2c1818323 100644 --- a/board/oak_pd/board.h +++ b/board/oak_pd/board.h @@ -8,9 +8,7 @@ #ifndef __CROS_EC_BOARD_H #define __CROS_EC_BOARD_H -#undef CONFIG_BOARD_OAK_REV_1 -#define CONFIG_BOARD_OAK_REV_2 -#undef CONFIG_BOARD_OAK_REV_3 +#include "board_revs.h" /* * The flash size is only 32kB. diff --git a/board/oak_pd/board_revs.h b/board/oak_pd/board_revs.h new file mode 120000 index 0000000000..1d25900dd9 --- /dev/null +++ b/board/oak_pd/board_revs.h @@ -0,0 +1 @@ +../oak/board_revs.h
\ No newline at end of file diff --git a/board/oak_pd/gpio.inc b/board/oak_pd/gpio.inc index e5d0c67924..228c37bea3 100644 --- a/board/oak_pd/gpio.inc +++ b/board/oak_pd/gpio.inc @@ -42,7 +42,7 @@ GPIO(USB_C1_CC2_ODL, PIN(A, 8), GPIO_ODR_LOW) GPIO(SLAVE_I2C_SCL, PIN(B, 6), GPIO_INPUT) GPIO(SLAVE_I2C_SDA, PIN(B, 7), GPIO_INPUT) -#ifdef CONFIG_OAK_BOARD_REV_1 +#if BOARD_REV == OAK_REV1 GPIO(EC_INT, PIN(A, 14), GPIO_OUT_HIGH) #else GPIO(EC_INT, PIN(B, 5), GPIO_OUT_HIGH) |