On Mon, Oct 19, 2009 at 00:55, Steven King <sfking00@xxxxxxxxx> wrote:
This is a script and patch to merge the m68knommu arch into m68k.
Thanks, nice!
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
The patch modifies the toplevel Makefile so that ARCH=m68knommu still works
(by setting SRCARCH=m68k) and adds the m68knommu Kconfig and Makefile
to the m68k Kconfig and Makefile, using the definition of ARCH to select
which values to use.
(still dreaming of my pet Amiga-nommu project) I prefer to use
CONFIG_MMU as the selector...
Thus when building for either a m68k or an m68knommu target, one still
specifies either ARCH=m68k or ARCH=m68knommu and everything should
build EXACTLY as it did pre-merge. (I think).
... using CONFIG_MMU would change this?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
