| Message ID | 1323107263-1870-5-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
On Mon, Dec 5, 2011 at 12:47 PM, Peter Maydell <peter.maydell@linaro.org> wrote: > Introduce a USE_INITRD switch so we can avoid requiring the user to touch > a pointless filesystem.cpio.gz if they're not using an initrd. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > Makefile | 11 +++++++++-- > 1 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/Makefile b/Makefile > index 38f1df6..0e07bf1 100644 > --- a/Makefile > +++ b/Makefile > @@ -6,11 +6,19 @@ > # found in the LICENSE.txt file. > > CPPFLAGS += -DSMP > -#CPPFLAGS += -DUSE_INITRD > #CPPFLAGS += -DTHUMB2_KERNEL > CPPFLAGS += -march=armv7-a > CPPFLAGS += -DVEXPRESS > > +# Turn this on to use an initrd whose contents are in filesystem.cpio.gz > +USE_INITRD = no hmm, perhaps we should have a super-simple config file added to .gitignore so we don't have to mock around with dirty trees due to different development setups? > +ifeq ($(USE_INITRD),yes) > +CPPFLAGS += -DUSE_INITRD > +FILESYSTEM = filesystem.cpio.gz > +else > +FILESYSTEM = > +endif > + > # MPS (Cortex-M3) definitions > #CPPFLAGS += -DMACH_MPS -DTHUMB2_KERNEL > #CPPFLAGS += -march=armv7-m > @@ -20,7 +28,6 @@ MONITOR = monitor.S > BOOTLOADER = boot.S > KERNEL_SRC = ../linux-kvm-arm > KERNEL = uImage > -FILESYSTEM = filesystem.cpio.gz > > IMAGE = linux-system.axf > LD_SCRIPT = model.lds.S > -- > 1.7.5.4 >
diff --git a/Makefile b/Makefile index 38f1df6..0e07bf1 100644 --- a/Makefile +++ b/Makefile @@ -6,11 +6,19 @@ # found in the LICENSE.txt file. CPPFLAGS += -DSMP -#CPPFLAGS += -DUSE_INITRD #CPPFLAGS += -DTHUMB2_KERNEL CPPFLAGS += -march=armv7-a CPPFLAGS += -DVEXPRESS +# Turn this on to use an initrd whose contents are in filesystem.cpio.gz +USE_INITRD = no +ifeq ($(USE_INITRD),yes) +CPPFLAGS += -DUSE_INITRD +FILESYSTEM = filesystem.cpio.gz +else +FILESYSTEM = +endif + # MPS (Cortex-M3) definitions #CPPFLAGS += -DMACH_MPS -DTHUMB2_KERNEL #CPPFLAGS += -march=armv7-m @@ -20,7 +28,6 @@ MONITOR = monitor.S BOOTLOADER = boot.S KERNEL_SRC = ../linux-kvm-arm KERNEL = uImage -FILESYSTEM = filesystem.cpio.gz IMAGE = linux-system.axf LD_SCRIPT = model.lds.S
Introduce a USE_INITRD switch so we can avoid requiring the user to touch a pointless filesystem.cpio.gz if they're not using an initrd. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- Makefile | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-)