diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2015-05-21 19:24:05 -0300 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-06-08 08:34:38 +0200 |
| commit | 9a8804a85e37d774419ee6452a90cc6e57d925f3 (patch) | |
| tree | 7e8adcad1447b586a5906862ee8f16c08a0bf0d2 /board | |
| parent | c0c5341e732b0c52190b2fd85bb6b94c5879dfd9 (diff) | |
| download | talos-obmc-uboot-9a8804a85e37d774419ee6452a90cc6e57d925f3.tar.gz talos-obmc-uboot-9a8804a85e37d774419ee6452a90cc6e57d925f3.zip | |
wandboard: Add board revision detection support
There are two revisions of wandboard: version B1 and C1.
Add the revision detection support, so that the correct dtb file can
be automatically loaded.
Based on the patch from Richard Hu <hakahu@gmail.com>.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Reviewed-by: Stefano Babic <sbabic@denx.de>
Tested-By: Vagrant Cascadian <vagrant@aikidev.net>
Diffstat (limited to 'board')
| -rw-r--r-- | board/wandboard/wandboard.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index 90625ab9e0..0af63d291f 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -50,6 +50,7 @@ DECLARE_GLOBAL_DATA_PTR; #define USDHC1_CD_GPIO IMX_GPIO_NR(1, 2) #define USDHC3_CD_GPIO IMX_GPIO_NR(3, 9) #define ETH_PHY_RESET IMX_GPIO_NR(3, 29) +#define REV_DETECTION IMX_GPIO_NR(2, 28) int dram_init(void) { @@ -105,6 +106,10 @@ static iomux_v3_cfg_t const enet_pads[] = { IOMUX_PADS(PAD_EIM_D29__GPIO3_IO29 | MUX_PAD_CTRL(NO_PAD_CTRL)), }; +static iomux_v3_cfg_t const rev_detection_pad[] = { + IOMUX_PADS(PAD_EIM_EB0__GPIO2_IO28 | MUX_PAD_CTRL(NO_PAD_CTRL)), +}; + static void setup_iomux_uart(void) { SETUP_IOMUX_PADS(uart1_pads); @@ -393,6 +398,17 @@ static const struct boot_mode board_boot_modes[] = { }; #endif +static bool is_revc1(void) +{ + SETUP_IOMUX_PADS(rev_detection_pad); + gpio_direction_input(REV_DETECTION); + + if (gpio_get_value(REV_DETECTION)) + return true; + else + return false; +} + int board_late_init(void) { #ifdef CONFIG_CMD_BMODE @@ -404,6 +420,11 @@ int board_late_init(void) setenv("board_rev", "MX6Q"); else setenv("board_rev", "MX6DL"); + + if (is_revc1()) + setenv("board_name", "C1"); + else + setenv("board_name", "B1"); #endif return 0; } @@ -424,7 +445,10 @@ int board_init(void) int checkboard(void) { - puts("Board: Wandboard\n"); + if (is_revc1()) + puts("Board: Wandboard rev C1\n"); + else + puts("Board: Wandboard rev B1\n"); return 0; } |
