diff options
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3146ed3f6eca..9277237810e9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -29,6 +29,7 @@ config ARM | |||
29 | select HAVE_GENERIC_HARDIRQS | 29 | select HAVE_GENERIC_HARDIRQS |
30 | select HAVE_SPARSE_IRQ | 30 | select HAVE_SPARSE_IRQ |
31 | select GENERIC_IRQ_SHOW | 31 | select GENERIC_IRQ_SHOW |
32 | select CPU_PM if (SUSPEND || CPU_IDLE) | ||
32 | help | 33 | help |
33 | The ARM series is a line of low-power-consumption RISC chip designs | 34 | The ARM series is a line of low-power-consumption RISC chip designs |
34 | licensed by ARM Ltd and targeted at embedded applications and | 35 | licensed by ARM Ltd and targeted at embedded applications and |
@@ -830,6 +831,7 @@ config ARCH_U300 | |||
830 | select HAVE_SCHED_CLOCK | 831 | select HAVE_SCHED_CLOCK |
831 | select HAVE_TCM | 832 | select HAVE_TCM |
832 | select ARM_AMBA | 833 | select ARM_AMBA |
834 | select ARM_PATCH_PHYS_VIRT | ||
833 | select ARM_VIC | 835 | select ARM_VIC |
834 | select GENERIC_CLOCKEVENTS | 836 | select GENERIC_CLOCKEVENTS |
835 | select CLKDEV_LOOKUP | 837 | select CLKDEV_LOOKUP |
@@ -1807,6 +1809,38 @@ config ZBOOT_ROM_SH_MOBILE_SDHI | |||
1807 | 1809 | ||
1808 | endchoice | 1810 | endchoice |
1809 | 1811 | ||
1812 | config ARM_APPENDED_DTB | ||
1813 | bool "Use appended device tree blob to zImage (EXPERIMENTAL)" | ||
1814 | depends on OF && !ZBOOT_ROM && EXPERIMENTAL | ||
1815 | help | ||
1816 | With this option, the boot code will look for a device tree binary | ||
1817 | (DTB) appended to zImage | ||
1818 | (e.g. cat zImage <filename>.dtb > zImage_w_dtb). | ||
1819 | |||
1820 | This is meant as a backward compatibility convenience for those | ||
1821 | systems with a bootloader that can't be upgraded to accommodate | ||
1822 | the documented boot protocol using a device tree. | ||
1823 | |||
1824 | Beware that there is very little in terms of protection against | ||
1825 | this option being confused by leftover garbage in memory that might | ||
1826 | look like a DTB header after a reboot if no actual DTB is appended | ||
1827 | to zImage. Do not leave this option active in a production kernel | ||
1828 | if you don't intend to always append a DTB. Proper passing of the | ||
1829 | location into r2 of a bootloader provided DTB is always preferable | ||
1830 | to this option. | ||
1831 | |||
1832 | config ARM_ATAG_DTB_COMPAT | ||
1833 | bool "Supplement the appended DTB with traditional ATAG information" | ||
1834 | depends on ARM_APPENDED_DTB | ||
1835 | help | ||
1836 | Some old bootloaders can't be updated to a DTB capable one, yet | ||
1837 | they provide ATAGs with memory configuration, the ramdisk address, | ||
1838 | the kernel cmdline string, etc. Such information is dynamically | ||
1839 | provided by the bootloader and can't always be stored in a static | ||
1840 | DTB. To allow a device tree enabled kernel to be used with such | ||
1841 | bootloaders, this option allows zImage to extract the information | ||
1842 | from the ATAG list and store it at run time into the appended DTB. | ||
1843 | |||
1810 | config CMDLINE | 1844 | config CMDLINE |
1811 | string "Default kernel command string" | 1845 | string "Default kernel command string" |
1812 | default "" | 1846 | default "" |