diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/Kconfig | 6 | ||||
-rw-r--r-- | arch/arm/cpu/Kconfig | 7 | ||||
-rw-r--r-- | arch/arm/mach-at91/Kconfig | 7 | ||||
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 28 | ||||
-rw-r--r-- | arch/arm/mach-mxs/Kconfig | 6 | ||||
-rw-r--r-- | arch/arm/mach-netx/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap/Kconfig | 11 | ||||
-rw-r--r-- | arch/arm/mach-pxa/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-samsung/Kconfig | 18 | ||||
-rw-r--r-- | arch/blackfin/Kconfig | 2 | ||||
-rw-r--r-- | arch/mips/Kconfig | 26 | ||||
-rw-r--r-- | arch/nios2/Kconfig | 5 | ||||
-rw-r--r-- | arch/openrisc/Kconfig | 2 | ||||
-rw-r--r-- | arch/ppc/mach-mpc5xxx/Kconfig | 2 | ||||
-rw-r--r-- | arch/ppc/mach-mpc85xx/Kconfig | 3 | ||||
-rw-r--r-- | arch/x86/Kconfig | 15 | ||||
-rw-r--r-- | arch/x86/boot/Kconfig | 2 | ||||
-rw-r--r-- | arch/x86/mach-i386/Kconfig | 3 |
18 files changed, 69 insertions, 78 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index cdb5081188..2b5446baf8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -19,7 +19,7 @@ config ARM_LINUX config HAVE_MACH_ARM_HEAD bool -menu "System Type " +menu "System Type" choice prompt "ARM system type" @@ -72,7 +72,7 @@ config ARCH_NOMADIK select CPU_ARM926T select CLOCKSOURCE_NOMADIK help - Support for the Nomadik platform by ST-Ericsson + Support for the Nomadik platform by ST-Ericsson config ARCH_OMAP bool "TI OMAP" @@ -154,7 +154,7 @@ config THUMB2_BAREBOX endmenu -menu "Arm specific settings " +menu "Arm specific settings" config CMD_ARM_CPUINFO bool "cpuinfo command" diff --git a/arch/arm/cpu/Kconfig b/arch/arm/cpu/Kconfig index d8a5fb1734..86bc174101 100644 --- a/arch/arm/cpu/Kconfig +++ b/arch/arm/cpu/Kconfig @@ -4,7 +4,7 @@ config CPU_32 bool default y -# Select CPU types depending on the architecture selected. This selects +# Select CPU types depending on the architecture selected. This selects # which CPUs we support in the kernel image, and the compiler instruction # optimiser behaviour. @@ -27,14 +27,13 @@ config CPU_ARM920T Say Y if you want support for the ARM920T processor. Otherwise, say N. - # ARM926T config CPU_ARM926T bool select CPU_32v5 help - This is a variant of the ARM920. It has slightly different - instruction sequences for cache and TLB operations. Curiously, + This is a variant of the ARM920. It has slightly different + instruction sequences for cache and TLB operations. Curiously, there is no documentation on it at the ARM corporate website. Say Y if you want support for the ARM926T processor. diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 6fea9035c8..4dda00f990 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -123,13 +123,12 @@ config SUPPORT_CALAO_MOB_TNY_MD2 if ARCH_AT91RM9200 choice - prompt "AT91RM9200 Board Type" config MACH_AT91RM9200EK bool "Atmel AT91RM9200-EK Evaluation Kit" - help select HAVE_AT91_DATAFLASH_CARD + help Select this if you are using Atmel's AT91RM9200-EK Evaluation Kit. <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3507> @@ -142,7 +141,6 @@ endif if ARCH_AT91SAM9260 choice - prompt "AT91SAM9260 Board Type" config MACH_AT91SAM9260EK @@ -225,7 +223,6 @@ endif if ARCH_AT91SAM9G20 choice - prompt "AT91SAM9G20 Board Type" config MACH_AT91SAM9G20EK @@ -413,7 +410,7 @@ config CALAO_MOB_TNY_MD2 depends on SUPPORT_CALAO_MOB_TNY_MD2 config CALAO_MB_QIL_A9260 - bool "MB-QIL A9260 Motherboard Board support" + bool "MB-QIL A9260 Motherboard Board support" depends on MACH_QIL_A9260 endif diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 1bc2e249b9..ec4f864164 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -199,7 +199,6 @@ endchoice if ARCH_IMX1 choice - prompt "i.MX1 Board Type" config MACH_SCB9328 @@ -218,7 +217,6 @@ endif if ARCH_IMX21 choice - prompt "i.MX21 Board Type" config MACH_IMX21ADS @@ -238,7 +236,6 @@ endif if ARCH_IMX25 choice - prompt "i.MX25 Board Type" config MACH_EUKREA_CPUIMX25 @@ -272,7 +269,6 @@ endif if ARCH_IMX27 choice - prompt "i.MX27 Board Type" config MACH_EUKREA_CPUIMX27 @@ -331,7 +327,6 @@ endif if ARCH_IMX31 choice - prompt "i.MX31 Board Type" config MACH_PCM037 @@ -352,7 +347,6 @@ endif if ARCH_IMX35 choice - prompt "i.MX35 Board Type" config MACH_EUKREA_CPUIMX35 @@ -399,7 +393,6 @@ endif if ARCH_IMX51 choice - prompt "i.MX51 Board Type" config MACH_FREESCALE_MX51_PDK @@ -444,7 +437,6 @@ endif if ARCH_IMX53 choice - prompt "i.MX53 Board Type" config MACH_FREESCALE_MX53_LOCO @@ -479,6 +471,7 @@ config MACH_GUF_VINCELL endchoice if MACH_TX53 + choice prompt "TX53 board revision" config TX53_REV_1011 @@ -495,7 +488,6 @@ endif if ARCH_IMX6 choice - prompt "i.MX6 Board Type" config MACH_MX6Q_ARM2 @@ -510,9 +502,10 @@ endif # ---------------------------------------------------------- -menu "Board specific settings " +menu "Board specific settings" if MACH_PCM037 + choice prompt "SDRAM Bank0" config PCM037_SDRAM_BANK0_128MB @@ -530,9 +523,11 @@ config PCM037_SDRAM_BANK1_128MB config PCM037_SDRAM_BANK1_256MB bool "256MB" endchoice + endif if MACH_EUKREA_CPUIMX27 + choice prompt "SDRAM Size" config EUKREA_CPUIMX27_SDRAM_128MB @@ -540,6 +535,7 @@ config EUKREA_CPUIMX27_SDRAM_128MB config EUKREA_CPUIMX27_SDRAM_256MB bool "256 MB" endchoice + choice prompt "NOR Flash Size" config EUKREA_CPUIMX27_NOR_32MB @@ -547,6 +543,7 @@ config EUKREA_CPUIMX27_NOR_32MB config EUKREA_CPUIMX27_NOR_64MB bool "> 32 MB" endchoice + choice prompt "Quad UART Port" depends on DRIVER_SERIAL_NS16550 @@ -559,8 +556,11 @@ config EUKREA_CPUIMX27_QUART3 config EUKREA_CPUIMX27_QUART4 bool "Q4" endchoice + endif + if MACH_FREESCALE_MX25_3STACK + choice prompt "SDRAM Type" config FREESCALE_MX25_3STACK_SDRAM_64MB_DDR2 @@ -568,16 +568,18 @@ config FREESCALE_MX25_3STACK_SDRAM_64MB_DDR2 config FREESCALE_MX25_3STACK_SDRAM_128MB_MDDR bool "128 MB (mDDR)" endchoice + endif + endmenu -menu "i.MX specific settings " +menu "i.MX specific settings" config IMX_IIM tristate "IIM fusebox device" depends on !ARCH_IMX21 && !ARCH_IMX21 help - Device driver for the IC Identification Module (IIM) fusebox. Use the + Device driver for the IC Identification Module (IIM) fusebox. Use the regular md/mw commands to program and read the fusebox. Fuses are grouped in "rows", 8 bits per row. When using md/mw commands, @@ -598,7 +600,7 @@ config IMX_IIM_FUSE_BLOW Before being actually able to blow the fuses, you need to explicitely enable it: - imx_iim0.permanent_write_enable=1 + imx_iim0.permanent_write_enable=1 endmenu diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig index ff295f144c..853d81a0c4 100644 --- a/arch/arm/mach-mxs/Kconfig +++ b/arch/arm/mach-mxs/Kconfig @@ -84,7 +84,7 @@ endchoice endif -menu "i.MX specific settings " +menu "i.MX specific settings" config MXS_OCOTP tristate "OCOTP device" @@ -105,7 +105,7 @@ config MXS_OCOTP_WRITABLE Before being actually able to blow the bits, you need to explicitely enable writing: - ocotp0.permanent_write_enable=1 + ocotp0.permanent_write_enable=1 config MXS_CMD_BCB depends on NAND_MXS @@ -117,7 +117,7 @@ config MXS_CMD_BCB endmenu -menu "Board specific settings " +menu "Board specific settings" if MACH_TX28 diff --git a/arch/arm/mach-netx/Kconfig b/arch/arm/mach-netx/Kconfig index 8e83417285..b767e54d4d 100644 --- a/arch/arm/mach-netx/Kconfig +++ b/arch/arm/mach-netx/Kconfig @@ -40,13 +40,11 @@ config NETX_COOKIE default 16 if MACH_NXHX choice - prompt "Netx Board Type" config MACH_NXDB500 bool "Hilscher Netx nxdb500" select HAS_NETX_ETHER - select HAS_CFI select MACH_HAS_LOWLEVEL_INIT help Say Y here if you are using the Hilscher Netx nxdb500 board diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig index b9f3dff063..451783eaa5 100644 --- a/arch/arm/mach-omap/Kconfig +++ b/arch/arm/mach-omap/Kconfig @@ -12,7 +12,7 @@ # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # @@ -59,7 +59,7 @@ config OMAP3_CLOCK_CONFIG config OMAP_GPMC prompt "Support for GPMC configuration" bool - depends on (ARCH_OMAP2 || ARCH_OMAP3 || ARCH_OMAP4) + depends on (ARCH_OMAP2 || ARCH_OMAP3 || ARCH_OMAP4) default y help Enable this if you use Texas Instrument's General purpose Memory @@ -169,7 +169,8 @@ config MACH_PCAAXL2 endchoice if MACH_OMAP3EVM - choice + +choice prompt "Select UART" config OMAP3EVM_UART1 @@ -183,7 +184,9 @@ if MACH_OMAP3EVM depends on MACH_OMAP3EVM help Say Y here if you would like to use UART3 as console. - endchoice + +endchoice + endif config MACH_OMAP_ADVANCED_MUX diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index 029fd8b6f2..6808d2fe97 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig @@ -42,9 +42,7 @@ config MACH_MIOA701 config MACH_PCM027 bool "Phytec phyCORE-PXA270" - select HAS_CFI select MACH_HAS_LOWLEVEL_INIT - select HAVE_MMU help Say Y here if you are using a Phytec phyCORE PXA270 board diff --git a/arch/arm/mach-samsung/Kconfig b/arch/arm/mach-samsung/Kconfig index 3a4d910001..80575cb984 100644 --- a/arch/arm/mach-samsung/Kconfig +++ b/arch/arm/mach-samsung/Kconfig @@ -13,12 +13,12 @@ config ARCH_TEXT_BASE default 0x23e00000 if MACH_TINY210 config BOARDINFO - default "Mini 2440" if MACH_MINI2440 - default "Mini 6410" if MACH_MINI6410 - default "Tiny 6410" if MACH_TINY6410 + default "Mini 2440" if MACH_MINI2440 + default "Mini 6410" if MACH_MINI6410 + default "Tiny 6410" if MACH_TINY6410 default "Digi A9M2440" if MACH_A9M2440 default "Digi A9M2410" if MACH_A9M2410 - default "Tiny 210" if MACH_TINY210 + default "Tiny 210" if MACH_TINY210 config ARCH_BAREBOX_MAX_BARE_INIT_SIZE hex @@ -35,7 +35,6 @@ config CPU_S3C2440 bool choice - prompt "S3C24xx Board Type" config MACH_A9M2410 @@ -71,7 +70,7 @@ config MACH_MINI2440 endchoice -menu "Board specific settings " +menu "Board specific settings" choice prompt "A9M2440 baseboard" @@ -98,7 +97,6 @@ config CPU_S3C6410 bool choice - prompt "S3C64xx Board Type" config MACH_MINI6410 @@ -118,7 +116,7 @@ config MACH_TINY6410 endchoice -menu "Board specific settings " +menu "Board specific settings" source arch/arm/boards/friendlyarm-tiny6410/Kconfig @@ -135,7 +133,6 @@ config CPU_S5PV210 bool choice - prompt "S5PCxx board type" config MACH_TINY210 @@ -149,8 +146,7 @@ endchoice endif - -menu "S3C Features " +menu "S3C Features" config S3C_LOWLEVEL_INIT bool diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 1c58ba83b7..5d8a2e2a2c 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig @@ -29,7 +29,7 @@ config MACH_IPE337 endchoice -choice +choice prompt "Select your board options" depends on MACH_IPE337 default MACH_IPE337_V2 diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 7a1eeac706..947edcf6f8 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -62,10 +62,11 @@ source arch/mips/mach-xburst/Kconfig endmenu # -# Endianess selection. Sufficiently obscure so many users don't know what to -# answer,so we try hard to limit the available choices. Also the use of a +# Endianess selection. Sufficiently obscure so many users don't know what to +# answer,so we try hard to limit the available choices. Also the use of a # choice statement should be more obvious to the user. # + choice prompt "Endianess selection" help @@ -98,8 +99,8 @@ config CPU_MIPS32_R1 select CPU_SUPPORTS_32BIT_KERNEL help Choose this option to build a barebox for release 1 or later of the - MIPS32 architecture. Most modern embedded systems with a 32-bit - MIPS processor are based on a MIPS32 processor. If you know the + MIPS32 architecture. Most modern embedded systems with a 32-bit + MIPS processor are based on a MIPS32 processor. If you know the specific type of processor in your system, choose those that one otherwise CPU_MIPS32_R1 is a safe bet for any MIPS32 system. Release 2 of the MIPS32 architecture is available since several @@ -113,8 +114,8 @@ config CPU_MIPS32_R2 select CPU_SUPPORTS_32BIT_KERNEL help Choose this option to build a barebox for release 2 or later of the - MIPS32 architecture. Most modern embedded systems with a 32-bit - MIPS processor are based on a MIPS32 processor. If you know the + MIPS32 architecture. Most modern embedded systems with a 32-bit + MIPS processor are based on a MIPS32 processor. If you know the specific type of processor in your system, choose those that one otherwise CPU_MIPS32_R1 is a safe bet for any MIPS32 system. @@ -125,8 +126,8 @@ config CPU_MIPS64_R1 select CPU_SUPPORTS_64BIT_KERNEL help Choose this option to build a barebox for release 1 or later of the - MIPS64 architecture. Many modern embedded systems with a 64-bit - MIPS processor are based on a MIPS64 processor. If you know the + MIPS64 architecture. Many modern embedded systems with a 64-bit + MIPS processor are based on a MIPS64 processor. If you know the specific type of processor in your system, choose those that one otherwise CPU_MIPS64_R1 is a safe bet for any MIPS64 system. Release 2 of the MIPS64 architecture is available since several @@ -141,14 +142,13 @@ config CPU_MIPS64_R2 select CPU_SUPPORTS_64BIT_KERNEL help Choose this option to build a barebox for release 2 or later of the - MIPS64 architecture. Many modern embedded systems with a 64-bit - MIPS processor are based on a MIPS64 processor. If you know the + MIPS64 architecture. Many modern embedded systems with a 64-bit + MIPS processor are based on a MIPS64 processor. If you know the specific type of processor in your system, choose those that one otherwise CPU_MIPS64_R1 is a safe bet for any MIPS64 system. endchoice - config SYS_HAS_CPU_MIPS32_R1 bool @@ -199,7 +199,7 @@ choice help You should only select this option if you have a workload that actually benefits from 64-bit processing or if your machine has - large memory. You will only be presented a single option in this + large memory. You will only be presented a single option in this menu if your system does not support both 32-bit and 64-bit modes. config 32BIT @@ -216,7 +216,7 @@ config 64BIT endchoice -menu "MIPS specific settings " +menu "MIPS specific settings" config CMD_MIPS_CPUINFO bool "cpuinfo command" diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig index e1af0c007b..c49f6e9376 100644 --- a/arch/nios2/Kconfig +++ b/arch/nios2/Kconfig @@ -16,13 +16,12 @@ choice prompt "Select your board" config GENERIC - bool "Generic " + bool "Generic" select NIOS2 - endchoice -menu "Board configuration " +menu "Board configuration" config EARLY_PRINTF default n diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig index bcfd67f261..47ee3fe33a 100644 --- a/arch/openrisc/Kconfig +++ b/arch/openrisc/Kconfig @@ -16,7 +16,7 @@ choice prompt "Select your board" config GENERIC - bool "Generic " + bool "Generic" select OPENRISC endchoice diff --git a/arch/ppc/mach-mpc5xxx/Kconfig b/arch/ppc/mach-mpc5xxx/Kconfig index db4f391784..34254eb7ce 100644 --- a/arch/ppc/mach-mpc5xxx/Kconfig +++ b/arch/ppc/mach-mpc5xxx/Kconfig @@ -17,7 +17,6 @@ choice config MACH_PHYCORE_MPC5200B_TINY bool "Phycore mpc5200b tiny" - select HAS_CFI help Say Y here if you are using the Phytec Phycore MPC5200B Tiny board aka pcm030. @@ -50,4 +49,5 @@ config MACH_PHYCORE_MPC5200B_TINY_REV old board you should set this option to 1 endmenu + endif diff --git a/arch/ppc/mach-mpc85xx/Kconfig b/arch/ppc/mach-mpc85xx/Kconfig index b2af05ec59..8cde1bd7c8 100644 --- a/arch/ppc/mach-mpc85xx/Kconfig +++ b/arch/ppc/mach-mpc85xx/Kconfig @@ -17,9 +17,10 @@ choice config P2020RDB bool "P2020RDB" help - Say Y here if you are using the Freescale P2020RDB + Say Y here if you are using the Freescale P2020RDB endchoice + endif if P2020RDB diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 711bbfe0e5..777604fafe 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -40,19 +40,18 @@ choice prompt "Bring up type" config X86_BIOS_BRINGUP - prompt "16 bit BIOS" - bool + bool "16 bit BIOS" help - Barebox will act as a BIOS based bootloader. This includes - some 16 bit real mode code and some restrictions everyone knows - from BIOS based systems. + Barebox will act as a BIOS based bootloader. This includes + some 16 bit real mode code and some restrictions everyone knows + from BIOS based systems. config X86_NATIVE_BRINGUP bool "native" help - Barebox will act as a native bootloader. This includes all the - required initialization needed to bring up a piece of hardware. - Note: Not implemented yet + Barebox will act as a native bootloader. This includes all the + required initialization needed to bring up a piece of hardware. + Note: Not implemented yet endchoice diff --git a/arch/x86/boot/Kconfig b/arch/x86/boot/Kconfig index cdb82e46d9..8dba00d591 100644 --- a/arch/x86/boot/Kconfig +++ b/arch/x86/boot/Kconfig @@ -1,6 +1,6 @@ if X86_BIOS_BRINGUP -menu "BIOS boot source " +menu "BIOS boot source" config X86_HDBOOT bool "HD boot" diff --git a/arch/x86/mach-i386/Kconfig b/arch/x86/mach-i386/Kconfig index 11f6aa679a..b64d21fd9a 100644 --- a/arch/x86/mach-i386/Kconfig +++ b/arch/x86/mach-i386/Kconfig @@ -1,5 +1,5 @@ -menu "Board specific settings " +menu "Board specific settings" if X86_BOOTLOADER @@ -10,7 +10,6 @@ config X86_GENERIC_HAS_ISA config X86_GENERIC_HAS_PCI bool "PCI support" - select HAS_PCI help Say Y here if the target supports a PCI bus |