All of lore.kernel.org
 help / color / mirror / Atom feed
From: Steven King <sfking@fdwdc.com>
To: linux-kernel@vger.kernel.org
Cc: Roman Zippel <zippel@linux-m68k.org>,
	linux-m68k@vger.kernel.org, uclinux-dev@uclinux.org
Subject: Re: [PATCH] [Repost without wordwrapping] Merge m68k and m68knommu
Date: Thu, 19 Nov 2009 05:49:53 -0800	[thread overview]
Message-ID: <200911190549.53749.sfking@fdwdc.com> (raw)
In-Reply-To: <10f740e80911181332u48f8e610o4354cfd3994c8510@mail.gmail.com>

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

WARNING: multiple messages have this Message-ID (diff)
From: Steven King <sfking@fdwdc.com>
To: linux-kernel@vger.kernel.org
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
	linux-m68k@vger.kernel.org, uclinux-dev@uclinux.org,
	Greg Ungerer <gerg@snapgear.com>,
	Roman Zippel <zippel@linux-m68k.org>
Subject: Re: [PATCH] [Repost without wordwrapping] Merge m68k and m68knommu
Date: Thu, 19 Nov 2009 05:49:53 -0800	[thread overview]
Message-ID: <200911190549.53749.sfking@fdwdc.com> (raw)
In-Reply-To: <10f740e80911181332u48f8e610o4354cfd3994c8510@mail.gmail.com>

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


  reply	other threads:[~2009-11-19 13:49 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-18 23:55 [PATCH] [Repost without wordwrapping] Merge m68k and m68knommu Steven King
2009-11-10  8:55 ` Steven King
2009-12-04  4:47   ` Greg Ungerer
2009-12-05 21:13     ` Steven King
2009-11-18 21:32 ` Geert Uytterhoeven
2009-11-19 13:49   ` Steven King [this message]
2009-11-19 13:49     ` Steven King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200911190549.53749.sfking@fdwdc.com \
    --to=sfking@fdwdc.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-m68k@vger.kernel.org \
    --cc=uclinux-dev@uclinux.org \
    --cc=zippel@linux-m68k.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.