diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2013-01-09 15:44:45 +0000 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2013-01-09 15:54:47 +0000 |
commit | ce44479906988dc0a4b1dcfd1d01b5508e6b99bf (patch) | |
tree | f741809ccdeed5ea75aa064053cd305fb94614dc | |
parent | 81a47f2daf02ab6869b7d0dc68e523e3eec8bfb1 (diff) |
Tidy up the kernel boot arguments
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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=\<serverip\>:\<rootfs\>,tcp rw ip=dhcp $(BOOTARGS_COMMON)" CHOSEN_NODE := chosen { \ bootargs = \"$(BOOTARGS)\"; \ }; |