diff options
| author | Tom Rini <trini@konsulko.com> | 2017-02-23 10:12:41 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-02-23 10:12:41 -0500 |
| commit | d38de7cb03adf88e18c05d840c2528b7a5af2f9b (patch) | |
| tree | 35be69932e53e4c58260af58ae841a3d1a2523b6 /include/configs/uniphier.h | |
| parent | b24cf8540a85a9bf97975aadd6a7542f166c78a3 (diff) | |
| parent | bc647958047cd03193e19cd8c08a6771fea828b7 (diff) | |
| download | u-boot-imx-d38de7cb03adf88e18c05d840c2528b7a5af2f9b.zip u-boot-imx-d38de7cb03adf88e18c05d840c2528b7a5af2f9b.tar.gz u-boot-imx-d38de7cb03adf88e18c05d840c2528b7a5af2f9b.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
- Fix regressions caused by the previous reworks
- Add pin configuration support
- Re-work SPL code
- Update DRAM and PLL setup code
- Enable needed configs, disable unneeded configs
Diffstat (limited to 'include/configs/uniphier.h')
| -rw-r--r-- | include/configs/uniphier.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index ab35191..2976d63 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -142,7 +142,7 @@ #if defined(CONFIG_ARM64) && !defined(CONFIG_ARMV8_MULTIENTRY) /* ARM Trusted Firmware */ #define BOOT_IMAGES \ - "second_image=bl1.bin\0" \ + "second_image=unph_bl.bin\0" \ "third_image=fip.bin\0" #else #define BOOT_IMAGES \ |