From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Ungerer Subject: Re: [PATCH] [Repost without wordwrapping] Merge m68k and m68knommu Date: Fri, 04 Dec 2009 14:47:56 +1000 Message-ID: <4B18947C.9090208@snapgear.com> References: <200910181655.40579.sfking00@yahoo.com> <200911100055.43227.sfking00@yahoo.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from rex.securecomputing.com ([203.24.151.4]:44379 "EHLO cyberguard.com.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755800AbZLDEr3 (ORCPT ); Thu, 3 Dec 2009 23:47:29 -0500 In-Reply-To: <200911100055.43227.sfking00@yahoo.com> Sender: linux-m68k-owner@vger.kernel.org List-Id: linux-m68k@vger.kernel.org To: Steven King Cc: linux-kernel@vger.kernel.org, linux-m68k@vger.kernel.org, uclinux-dev@uclinux.org, Geert Uytterhoeven , Roman Zippel 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 >> _mm. and the m68knommu version of the file is moved into the >> corresponding m68k directory and renamed _no. and a small >> wrapper file . 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 _mm. >> #else >> #include _no. >> #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 -- ------------------------------------------------------------------------ Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com 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