From patchwork Mon Apr 11 15:08:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Marek X-Patchwork-Id: 698451 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3BF7Afo022190 for ; Mon, 11 Apr 2011 15:08:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753881Ab1DKPIY (ORCPT ); Mon, 11 Apr 2011 11:08:24 -0400 Received: from cantor2.suse.de ([195.135.220.15]:40079 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753015Ab1DKPIY (ORCPT ); Mon, 11 Apr 2011 11:08:24 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) by mx2.suse.de (Postfix) with ESMTP id B20F386A2E; Mon, 11 Apr 2011 17:08:22 +0200 (CEST) Received: by sepie.suse.cz (Postfix, from userid 10020) id BD940764D5; Mon, 11 Apr 2011 17:08:21 +0200 (CEST) Date: Mon, 11 Apr 2011 17:08:21 +0200 From: Michal Marek To: "H. Peter Anvin" Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Gleixner , Ingo Molnar , x86@kernel.org Subject: Re: [PATCH 09/34] x86: Allow to override the ROOT_DEV variable Message-ID: <20110411150820.GA22004@sepie.suse.cz> References: <1302015561-21047-1-git-send-email-mmarek@suse.cz> <1302015561-21047-10-git-send-email-mmarek@suse.cz> <4D9B3581.6080105@zytor.com> <4D9C1AA0.9030008@suse.cz> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4D9C1AA0.9030008@suse.cz> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 11 Apr 2011 15:08:25 +0000 (UTC) On Wed, Apr 06, 2011 at 09:47:44AM +0200, Michal Marek wrote: > On 5.4.2011 17:30, H. Peter Anvin wrote: > >> --- a/arch/x86/boot/Makefile > >> +++ b/arch/x86/boot/Makefile > >> @@ -13,7 +13,7 @@ > >> # This can be either FLOPPY, CURRENT, /dev/xxxx or empty, in which case > >> # the default of FLOPPY is used by 'build'. > >> > >> -ROOT_DEV := CURRENT > >> +ROOT_DEV ?= CURRENT > >> > >> # If you want to preset the SVGA mode, uncomment the next line and > >> # set SVGA_MODE to whatever number you want. > > > > Is this a good thing? As far as I understand ?= it may mean picking > > something up from the outside environment. > > > > Since ROOT_DEV has been obsolete for 15 years or more, this would seem > > to be a needless new error mode. > > So can we just set the default root device to (0, 0)? Like this? Subject: [PATCH] x86: Do not set the rood_dev field in bzImage This has been obsoleted by the root= commandline for several years. People who still depend on this will surely have a copy of the rdev command around, the rest of the world gets rid of another piece of buildhost-dependent data in the build. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: x86@kernel.org Signed-off-by: Michal Marek --- arch/x86/boot/Makefile | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index f7cb086..95365a8 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -9,12 +9,6 @@ # Changed by many, many contributors over the years. # -# ROOT_DEV specifies the default root-device when making the image. -# This can be either FLOPPY, CURRENT, /dev/xxxx or empty, in which case -# the default of FLOPPY is used by 'build'. - -ROOT_DEV := CURRENT - # If you want to preset the SVGA mode, uncomment the next line and # set SVGA_MODE to whatever number you want. # Set it to -DSVGA_MODE=NORMAL_VGA if you just want the EGA/VGA mode. @@ -75,8 +69,7 @@ GCOV_PROFILE := n $(obj)/bzImage: asflags-y := $(SVGA_MODE) quiet_cmd_image = BUILD $@ -cmd_image = $(obj)/tools/build $(obj)/setup.bin $(obj)/vmlinux.bin \ - $(ROOT_DEV) > $@ +cmd_image = $(obj)/tools/build $(obj)/setup.bin $(obj)/vmlinux.bin > $@ $(obj)/bzImage: $(obj)/setup.bin $(obj)/vmlinux.bin $(obj)/tools/build FORCE $(call if_changed,image)