diff options
| -rw-r--r-- | BoardConfig.mk | 1 | ||||
| -rw-r--r-- | README.md | 14 | ||||
| -rw-r--r-- | aosp_espressowifi.mk | 10 | ||||
| -rw-r--r-- | device-cm.mk | 24 | ||||
| -rw-r--r-- | device-common.mk | 13 | ||||
| -rw-r--r-- | device.mk | 4 | ||||
| -rwxr-xr-x | liblights/Android.mk | 2 | ||||
| -rw-r--r-- | rootdir/init.espresso.rc | 4 |
8 files changed, 42 insertions, 30 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 2f6c2f3..4a1594a 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -14,6 +14,7 @@ # limitations under the License. # +# Include common espresso BoardConfig include device/samsung/espressowifi/BoardConfigCommon.mk # assert @@ -1,12 +1,2 @@ -Common Device configuration for Samsung Galaxy Tab 2 Family -===================================== -(GT-P3100, GT-P3110, GT-P3113, GT-P5100, GT-P5110, GT-P5113) -===================================== - -Basic | Spec Sheet --------:|:------------------------- -CPU | Dual-core 1 GHz Cortex-A9 -CHIPSET | TI OMAP 4430 -GPU | PowerVR SGX540 -Memory | 1 GB RAM -Shipped Android Version | 4.0.3 (upgradeable to 4.2.2) +android_device_samsung_espressowifi +============================ diff --git a/aosp_espressowifi.mk b/aosp_espressowifi.mk index 45c91b1..f8fa65e 100644 --- a/aosp_espressowifi.mk +++ b/aosp_espressowifi.mk @@ -17,16 +17,12 @@ # Use 44.1 kHz UI sounds $(call inherit-product-if-exists, frameworks/base/data/sounds/AudioPackage13.mk) -# This is a wifi-only device -PRODUCT_PROPERTY_OVERRIDES += \ - ro.carrier=wifi-only - -# Inherit from the common Open Source product configuration -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) - # Inherit device configuration $(call inherit-product, device/samsung/espressowifi/device.mk) +# Inherit from those products. Most specific first. +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk) + PRODUCT_NAME := aosp_espressowifi PRODUCT_DEVICE := espressowifi PRODUCT_BRAND := Android diff --git a/device-cm.mk b/device-cm.mk new file mode 100644 index 0000000..953bcb9 --- /dev/null +++ b/device-cm.mk @@ -0,0 +1,24 @@ +# +# Copyright (C) 2016 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +LOCAL_PATH := device/samsung/espressowifi + +# Recovery Ramdisk +PRODUCT_PACKAGES += \ + $(LOCAL_PATH)/recovery/root/init.recovery.espresso.rc:recovery/root/init.recovery.espresso.rc + +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/init.espresso.variant.sh:system/bin/init.espresso.variant.sh diff --git a/device-common.mk b/device-common.mk index 6294f76..754f802 100644 --- a/device-common.mk +++ b/device-common.mk @@ -21,6 +21,9 @@ TARGET_BOARD_OMAP_CPU := 4430 # Include common omap4 makefile $(call inherit-product, hardware/ti/omap4/omap4.mk) +# Include CM specific additions +$(call inherit-product, device/samsung/espressowifi/device-cm.mk) + DEVICE_PACKAGE_OVERLAYS += \ $(LOCAL_PATH)/overlay/aosp-common @@ -38,13 +41,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/rootdir/fstab.espresso:root/fstab.espresso -# Recovery Ramdisk -PRODUCT_PACKAGES += \ - $(LOCAL_PATH)/recovery/root/init.recovery.espresso.rc:recovery/root/init.recovery.espresso.rc - -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/init.espresso.variant.sh:system/bin/init.espresso.variant.sh - # GPS # gps config appropriate for this device $(call inherit-product, device/common/gps/gps_us_supl.mk) @@ -56,7 +52,7 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/gps.xml:system/etc/gps.xml -# Wifi +# Wi-Fi PRODUCT_PACKAGES += \ libwpa_client \ hostapd \ @@ -93,6 +89,7 @@ PRODUCT_PACKAGES += \ audio.r_submix.default \ audio.usb.default \ camera.omap4 \ + e2fsck \ lights.omap4 \ libinvensense_mpl \ power.piranha \ @@ -19,6 +19,10 @@ $(call inherit-product, device/samsung/espressowifi/device-common.mk) LOCAL_PATH := device/samsung/espressowifi +# This is a wifi-only device +PRODUCT_PROPERTY_OVERRIDES += \ + ro.carrier=wifi-only + # Include wifi-only overlays DEVICE_PACKAGE_OVERLAYS += \ $(LOCAL_PATH)/overlay/aosp diff --git a/liblights/Android.mk b/liblights/Android.mk index 5f4cffa..ca6766e 100755 --- a/liblights/Android.mk +++ b/liblights/Android.mk @@ -22,7 +22,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := lights.c LOCAL_CFLAGS := -Wall -Werror -LOCAL_MODULE_RELATIVE_PATH := hw +LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw LOCAL_SHARED_LIBRARIES := liblog LOCAL_MODULE := lights.omap4 LOCAL_MODULE_TAGS := optional diff --git a/rootdir/init.espresso.rc b/rootdir/init.espresso.rc index 3ce9f75..373711e 100644 --- a/rootdir/init.espresso.rc +++ b/rootdir/init.espresso.rc @@ -32,8 +32,6 @@ on fs # increase read-ahead value to 256 kb write /sys/block/mmcblk0/queue/read_ahead_kb 256 - mount debugfs debugfs /sys/kernel/debug - on post-fs-data # dmrpc mkdir /data/smc 0770 drmrpc drmrpc @@ -76,6 +74,8 @@ on post-fs-data setprop vold.post_fs_data_done 1 on boot + mount debugfs /sys/kernel/debug /sys/kernel/debug + # SMC Service service tf_daemon /system/bin/tf_daemon \ -d -c /system/bin/smc.ini |