From 581b26585db58ae3d7e0405f5778a42c632ed070 Mon Sep 17 00:00:00 2001 From: Pawit Pornkitprasan Date: Mon, 16 Apr 2012 18:16:25 +0700 Subject: galaxysmtd: Use integrated kernel building Change-Id: I2a1114268343a1e377f13977982a52e12e2c034d --- BoardConfig.mk | 4 ++-- cifs.ko | Bin 2833280 -> 0 bytes cm.dependencies | 5 +++++ device.mk | 14 -------------- fuse.ko | Bin 649584 -> 0 bytes kernel | Bin 3077248 -> 0 bytes nls_utf8.ko | Bin 28300 -> 0 bytes tun.ko | Bin 211380 -> 0 bytes 8 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 cifs.ko delete mode 100644 fuse.ko delete mode 100755 kernel delete mode 100644 nls_utf8.ko delete mode 100644 tun.ko diff --git a/BoardConfig.mk b/BoardConfig.mk index 0e15033..7378e70 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -20,8 +20,8 @@ #Video Devices BOARD_SECOND_CAMERA_DEVICE := /dev/video2 -#Prebuilt Kernel -TARGET_PREBUILT_KERNEL := device/samsung/galaxysmtd/kernel +# Kernel Config +TARGET_KERNEL_CONFIG := cyanogenmod_galaxysmtd_defconfig # FM Radio BOARD_HAVE_FM_RADIO := true diff --git a/cifs.ko b/cifs.ko deleted file mode 100644 index 2b85b78..0000000 Binary files a/cifs.ko and /dev/null differ diff --git a/cm.dependencies b/cm.dependencies index 642986d..7b78e1d 100644 --- a/cm.dependencies +++ b/cm.dependencies @@ -6,5 +6,10 @@ { "repository": "android_device_samsung_aries-common", "target_path": "device/samsung/aries-common" + }, + { + "repository": "android_kernel_samsung_aries", + "target_path": "kernel/samsung/aries", + "branch": "android-samsung-3.0-ics" } ] \ No newline at end of file diff --git a/device.mk b/device.mk index 7c4380f..1ba304b 100644 --- a/device.mk +++ b/device.mk @@ -46,20 +46,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ frameworks/base/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml -# 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 - # Inherit Aries common device configuration. $(call inherit-product, device/samsung/aries-common/device_base.mk) diff --git a/fuse.ko b/fuse.ko deleted file mode 100644 index ec6e55b..0000000 Binary files a/fuse.ko and /dev/null differ diff --git a/kernel b/kernel deleted file mode 100755 index 3d73619..0000000 Binary files a/kernel and /dev/null differ diff --git a/nls_utf8.ko b/nls_utf8.ko deleted file mode 100644 index e47f343..0000000 Binary files a/nls_utf8.ko and /dev/null differ diff --git a/tun.ko b/tun.ko deleted file mode 100644 index 541d354..0000000 Binary files a/tun.ko and /dev/null differ -- cgit v1.1