From ce44479906988dc0a4b1dcfd1d01b5508e6b99bf Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Wed, 9 Jan 2013 15:44:45 +0000 Subject: Tidy up the kernel boot arguments Signed-off-by: Catalin Marinas --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 08b6707..c80d84e 100644 --- a/Makefile +++ b/Makefile @@ -35,15 +35,17 @@ FDT_INCL_REGEX := \(/include/[[:space:]]*"\)\([^"]\+\)\(".*\) FDT_DEPS := $(FDT_SRC) $(addprefix $(dir $(FDT_SRC)), $(shell sed -ne 'sq$(strip $(FDT_INCL_REGEX)q\2q p' < $(FDT_SRC)))) FDT_OFFSET := 0x08000000 +BOOTARGS_COMMON := "console=ttyAMA0 earlyprintk=pl011,0x1c090000 $(BOOTARGS_EXTRA)" + ifneq (,$(findstring USE_INITRD,$(CPPFLAGS))) -BOOTARGS := "console=ttyAMA0 $(BOOTARGS_EXTRA)" +BOOTARGS := "$(BOOTARGS_COMMON)" CHOSEN_NODE := chosen { \ bootargs = \"$(BOOTARGS)\"; \ linux,initrd-start = <$(FILESYSTEM_START)>; \ linux,initrd-end = <$(FILESYSTEM_END)>; \ }; else -BOOTARGS := "console=ttyAMA0 root=/dev/nfs nfsroot=10.1.69.68:/work/debootstrap/aarch64,tcp rw ip=dhcp $(BOOTARGS_EXTRA)" +BOOTARGS := "root=/dev/nfs nfsroot=\:\,tcp rw ip=dhcp $(BOOTARGS_COMMON)" CHOSEN_NODE := chosen { \ bootargs = \"$(BOOTARGS)\"; \ }; -- cgit v1.2.3