Re: [PATCH] [Repost without wordwrapping] Merge m68k and m68knommu

[Greg Ungerer]

Hi Steven,

Steven King wrote:
> On Sunday 18 October 2009 04:55:40 Steven King wrote:
> > This is a script and patch to merge the m68knommu arch into m68k.
>
> Ping.

Sorry, I have just not had time to look at this yet.
Promise to find some time soon to have a closer look soon :-)

Regards
Greg



> > 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.
> >
> > 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).
> >
> >
> > Signed-off-by: Steven King <sfking@xxxxxxxxx>



--
------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg@xxxxxxxxxxxx
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close                             FAX:         +61 7 3217 5323
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/