bringup rk3368 android qt

Change-Id: Ie2bc237a75c9ddecc8b8a39a32144a22b5978eba
Signed-off-by: Jianhui Wang <[email protected]>

Author: Jianhui Wang

AndroidProducts.mk

@@ -15,5 +15,8 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/rk3368.mk \
-    $(LOCAL_DIR)/rk3368_box.mk \
+    $(LOCAL_DIR)/rk3368_Android10/rk3368_Android10.mk \
+
+COMMON_LUNCH_CHOICES := \
+    rk3368_Android10-userdebug \
+    rk3368_Android10-user \

BoardConfig.mk

@@ -16,9 +16,8 @@
 
 # Use the non-open-source parts, if they're present
 -include vendor/rockchip/rk3368/BoardConfigVendor.mk
--include device/rockchip/common/BoardConfig.mk
 
-CURRENT_SDK_VERSION := RK3368_ANDROID9.0_MID_V1.0
+CURRENT_SDK_VERSION := RK3368_ANDROID10.0_MID_V1.0
 
 TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-a
@@ -34,9 +33,13 @@ TARGET_2ND_CPU_ABI2 := armeabi
 TARGET_2ND_CPU_VARIANT := cortex-a7
 
 TARGET_PREBUILT_KERNEL := kernel/arch/arm64/boot/Image
-PRODUCT_PACKAGE_OVERLAYS += device/rockchip/rk3368/overlay
+BOARD_PREBUILT_DTBIMAGE_DIR := kernel/arch/arm64/boot/dts/rockchip
+PRODUCT_KERNEL_DTS ?= rk3368-xikp-avb.dts
+PRODUCT_KERNEL_CONFIG ?= rockchip_defconfig
 
-BOARD_AVB_ENABLE := true
+SF_PRIMARY_DISPLAY_ORIENTATION := 0
+
+BOARD_AVB_ENABLE := false
 
 
 # Disable emulator for "make dist" until there is a 64-bit qemu kernel
@@ -120,3 +123,9 @@ BOARD_SUPPORT_VP6 := false
 
 #for camera autofocus support
 CAMERA_SUPPORT_AUTOFOCUS=false
+
+ifeq ($(strip $(BOARD_USES_AB_IMAGE)), true)
+    DEVICE_MANIFEST_FILE := device/rockchip/rk3368/manifest_ab.xml
+else
+    DEVICE_MANIFEST_FILE := device/rockchip/rk3368/manifest.xml
+endif

buildspec.mk

@@ -29,9 +29,6 @@ TARGET_BOARD_PLATFORM_GPU ?= G6110
 ifndef TARGET_PRODUCT
 TARGET_PRODUCT:=rk3368
 endif
-ifndef TARGET_DEVICE
-TARGET_DEVICE:=rk3368
-endif
 
 # Choose a variant to build.  If you don't pick one, the default is eng.
 # User is what we ship.  Userdebug is that, with a few flags turned on

buildspec_box.mk

@@ -33,11 +33,15 @@ ifeq ($(HOST_OS),linux)
   TARGET_USERIMAGES_USE_F2FS := true
 endif
 
+ PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/init.recovery.rk30board.rc:recovery/root/init.recovery.rk30board.rc \
+    vendor/rockchip/common/bin/$(TARGET_ARCH)/busybox:recovery/root/sbin/busybox \
+
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/init.rk3368.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.rk3368.rc \
-    $(LOCAL_PATH)/init.rk30board.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.rk30board.usb.rc \
+    $(LOCAL_PATH)/init.rk3368.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.rk3368.usb.rc \
     $(LOCAL_PATH)/wake_lock_filter.xml:system/etc/wake_lock_filter.xml \
-    device/rockchip/rk3368/package_performance.xml:$(TARGET_COPY_OUT_OEM)/etc/package_performance.xml \
+    device/rockchip/rk3368/package_performance.xml:$(TARGET_COPY_OUT_ODM)/etc/package_performance.xml \
     device/rockchip/$(TARGET_BOARD_PLATFORM)/media_profiles_default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
 
 # setup dalvik vm configs.
@@ -57,6 +61,11 @@ PRODUCT_PROPERTY_OVERRIDES += ro.tee.storage=rkss
 
 endif
 
+PRODUCT_PACKAGES += \
+    [email protected] \
+    [email protected] \
+    memtrack.$(TARGET_BOARD_PLATFORM)
+
 #
 #add Rockchip properties here
 #

device.mk

@@ -0,0 +1,20 @@
+on early-fs
+    setprop sys.usb.controller "ff580000.usb"
+    setprop sys.usb.configfs 1
+
+on fs && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/bcdDevice 0x0310
+    write /config/usb_gadget/g1/bcdUSB 0x0200
+    write /config/usb_gadget/g1/os_desc/b_vendor_code 0x1
+    write /config/usb_gadget/g1/os_desc/qw_sign "MSFT100"
+    write /config/usb_gadget/g1/configs/b.1/MaxPower 500
+    symlink /config/usb_gadget/g1/configs/b.1 /config/usb_gadget/g1/os_desc/b.1
+
+# Always start console on userdebug and eng builds
+on fs && property:ro.debuggable=1
+    start console
+
+service console /system/bin/sh
+    console
+    disabled
+    seclabel u:r:shell:s0

dtbo.img

@@ -1,7 +1,12 @@
 on property:sys.boot_completed=1
     chown system system /sys/class/devfreq/ffa30000.rogue-g6110/governor
+    chmod 0664 /sys/class/devfreq/ffa30000.rogue-g6110/governor
     chown system system /sys/class/devfreq/ffa30000.rogue-g6110/min_freq
+    chmod 0664 /sys/class/devfreq/ffa30000.rogue-g6110/min_freq
     chown system system /sys/class/devfreq/ffa30000.rogue-g6110/max_freq
+    chmod 0664 /sys/class/devfreq/ffa30000.rogue-g6110/max_freq
+    chown root system /sys/class/devfreq/dmc/governor
+    chmod 0664 /sys/class/devfreq/dmc/governor
 
 on early-boot
     # Update dm-verity state and set partition.*.verified properties

external_camera_config.xml

@@ -0,0 +1,2 @@
+on boot
+setprop sys.usb.controller "ff580000.usb"