summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig6
-rw-r--r--arch/arm/cpu/Kconfig7
-rw-r--r--arch/arm/mach-at91/Kconfig7
-rw-r--r--arch/arm/mach-imx/Kconfig29
-rw-r--r--arch/arm/mach-mxs/Kconfig6
-rw-r--r--arch/arm/mach-netx/Kconfig1
-rw-r--r--arch/arm/mach-omap/Kconfig17
-rw-r--r--arch/arm/mach-samsung/Kconfig18
-rw-r--r--arch/blackfin/Kconfig2
-rw-r--r--arch/mips/Kconfig26
-rw-r--r--arch/nios2/Kconfig5
-rw-r--r--arch/openrisc/Kconfig2
-rw-r--r--arch/ppc/mach-mpc5xxx/Kconfig1
-rw-r--r--arch/ppc/mach-mpc85xx/Kconfig3
-rw-r--r--arch/x86/Kconfig15
-rw-r--r--arch/x86/boot/Kconfig2
-rw-r--r--arch/x86/mach-i386/Kconfig2
17 files changed, 73 insertions, 76 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3afd88514f..01fe9dedf0 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"
@@ -71,7 +71,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"
@@ -153,7 +153,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 3de6061666..2750dd5f12 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -116,13 +116,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>
@@ -135,7 +134,6 @@ endif
if ARCH_AT91SAM9260
choice
-
prompt "AT91SAM9260 Board Type"
config MACH_AT91SAM9260EK
@@ -218,7 +216,6 @@ endif
if ARCH_AT91SAM9G20
choice
-
prompt "AT91SAM9G20 Board Type"
config MACH_AT91SAM9G20EK
@@ -390,7 +387,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 3f4b45210c..2d655709b8 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -197,7 +197,6 @@ endchoice
if ARCH_IMX1
choice
-
prompt "i.MX1 Board Type"
config MACH_SCB9328
@@ -216,7 +215,6 @@ endif
if ARCH_IMX21
choice
-
prompt "i.MX21 Board Type"
config MACH_IMX21ADS
@@ -236,7 +234,6 @@ endif
if ARCH_IMX25
choice
-
prompt "i.MX25 Board Type"
config MACH_EUKREA_CPUIMX25
@@ -270,7 +267,6 @@ endif
if ARCH_IMX27
choice
-
prompt "i.MX27 Board Type"
config MACH_EUKREA_CPUIMX27
@@ -329,7 +325,6 @@ endif
if ARCH_IMX31
choice
-
prompt "i.MX31 Board Type"
config MACH_PCM037
@@ -350,7 +345,6 @@ endif
if ARCH_IMX35
choice
-
prompt "i.MX35 Board Type"
config MACH_EUKREA_CPUIMX35
@@ -397,7 +391,6 @@ endif
if ARCH_IMX51
choice
-
prompt "i.MX51 Board Type"
config MACH_FREESCALE_MX51_PDK
@@ -442,7 +435,6 @@ endif
if ARCH_IMX53
choice
-
prompt "i.MX53 Board Type"
config MACH_FREESCALE_MX53_LOCO
@@ -471,6 +463,7 @@ config MACH_TX53
endchoice
if MACH_TX53
+
choice
prompt "TX53 board revision"
config TX53_REV_1011
@@ -478,6 +471,7 @@ config TX53_REV_1011
config TX53_REV_XX30
bool "8030 / 1030"
endchoice
+
endif
endif
@@ -485,7 +479,6 @@ endif
if ARCH_IMX6
choice
-
prompt "i.MX6 Board Type"
config MACH_MX6Q_ARM2
@@ -500,9 +493,10 @@ endif
# ----------------------------------------------------------
-menu "Board specific settings "
+menu "Board specific settings"
if MACH_PCM037
+
choice
prompt "SDRAM Bank0"
config PCM037_SDRAM_BANK0_128MB
@@ -520,9 +514,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
@@ -530,6 +526,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
@@ -537,6 +534,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
@@ -549,8 +547,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
@@ -558,16 +559,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,
@@ -588,7 +591,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..b9e3457d66 100644
--- a/arch/arm/mach-netx/Kconfig
+++ b/arch/arm/mach-netx/Kconfig
@@ -40,7 +40,6 @@ config NETX_COOKIE
default 16 if MACH_NXHX
choice
-
prompt "Netx Board Type"
config MACH_NXDB500
diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig
index 81f6127e0a..e4103e241f 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
@@ -115,14 +115,14 @@ config MACH_BEAGLE
select HAVE_NOSHELL
select HAVE_DEFAULT_ENVIRONMENT_NEW
depends on ARCH_OMAP3
- help
+ help
Say Y here if you are using Beagle Board
config MACH_OMAP3EVM
bool "Texas Instrument's OMAP3 EVM"
select HAVE_NOSHELL
depends on ARCH_OMAP3
- help
+ help
Say Y here if you are using OMAP3EVM
config MACH_PANDA
@@ -155,7 +155,7 @@ config MACH_PCAAL1
bool "Phytec phyCARD-A-L1"
select HAVE_NOSHELL
depends on ARCH_OMAP3
- help
+ help
Say Y here if you are using a phyCARD-A-L1 PCA-A-L1
config MACH_PCAAXL2
@@ -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-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..db001d736f 100644
--- a/arch/ppc/mach-mpc5xxx/Kconfig
+++ b/arch/ppc/mach-mpc5xxx/Kconfig
@@ -50,4 +50,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..cb12b9c026 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 14:25:35 +0000