From da0fd963266488e75210697175680c949829efb6 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Fri, 25 Apr 2014 11:25:23 +0200 Subject: bootimg.mk: X-Loader and U-Boot modules are already correctly installed Signed-off-by: Paul Kocialkowski --- bootimg.mk | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/bootimg.mk b/bootimg.mk index 2f3920e..27980ef 100644 --- a/bootimg.mk +++ b/bootimg.mk @@ -16,10 +16,8 @@ LOCAL_PATH := $(call my-dir) 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 +INSTALLED_UBOOT_SCRIPT_MODULE := $(PRODUCT_OUT)/boot.scr +INSTALLED_UBOOT_SPLASH_MODULE := $(PRODUCT_OUT)/splash.rgb16z BUILT_RAMDISK_TARGET := $(INSTALLED_RAMDISK_TARGET) @@ -36,11 +34,9 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(INSTALLED_RECOVERY_KERNEL_TARGET) @echo -e ${CL_CYN}"Made recovery 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} + @echo -e ${CL_CYN}"Made X-Loader: $(INSTALLED_XLOADER_MODULE)"${CL_RST} + $(ACP) $(UBOOT_SRC)/../boot-scr/splash.rgb16z $(INSTALLED_UBOOT_SPLASH_MODULE) + @echo -e ${CL_CYN}"Made U-Boot splash: $(INSTALLED_UBOOT_SPLASH_MODULE)"${CL_RST} + $(MKIMAGE) -A arm -T script -C none -n "boot.scr" -d $(UBOOT_SRC)/../boot-scr/boot.txt $(INSTALLED_UBOOT_SCRIPT_MODULE) + @echo -e ${CL_CYN}"Made U-Boot script: $(INSTALLED_UBOOT_SCRIPT_MODULE)"${CL_RST} + @echo -e ${CL_CYN}"Made U-Boot: $(INSTALLED_UBOOT_MODULE)"${CL_RST} -- cgit v1.1