Fajita Bring Up

diff --git a/AndroidBoard.mk b/AndroidBoard.mk
index 15d5427490b27e2ff7b0d2fbf57700a58cc13b6e..7740baf7a0e448829d75ec29f7fd6b9177ae5f55 100644 (file)
--- a/AndroidBoard.mk
+++ b/AndroidBoard.mk
@@ -25,6 +25,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter enchilada,$(TARGET_DEVICE)),)
+ifneq ($(filter fajita,$(TARGET_DEVICE)),)
 include $(call all-makefiles-under,$(LOCAL_PATH))
 endif

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 7d6412b4eb553550982ed75e196338be8f73aa35..211c5a6c5d9da3b7ebe64073c1233cd2d8b8cd00 100644 (file)
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,4 +15,4 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/omni_enchilada.mk
+    $(LOCAL_DIR)/omni_fajita.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 0f2ae5cf9c5262ba53050f0f79bc8340d1f7480e..399a880856f12b4231afa7d29e90617cd08264a4 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -49,7 +49,7 @@ BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom androidboot.console=ttyMSM0 vi
 BOARD_KERNEL_CMDLINE += skip_override androidboot.fastboot=1
 BOARD_KERNEL_BASE := 0x00000000
 BOARD_KERNEL_PAGESIZE := 4096
-TARGET_PREBUILT_KERNEL := device/oneplus/enchilada/prebuilt/Image.gz-dtb
+TARGET_PREBUILT_KERNEL := device/oneplus/fajita/prebuilt/Image.gz-dtb
 
 # Platform
 TARGET_BOARD_PLATFORM := sdm845
@@ -93,7 +93,6 @@ TARGET_RECOVERY_DEVICE_MODULES += android.hardware.boot@1.0
 TW_RECOVERY_ADDITIONAL_RELINK_FILES := ${OUT}/system/lib64/android.hardware.boot@1.0.so
 TARGET_RECOVERY_PIXEL_FORMAT := BGRA_8888
 TW_NO_SCREEN_BLANK := true
-TW_EXCLUDE_TWRPAPP := true
 
 # Encryption
 PLATFORM_SECURITY_PATCH := 2025-12-31

diff --git a/README.md b/README.md
index 40a07f20949d888321d6d13aff855b0f402e63eb..6f7118715d7b7918484e82e32769cb556d4cb0d6 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,70 +1,3 @@
-# Device Tree for OnePlus 6 (enchilada)
-
-The OnePlus 6 (codenamed _"enchilada"_) is a flagship smartphone from OnePlus.
-It was released in May 2018.
-
-| Basic                   | Spec Sheet                                                                                                                     |
-| -----------------------:|:------------------------------------------------------------------------------------------------------------------------------ |
-| CPU                     | Octa-core (4x2.8 GHz Kryo 385 Gold & 4x1.7 GHz Kryo 385 Silver)                                                                |
-| Chipset                 | Qualcomm SDM845 Snapdragon 845                                                                                                 |
-| GPU                     | Adreno 630                                                                                                                     |
-| Memory                  | 6/8 GB RAM                                                                                                                     |
-| Shipped Android Version | 8.1                                                                                                                            |
-| Storage                 | 64/128/256 GB                                                                                                                  |
-| Battery                 | Non-removable Li-Po 3300 mAh battery                                                                                           |
-| Display                 | Optic AMOLED, 1080 x 2280 pixels, 19:9 ratio (~402 ppi density)                                                                |
-| Camera (Back)           | Dual: 16 MP (f/1.7, 27mm, 1/2.6", 1.22µm, gyro-EIS, OIS) + 20 MP (16 MP effective, f/1.7, 1/2.8", 1.0µm), PDAF, dual-LED flash |
-| Camera (Front)          | 16 MP (f/2.0, 25mm, 1/3", 1.0µm), gyro-EIS, Auto HDR, 1080p                                                                    |
-
-Copyright 2018 - The LineageOS Project.
-
-![OnePlus 6](https://cdn2.gsmarena.com/vv/pics/oneplus/oneplus-6-5.jpg "OnePlus 6")
-
-
-## Compile
-
-First checkout minimal twrp with omnirom tree:
-
-```
-repo init -u git://github.com/minimal-manifest-twrp/platform_manifest_twrp_omni.git -b twrp-8.1
-repo sync
-```
-
-Then add these projects to .repo/manifest.xml:
-
-```xml
-<project path="device/oneplus/enchilada" name="mauronofrio/android_device_oneplus_enchilada" remote="github" revision="android-8.1" />
-```
-
-To make all works you need to modify the buildinfo.sh in build/tools
-echo "ro.build.version.release=$PLATFORM_VERSION"
-echo "ro.build.version.security_patch=$PLATFORM_SECURITY_PATCH"
-to
-echo "ro.build.version.release_orig=$PLATFORM_VERSION"
-echo "ro.build.version.security_patch_orig=$PLATFORM_SECURITY_PATCH"
-
-And you need to increase the PLATFORM_VERSION to 16.1.0 in build/core/version_defaults.mk to override Google's anti-rollback features
-
-```
-
-Finally execute these:
-
-```
-. build/envsetup.sh
-export ALLOW_MISSING_DEPENDENCIES=true # Only if you use minimal twrp tree.
-lunch omni_enchilada-eng 
-mka adbd recoveryimage 
-```
-
-To test it:
-
-```
-fastboot boot out/target/product/enchilada/recovery.img
-```
-## Thanks
-```
-- @engstk to make TWRP works on PIE
-- @joemossjr16 for some tips
-- @Dees-Troy for some tips
-- @wuxianlin for initial bring up
+# android_device_oneplus_fajita
 
+Waiting for some additional infos
\ No newline at end of file

diff --git a/device.mk b/device.mk
index 5144fc01fd8eb95ba37b143d7376584f0b31b63f..218b79e0e52fb435acea533193119ea74ddb223b 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -1,12 +1,11 @@
 
-LOCAL_PATH := device/oneplus/enchilada
+LOCAL_PATH := device/oneplus/fajita
 
 # Getting this to build in my local omni tree proved quite difficult so just using a prebuilt update_engine_sideload for now.
 # Oddly enough, OnePlus stock recovery does not include an update_engine_sideload binary either.
 # Enable update engine sideloading by including the static version of the
 # boot_control HAL and its dependencies.
 #PRODUCT_STATIC_BOOT_CONTROL_HAL := \
-#    bootctrl.msm8998 \
 #    libsparse
 
 #PRODUCT_PACKAGES += \

diff --git a/omni_fajita.mk b/omni_fajita.mk
new file mode 100644 (file)
index 0000000..9734a88
--- /dev/null
+++ b/omni_fajita.mk
@@ -0,0 +1,38 @@
+#
+# Copyright 2017 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.
+#
+
+# Release name
+PRODUCT_RELEASE_NAME := fajita
+
+$(call inherit-product, build/target/product/embedded.mk)
+
+# Inherit from our custom product configuration
+$(call inherit-product, vendor/omni/config/common.mk)
+
+# Inherit from hardware-specific part of the product configuration
+$(call inherit-product, device/oneplus/fajita/device.mk)
+
+## Device identifier. This must come after all inclusions
+PRODUCT_DEVICE := fajita
+PRODUCT_NAME := omni_fajita
+PRODUCT_BRAND := OnePlus
+PRODUCT_MODEL := OnePlus A6013
+PRODUCT_MANUFACTURER := OnePlus
+
+PRODUCT_BUILD_PROP_OVERRIDES += \
+    PRODUCT_NAME=OnePlus6T \
+    BUILD_PRODUCT=OnePlus6T \
+    TARGET_DEVICE=OnePlus6T

diff --git a/recovery/root/init.blu_spark.rc b/recovery/root/init.blu_spark.rc
deleted file mode 100644 (file)
index aec78a9..0000000
--- a/recovery/root/init.blu_spark.rc
+++ /dev/null
@@ -1,51 +0,0 @@
-# blu_spark extras
-
-on property:sys.boot_completed=1
-    # Tweak IO performance after boot complete
-    write /sys/block/dm-0/queue/scheduler "zen"
-    write /sys/block/dm-1/queue/scheduler "zen"
-    write /sys/block/sda/queue/scheduler "zen"
-    write /sys/block/sde/queue/scheduler "zen"
-    write /sys/block/dm-0/queue/read_ahead_kb 128
-       write /sys/block/dm-0/queue/iostats 1
-       write /sys/block/dm-0/queue/nr_requests 128
-    write /sys/block/dm-1/queue/read_ahead_kb 128
-       write /sys/block/dm-1/queue/iostats 1
-       write /sys/block/dm-1/queue/nr_requests 128
-    write /sys/block/sda/queue/read_ahead_kb 128
-       write /sys/block/sda/queue/iostats 1
-       write /sys/block/sda/queue/nr_requests 128
-    write /sys/block/sde/queue/read_ahead_kb 128
-       write /sys/block/sde/queue/iostats 1
-       write /sys/block/sde/queue/nr_requests 128
-
-    # Disable Adaptive LMK
-    write /sys/module/lowmemorykiller/parameters/enable_adaptive_lmk 0
-
-    # Input boost and stune configuration
-    write /sys/module/cpu_boost/parameters/input_boost_freq "0:1056000 1:0 2:0 3:0 4:0 5:0 6:0 7:0"
-    write /sys/module/cpu_boost/parameters/input_boost_ms 500
-       write /sys/module/cpu_boost/parameters/dynamic_stune_boost 15
-
-    # Set min cpu freq
-    write /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq 576000
-    write /sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq 825600
-
-    # Disable scheduler core_ctl
-    write /sys/devices/system/cpu/cpu0/core_ctl/enable 0
-    write /sys/devices/system/cpu/cpu4/core_ctl/enable 0
-
-    # Configure governor settings for little cluster
-    write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor "blu_schedutil"
-    write /sys/devices/system/cpu/cpu0/cpufreq/blu_schedutil/up_rate_limit_us 0
-    write /sys/devices/system/cpu/cpu0/cpufreq/blu_schedutil/down_rate_limit_us 0
-
-    # Configure governor settings for big cluster
-    write /sys/devices/system/cpu/cpu4/cpufreq/scaling_governor "blu_schedutil"
-    write /sys/devices/system/cpu/cpu4/cpufreq/blu_schedutil/up_rate_limit_us 0
-    write /sys/devices/system/cpu/cpu4/cpufreq/blu_schedutil/down_rate_limit_us 0
-
-       # OTG on by default
-       write /sys/class/power_supply/usb/otg_switch 1
-
-       write /dev/kmsg "Boot blu_spark completed "

diff --git a/recovery/root/init.recovery.qcom.rc b/recovery/root/init.recovery.qcom.rc
index 14e7181757aa861a96d46a0392c7988fb3d6c0de..8b504b8d446c0bfc4a4928e20666c13f97494eff 100644 (file)
--- a/recovery/root/init.recovery.qcom.rc
+++ b/recovery/root/init.recovery.qcom.rc
@@ -24,7 +24,6 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-import /init.blu_spark.rc
 
 on fs
     wait /dev/block/platform/soc/${ro.boot.bootdevice}

diff --git a/recovery/root/sbin/libicuuc.so b/recovery/root/sbin/libicuuc.so
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/recovery/root/sbin/libxml2.so b/recovery/root/sbin/libxml2.so
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/recovery/root/sbin/qseecomd b/recovery/root/sbin/qseecomd
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/recovery/root/sbin/update_engine_sideload b/recovery/root/sbin/update_engine_sideload
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/recovery/root/vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so b/recovery/root/vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/recovery/root/vendor/lib64/libQSEEComAPI.so b/recovery/root/vendor/lib64/libQSEEComAPI.so
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/recovery/root/vendor/lib64/libdiag.so b/recovery/root/vendor/lib64/libdiag.so
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/recovery/root/vendor/lib64/libdrmfs.so b/recovery/root/vendor/lib64/libdrmfs.so
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/recovery/root/vendor/lib64/librpmb.so b/recovery/root/vendor/lib64/librpmb.so
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/recovery/root/vendor/lib64/libssd.so b/recovery/root/vendor/lib64/libssd.so
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/system.prop b/system.prop
index 9f43165571cb7fc2bc5bcf1e39ca142599ed0a21..aa9bfe961f61cbcbfe672a739603d9660840a60b 100644 (file)
--- a/system.prop
+++ b/system.prop
@@ -1 +1 @@
-ro.display.series=OnePlus 6
+ro.display.series=OnePlus 6T

diff --git a/vendorsetup.sh b/vendorsetup.sh
index edb5351d8ce7829cc98eb6a8730f69a7bef6d137..3ff8df6e0ac85db999823753f90e3428c0ee9b14 100644 (file)
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,2 +1 @@
-add_lunch_combo omni_enchilada-eng
-add_lunch_combo omni_enchilada-userdebug
+add_lunch_combo omni_fajita-eng