From 2538cbd4349b3b8da33f78837f9b0f1a11aef02d Mon Sep 17 00:00:00 2001 From: KalimochoAz Date: Sun, 18 Dec 2011 16:45:49 +0100 Subject: Add CM definitions --- device_base.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'device_base.mk') diff --git a/device_base.mk b/device_base.mk index 4d0f2d5..79b213b 100644 --- a/device_base.mk +++ b/device_base.mk @@ -39,7 +39,7 @@ # These is the hardware-specific overlay, which points to the location # of hardware-specific resource overrides, typically the frameworks and # application settings that are stored in resourced. -DEVICE_PACKAGE_OVERLAYS := device/samsung/crespo/overlay +DEVICE_PACKAGE_OVERLAYS += device/samsung/crespo/overlay # These are the hardware-specific configuration files PRODUCT_COPY_FILES := \ @@ -137,7 +137,7 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ lights.s5pc110 \ hwcomposer.s5pc110 \ - sensors.herring + sensors.herring # Camera PRODUCT_PACKAGES += \ -- cgit v1.1 From 6b97762ec160cb6a787f04005f49947a0ddf8162 Mon Sep 17 00:00:00 2001 From: KalimochoAz Date: Tue, 20 Dec 2011 11:22:56 +0100 Subject: Add musicFX app Change-Id: I40497d9b8b8990f6ee8950380e468a86916867cc --- device_base.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'device_base.mk') diff --git a/device_base.mk b/device_base.mk index 79b213b..97acc7e 100644 --- a/device_base.mk +++ b/device_base.mk @@ -160,6 +160,11 @@ PRODUCT_PACKAGES += \ libstagefrighthw \ com.android.future.usb.accessory +# Extra apps +PRODUCT_PACKAGES += \ + MusicFX + + # Input device calibration files PRODUCT_COPY_FILES += \ device/samsung/crespo/mxt224_ts_input.idc:system/usr/idc/mxt224_ts_input.idc -- cgit v1.1 From fcb68d4612fdd8a69a95718cf3794d6831719fc0 Mon Sep 17 00:00:00 2001 From: KalimochoAz Date: Tue, 20 Dec 2011 18:59:49 +0100 Subject: Removed MusicFX since we already have DSP manager Also removed vendorsetup since is already on vendor cm Change-Id: I567fe0f8ecf8d4bc25167e6339006eda40c66e93 --- device_base.mk | 5 ----- 1 file changed, 5 deletions(-) (limited to 'device_base.mk') diff --git a/device_base.mk b/device_base.mk index 97acc7e..79b213b 100644 --- a/device_base.mk +++ b/device_base.mk @@ -160,11 +160,6 @@ PRODUCT_PACKAGES += \ libstagefrighthw \ com.android.future.usb.accessory -# Extra apps -PRODUCT_PACKAGES += \ - MusicFX - - # Input device calibration files PRODUCT_COPY_FILES += \ device/samsung/crespo/mxt224_ts_input.idc:system/usr/idc/mxt224_ts_input.idc -- cgit v1.1 From e576ba439c809074577a764dbe43f37bbe1036a4 Mon Sep 17 00:00:00 2001 From: KalimochoAz Date: Mon, 9 Jan 2012 17:47:24 +0100 Subject: Readded CrespoParts to compilation Change-Id: I4f8da176e98e11ff38c35f411d64357766dd7b37 --- device_base.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'device_base.mk') diff --git a/device_base.mk b/device_base.mk index 79b213b..ee737b5 100644 --- a/device_base.mk +++ b/device_base.mk @@ -164,6 +164,10 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ device/samsung/crespo/mxt224_ts_input.idc:system/usr/idc/mxt224_ts_input.idc +# Device app +PRODUCT_PACKAGES += \ + CrespoParts + # for bugmailer PRODUCT_PACKAGES += send_bug PRODUCT_COPY_FILES += \ -- cgit v1.1 From c2667b3120212ef9b9eb76e3c04371452df5b73c Mon Sep 17 00:00:00 2001 From: KalimochoAz Date: Sat, 10 Mar 2012 09:45:50 +0100 Subject: Update binary kernel - more RAM https://github.com/KalimochoAz/samsung-kernel-crespo/commit/538bae6ee1b5c15ba819b6e292c22d6c7349f5c4 - added module to allow ntfs - Move some low use fs to external modules of the kernel Change-Id: Ic1a37c65dc7e36222a04428b436b0296b3b152ef --- device_base.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'device_base.mk') diff --git a/device_base.mk b/device_base.mk index ee737b5..5a31c4a 100644 --- a/device_base.mk +++ b/device_base.mk @@ -220,8 +220,7 @@ else LOCAL_WIFI_MODULE := $(TARGET_PREBUILT_WIFI_MODULE) endif -PRODUCT_COPY_FILES += \ - $(LOCAL_WIFI_MODULE):system/modules/bcm4329.ko +include device/samsung/crespo/KernelModules.mk ifeq ($(TARGET_PREBUILT_KERNEL),) LOCAL_KERNEL := device/samsung/crespo/kernel -- cgit v1.1 From 0e1c160dbfdfd48514006e8aab3d1a0595b208c3 Mon Sep 17 00:00:00 2001 From: "Brint E. Kriebel" Date: Tue, 3 Apr 2012 13:23:15 -0600 Subject: crespo: Re-implement the use of module location variables In commit c2667b3120212ef9b9eb76e3c04371452df5b73c the ability to override the wifi kernel module location was removed. Add the ability to pass the location of the wifi and scsi_wait_scan module. Change-Id: I93c9ea93f7e789d849a6f8341257bf1a7cb0bc48 --- device_base.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'device_base.mk') diff --git a/device_base.mk b/device_base.mk index 5a31c4a..7c9d5e0 100644 --- a/device_base.mk +++ b/device_base.mk @@ -1,3 +1,4 @@ +# Portions Copyright (C) 2012 VMware, Inc. All Rights Reserved. # Copyright (C) 2010 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -214,13 +215,22 @@ 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 -include device/samsung/crespo/KernelModules.mk +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 -- cgit v1.1 From ae8b05ea7862c43e772d88034168cffcc1a38056 Mon Sep 17 00:00:00 2001 From: KalimochoAz Date: Thu, 19 Apr 2012 10:55:36 +0200 Subject: Support inline kernel building Patch2: remove prebuild files Patch3: fix path to kernel dependency Change-Id: I45e911eb29b74b049ff19db045e2f905421fc5df --- device_base.mk | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'device_base.mk') 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) -- cgit v1.1