diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/Kconfig | 6 | ||||
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 8c064a3e43db..f219c30eb4e1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -1945,6 +1945,7 @@ config ZBOOT_ROM_BSS | |||
1945 | config ZBOOT_ROM | 1945 | config ZBOOT_ROM |
1946 | bool "Compressed boot loader in ROM/flash" | 1946 | bool "Compressed boot loader in ROM/flash" |
1947 | depends on ZBOOT_ROM_TEXT != ZBOOT_ROM_BSS | 1947 | depends on ZBOOT_ROM_TEXT != ZBOOT_ROM_BSS |
1948 | depends on !ARM_APPENDED_DTB && !XIP_KERNEL && !AUTO_ZRELADDR | ||
1948 | help | 1949 | help |
1949 | Say Y here if you intend to execute your compressed kernel image | 1950 | Say Y here if you intend to execute your compressed kernel image |
1950 | (zImage) directly from ROM or flash. If unsure, say N. | 1951 | (zImage) directly from ROM or flash. If unsure, say N. |
@@ -1980,7 +1981,7 @@ endchoice | |||
1980 | 1981 | ||
1981 | config ARM_APPENDED_DTB | 1982 | config ARM_APPENDED_DTB |
1982 | bool "Use appended device tree blob to zImage (EXPERIMENTAL)" | 1983 | bool "Use appended device tree blob to zImage (EXPERIMENTAL)" |
1983 | depends on OF && !ZBOOT_ROM | 1984 | depends on OF |
1984 | help | 1985 | help |
1985 | With this option, the boot code will look for a device tree binary | 1986 | With this option, the boot code will look for a device tree binary |
1986 | (DTB) appended to zImage | 1987 | (DTB) appended to zImage |
@@ -2068,7 +2069,7 @@ endchoice | |||
2068 | 2069 | ||
2069 | config XIP_KERNEL | 2070 | config XIP_KERNEL |
2070 | bool "Kernel Execute-In-Place from ROM" | 2071 | bool "Kernel Execute-In-Place from ROM" |
2071 | depends on !ZBOOT_ROM && !ARM_LPAE && !ARCH_MULTIPLATFORM | 2072 | depends on !ARM_LPAE && !ARCH_MULTIPLATFORM |
2072 | help | 2073 | help |
2073 | Execute-In-Place allows the kernel to run from non-volatile storage | 2074 | Execute-In-Place allows the kernel to run from non-volatile storage |
2074 | directly addressable by the CPU, such as NOR flash. This saves RAM | 2075 | directly addressable by the CPU, such as NOR flash. This saves RAM |
@@ -2131,7 +2132,6 @@ config CRASH_DUMP | |||
2131 | 2132 | ||
2132 | config AUTO_ZRELADDR | 2133 | config AUTO_ZRELADDR |
2133 | bool "Auto calculation of the decompressed kernel image address" | 2134 | bool "Auto calculation of the decompressed kernel image address" |
2134 | depends on !ZBOOT_ROM | ||
2135 | help | 2135 | help |
2136 | ZRELADDR is the physical address where the decompressed kernel | 2136 | ZRELADDR is the physical address where the decompressed kernel |
2137 | image will be placed. If AUTO_ZRELADDR is selected, the address | 2137 | image will be placed. If AUTO_ZRELADDR is selected, the address |
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 7a6e6f710068..fae0578fec7e 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
@@ -3,7 +3,6 @@ config ARCH_MXC | |||
3 | select ARCH_REQUIRE_GPIOLIB | 3 | select ARCH_REQUIRE_GPIOLIB |
4 | select ARM_CPU_SUSPEND if PM | 4 | select ARM_CPU_SUSPEND if PM |
5 | select ARM_PATCH_PHYS_VIRT | 5 | select ARM_PATCH_PHYS_VIRT |
6 | select AUTO_ZRELADDR if !ZBOOT_ROM | ||
7 | select CLKSRC_MMIO | 6 | select CLKSRC_MMIO |
8 | select COMMON_CLK | 7 | select COMMON_CLK |
9 | select GENERIC_ALLOCATOR | 8 | select GENERIC_ALLOCATOR |