diff options
| author | Tom Rini <trini@konsulko.com> | 2017-09-20 12:32:34 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-09-20 12:32:34 -0400 |
| commit | e884656c2c0b2406b9bf99ea76f5a8c75128a331 (patch) | |
| tree | 520d14bd1fdaed0adefc4209f53dc0d0d1467b67 /board/solidrun | |
| parent | 975f97b43181694041f77ecd8118364afe588144 (diff) | |
| parent | 031426a7af63d3c939fc963311e6dc8e904a0440 (diff) | |
Merge git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'board/solidrun')
| -rw-r--r-- | board/solidrun/mx6cuboxi/mx6cuboxi.c | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c index 986abc5772..1e4da4a6b1 100644 --- a/board/solidrun/mx6cuboxi/mx6cuboxi.c +++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c @@ -349,6 +349,7 @@ static bool is_hummingboard(void) * Machine selection - * Machine val1, val2 * ------------------------- + * HB2 x x * HB rev 3.x x 0 * CBi 0 1 * HB 1 1 @@ -362,9 +363,37 @@ static bool is_hummingboard(void) return true; } +static bool is_hummingboard2(void) +{ + int val1; + + SETUP_IOMUX_PADS(hb_cbi_sense); + + gpio_direction_input(IMX_GPIO_NR(2, 8)); + + val1 = gpio_get_value(IMX_GPIO_NR(2, 8)); + + /* + * Machine selection - + * Machine val1 + * ------------------- + * HB2 0 + * HB rev 3.x x + * CBi x + * HB x + */ + + if (val1 == 0) + return true; + else + return false; +} + int checkboard(void) { - if (is_hummingboard()) + if (is_hummingboard2()) + puts("Board: MX6 Hummingboard2\n"); + else if (is_hummingboard()) puts("Board: MX6 Hummingboard\n"); else puts("Board: MX6 Cubox-i\n"); @@ -375,7 +404,9 @@ int checkboard(void) int board_late_init(void) { #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - if (is_hummingboard()) + if (is_hummingboard2()) + env_set("board_name", "HUMMINGBOARD2"); + else if (is_hummingboard()) env_set("board_name", "HUMMINGBOARD"); else env_set("board_name", "CUBOXI"); |