Support inline kernel building

Patch2: remove prebuild files
Patch3: fix path to kernel dependency

Change-Id: I45e911eb29b74b049ff19db045e2f905421fc5df

6 files changed, 11 insertions, 26 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index dd18658..90f7c6a 100755
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -60,6 +60,10 @@ TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
 TARGET_RECOVERY_UI_LIB := librecovery_ui_crespo
 TARGET_RELEASETOOLS_EXTENSIONS := device/samsung/crespo
 
+# Define kernel config for inline building
+TARGET_KERNEL_CONFIG := crespo_defconfig
+TARGET_KERNEL_SOURCE := kernel/samsung/crespo
+
 TARGET_USERIMAGES_USE_EXT4 := true
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 536870912
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 1073741824
diff --git a/bcm4329.ko b/bcm4329.ko
deleted file mode 100644
index 2a22665..0000000
--- a/bcm4329.ko
+++ /dev/null
diff --git a/cm.dependencies b/cm.dependencies
new file mode 100644
index 0000000..68a8df7
--- /dev/null
+++ b/cm.dependencies
@@ -0,0 +1,7 @@
+[
+    {
+      "repository": "android_kernel_samsung_crespo",
+      "target_path": "kernel/samsung/crespo",
+      "branch": "ics"
+    }
+]
diff --git a/device_base.mk b/device_base.mk
index 7c9d5e0..45e6adb 100644
--- a/device_base.mk
+++ b/device_base.mk
@@ -215,30 +215,4 @@ PRODUCT_TAGS += dalvik.gc.type-precise
 # Screen size is "normal", density is "hdpi"
 PRODUCT_AAPT_CONFIG := normal hdpi
 
-# Kernel Modules to be copied
-ifeq ($(TARGET_PREBUILT_WIFI_MODULE),)
-LOCAL_WIFI_MODULE := device/samsung/crespo/bcm4329.ko
-else
-LOCAL_WIFI_MODULE := $(TARGET_PREBUILT_WIFI_MODULE)
-endif
-
-ifeq ($(TARGET_PREBUILT_SCSI_MODULE),)
-LOCAL_SCSI_MODULE := device/samsung/crespo/scsi_wait_scan.ko
-else
-LOCAL_SCSI_MODULE := $(TARGET_PREBUILT_SCSI_MODULE)
-endif
-
-PRODUCT_COPY_FILES += \
-    $(LOCAL_WIFI_MODULE):system/modules/bcm4329.ko \
-    $(LOCAL_SCSI_MODULE):system/modules/scsi_wait_scan.ko
-
-ifeq ($(TARGET_PREBUILT_KERNEL),)
-LOCAL_KERNEL := device/samsung/crespo/kernel
-else
-LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
-endif
-
-PRODUCT_COPY_FILES += \
-    $(LOCAL_KERNEL):kernel
-
 $(call inherit-product-if-exists, vendor/nxp/pn544/nxp-pn544-fw-vendor.mk)
diff --git a/kernel b/kernel
deleted file mode 100755
index ab4eac2..0000000
--- a/kernel
+++ /dev/null
diff --git a/scsi_wait_scan.ko b/scsi_wait_scan.ko
deleted file mode 100644
index 05cdd04..0000000
--- a/scsi_wait_scan.ko
+++ /dev/null