66d857b08b
There is a lot of common code that could be shared between the m68k and m68knommu arch branches. It makes sense to merge the two branches into a single directory structure so that we can more easily share that common code. This is a brute force merge, based on a script from Stephen King <sfking@fdwdc.com>, which was originally written by Arnd Bergmann <arnd@arndb.de>. > The script was inspired by the script Sam Ravnborg used to merge the > includes from m68knommu. For those files common to both arches but > differing in content, the m68k version of the file is renamed to > <file>_mm.<ext> and the m68knommu version of the file is moved into the > corresponding m68k directory and renamed <file>_no.<ext> and a small > wrapper file <file>.<ext> is used to select between the two version. Files > that are common to both but don't differ are removed from the m68knommu > tree and files and directories that are unique to the m68knommu tree are > moved to the m68k tree. Finally, the arch/m68knommu tree is removed. > > To select between the the versions of the files, the wrapper uses > > #ifdef CONFIG_MMU > #include <file>_mm.<ext> > #else > #include <file>_no.<ext> > #endif On top of this file merge I have done a simplistic merge of m68k and m68knommu Kconfig, which primarily attempts to keep existing options and menus in place. Other than a handful of options being moved it produces identical .config outputs on m68k and m68knommu targets I tested it on. With this in place there is now quite a bit of scope for merge cleanups in future patches. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
40 lines
776 B
Plaintext
40 lines
776 B
Plaintext
menu "Kernel hacking"
|
|
|
|
source "lib/Kconfig.debug"
|
|
|
|
if !MMU
|
|
|
|
config FULLDEBUG
|
|
bool "Full Symbolic/Source Debugging support"
|
|
help
|
|
Enable debugging symbols on kernel build.
|
|
|
|
config HIGHPROFILE
|
|
bool "Use fast second timer for profiling"
|
|
depends on COLDFIRE
|
|
help
|
|
Use a fast secondary clock to produce profiling information.
|
|
|
|
config BOOTPARAM
|
|
bool 'Compiled-in Kernel Boot Parameter'
|
|
|
|
config BOOTPARAM_STRING
|
|
string 'Kernel Boot Parameter'
|
|
default 'console=ttyS0,19200'
|
|
depends on BOOTPARAM
|
|
|
|
config NO_KERNEL_MSG
|
|
bool "Suppress Kernel BUG Messages"
|
|
help
|
|
Do not output any debug BUG messages within the kernel.
|
|
|
|
config BDM_DISABLE
|
|
bool "Disable BDM signals"
|
|
depends on (EXPERIMENTAL && COLDFIRE)
|
|
help
|
|
Disable the ColdFire CPU's BDM signals.
|
|
|
|
endif
|
|
|
|
endmenu
|