nitrogen8mp: update to match 14.0.0_1.0.0 release

Signed-off-by: Gary Bisson <[email protected]>
boundarydevices · May 6, 2024 · 089c5e7 · 089c5e7
1 parent 9ff6143
commit 089c5e7
Show file tree

Hide file tree

Showing 14 changed files with 137 additions and 185 deletions.
diff --git a/nitrogen8mp/BoardConfig.mk b/nitrogen8mp/BoardConfig.mk
@@ -69,9 +69,6 @@ BOARD_PREBUILT_DTBOIMAGE := $(OUT_DIR)/target/product/$(PRODUCT_DEVICE)/dtbo-imx
 BOARD_USES_METADATA_PARTITION := true
 BOARD_ROOT_EXTRA_FOLDERS += metadata
 
-# system-as-root is not possible for non-A/B or A/B with dynamic partitions
-BOARD_BUILD_SYSTEM_ROOT_IMAGE := false
-
 # Necessary changes for non-A/B partitioning
 ifeq ($(AB_OTA_UPDATER),false)
 TARGET_RELEASETOOLS_EXTENSIONS := $(CONFIG_REPO_PATH)/common/imx8m

diff --git a/nitrogen8mp/audio_policy_configuration.xml b/nitrogen8mp/audio_policy_configuration.xml
@@ -49,6 +49,8 @@
                 </mixPort>
                 <mixPort name="compressed_offload" role="source"
                          flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                     <profile name="" format="AUDIO_FORMAT_MP3"
                              samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
@@ -105,6 +107,9 @@
         <!-- Remote Submix Audio HAL -->
         <xi:include href="r_submix_audio_policy_configuration.xml"/>
 
+        <!-- Bluetooth Audio HAL -->
+        <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
+
     </modules>
 
     <!-- Volume section -->

diff --git a/nitrogen8mp/compatibility_matrix.xml b/nitrogen8mp/compatibility_matrix.xml
@@ -39,14 +39,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="false">
-        <name>android.system.wifi.keystore</name>
-        <version>1.0</version>
-        <interface>
-            <name>IKeystore</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="native" optional="false">
         <name>netutils-wrapper</name>
         <version>1.0</version>

diff --git a/nitrogen8mp/device_framework_matrix.xml b/nitrogen8mp/device_framework_matrix.xml
@@ -1,17 +1,17 @@
 <compatibility-matrix version="1.0" type="framework">
-    <hal format="hidl" optional="true">
-        <name>nxp.hardware.display</name>
-        <version>1.0</version>
+    <hal format="aidl" optional="true">
+        <name>nxp.hardware.secureime</name>
+        <version>1</version>
         <interface>
-            <name>IDisplay</name>
+            <name>ISecureIME</name>
             <instance>default</instance>
         </interface>
     </hal>
     <hal format="aidl" optional="true">
-        <name>nxp.hardware.secureime</name>
+        <name>nxp.hardware.imx_dek_extractor</name>
         <version>1</version>
         <interface>
-            <name>ISecureIME</name>
+            <name>IDek_Extractor</name>
             <instance>default</instance>
         </interface>
     </hal>

diff --git a/nitrogen8mp/init.imx8mp.rc b/nitrogen8mp/init.imx8mp.rc
@@ -6,8 +6,8 @@ on early-boot
     # Set GPU 3D minimum clock to 3/64
     write /sys/bus/platform/drivers/galcore/gpu3DMinClock 3
 
-    # Set RenderEngine Backend
-    setprop debug.renderengine.backend gles
+    # Disable backpressure gpu composition
+    setprop debug.sf.enable_gl_backpressure false
 
     # change for FSL specific service
     chown root system /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq

diff --git a/nitrogen8mp/init.rc b/nitrogen8mp/init.rc
@@ -1,19 +1,6 @@
 import /vendor/etc/init/hw/init.${ro.hardware}.usb.rc
 import /vendor/etc/init/hw/init.${ro.hardware}.${ro.boot.soc_type}.rc
 
-service vendor.charger /system/bin/charger
-    class charger
-    user system
-    group system wakelock input
-    capabilities SYS_BOOT
-    file /dev/kmsg w
-    file /sys/fs/pstore/console-ramoops-0 r
-    file /sys/fs/pstore/console-ramoops r
-    file /proc/last_kmsg r
-
-on charger
-    start vendor.charger
-
 on early-init
     # mount the debugfs
     mount debugfs none /sys/kernel/debug/ mode=0755
@@ -81,11 +68,11 @@ on init && property:vendor.skip.charger_not_need=0 && property:ro.boot.powersave
 on late-fs && property:vendor.storageproxyd=trusty && property:vendor.skip.charger_not_need=0
     start storageproxyd
     start vendor.oemlock-1-0
-    start confirmationui-1-0
+    start vendor.confirmationui_default
 
 on late-fs && property:vendor.skip.charger_not_need=0
     # Start keymaster/gatekeeper service
-    start vendor.gatekeeper-1-0-${ro.boot.keystore}
+    start vendor.gatekeeper-${ro.boot.keystore}
     start vendor.keymint-${ro.boot.keystore}
     setprop vendor.powerhal.init 1
 
@@ -176,12 +163,6 @@ on fs && property:vendor.skip.charger_not_need=0
     verity_update_state
 
 on post-fs && property:vendor.skip.charger_not_need=0
-    # Set netd memlock rlimit to 8MB
-    setrlimit 8 8388608 8388608
-
-    # Turn on swap
-    swapon_all /vendor/etc/fstab.nxp
-
     # Swap in only 1 page at a time
     write /proc/sys/vm/page-cluster 0
 
@@ -261,3 +242,16 @@ service confirmationui_ta_load /vendor/bin/trusty_apploader /vendor/firmware/tee
 
 on property:sys.boot_completed=1 && property:vendor.storageproxyd=trusty && property:vendor.skip.charger_not_need=0
     start confirmationui_ta_load
+
+service imx_dek_extractor /vendor/bin/hw/imx_dek_extractor
+    user system
+    group system
+    disabled
+    oneshot
+
+on property:sys.boot_completed=1 && property:vendor.storageproxyd=trusty
+    start imx_dek_extractor
+
+on property:sys.boot_completed=1
+    # Turn on swap
+    swapon_all /vendor/etc/fstab.nxp
diff --git a/nitrogen8mp/init.usb.rc b/nitrogen8mp/init.usb.rc
@@ -49,7 +49,5 @@ on early-boot
     write /sys/module/libcomposite/parameters/disable_l1_for_hs "y"
     symlink /config/usb_gadget/g1/configs/b.1 /config/usb_gadget/g1/os_desc/b.1
 
-    setprop vendor.usb.sysfs_path /sys/devices/platform/soc@0/32f10100.usb/38100000.usb/
-
 on boot
     setprop sys.usb.configfs 2
diff --git a/nitrogen8mp/manifest.xml b/nitrogen8mp/manifest.xml
@@ -1,27 +1,7 @@
-<manifest version="1.0" type="device" target-level="7">
-    <hal format="hidl">
-	<name>android.hardware.graphics.allocator</name>
-        <transport>hwbinder</transport>
-	<impl level="generic"></impl>
-	<version>4.0</version>
-	<interface>
-	    <name>IAllocator</name>
-	    <instance>default</instance>
-	</interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.composer</name>
-        <transport>hwbinder</transport>
-        <version>2.4</version>
-        <interface>
-            <name>IComposer</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
+<manifest version="1.0" type="device" target-level="8">
+    <hal format="aidl">
         <name>android.hardware.gatekeeper</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
+        <version>1</version>
         <interface>
             <name>IGatekeeper</name>
             <instance>default</instance>
@@ -55,19 +35,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.media.omx</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IOmx</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>IOmxStore</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>
@@ -95,28 +62,22 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>nxp.hardware.display</name>
-            <transport>hwbinder</transport>
-        <version>1.0</version>
+    <hal format="aidl">
+        <name>android.hardware.camera.provider</name>
+        <version>1</version>
         <interface>
-            <name>IDisplay</name>
-            <instance>default</instance>
+            <name>ICameraProvider</name>
+            <instance>external/0</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-       <name>android.hardware.camera.provider</name>
-       <transport>hwbinder</transport>
-       <fqname>@2.4::ICameraProvider/external/0</fqname>
-    </hal>
     <hal format="aidl">
        <name>android.hardware.security.keymint</name>
-       <version>2</version>
+       <version>3</version>
        <fqname>IKeyMintDevice/default</fqname>
     </hal>
     <hal format="aidl">
        <name>android.hardware.security.keymint</name>
-       <version>2</version>
+       <version>3</version>
        <fqname>IRemotelyProvisionedComponent/default</fqname>
     </hal>
     <hal format="aidl">

diff --git a/nitrogen8mp/manifest_powersave.xml b/nitrogen8mp/manifest_powersave.xml
@@ -1,27 +1,7 @@
-<manifest version="1.0" type="device" target-level="7">
-    <hal format="hidl">
-	<name>android.hardware.graphics.allocator</name>
-        <transport>hwbinder</transport>
-	<impl level="generic"></impl>
-	<version>4.0</version>
-	<interface>
-	    <name>IAllocator</name>
-	    <instance>default</instance>
-	</interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.composer</name>
-        <transport>hwbinder</transport>
-        <version>2.4</version>
-        <interface>
-            <name>IComposer</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
+<manifest version="1.0" type="device" target-level="8">
+    <hal format="aidl">
         <name>android.hardware.gatekeeper</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
+        <version>1</version>
         <interface>
             <name>IGatekeeper</name>
             <instance>default</instance>
@@ -55,19 +35,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.media.omx</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IOmx</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>IOmxStore</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>
@@ -95,23 +62,14 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>nxp.hardware.display</name>
-            <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IDisplay</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="aidl">
        <name>android.hardware.security.keymint</name>
-       <version>2</version>
+       <version>3</version>
        <fqname>IKeyMintDevice/default</fqname>
     </hal>
     <hal format="aidl">
        <name>android.hardware.security.keymint</name>
-       <version>2</version>
+       <version>3</version>
        <fqname>IRemotelyProvisionedComponent/default</fqname>
     </hal>
     <hal format="aidl">