Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

microblaze: Remove the buggy ALLOW_EDIT_AUTO config option

This was intended to allow manual override of CPU settings copied automatically
to Kconfig.auto, however it's problematic for several reasons, but mostly:

* If the defconfig doesn't have ALLOW_EDIT_AUTO=y, then it's impossible for
that defconfig to iverride the values in the kernel source tree. This leads
to very strange errors where the kernel is compiled with the wrong CPUFLAGS.

Next patch in the series will back out the default in Kconfig.auto to baseline
settings, so a kernel built with no default values will at least boot on any
hardware, just not make use of additional CPU features.

Signed-off-by: John Williams <john.williams@petalogix.com>
Signed-off-by: Michal Simek <monstr@monstr.eu>

authored by

John Williams and committed by
Michal Simek
3e78e4e5 a1f55113

+8 -28
-19
arch/microblaze/platform/Kconfig.platform
··· 59 59 Allows turn on optimalized library function (memcpy and memmove). 60 60 Function are written in asm code. 61 61 62 - # This is still a bit broken - disabling for now JW 20070504 63 - config ALLOW_EDIT_AUTO 64 - bool "Permit Display/edit of Kconfig.auto platform settings" 65 - default n 66 - help 67 - Allows the editing of auto-generated platform settings from 68 - the Kconfig.auto file. Obviously this does not change the 69 - underlying hardware, so be very careful if you go editing 70 - these settings. 71 - 72 - Also, if you enable this, and edit various Kconfig.auto 73 - settings, YOUR CHANGES WILL BE LOST if you then disable it 74 - again. You have been warned! 75 - 76 - If unsure, say no. 77 - 78 - comment "Automatic platform settings from Kconfig.auto" 79 - depends on ALLOW_EDIT_AUTO 80 - 81 62 if PLATFORM_GENERIC=y 82 63 source "arch/microblaze/platform/generic/Kconfig.auto" 83 64 endif
+8 -9
arch/microblaze/platform/generic/Kconfig.auto
··· 21 21 22 22 # Definitions for MICROBLAZE0 23 23 comment "Definitions for MICROBLAZE0" 24 - depends on ALLOW_EDIT_AUTO 25 24 26 25 config KERNEL_BASE_ADDR 27 26 hex "Physical address where Linux Kernel is" ··· 29 30 BASE Address for kernel 30 31 31 32 config XILINX_MICROBLAZE0_FAMILY 32 - string "Targetted FPGA family" if ALLOW_EDIT_AUTO 33 + string "Targetted FPGA family" 33 34 default "virtex5" 34 35 35 36 config XILINX_MICROBLAZE0_USE_MSR_INSTR 36 - int "USE_MSR_INSTR range (0:1)" if ALLOW_EDIT_AUTO 37 + int "USE_MSR_INSTR range (0:1)" 37 38 default 1 38 39 39 40 config XILINX_MICROBLAZE0_USE_PCMP_INSTR 40 - int "USE_PCMP_INSTR range (0:1)" if ALLOW_EDIT_AUTO 41 + int "USE_PCMP_INSTR range (0:1)" 41 42 default 1 42 43 43 44 config XILINX_MICROBLAZE0_USE_BARREL 44 - int "USE_BARREL range (0:1)" if ALLOW_EDIT_AUTO 45 + int "USE_BARREL range (0:1)" 45 46 default 1 46 47 47 48 config XILINX_MICROBLAZE0_USE_DIV 48 - int "USE_DIV range (0:1)" if ALLOW_EDIT_AUTO 49 + int "USE_DIV range (0:1)" 49 50 default 1 50 51 51 52 config XILINX_MICROBLAZE0_USE_HW_MUL 52 - int "USE_HW_MUL values (0=NONE, 1=MUL32, 2=MUL64)" if ALLOW_EDIT_AUTO 53 + int "USE_HW_MUL values (0=NONE, 1=MUL32, 2=MUL64)" 53 54 default 2 54 55 55 56 config XILINX_MICROBLAZE0_USE_FPU 56 - int "USE_FPU values (0=NONE, 1=BASIC, 2=EXTENDED)" if ALLOW_EDIT_AUTO 57 + int "USE_FPU values (0=NONE, 1=BASIC, 2=EXTENDED)" 57 58 default 2 58 59 59 60 config XILINX_MICROBLAZE0_HW_VER 60 - string "Core version number" if ALLOW_EDIT_AUTO 61 + string "Core version number" 61 62 default 7.10.d