Re: [uClinux-dev] Re: [PATCH] [Repost without wordwrapping] Merge m68k and m68knommu
On Thursday 03 December 2009 9:50:41 Sam Ravnborg wrote: On Fri, Dec 04, 2009 at 02:47:56PM +1000, Greg Ungerer wrote: 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 :-) I have tried the script when it was first posted. Result looked good and it could build with what I had available of cross compiler (I think only m68k). Thanks Sam, I built all the coldfire defconfigs as well as specific configs for the hardware I have here, but I couldn't get the Code Sourcery toolchain to even build the regular kernel for m68k (I guess the Code Sourcery tools only support Coldfire?), so I wasnt able to verify the m68k build. However, I should soon be getting a nice, shinny new (to me) Mac Classsic II to play with ;-P -- Steven King -- sfking at fdwdc dot com ___ uClinux-dev mailing list uClinux-dev@uclinux.org http://mailman.uclinux.org/mailman/listinfo/uclinux-dev This message was resent by uclinux-dev@uclinux.org To unsubscribe see: http://mailman.uclinux.org/mailman/options/uclinux-dev
[uClinux-dev] Re: [PATCH] [Repost without wordwrapping] Merge m68k and m68knommu
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 sfk...@fdwdc.com -- Greg Ungerer -- Principal EngineerEMAIL: g...@snapgear.com SnapGear Group, McAfee PHONE: +61 7 3435 2888 8 Gardner Close FAX: +61 7 3217 5323 Milton, QLD, 4064, AustraliaWEB: http://www.SnapGear.com ___ uClinux-dev mailing list uClinux-dev@uclinux.org http://mailman.uclinux.org/mailman/listinfo/uclinux-dev This message was resent by uclinux-dev@uclinux.org To unsubscribe see: http://mailman.uclinux.org/mailman/options/uclinux-dev
[uClinux-dev] Re: [PATCH] [Repost without wordwrapping] Merge m68k and m68knommu
On Wednesday 18 November 2009 01:32:25 Geert Uytterhoeven wrote: 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... CONFIG_MMU is used as the selector elsewhere, but for Kconfig and the Makefiles something else was needed. 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? Yes; originally I tried using CONFIG_MMU to choose between the mmu and nommu portions of the Kconfig and Makefile, but that broke the defconfigs. Rather than patch the defconfigs or make a more elaborate patch for the Kconfig, for this initial patch I wanted to keep it as simple and as un-invasive as possible so that it would be trivial (?) to verify the merged kernel tree produces a kernel that is the same as the pre-merged kernel tree, thus providing a baseline for bisecting any problems with the subsequent patches that do the real merging of the individual files. A later patch will do a better job of merging the Kconfigs and Makefiles. Then you'd be able to have your Amiga-nommu and I can have my Coldfire 5484 either as mmu or nommu... -- Steven King -- sfking at fdwdc dot com ___ uClinux-dev mailing list uClinux-dev@uclinux.org http://mailman.uclinux.org/mailman/listinfo/uclinux-dev This message was resent by uclinux-dev@uclinux.org To unsubscribe see: http://mailman.uclinux.org/mailman/options/uclinux-dev
[uClinux-dev] Re: [PATCH] [Repost without wordwrapping] Merge m68k and m68knommu
On Mon, Oct 19, 2009 at 00:55, Steven King sfkin...@yahoo.com 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 -- ge...@linux-m68k.org
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
___
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev
