diff options
author | Tom Rini <trini@ti.com> | 2013-10-08 09:51:48 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-10-08 09:51:48 -0400 |
commit | 9f3fe6da27e2328285aa37149fce845da4e57560 (patch) | |
tree | 26fdeff18bd1c7bddc7fadb969a4c12ad9bc863c /arch/arm/cpu/armv7/socfpga/spl.c | |
parent | 968294bd7b9b540f53c1fb3c809da464623a4362 (diff) | |
parent | 572886af5984febafa6f083e6b8af0465f4f5764 (diff) | |
download | u-boot-imx-9f3fe6da27e2328285aa37149fce845da4e57560.zip u-boot-imx-9f3fe6da27e2328285aa37149fce845da4e57560.tar.gz u-boot-imx-9f3fe6da27e2328285aa37149fce845da4e57560.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/armv7/socfpga/spl.c')
-rw-r--r-- | arch/arm/cpu/armv7/socfpga/spl.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/socfpga/spl.c b/arch/arm/cpu/armv7/socfpga/spl.c index 2b9be28..74bceab 100644 --- a/arch/arm/cpu/armv7/socfpga/spl.c +++ b/arch/arm/cpu/armv7/socfpga/spl.c @@ -12,6 +12,7 @@ #include <image.h> #include <asm/arch/reset_manager.h> #include <spl.h> +#include <asm/arch/system_manager.h> DECLARE_GLOBAL_DATA_PTR; @@ -25,6 +26,11 @@ u32 spl_boot_device(void) */ void spl_board_init(void) { +#ifndef CONFIG_SOCFPGA_VIRTUAL_TARGET + /* configure the pin muxing through system manager */ + sysmgr_pinmux_init(); +#endif /* CONFIG_SOCFPGA_VIRTUAL_TARGET */ + /* de-assert reset for peripherals and bridges based on handoff */ reset_deassert_peripherals_handoff(); |