diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-01 09:37:15 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-01 09:37:15 +0200 |
| commit | e60e6d3ae8055573055e15523ed138625ec539da (patch) | |
| tree | 8219200d5d073e5671385288829ac07968f05b01 /arch/arm/mach-imx | |
| parent | 33a6e99a38bcb9f1bc698cf85fdc3d900dd30752 (diff) | |
| parent | 8fcc9cb23709d4ca0418a0576583b19e11f1eed3 (diff) | |
| download | barebox-e60e6d3ae8055573055e15523ed138625ec539da.tar.gz barebox-e60e6d3ae8055573055e15523ed138625ec539da.tar.xz | |
Merge branch 'for-next/imx-realq7'
Conflicts:
arch/arm/dts/Makefile
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index b13fa99ba9..644c05eca0 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -527,6 +527,7 @@ config MACH_SABRESD config MACH_REALQ7 bool "DataModul i.MX6Q Real Qseven Board" + select ARCH_IMX_INTERNAL_BOOT_USE_IMXIMAGE select HAVE_DEFAULT_ENVIRONMENT_NEW endchoice |