summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaulK <contact@paulk.fr>2012-02-29 12:57:13 +0100
committerPaul Kocialkowski <contact@paulk.fr>2012-07-09 00:16:12 +0200
commit0ded304974012ddba74414583691498321e8612c (patch)
tree26c67466028d6a23786d06e7f33ae477cd29f19d
parent27ef63991756bb4006b2563a87df556a07118b0e (diff)
downloaddevice_samsung_galaxysmtd-0ded304974012ddba74414583691498321e8612c.zip
device_samsung_galaxysmtd-0ded304974012ddba74414583691498321e8612c.tar.gz
device_samsung_galaxysmtd-0ded304974012ddba74414583691498321e8612c.tar.bz2
Removed prebuilt kernel instructions and added custom bootimg.mk
-rw-r--r--BoardConfig.mk5
-rw-r--r--bootimg.mk9
-rw-r--r--galaxysmtd.mk14
3 files changed, 13 insertions, 15 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index d34e51b..33ff48a 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -71,7 +71,7 @@ BOARD_NAND_PAGE_SIZE := 4096 -s 128
BOARD_KERNEL_BASE := 0x32000000
BOARD_KERNEL_PAGESIZE := 4096
BOARD_KERNEL_CMDLINE := console=ttyFIQ0,115200 init=/init no_console_suspend
-TARGET_PREBUILT_KERNEL := device/samsung/galaxysmtd/kernel
+#TARGET_PREBUILT_KERNEL := device/samsung/galaxysmtd/kernel
BOARD_BOOTIMAGE_PARTITION_SIZE := 7864320
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 196608000
@@ -91,6 +91,9 @@ WIFI_DRIVER_MODULE_ARG := "firmware_path=/vendor/firmware/fw_bcm4329.bin n
# Vold
BOARD_VOLD_EMMC_SHARES_DEV_MAJOR := true
+# Images
+BOARD_CUSTOM_BOOTIMG_MK := device/samsung/galaxysmtd/bootimg.mk
+
# Recovery
TARGET_USERIMAGES_USE_EXT4 := true
BOARD_CUSTOM_RECOVERY_KEYMAPPING := ../../device/samsung/galaxysmtd/recovery/recovery_ui.c
diff --git a/bootimg.mk b/bootimg.mk
new file mode 100644
index 0000000..a9e517b
--- /dev/null
+++ b/bootimg.mk
@@ -0,0 +1,9 @@
+LOCAL_PATH := $(call my-dir)
+
+$(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 $@
+
diff --git a/galaxysmtd.mk b/galaxysmtd.mk
index cd45293..e79cf7a 100644
--- a/galaxysmtd.mk
+++ b/galaxysmtd.mk
@@ -157,20 +157,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
# we have enough storage space to hold precise GC data
PRODUCT_TAGS += dalvik.gc.type-precise
-# kernel modules
-PRODUCT_COPY_FILES += $(foreach module,\
- $(wildcard device/samsung/galaxysmtd/*.ko),\
- $(module):system/lib/modules/$(notdir $(module)))
-
-ifeq ($(TARGET_PREBUILT_KERNEL),)
- LOCAL_KERNEL := device/samsung/galaxysmtd/kernel
-else
- LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
-endif
-
-PRODUCT_COPY_FILES += \
- $(LOCAL_KERNEL):kernel
-
PRODUCT_COPY_FILES += \
device/samsung/aries-common/updater.sh:updater.sh