From 1f522a7946a9f050f6b2d3361af289566b99b62a Mon Sep 17 00:00:00 2001 From: Andrew Dodd Date: Fri, 20 Apr 2012 18:48:43 -0400 Subject: Move to inbuilt kernel building, update wifi paths Change-Id: Ia3b3d9afb6f50b979b31fe9b19eba5e7fc7862d1 --- BoardConfig.mk | 23 ++++++++++++++--------- cm.dependencies | 6 ++++++ galaxynote.mk | 20 -------------------- init.smdk4210.rc | 6 +++--- lpm.rc | 4 ++-- modules/Si4709_driver.ko | Bin 23360 -> 0 bytes modules/dhd.ko | Bin 419768 -> 0 bytes modules/j4fs.ko | Bin 47596 -> 0 bytes modules/scsi_wait_scan.ko | Bin 1900 -> 0 bytes shbootimg.mk | 4 ++-- zImage | Bin 4482408 -> 0 bytes 11 files changed, 27 insertions(+), 36 deletions(-) create mode 100644 cm.dependencies delete mode 100644 modules/Si4709_driver.ko delete mode 100644 modules/dhd.ko delete mode 100644 modules/j4fs.ko delete mode 100644 modules/scsi_wait_scan.ko delete mode 100755 zImage diff --git a/BoardConfig.mk b/BoardConfig.mk index 61f8096..bd8a22d 100755 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -51,7 +51,10 @@ BOARD_NAND_PAGE_SIZE := 4096 -s 128 BOARD_KERNEL_PAGESIZE := 4096 BOARD_KERNEL_BASE := 0x40000000 BOARD_KERNEL_CMDLINE := console=ttySAC2,115200 consoleblank=0 -TARGET_PREBUILT_KERNEL := device/samsung/galaxynote/zImage + +# Inline kernel building +TARGET_KERNEL_SOURCE := kernel/samsung/smdk4210 +TARGET_KERNEL_CONFIG := cyanogenmod_galaxys2_defconfig # Filesystem TARGET_USERIMAGES_USE_EXT4 := true @@ -90,18 +93,20 @@ BOARD_MOBILEDATA_INTERFACE_NAME := "pdp0" #BOARD_FM_DEVICE := si4709 # WiFi (BCM4330) -BOARD_WPA_SUPPLICANT_DRIVER := NL80211 +BOARD_WLAN_DEVICE := bcmdhd +BOARD_WLAN_DEVICE_REV := bcm4330_b1 WPA_SUPPLICANT_VERSION := VER_0_8_X +BOARD_WPA_SUPPLICANT_DRIVER := NL80211 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd BOARD_HOSTAPD_DRIVER := NL80211 BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_bcmdhd -BOARD_WLAN_DEVICE := bcmdhd -BOARD_WLAN_DEVICE_REV := bcm4330_b1 -WIFI_DRIVER_MODULE_NAME := "bcmdhd" -WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/bcmdhd/parameters/firmware_path" -WIFI_DRIVER_FW_PATH_STA := "/system/vendor/firmware/fw_bcmdhd.bin" -WIFI_DRIVER_FW_PATH_P2P := "/system/vendor/firmware/fw_bcmdhd_p2p.bin" -WIFI_DRIVER_FW_PATH_AP := "/system/vendor/firmware/fw_bcmdhd_apsta.bin" +WIFI_DRIVER_MODULE_PATH := "/system/lib/modules/dhd.ko" +WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/dhd/parameters/firmware_path" +WIFI_DRIVER_FW_PATH_STA := "/system/etc/wifi/bcm4330_sta.bin" +WIFI_DRIVER_FW_PATH_AP := "/system/etc/wifi/bcm4330_apsta.bin" +WIFI_DRIVER_FW_PATH_P2P := "/system/etc/wifi/bcm4330_p2p.bin" +WIFI_DRIVER_MODULE_NAME := "dhd" +WIFI_DRIVER_MODULE_ARG := "firmware_path=/system/etc/wifi/bcm4330_sta.bin nvram_path=/system/etc/wifi/nvram_net.txt" WIFI_BAND := 802_11_ABG # Bluetooth diff --git a/cm.dependencies b/cm.dependencies new file mode 100644 index 0000000..94a763e --- /dev/null +++ b/cm.dependencies @@ -0,0 +1,6 @@ +[ + { + "repository": "android_kernel_samsung_smdk4210", + "target_path": "kernel/samsung/smdk4210" + } +] diff --git a/galaxynote.mk b/galaxynote.mk index 1f4e558..b74648f 100755 --- a/galaxynote.mk +++ b/galaxynote.mk @@ -172,26 +172,6 @@ PRODUCT_TAGS += dalvik.gc.type-precise PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ persist.sys.usb.config=mtp -# kernel modules for ramdisk -RAMDISK_MODULES := $(addprefix device/samsung/galaxynote/modules/, dhd.ko j4fs.ko \ - scsi_wait_scan.ko Si4709_driver.ko) -PRODUCT_COPY_FILES += $(foreach module,\ - $(RAMDISK_MODULES),\ - $(module):root/lib/modules/$(notdir $(module))) - -# other kernel modules not in ramdisk -PRODUCT_COPY_FILES += $(foreach module,\ - $(filter-out $(RAMDISK_MODULES),$(wildcard device/samsung/galaxynote/modules/*.ko)),\ - $(module):system/lib/modules/$(notdir $(module))) - -# kernel modules for recovery ramdisk -PRODUCT_COPY_FILES += \ - device/samsung/galaxynote/modules/j4fs.ko:recovery/root/lib/modules/j4fs.ko - -# the kernel itself -PRODUCT_COPY_FILES += \ - device/samsung/galaxynote/zImage:kernel - $(call inherit-product, frameworks/base/build/phone-xhdpi-1024-dalvik-heap.mk) # Include exynos4 platform specific parts diff --git a/init.smdk4210.rc b/init.smdk4210.rc index 1c5c8aa..53b344f 100644 --- a/init.smdk4210.rc +++ b/init.smdk4210.rc @@ -51,11 +51,11 @@ on fs on post-fs-data # insmod kernel modules - insmod /lib/modules/Si4709_driver.ko - insmod /lib/modules/j4fs.ko + insmod /system/lib/modules/Si4709_driver.ko +# insmod /lib/modules/j4fs.ko # mount param.lfs - mount j4fs /dev/block/mmcblk0p4 /mnt/.lfs +# mount j4fs /dev/block/mmcblk0p4 /mnt/.lfs # GPS chown root system /dev/ttySAC1 diff --git a/lpm.rc b/lpm.rc index be98378..851239d 100644 --- a/lpm.rc +++ b/lpm.rc @@ -41,8 +41,8 @@ on fs on post-fs-data # insmod kernel modules - insmod /lib/modules/j4fs.ko - mount j4fs /dev/block/mmcblk0p4 /mnt/.lfs ro +# insmod /lib/modules/j4fs.ko +# mount j4fs /dev/block/mmcblk0p4 /mnt/.lfs ro on boot # CPU Frequency Governor diff --git a/modules/Si4709_driver.ko b/modules/Si4709_driver.ko deleted file mode 100644 index 3e59cc4..0000000 Binary files a/modules/Si4709_driver.ko and /dev/null differ diff --git a/modules/dhd.ko b/modules/dhd.ko deleted file mode 100644 index 9a6accb..0000000 Binary files a/modules/dhd.ko and /dev/null differ diff --git a/modules/j4fs.ko b/modules/j4fs.ko deleted file mode 100644 index 675845d..0000000 Binary files a/modules/j4fs.ko and /dev/null differ diff --git a/modules/scsi_wait_scan.ko b/modules/scsi_wait_scan.ko deleted file mode 100644 index 0d5880e..0000000 Binary files a/modules/scsi_wait_scan.ko and /dev/null differ diff --git a/shbootimg.mk b/shbootimg.mk index cce0aaa..d0abf48 100755 --- a/shbootimg.mk +++ b/shbootimg.mk @@ -1,9 +1,9 @@ LOCAL_PATH := $(call my-dir) INSTALLED_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/boot.img -$(INSTALLED_BOOTIMAGE_TARGET): $(TARGET_PREBUILT_KERNEL) $(recovery_ramdisk) $(INSTALLED_RAMDISK_TARGET) $(PRODUCT_OUT)/utilities/flash_image $(PRODUCT_OUT)/utilities/busybox +$(INSTALLED_BOOTIMAGE_TARGET): $(PRODUCT_OUT)/kernel $(recovery_ramdisk) $(INSTALLED_RAMDISK_TARGET) $(PRODUCT_OUT)/utilities/flash_image $(PRODUCT_OUT)/utilities/busybox $(call pretty,"Boot image: $@") - $(hide) ./device/samsung/galaxynote/mkshbootimg.py $@ $(TARGET_PREBUILT_KERNEL) $(INSTALLED_RAMDISK_TARGET) $(recovery_ramdisk) + $(hide) ./device/samsung/galaxys2/mkshbootimg.py $@ $(PRODUCT_OUT)/kernel $(INSTALLED_RAMDISK_TARGET) $(recovery_ramdisk) $(INSTALLED_RECOVERYIMAGE_TARGET): $(INSTALLED_BOOTIMAGE_TARGET) $(ACP) $(INSTALLED_BOOTIMAGE_TARGET) $@ diff --git a/zImage b/zImage deleted file mode 100755 index c653ca7..0000000 Binary files a/zImage and /dev/null differ -- cgit v1.1