You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Greg Ungerer 66d857b08b m68k: merge m68k and m68knommu arch directories ... 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>		14 years ago
..
amiga	m68k/amiga: Reclaim Chip RAM for PPC exception handlers	14 years ago
apollo	…
atari	m68k/atari: Rename "scc" to "atari_scc"	14 years ago
bvme6000	m68k: Switch do_timer() to xtime_update()	14 years ago
configs	m68k: merge m68k and m68knommu arch directories	14 years ago
emu	m68k/atari: ARAnyM - Add support for network access	14 years ago
fpsp040	…
hp300	…
ifpsp060	m68k: fix comment typo diable -> disable.	14 years ago
include/asm	remove dma64_addr_t	14 years ago
kernel	m68k: merge m68k and m68knommu arch directories	14 years ago
lib	m68k: merge m68k and m68knommu arch directories	14 years ago
mac	fix comment typos concerning "consistent"	14 years ago
math-emu	m68k: Makefiles - Change to new flags variables	14 years ago
mm	m68k: merge m68k and m68knommu arch directories	14 years ago
mvme16x	m68k: Switch do_timer() to xtime_update()	14 years ago
mvme147	m68k: Switch do_timer() to xtime_update()	14 years ago
platform	m68k: merge m68k and m68knommu arch directories	14 years ago
q40	…
sun3	m68k: Switch do_timer() to xtime_update()	14 years ago
sun3x	…
tools/amiga	…
Kconfig	m68k: merge m68k and m68knommu arch directories	14 years ago
Kconfig.debug	m68k: merge m68k and m68knommu arch directories	14 years ago
Kconfig.mmu	m68k: merge m68k and m68knommu arch directories	14 years ago
Kconfig.nommu	m68k: merge m68k and m68knommu arch directories	14 years ago
Makefile	m68k: merge m68k and m68knommu arch directories	14 years ago
Makefile_mm	m68k: merge m68k and m68knommu arch directories	14 years ago
Makefile_no	m68k: merge m68k and m68knommu arch directories	14 years ago
install.sh	…