Skip to content

Commit

Permalink
arch: mips: Kconfig: pedantic formatting
Browse files Browse the repository at this point in the history
Formatting of Kconfig files doesn't look so pretty, so let the
Great White Handkerchief come around and clean it up.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: linux-kernel@vger.kernel.org
Cc: hauke@hauke-m.de
Cc: zajec5@gmail.com
Cc: f.fainelli@gmail.com
Cc: bcm-kernel-feedback-list@broadcom.com
Cc: linux-mips@vger.kernel.org
  • Loading branch information
Enrico Weigelt, metux IT consult authored and Paul Burton committed Mar 19, 2019
1 parent 716850a commit 371a415
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 40 deletions.
61 changes: 30 additions & 31 deletions arch/mips/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ config BCM47XX
select BCM47XX_SPROM
select BCM47XX_SSB if !BCM47XX_BCMA
help
Support for BCM47XX based boards
Support for BCM47XX based boards

config BCM63XX
bool "Broadcom BCM63XX based boards"
Expand All @@ -294,7 +294,7 @@ config BCM63XX
select MIPS_L1_CACHE_SHIFT_4
select CLKDEV_LOOKUP
help
Support for BCM63XX based boards
Support for BCM63XX based boards

config MIPS_COBALT
bool "Cobalt Server"
Expand Down Expand Up @@ -373,10 +373,10 @@ config MACH_JAZZ
select SYS_SUPPORTS_64BIT_KERNEL
select SYS_SUPPORTS_100HZ
help
This a family of machines based on the MIPS R4030 chipset which was
used by several vendors to build RISC/os and Windows NT workstations.
Members include the Acer PICA, MIPS Magnum 4000, MIPS Millennium and
Olivetti M700-10 workstations.
This a family of machines based on the MIPS R4030 chipset which was
used by several vendors to build RISC/os and Windows NT workstations.
Members include the Acer PICA, MIPS Magnum 4000, MIPS Millennium and
Olivetti M700-10 workstations.

config MACH_INGENIC
bool "Ingenic SoC based machines"
Expand Down Expand Up @@ -572,14 +572,14 @@ config NXP_STB220
bool "NXP STB220 board"
select SOC_PNX833X
help
Support for NXP Semiconductors STB220 Development Board.
Support for NXP Semiconductors STB220 Development Board.

config NXP_STB225
bool "NXP 225 board"
select SOC_PNX833X
select SOC_PNX8335
help
Support for NXP Semiconductors STB225 Development Board.
Support for NXP Semiconductors STB225 Development Board.

config PMC_MSP
bool "PMC-Sierra MSP chipsets"
Expand Down Expand Up @@ -721,9 +721,9 @@ config SGI_IP28
select SYS_SUPPORTS_64BIT_KERNEL
select SYS_SUPPORTS_BIG_ENDIAN
select MIPS_L1_CACHE_SHIFT_7
help
This is the SGI Indigo2 with R10000 processor. To compile a Linux
kernel that runs on these, say Y here.
help
This is the SGI Indigo2 with R10000 processor. To compile a Linux
kernel that runs on these, say Y here.

config SGI_IP32
bool "SGI IP32 (O2)"
Expand Down Expand Up @@ -1174,9 +1174,9 @@ config HOLES_IN_ZONE
config SYS_SUPPORTS_RELOCATABLE
bool
help
Selected if the platform supports relocating the kernel.
The platform must provide plat_get_fdt() if it selects CONFIG_USE_OF
to allow access to command line and entropy sources.
Selected if the platform supports relocating the kernel.
The platform must provide plat_get_fdt() if it selects CONFIG_USE_OF
to allow access to command line and entropy sources.

config MIPS_CBPF_JIT
def_bool y
Expand Down Expand Up @@ -2119,8 +2119,8 @@ config MIPS_PGD_C0_CONTEXT
# Set to y for ptrace access to watch registers.
#
config HARDWARE_WATCHPOINTS
bool
default y if CPU_MIPSR1 || CPU_MIPSR2 || CPU_MIPSR6
bool
default y if CPU_MIPSR1 || CPU_MIPSR2 || CPU_MIPSR6

menu "Kernel type"

Expand Down Expand Up @@ -2184,10 +2184,10 @@ config PAGE_SIZE_4KB
bool "4kB"
depends on !CPU_LOONGSON2 && !CPU_LOONGSON3
help
This option select the standard 4kB Linux page size. On some
R3000-family processors this is the only available page size. Using
4kB page size will minimize memory consumption and is therefore
recommended for low memory systems.
This option select the standard 4kB Linux page size. On some
R3000-family processors this is the only available page size. Using
4kB page size will minimize memory consumption and is therefore
recommended for low memory systems.

config PAGE_SIZE_8KB
bool "8kB"
Expand Down Expand Up @@ -2480,7 +2480,6 @@ config SB1_PASS_2_1_WORKAROUNDS
depends on CPU_SB1 && CPU_SB1_PASS_2
default y


choice
prompt "SmartMIPS or microMIPS ASE support"

Expand Down Expand Up @@ -2688,16 +2687,16 @@ config RANDOMIZE_BASE
bool "Randomize the address of the kernel image"
depends on RELOCATABLE
---help---
Randomizes the physical and virtual address at which the
kernel image is loaded, as a security feature that
deters exploit attempts relying on knowledge of the location
of kernel internals.
Randomizes the physical and virtual address at which the
kernel image is loaded, as a security feature that
deters exploit attempts relying on knowledge of the location
of kernel internals.

Entropy is generated using any coprocessor 0 registers available.
Entropy is generated using any coprocessor 0 registers available.

The kernel will be offset by up to RANDOMIZE_BASE_MAX_OFFSET.
The kernel will be offset by up to RANDOMIZE_BASE_MAX_OFFSET.

If unsure, say N.
If unsure, say N.

config RANDOMIZE_BASE_MAX_OFFSET
hex "Maximum kASLR offset" if EXPERT
Expand Down Expand Up @@ -2827,7 +2826,7 @@ choice
prompt "Timer frequency"
default HZ_250
help
Allows the configuration of the timer frequency.
Allows the configuration of the timer frequency.

config HZ_24
bool "24 HZ" if SYS_SUPPORTS_24HZ || SYS_SUPPORTS_ARBIT_HZ
Expand Down Expand Up @@ -3127,10 +3126,10 @@ config ARCH_MMAP_RND_BITS_MAX
default 15

config ARCH_MMAP_RND_COMPAT_BITS_MIN
default 8
default 8

config ARCH_MMAP_RND_COMPAT_BITS_MAX
default 15
default 15

config I8253
bool
Expand Down
8 changes: 4 additions & 4 deletions arch/mips/bcm47xx/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ config BCM47XX_SSB
select SSB_DRIVER_GPIO
default y
help
Add support for old Broadcom BCM47xx boards with Sonics Silicon Backplane support.
Add support for old Broadcom BCM47xx boards with Sonics Silicon Backplane support.

This will generate an image with support for SSB and MIPS32 R1 instruction set.
This will generate an image with support for SSB and MIPS32 R1 instruction set.

config BCM47XX_BCMA
bool "BCMA Support for Broadcom BCM47XX"
Expand All @@ -31,8 +31,8 @@ config BCM47XX_BCMA
select BCMA_DRIVER_GPIO
default y
help
Add support for new Broadcom BCM47xx boards with Broadcom specific Advanced Microcontroller Bus.
Add support for new Broadcom BCM47xx boards with Broadcom specific Advanced Microcontroller Bus.

This will generate an image with support for BCMA and MIPS32 R2 instruction set.
This will generate an image with support for BCMA and MIPS32 R2 instruction set.

endif
2 changes: 1 addition & 1 deletion arch/mips/bcm63xx/boards/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ choice
default BOARD_BCM963XX

config BOARD_BCM963XX
bool "Generic Broadcom 963xx boards"
bool "Generic Broadcom 963xx boards"
select SSB

endchoice
8 changes: 4 additions & 4 deletions arch/mips/pic32/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ choice
Select the devicetree.

config DTB_PIC32_NONE
bool "None"
bool "None"

config DTB_PIC32_MZDA_SK
bool "PIC32MZDA Starter Kit"
depends on PIC32MZDA
select BUILTIN_DTB
bool "PIC32MZDA Starter Kit"
depends on PIC32MZDA
select BUILTIN_DTB

endchoice

Expand Down

0 comments on commit 371a415

Please sign in to comment.