diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-28 12:26:21 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-28 12:26:21 +0200 |
| commit | b1cdd8baa14f518288ceddb391d6587c1ecb3174 (patch) | |
| tree | c3d00b3193b2ee86b9679baf1933b10a7d07a13d /common | |
| parent | 48b3ed217f58487c583d59575d7dfe2aafbb738d (diff) | |
| parent | 434f2cfcad9f70231ad5a096325ba72ef0d2a2cc (diff) | |
| download | u-boot-b1cdd8baa14f518288ceddb391d6587c1ecb3174.zip u-boot-b1cdd8baa14f518288ceddb391d6587c1ecb3174.tar.gz u-boot-b1cdd8baa14f518288ceddb391d6587c1ecb3174.tar.bz2 | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'common')
| -rw-r--r-- | common/image-fdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/image-fdt.c b/common/image-fdt.c index 9fc7481..7795b80 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -492,7 +492,7 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, if (!ft_verify_fdt(blob)) return -1; -#ifdef CONFIG_SOC_K2HK +#if defined(CONFIG_SOC_KEYSTONE) if (IMAGE_OF_BOARD_SETUP) ft_board_setup_ex(blob, gd->bd); #endif |