diff options
| author | Tom Rini <trini@konsulko.com> | 2015-11-16 08:35:38 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-16 08:35:38 -0500 |
| commit | 98e73c834467ef6f1d3e9a8102745e16b3128ac1 (patch) | |
| tree | a73931f3865dea561750d6a738dbd1738ba8c666 /arch/arm/cpu/armv7/mx6/soc.c | |
| parent | 618a51e9aefe1e03f498ea48bfab70a0b2c9be39 (diff) | |
| parent | ec26c1eef735befb7011c24e08e6310ab6dc9be6 (diff) | |
| download | talos-obmc-uboot-98e73c834467ef6f1d3e9a8102745e16b3128ac1.tar.gz talos-obmc-uboot-98e73c834467ef6f1d3e9a8102745e16b3128ac1.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/cpu/armv7/mx6/soc.c')
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/soc.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index 282302b1fc..bf5ae8cdff 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -15,6 +15,7 @@ #include <asm/arch/sys_proto.h> #include <asm/imx-common/boot_mode.h> #include <asm/imx-common/dma.h> +#include <asm/imx-common/hab.h> #include <stdbool.h> #include <asm/arch/mxc_hdmi.h> #include <asm/arch/crm_regs.h> @@ -48,6 +49,13 @@ U_BOOT_DEVICE(imx6_thermal) = { }; #endif +#if defined(CONFIG_SECURE_BOOT) +struct imx_sec_config_fuse_t const imx_sec_config_fuse = { + .bank = 0, + .word = 6, +}; +#endif + u32 get_nr_cpus(void) { struct scu_regs *scu = (struct scu_regs *)SCU_BASE_ADDR; @@ -392,6 +400,13 @@ const struct boot_mode soc_boot_modes[] = { {NULL, 0}, }; +void reset_misc(void) +{ +#ifdef CONFIG_VIDEO_MXS + lcdif_power_down(); +#endif +} + void s_init(void) { struct anatop_regs *anatop = (struct anatop_regs *)ANATOP_BASE_ADDR; |
