dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
John Williams 2009-08-24 13:52:32 +10:00 committed by Michal Simek
parent a1f55113ca
commit 3e78e4e5ea
2 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/microblaze/platform/Kconfig.platform
View File

@ -59,25 +59,6 @@ config OPT_LIB_ASM
Allows turn on optimalized library function (memcpy and memmove).
Function are written in asm code.
# This is still a bit broken - disabling for now JW 20070504
config ALLOW_EDIT_AUTO
bool "Permit Display/edit of Kconfig.auto platform settings"
default n
help
Allows the editing of auto-generated platform settings from
the Kconfig.auto file. Obviously this does not change the
underlying hardware, so be very careful if you go editing
these settings.
Also, if you enable this, and edit various Kconfig.auto
settings, YOUR CHANGES WILL BE LOST if you then disable it
again. You have been warned!
If unsure, say no.
comment "Automatic platform settings from Kconfig.auto"
depends on ALLOW_EDIT_AUTO
if PLATFORM_GENERIC=y
source "arch/microblaze/platform/generic/Kconfig.auto"
endif

17
arch/microblaze/platform/generic/Kconfig.auto
View File

@ -21,7 +21,6 @@
# Definitions for MICROBLAZE0
comment "Definitions for MICROBLAZE0"
depends on ALLOW_EDIT_AUTO
config KERNEL_BASE_ADDR
hex "Physical address where Linux Kernel is"
@ -30,33 +29,33 @@ config KERNEL_BASE_ADDR
BASE Address for kernel
config XILINX_MICROBLAZE0_FAMILY
string "Targetted FPGA family" if ALLOW_EDIT_AUTO
string "Targetted FPGA family"
default "virtex5"
config XILINX_MICROBLAZE0_USE_MSR_INSTR
int "USE_MSR_INSTR range (0:1)" if ALLOW_EDIT_AUTO
int "USE_MSR_INSTR range (0:1)"
default 1
config XILINX_MICROBLAZE0_USE_PCMP_INSTR
int "USE_PCMP_INSTR range (0:1)" if ALLOW_EDIT_AUTO
int "USE_PCMP_INSTR range (0:1)"
default 1
config XILINX_MICROBLAZE0_USE_BARREL
int "USE_BARREL range (0:1)" if ALLOW_EDIT_AUTO
int "USE_BARREL range (0:1)"
default 1
config XILINX_MICROBLAZE0_USE_DIV
int "USE_DIV range (0:1)" if ALLOW_EDIT_AUTO
int "USE_DIV range (0:1)"
default 1
config XILINX_MICROBLAZE0_USE_HW_MUL
int "USE_HW_MUL values (0=NONE, 1=MUL32, 2=MUL64)" if ALLOW_EDIT_AUTO
int "USE_HW_MUL values (0=NONE, 1=MUL32, 2=MUL64)"
default 2
config XILINX_MICROBLAZE0_USE_FPU
int "USE_FPU values (0=NONE, 1=BASIC, 2=EXTENDED)" if ALLOW_EDIT_AUTO
int "USE_FPU values (0=NONE, 1=BASIC, 2=EXTENDED)"
default 2
config XILINX_MICROBLAZE0_HW_VER
string "Core version number" if ALLOW_EDIT_AUTO
string "Core version number"
default 7.10.d