summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaulK <contact@paulk.fr>2012-03-17 16:58:16 +0100
committerPaul Kocialkowski <contact@paulk.fr>2012-07-09 00:16:12 +0200
commit6c23d8421254d196cab6131506d1d37b48f5a9e1 (patch)
tree3750c6cfed3641dbf0821c3b3d380d3f2926af8e
parent0ded304974012ddba74414583691498321e8612c (diff)
downloaddevice_samsung_galaxysmtd-6c23d8421254d196cab6131506d1d37b48f5a9e1.zip
device_samsung_galaxysmtd-6c23d8421254d196cab6131506d1d37b48f5a9e1.tar.gz
device_samsung_galaxysmtd-6c23d8421254d196cab6131506d1d37b48f5a9e1.tar.bz2
Changed custom bootimg commands
-rw-r--r--BoardConfig.mk1
-rw-r--r--bootimg.mk12
2 files changed, 11 insertions, 2 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 33ff48a..76f7132 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -98,7 +98,6 @@ BOARD_CUSTOM_BOOTIMG_MK := device/samsung/galaxysmtd/bootimg.mk
TARGET_USERIMAGES_USE_EXT4 := true
BOARD_CUSTOM_RECOVERY_KEYMAPPING := ../../device/samsung/galaxysmtd/recovery/recovery_ui.c
BOARD_USES_BML_OVER_MTD := true
-BOARD_CUSTOM_BOOTIMG_MK := device/samsung/aries-common/shbootimg.mk
TARGET_RECOVERY_PRE_COMMAND := "echo 1 > /cache/.startrecovery; sync;"
BOARD_HAS_NO_SELECT_BUTTON := true
diff --git a/bootimg.mk b/bootimg.mk
index a9e517b..c5ffd74 100644
--- a/bootimg.mk
+++ b/bootimg.mk
@@ -1,9 +1,19 @@
LOCAL_PATH := $(call my-dir)
-$(INSTALLED_BOOTIMAGE_TARGET): $(INSTALLED_RAMDISK_TARGET) $(INSTALLED_KERNEL_TARGET)
+#TARGET_KERNEL_CONFIG
+
+INSTALLED_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/boot.img
+INSTALLED_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img
+INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel
+
+.NOTPARALLEL: $(INSTALLED_BOOTIMAGE_TARGET)
+.NOTPARALLEL: $(INSTALLED_RECOVERYIMAGE_TARGET)
+
+$(INSTALLED_BOOTIMAGE_TARGET): $(INSTALLED_RAMDISK_TARGET) $(INSTALLED_KERNEL_TARGET)
$(call pretty,"Boot image: $@")
$(ACP) $(PRODUCT_OUT)/kernel $@
$(INSTALLED_RECOVERYIMAGE_TARGET): $(recovery_ramdisk) $(recovery_kernel) $(PRODUCT_OUT)/utilities/busybox $(PRODUCT_OUT)/utilities/mke2fs
$(ACP) $(PRODUCT_OUT)/kernel-recovery $@
+include $(BUILD_SYSTEM)/kernel.mk