diff options
author | Tom Rini <trini@konsulko.com> | 2019-07-04 11:35:51 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-07-04 11:35:51 -0400 |
commit | de1214884495cd1f17a05c5ea708f7c53202b341 (patch) | |
tree | a7e75be06a2ceeada10c4375107496c877acc3a0 /board | |
parent | ca4491f2d2af93d8b77c48c5d272d88094fc06eb (diff) | |
parent | 4d981f5f27ab30af5e248245696b6a051c872ec4 (diff) |
Merge tag 'u-boot-imx-20190704' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
Fixes for 2019.07
-----------------
- Wandboard
Diffstat (limited to 'board')
-rw-r--r-- | board/wandboard/README | 2 | ||||
-rw-r--r-- | board/wandboard/wandboard.c | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/board/wandboard/README b/board/wandboard/README index e5170bcc812..f84f2053375 100644 --- a/board/wandboard/README +++ b/board/wandboard/README @@ -29,7 +29,7 @@ $ sudo dd if=SPL of=/dev/mmcblk0 bs=1k seek=1; sync - Flash the u-boot.img image into the SD card: -sudo dd if=u-boot.img of=/dev/mmcblk0 bs=1k seek=69; sync +sudo dd if=u-boot-dtb.img of=/dev/mmcblk0 bs=1k seek=69; sync - Insert the SD card into the slot located in the bottom of the board (same side as the mx6 processor) diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index 9d7a94ff9d9..74d7a17028b 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -500,3 +500,21 @@ int checkboard(void) return 0; } + +#ifdef CONFIG_SPL_LOAD_FIT +int board_fit_config_name_match(const char *name) +{ + if (is_mx6dq()) { + if (!strcmp(name, "imx6q-wandboard-revb1")) + return 0; + } else if (is_mx6dqp()) { + if (!strcmp(name, "imx6qp-wandboard-revd1")) + return 0; + } else if (is_mx6dl() || is_mx6solo()) { + if (!strcmp(name, "imx6dl-wandboard-revb1")) + return 0; + } + + return -EINVAL; +} +#endif |