diff options
| author | Tom Rini <trini@ti.com> | 2014-11-25 11:08:52 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-26 11:21:14 -0500 |
| commit | 1fc4e6f486cc1e9d2dcf0ba86e6021c3d83dce51 (patch) | |
| tree | 9e96deb4b36a251fab92533bc6e8d7ffb58893eb /board/compulab | |
| parent | 94092e361cfa9461d746e530ca97d8822f5d23f0 (diff) | |
| parent | 933cdbb479aa87dcb6e3e333c3d1e04b0e7de1ec (diff) | |
| download | u-boot-imx-1fc4e6f486cc1e9d2dcf0ba86e6021c3d83dce51.zip u-boot-imx-1fc4e6f486cc1e9d2dcf0ba86e6021c3d83dce51.tar.gz u-boot-imx-1fc4e6f486cc1e9d2dcf0ba86e6021c3d83dce51.tar.bz2 | |
Merge git://git.denx.de/u-boot-fdt
Diffstat (limited to 'board/compulab')
| -rw-r--r-- | board/compulab/cm_fx6/cm_fx6.c | 4 | ||||
| -rw-r--r-- | board/compulab/cm_t54/cm_t54.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index 09e285b..84e3643 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -458,7 +458,7 @@ int cm_fx6_setup_ecspi(void) { return 0; } #endif #ifdef CONFIG_OF_BOARD_SETUP -void ft_board_setup(void *blob, bd_t *bd) +int ft_board_setup(void *blob, bd_t *bd) { uint8_t enetaddr[6]; @@ -467,6 +467,8 @@ void ft_board_setup(void *blob, bd_t *bd) fdt_find_and_setprop(blob, "/fec", "local-mac-address", enetaddr, 6, 1); } + + return 0; } #endif diff --git a/board/compulab/cm_t54/cm_t54.c b/board/compulab/cm_t54/cm_t54.c index b1a067d..2c2530a 100644 --- a/board/compulab/cm_t54/cm_t54.c +++ b/board/compulab/cm_t54/cm_t54.c @@ -121,7 +121,7 @@ int board_mmc_init(bd_t *bis) #ifdef CONFIG_USB_HOST_ETHER -void ft_board_setup(void *blob, bd_t *bd) +int ft_board_setup(void *blob, bd_t *bd) { uint8_t enetaddr[6]; @@ -130,6 +130,8 @@ void ft_board_setup(void *blob, bd_t *bd) fdt_find_and_setprop(blob, "/smsc95xx@0", "mac-address", enetaddr, 6, 1); } + + return 0; } static void generate_mac_addr(uint8_t *enetaddr) |