commit 7d2ba7cff79393fbb0e7df91c4d72d4d22789cf8
author Nick Sanders <nsanders@google.com> Thu Dec 29 15:44:29 2011 -0800
committer Nick Sanders <nsanders@google.com> Tue Jan 03 13:30:30 2012 -0800
tree eb00b1b83b9b96f10b71b63430903fa22ab656dc
parent a66c5122082a8e22aa34a33c6e9e86c3d3dc8355

Add default kernel and base for factory ramdisk.

factory_ramdisk.img now is a real u-boot img containing
a kernel and memory offset metadata.

Change-Id: I9b4624eab8a6f769bb8bf0568484ee1865267c08

core/tasks/factory_ramdisk.mk

diff --git a/core/tasks/factory_ramdisk.mk b/core/tasks/factory_ramdisk.mk
index ecfc4d0..6757194 100644
--- a/core/tasks/factory_ramdisk.mk
+++ b/core/tasks/factory_ramdisk.mk
@@ -60,14 +60,22 @@
 
 ifneq (,$(INTERNAL_FACTORY_RAMDISK_EXTRA_MODULES_FILES)$(INTERNAL_FACTORY_RAMDISK_FILES))
 
+BUILT_FACTORY_RAMDISK_FS := $(PRODUCT_OUT)/factory_ramdisk.gz
 BUILT_FACTORY_RAMDISK_TARGET := $(PRODUCT_OUT)/factory_ramdisk.img
 
-INSTALLED_FACTORY_RAMDISK_TARGET := $(BUILT_FACTORY_RAMDISK_TARGET)
-$(INSTALLED_FACTORY_RAMDISK_TARGET) : $(MKBOOTFS) \
+INSTALLED_FACTORY_RAMDISK_FS := $(BUILT_FACTORY_RAMDISK_FS)
+$(INSTALLED_FACTORY_RAMDISK_FS) : $(MKBOOTFS) \
     $(INTERNAL_FACTORY_RAMDISK_EXTRA_MODULES_FILES) $(INTERNAL_FACTORY_RAMDISK_FILES) | $(MINIGZIP)
-	$(call pretty,"Target factory ram disk: $@")
+	$(call pretty,"Target factory ram disk file system: $@")
 	$(hide) $(MKBOOTFS) $(TARGET_FACTORY_RAMDISK_OUT) | $(MINIGZIP) > $@
 
+TARGET_RAMDISK_KERNEL := $(INSTALLED_KERNEL_TARGET)
+INSTALLED_FACTORY_RAMDISK_TARGET := $(BUILT_FACTORY_RAMDISK_TARGET)
+$(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 $@
+
 endif
 
 endif # ONE_SHOT_MAKEFILE