diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2016-11-30 21:41:53 (GMT) |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2016-12-16 08:56:38 (GMT) |
| commit | 37fa41256bd756f3652e7479b976982092a4f9bc (patch) | |
| tree | 9c08803b3c6f224801c18a85e9d05a1462766ed5 /board/toradex/common | |
| parent | beaf40688ba7303e9db50558b3852c79437eecad (diff) | |
| download | u-boot-fsl-qoriq-37fa41256bd756f3652e7479b976982092a4f9bc.tar.xz | |
toradex: allow custom fdt board setup in board file
The config block support currently uses the ft_board_setup function
to patch the device tree with config block information. However, this
does not allow to patch the device tree with board specific information.
Rename the common setup function to ft_common_board_setup and use the
call it from the board files directly.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Diffstat (limited to 'board/toradex/common')
| -rw-r--r-- | board/toradex/common/tdx-common.c | 8 | ||||
| -rw-r--r-- | board/toradex/common/tdx-common.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c index d418055..2c6fc40 100644 --- a/board/toradex/common/tdx-common.c +++ b/board/toradex/common/tdx-common.c @@ -120,8 +120,8 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) } #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 */ diff --git a/board/toradex/common/tdx-common.h b/board/toradex/common/tdx-common.h index f308ebd..f8d78f0 100644 --- a/board/toradex/common/tdx-common.h +++ b/board/toradex/common/tdx-common.h @@ -10,4 +10,6 @@ #define TORADEX_USB_PRODUCT_NUM_OFFSET 0x4000 #define TDX_USB_VID 0x1B67 +int ft_common_board_setup(void *blob, bd_t *bd); + #endif /* _TDX_COMMON_H */ |