Initial Replicant 4.2 commit

Many thanks to Lukas Märdian for his great work:
part of the changes introduced in this commit reflect his work.

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>

1 files changed, 39 insertions, 21 deletions

diff --git a/bootimg.mk b/bootimg.mk
index 540fb11..1ac2bbc 100644
--- a/bootimg.mk
+++ b/bootimg.mk
@@ -1,27 +1,45 @@
+# Copyright (C) 2012-2014 Paul Kocialkowski <contact@paulk.fr>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 LOCAL_PATH := $(call my-dir)
 
-INSTALLED_XLOADER_MODULE := $(PRODUCT_OUT)/xloader
+INSTALLED_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk.cpio
+INSTALLED_XLOADER_TARGET := $(PRODUCT_OUT)/MLO
+INSTALLED_UBOOT_TARGET := $(PRODUCT_OUT)/u-boot.bin
+INSTALLED_UBOOT_SCRIPT_TARGET := $(PRODUCT_OUT)/boot.scr
+INSTALLED_UBOOT_SPLASH_TARGET := $(PRODUCT_OUT)/splash.rgb16z
+
+BUILT_RAMDISK_TARGET := $(INSTALLED_RAMDISK_TARGET)
 
-INSTALLED_BOOTLOADERIMAGE_TARGET := $(PRODUCT_OUT)/u-boot.bin
-INSTALLED_XLOADERIMAGE_TARGET := $(PRODUCT_OUT)/MLO
-INSTALLED_BOOTLOADER_SCRIPT_TARGET := $(PRODUCT_OUT)/boot.scr
-INSTALLED_BOOTLOADER_SPLASH_TARGET := $(PRODUCT_OUT)/splash.rgb16z
+$(INSTALLED_RAMDISK_TARGET): $(MKBOOTFS) $(INTERNAL_RAMDISK_FILES)
+	$(call pretty,"Target ram disk: $@")
+	$(hide) $(MKBOOTFS) $(TARGET_ROOT_OUT) > $@
 
-$(INSTALLED_BOOTIMAGE_TARGET): $(MKIMAGE) $(INSTALLED_RAMDISK_TARGET) $(INSTALLED_KERNEL_TARGET)
-	$(call pretty,"Boot image: $@")
+$(INSTALLED_BOOTIMAGE_TARGET): $(INSTALLED_KERNEL_TARGET)
 	$(ACP) $(INSTALLED_KERNEL_TARGET) $@
-	@echo -e ${CL_INS}"Made boot image: $@"${CL_RST}
+	@echo -e ${CL_CYN}"Made boot image: $@"${CL_RST}
+
+$(INSTALLED_RECOVERYIMAGE_TARGET): $(INSTALLED_RECOVERY_KERNEL_TARGET)
+	$(ACP) $(INSTALLED_RECOVERY_KERNEL_TARGET) $@
+	@echo -e ${CL_CYN}"Made recovery image: $@"${CL_RST}
 
-$(INSTALLED_BOOTLOADERIMAGE_TARGET): $(INSTALLED_XLOADER_MODULE) $(INSTALLED_BOOTLOADER_MODULE) $(MKIMAGE)
-	$(call pretty,"X-Loader image: $(INSTALLED_XLOADER_MODULE)")
-	$(ACP) $(INSTALLED_XLOADER_MODULE) $(INSTALLED_XLOADERIMAGE_TARGET)
-	@echo -e ${CL_INS}"Made X-Loader image: $(INSTALLED_XLOADERIMAGE_TARGET)"${CL_RST}
-	$(call pretty,"Bootloader splash: $(INSTALLED_BOOTLOADER_SPLASH_TARGET)")
-	$(ACP) $(BOOTLOADER_SRC)/../boot-scr/splash.rgb16z $(INSTALLED_BOOTLOADER_SPLASH_TARGET)
-	@echo -e ${CL_INS}"Made bootloader splash: $(INSTALLED_BOOTLOADER_SPLASH_TARGET)"${CL_RST}
-	$(call pretty,"Bootloader script: $(INSTALLED_BOOTLOADER_SCRIPT_TARGET)")
-	$(MKIMAGE) -A arm -T script -C none -n "boot.scr" -d $(BOOTLOADER_SRC)/../boot-scr/boot.txt $(INSTALLED_BOOTLOADER_SCRIPT_TARGET)
-	@echo -e ${CL_INS}"Made bootloader script: $(INSTALLED_BOOTLOADER_SCRIPT_TARGET)"${CL_RST}
-	$(call pretty,"Bootloader image: $@")
-	$(ACP) $(INSTALLED_BOOTLOADER_MODULE) $@
-	@echo -e ${CL_INS}"Made bootloader image: $@"${CL_RST}
+$(INSTALLED_BOOTLOADERIMAGE_TARGET): $(INSTALLED_XLOADER_MODULE) $(INSTALLED_UBOOT_MODULE) $(MKIMAGE)
+	$(ACP) $(INSTALLED_XLOADER_MODULE) $(INSTALLED_XLOADER_TARGET)
+	@echo -e ${CL_CYN}"Made X-Loader: $(INSTALLED_XLOADER_TARGET)"${CL_RST}
+	$(ACP) $(UBOOT_SRC)/../boot-scr/splash.rgb16z $(INSTALLED_UBOOT_SPLASH_TARGET)
+	@echo -e ${CL_CYN}"Made U-Boot splash: $(INSTALLED_UBOOT_SPLASH_TARGET)"${CL_RST}
+	$(MKIMAGE) -A arm -T script -C none -n "boot.scr" -d $(UBOOT_SRC)/../boot-scr/boot.txt $(INSTALLED_UBOOT_SCRIPT_TARGET)
+	@echo -e ${CL_CYN}"Made U-Boot script: $(INSTALLED_UBOOT_SCRIPT_TARGET)"${CL_RST}
+	$(ACP) $(INSTALLED_UBOOT_MODULE) $(INSTALLED_UBOOT_TARGET)
+	@echo -e ${CL_CYN}"Made U-Boot: $(INSTALLED_UBOOT_TARGET)"${CL_RST}