diff options
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 26896433ae78..b6f9ce6f4f5b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -812,25 +812,6 @@ config ARCH_SHARK | |||
812 | Support for the StrongARM based Digital DNARD machine, also known | 812 | Support for the StrongARM based Digital DNARD machine, also known |
813 | as "Shark" (<http://www.shark-linux.de/shark.html>). | 813 | as "Shark" (<http://www.shark-linux.de/shark.html>). |
814 | 814 | ||
815 | config ARCH_U300 | ||
816 | bool "ST-Ericsson U300 Series" | ||
817 | depends on MMU | ||
818 | select ARCH_REQUIRE_GPIOLIB | ||
819 | select ARM_AMBA | ||
820 | select ARM_PATCH_PHYS_VIRT | ||
821 | select ARM_VIC | ||
822 | select CLKDEV_LOOKUP | ||
823 | select CLKSRC_MMIO | ||
824 | select CLKSRC_OF | ||
825 | select COMMON_CLK | ||
826 | select CPU_ARM926T | ||
827 | select GENERIC_CLOCKEVENTS | ||
828 | select HAVE_TCM | ||
829 | select SPARSE_IRQ | ||
830 | select USE_OF | ||
831 | help | ||
832 | Support for ST-Ericsson U300 series mobile platforms. | ||
833 | |||
834 | config ARCH_DAVINCI | 815 | config ARCH_DAVINCI |
835 | bool "TI DaVinci" | 816 | bool "TI DaVinci" |
836 | select ARCH_HAS_HOLES_MEMORYMODEL | 817 | select ARCH_HAS_HOLES_MEMORYMODEL |
@@ -2041,7 +2022,7 @@ config CRASH_DUMP | |||
2041 | 2022 | ||
2042 | config AUTO_ZRELADDR | 2023 | config AUTO_ZRELADDR |
2043 | bool "Auto calculation of the decompressed kernel image address" | 2024 | bool "Auto calculation of the decompressed kernel image address" |
2044 | depends on !ZBOOT_ROM && !ARCH_U300 | 2025 | depends on !ZBOOT_ROM |
2045 | help | 2026 | help |
2046 | ZRELADDR is the physical address where the decompressed kernel | 2027 | ZRELADDR is the physical address where the decompressed kernel |
2047 | image will be placed. If AUTO_ZRELADDR is selected, the address | 2028 | image will be placed. If AUTO_ZRELADDR is selected, the address |