diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-24 19:08:17 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-24 19:08:17 -0400 |
| commit | 03eb14199e8a2ff2bc170b283305990151b0d619 (patch) | |
| tree | c16c123a850e8033b2daa71ad9ae241906542dd8 /arch/arm/Kconfig | |
| parent | d762f4383100c2a87b1a3f2d678cd3b5425655b4 (diff) | |
| parent | ede338f4ce2fb5ee99d18751df32fbd3b10df268 (diff) | |
Merge branch 'devicetree/arm-next' of git://git.secretlab.ca/git/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7275009686e6..3bc1a58cc7d8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -1683,6 +1683,13 @@ endmenu | |||
| 1683 | 1683 | ||
| 1684 | menu "Boot options" | 1684 | menu "Boot options" |
| 1685 | 1685 | ||
| 1686 | config USE_OF | ||
| 1687 | bool "Flattened Device Tree support" | ||
| 1688 | select OF | ||
| 1689 | select OF_EARLY_FLATTREE | ||
| 1690 | help | ||
| 1691 | Include support for flattened device tree machine descriptions. | ||
| 1692 | |||
| 1686 | # Compressed boot loader in ROM. Yes, we really want to ask about | 1693 | # Compressed boot loader in ROM. Yes, we really want to ask about |
| 1687 | # TEXT and BSS so we preserve their values in the config files. | 1694 | # TEXT and BSS so we preserve their values in the config files. |
| 1688 | config ZBOOT_ROM_TEXT | 1695 | config ZBOOT_ROM_TEXT |