commit 135c3af45af3d18ebda5aa9f66562191f3da55a1
author Nick Sanders <nsanders@google.com> Fri Apr 06 14:11:10 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 06 14:11:10 2012 -0700
tree b0879c5ed74fb4de12202410e20b9201040502be
parent 277e68b3af2e6521d4bc28a1a2e6b49e2cf1134f
parent df49771a4a82a147e287190f872ab9d0e237a69f

am df49771a: Allow factory specific kernel commandline

* commit 'df49771a4a82a147e287190f872ab9d0e237a69f':
  Allow factory specific kernel commandline

core/tasks/factory_ramdisk.mk

diff --git a/core/tasks/factory_ramdisk.mk b/core/tasks/factory_ramdisk.mk
index 2cbea87..576a159 100644
--- a/core/tasks/factory_ramdisk.mk
+++ b/core/tasks/factory_ramdisk.mk
@@ -75,10 +75,15 @@
 
 TARGET_RAMDISK_KERNEL := $(INSTALLED_KERNEL_TARGET)
 INSTALLED_FACTORY_RAMDISK_TARGET := $(BUILT_FACTORY_RAMDISK_TARGET)
+ifneq (,$(BOARD_KERNEL_CMDLINE_FACTORY_BOOT))
+  RAMDISK_CMDLINE := --cmdline "$(BOARD_KERNEL_CMDLINE_FACTORY_BOOT)"
+else
+  RAMDISK_CMDLINE :=
+endif
 $(INSTALLED_FACTORY_RAMDISK_TARGET) : $(MKBOOTIMG) $(TARGET_RAMDISK_KERNEL) $(INSTALLED_FACTORY_RAMDISK_FS)
 	$(call pretty,"Target factory ram disk img format: $@")
 	$(MKBOOTIMG) --kernel $(TARGET_RAMDISK_KERNEL) --ramdisk $(INSTALLED_FACTORY_RAMDISK_FS) \
-            --base $(BOARD_KERNEL_BASE) --output $@
+            --base $(BOARD_KERNEL_BASE) $(RAMDISK_CMDLINE) --output $@
 
 endif