summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Pundir <amit.pundir@linaro.org>2014-05-20 01:32:55 +0530
committerAmit Pundir <amit.pundir@linaro.org>2014-05-20 01:41:48 +0530
commit82e2ff0270c62f205c21253570f1048bdb369ac8 (patch)
tree146813147abbfaec1a4298e01198d9057ca88f06
parentfd5f17db9644173527cb0df506cb69a7fb9d6fa5 (diff)
downloadjuno-82e2ff0270c62f205c21253570f1048bdb369ac8.tar.gz
dont copy prebuilt kernel image, module and dtb when building from source
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
-rw-r--r--BoardConfig.mk1
-rw-r--r--device.mk10
-rw-r--r--init.juno.rc2
3 files changed, 9 insertions, 4 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 0cd744f..f6af7e7 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -50,6 +50,7 @@ KERNEL_TOOLS_PREFIX ?= $(realpath $(TOP))/prebuilts/gcc/linux-x86/aarch64/aarch6
KERNEL_CONFIG := android_defconfig
TARGET_KERNEL_SOURCE ?= kernel/linaro/juno
DEVICE_TREES := juno:juno.dtb
+BUILD_KERNEL_MODULES ?= true
else
TARGET_PREBUILT_KERNEL := $(LOCAL_PATH)/Image
endif
diff --git a/device.mk b/device.mk
index dd711dd..928d704 100644
--- a/device.mk
+++ b/device.mk
@@ -23,11 +23,8 @@ $(call inherit-product-if-exists, frameworks/native/build/tablet-dalvik-heap.mk)
TARGET_PROVIDES_INIT_RC := true
PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
$(LOCAL_PATH)/fstab.juno:root/fstab.juno \
- $(LOCAL_PATH)/hdlcd.ko:root/modules/hdlcd.ko \
$(LOCAL_PATH)/init.rc:root/init.rc \
$(LOCAL_PATH)/init.juno.rc:root/init.juno.rc \
- $(LOCAL_PATH)/Image:kernel \
- $(LOCAL_PATH)/juno.dtb:boot/juno.dtb \
$(LOCAL_PATH)/juno.kl:system/usr/keylayout/juno.kl \
$(LOCAL_PATH)/OpenGLwallpapers:system/etc/graphics/OpenGLwallpapers)
@@ -66,6 +63,13 @@ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \
frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml)
+ifneq ($(strip $(USE_ARM_KERNEL_SOURCE)),true)
+PRODUCT_COPY_FILES += \
+ $(LOCAL_PATH)/hdlcd.ko:system/modules/hdlcd.ko \
+ $(LOCAL_PATH)/Image:kernel \
+ $(LOCAL_PATH)/juno.dtb:boot/juno.dtb
+endif
+
define copy-howto
ifneq ($(wildcard $(TOP)/device/linaro/juno/howto/$(LINARO_BUILD_SPEC)/$1),)
PRODUCT_COPY_FILES += \
diff --git a/init.juno.rc b/init.juno.rc
index 48d32bd..b53ccfd 100644
--- a/init.juno.rc
+++ b/init.juno.rc
@@ -4,7 +4,7 @@ on early-init
on init
# HDLCD
- insmod /modules/hdlcd.ko
+ insmod /system/modules/hdlcd.ko
# See storage config details at http://source.android.com/tech/storage/
mkdir /storage/sdcard 0555 root root