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 <tglx@xxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Cc: x86@xxxxxxxxxx Signed-off-by: Michal Marek <mmarek@xxxxxxx> --- 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) -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
