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/tqc | |
| parent | 94092e361cfa9461d746e530ca97d8822f5d23f0 (diff) | |
| parent | 933cdbb479aa87dcb6e3e333c3d1e04b0e7de1ec (diff) | |
| download | blackbird-obmc-uboot-1fc4e6f486cc1e9d2dcf0ba86e6021c3d83dce51.tar.gz blackbird-obmc-uboot-1fc4e6f486cc1e9d2dcf0ba86e6021c3d83dce51.zip | |
Merge git://git.denx.de/u-boot-fdt
Diffstat (limited to 'board/tqc')
| -rw-r--r-- | board/tqc/tqm5200/tqm5200.c | 4 | ||||
| -rw-r--r-- | board/tqc/tqm834x/tqm834x.c | 4 | ||||
| -rw-r--r-- | board/tqc/tqm8xx/tqm8xx.c | 4 | ||||
| -rw-r--r-- | board/tqc/tqma6/tqma6.c | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/board/tqc/tqm5200/tqm5200.c b/board/tqc/tqm5200/tqm5200.c index a1f56cde29..e9363ea394 100644 --- a/board/tqc/tqm5200/tqm5200.c +++ b/board/tqc/tqm5200/tqm5200.c @@ -863,12 +863,14 @@ int board_get_height (void) #endif /* CONFIG_VIDEO_SM501 */ #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) -void ft_board_setup(void *blob, bd_t *bd) +int ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); #if defined(CONFIG_VIDEO) fdt_add_edid(blob, "smi,sm501", edid_buf); #endif + + return 0; } #endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */ diff --git a/board/tqc/tqm834x/tqm834x.c b/board/tqc/tqm834x/tqm834x.c index 814fcb2657..d891a3844c 100644 --- a/board/tqc/tqm834x/tqm834x.c +++ b/board/tqc/tqm834x/tqm834x.c @@ -414,12 +414,14 @@ static void set_ddr_config(void) { } #ifdef CONFIG_OF_BOARD_SETUP -void ft_board_setup(void *blob, bd_t *bd) +int ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); #ifdef CONFIG_PCI ft_pci_setup(blob, bd); #endif /* CONFIG_PCI */ + + return 0; } #endif /* CONFIG_OF_BOARD_SETUP */ diff --git a/board/tqc/tqm8xx/tqm8xx.c b/board/tqc/tqm8xx/tqm8xx.c index 9ce2a5739f..3b5230abc0 100644 --- a/board/tqc/tqm8xx/tqm8xx.c +++ b/board/tqc/tqm8xx/tqm8xx.c @@ -674,10 +674,12 @@ void ft_blob_update (void *blob, bd_t *bd) } } -void ft_board_setup(void *blob, bd_t *bd) +int ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); ft_blob_update(blob, bd); + + return 0; } #endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */ diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c index e480d57e7d..c9e163e7d5 100644 --- a/board/tqc/tqma6/tqma6.c +++ b/board/tqc/tqma6/tqma6.c @@ -266,12 +266,14 @@ int checkboard(void) * Device Tree Support */ #if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) -void ft_board_setup(void *blob, bd_t *bd) +int ft_board_setup(void *blob, bd_t *bd) { /* bring in eMMC dsr settings */ do_fixup_by_path_u32(blob, "/soc/aips-bus@02100000/usdhc@02198000", "dsr", tqma6_emmc_dsr, 2); tqma6_bb_ft_board_setup(blob, bd); + + return 0; } #endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */ |
