Merge change I2b959b13
* changes:
[qsd8250] Split 232MB for kernel into 224M + 8M
diff --git a/AndroidBoot.mk b/AndroidBoot.mk
index 6500f49..4487d0c 100644
--- a/AndroidBoot.mk
+++ b/AndroidBoot.mk
@@ -23,13 +23,13 @@
$(BOOTLOADER_EMMC_OUT):
mkdir -p $(BOOTLOADER_EMMC_OUT)
-$(TARGET_BOOTLOADER): $(BOOTLOADER_OUT) appsbootldr_clean emmc_appsbootldr_clean
+$(TARGET_BOOTLOADER): appsbootldr_clean emmc_appsbootldr_clean $(BOOTLOADER_OUT) $(BOOTLOADER_EMMC_OUT)
$(MAKE) -C bootable/bootloader/lk BOOTLOADER_OUT=../../../$(BOOTLOADER_OUT) $(TARGET_PRODUCT)
$(MAKE) -C bootable/bootloader/lk BOOTLOADER_OUT=../../../$(BOOTLOADER_EMMC_OUT) $(TARGET_PRODUCT) EMMC_BOOT=1
else
-$(TARGET_BOOTLOADER): $(BOOTLOADER_OUT) appsbootldr_clean
+$(TARGET_BOOTLOADER): appsbootldr_clean $(BOOTLOADER_OUT)
$(MAKE) -C bootable/bootloader/lk BOOTLOADER_OUT=../../../$(BOOTLOADER_OUT) $(TARGET_PRODUCT)
endif
@@ -38,10 +38,14 @@
TARGET_NANDWRITE := $(PRODUCT_OUT)/obj/nandwrite/build-$(TARGET_PRODUCT)_nandwrite/lk
NANDWRITE_OUT := $(TOP)/$(TARGET_OUT_INTERMEDIATES)/nandwrite
-$(NANDWRITE_OUT):
- mkdir -p $(BOOTLOADER_OUT)
+nandwrite_clean:
+ $(hide) rm -f $(TARGET_NANDWRITE)
+ $(hide) rm -rf $(NANDWRITE_OUT)
-$(TARGET_NANDWRITE): $(NANDWRITE_OUT)
+$(NANDWRITE_OUT):
+ mkdir -p $(NANDWRITE_OUT)
+
+$(TARGET_NANDWRITE): nandwrite_clean $(NANDWRITE_OUT)
@echo $(TARGET_PRODUCT)_nandwrite
- $(MAKE) -C bootable/bootloader/lk BOOTLOADER_OUT=../../../$(NANDWRITE_OUT) $(TARGET_PRODUCT)_nandwrite
+ $(MAKE) -C bootable/bootloader/lk BOOTLOADER_OUT=../../../$(NANDWRITE_OUT) $(TARGET_PRODUCT)_nandwrite BUILD_NANDWRITE=1
diff --git a/target/msm7630_surf/tools/makefile b/target/msm7630_surf/tools/makefile
index cda5cdf..6cadf14 100644
--- a/target/msm7630_surf/tools/makefile
+++ b/target/msm7630_surf/tools/makefile
@@ -10,9 +10,13 @@
COMPILER := gcc
ifeq ($(EMMC_BOOT), 1)
-APPSBOOTHDR_FILES := emmc_appsboot.mbn
+ APPSBOOTHDR_FILES := emmc_appsboot.mbn
else
-APPSBOOTHDR_FILES := appsboot.mbn
+ ifeq ($(BUILD_NANDWRITE), 1)
+ APPSBOOTHDR_FILES :=
+ else
+ APPSBOOTHDR_FILES := appsboot.mbn
+ endif
endif
APPSBOOTHEADER: $(APPSBOOTHDR_FILES)