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/common/tdx-common.c | |
| parent | 0b4bc1b3ab1850fccbade3e6103f2036f6bdb364 (diff) | |
| parent | 854bb75be98ad792ff64c26ae38a1392ea185cd6 (diff) | |
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/common/tdx-common.c')
| -rw-r--r-- | board/toradex/common/tdx-common.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c index f1ab7946773..2c6fc409c10 100644 --- a/board/toradex/common/tdx-common.c +++ b/board/toradex/common/tdx-common.c @@ -108,7 +108,7 @@ int show_board_info(void) return 0; } -#ifdef CONFIG_USBDOWNLOAD_GADGET +#ifdef CONFIG_USB_GADGET_DOWNLOAD int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) { unsigned short usb_pid; @@ -118,10 +118,10 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) return 0; } -#endif /* CONFIG_USBDOWNLOAD_GADGET */ +#endif -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) -int ft_board_setup(void *blob, bd_t *bd) +#if defined(CONFIG_OF_LIBFDT) +int ft_common_board_setup(void *blob, bd_t *bd) { if (tdx_serial) { fdt_setprop(blob, 0, "serial-number", tdx_serial_str, @@ -158,11 +158,9 @@ u32 get_board_serial(void) } #endif /* CONFIG_SERIAL_TAG */ -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) -int ft_board_setup(void *blob, bd_t *bd) +int ft_common_board_setup(void *blob, bd_t *bd) { return 0; } -#endif #endif /* CONFIG_TDX_CFG_BLOCK */ |