diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-29 14:07:50 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-29 14:07:50 +0100 |
| commit | e97f9d817e600cd6f43d1d0da76f5787e33a5c56 (patch) | |
| tree | 99603834683039fec18a31770f8a05879d432e6d /arch/arm/cpu/armv7/omap-common/hwinit-common.c | |
| parent | c0cae2e24552d57f3e2f841ec235453413cd7389 (diff) | |
| parent | b1cde7e21f950e05d18c102976c3b7d232b65e13 (diff) | |
| download | olio-uboot-2014.01-e97f9d817e600cd6f43d1d0da76f5787e33a5c56.tar.xz olio-uboot-2014.01-e97f9d817e600cd6f43d1d0da76f5787e33a5c56.zip | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu/armv7/omap-common/hwinit-common.c')
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/hwinit-common.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/hwinit-common.c b/arch/arm/cpu/armv7/omap-common/hwinit-common.c index 85d375432..bf2951031 100644 --- a/arch/arm/cpu/armv7/omap-common/hwinit-common.c +++ b/arch/arm/cpu/armv7/omap-common/hwinit-common.c @@ -43,16 +43,10 @@ static void set_mux_conf_regs(void) set_muxconf_regs_essential(); break; case OMAP_INIT_CONTEXT_UBOOT_AFTER_SPL: -#ifdef CONFIG_SYS_ENABLE_PADS_ALL - set_muxconf_regs_non_essential(); -#endif break; case OMAP_INIT_CONTEXT_UBOOT_FROM_NOR: case OMAP_INIT_CONTEXT_UBOOT_AFTER_CH: set_muxconf_regs_essential(); -#ifdef CONFIG_SYS_ENABLE_PADS_ALL - set_muxconf_regs_non_essential(); -#endif break; } } |