diff options
| author | Tom Rini <trini@konsulko.com> | 2016-12-18 13:54:25 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-12-18 17:43:20 -0500 |
| commit | 8ea05705a70135a94419b0d243666c1b51fe1f8d (patch) | |
| tree | 495da728ccebe411445c144fb88ba35041db2096 /board/toradex/colibri_imx7/colibri_imx7.c | |
| parent | 0b4bc1b3ab1850fccbade3e6103f2036f6bdb364 (diff) | |
| parent | 854bb75be98ad792ff64c26ae38a1392ea185cd6 (diff) | |
| download | u-boot-imx-8ea05705a70135a94419b0d243666c1b51fe1f8d.zip u-boot-imx-8ea05705a70135a94419b0d243666c1b51fe1f8d.tar.gz u-boot-imx-8ea05705a70135a94419b0d243666c1b51fe1f8d.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Migrate CONFIG_ARCH_USE_MEMSET/MEMCPY with this merge.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'board/toradex/colibri_imx7/colibri_imx7.c')
| -rw-r--r-- | board/toradex/colibri_imx7/colibri_imx7.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c index c64e31e..e1340c3 100644 --- a/board/toradex/colibri_imx7/colibri_imx7.c +++ b/board/toradex/colibri_imx7/colibri_imx7.c @@ -24,6 +24,7 @@ #include <power/pmic.h> #include <power/rn5t567_pmic.h> #include <usb/ehci-ci.h> +#include "../common/tdx-common.h" DECLARE_GLOBAL_DATA_PTR; @@ -387,6 +388,13 @@ int checkboard(void) return 0; } +#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) +int ft_board_setup(void *blob, bd_t *bd) +{ + return ft_common_board_setup(blob, bd); +} +#endif + #ifdef CONFIG_USB_EHCI_MX7 static iomux_v3_cfg_t const usb_otg2_pads[] = { MX7D_PAD_UART3_CTS_B__USB_OTG2_PWR | MUX_PAD_CTRL(NO_PAD_CTRL), |