diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-09-29 11:12:34 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-09-29 11:12:34 +0200 |
| commit | 8f0732ac3dc3bdbbcada313dc4b4b38d5d2c376a (patch) | |
| tree | b20bde0a30aa7902bdfc43a2097acc6f2f58cf5d /arch | |
| parent | fa651cce4f89f6d33f1ea301a6f1f781758c7dfd (diff) | |
| parent | 7577a4b3c27af9ad21a4aedf732754ae96225448 (diff) | |
Merge remote-tracking branch 'u-boot-imx/master'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/imx-common/cpu.c | 9 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-mx5/imx-regs.h | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c index fa1d468041..a10d12d97d 100644 --- a/arch/arm/imx-common/cpu.c +++ b/arch/arm/imx-common/cpu.c @@ -30,6 +30,7 @@ #include <asm/arch/clock.h> #include <asm/arch/sys_proto.h> #include <asm/arch/crm_regs.h> +#include <ipu_pixfmt.h> #ifdef CONFIG_FSL_ESDHC #include <fsl_esdhc.h> @@ -138,3 +139,11 @@ u32 get_ahb_clk(void) return get_periph_clk() / (ahb_podf + 1); } + +#if defined(CONFIG_VIDEO_IPUV3) +void arch_preboot_os(void) +{ + /* disable video before launching O/S */ + ipuv3_fb_shutdown(); +} +#endif diff --git a/arch/arm/include/asm/arch-mx5/imx-regs.h b/arch/arm/include/asm/arch-mx5/imx-regs.h index d1ef15d043..46017f4ad0 100644 --- a/arch/arm/include/asm/arch-mx5/imx-regs.h +++ b/arch/arm/include/asm/arch-mx5/imx-regs.h @@ -321,6 +321,8 @@ #define BOARD_REV_1_0 0x0 #define BOARD_REV_2_0 0x1 +#define BOARD_VER_OFFSET 0x8 + #define IMX_IIM_BASE (IIM_BASE_ADDR) #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__)) |