update device_rockchip

Signed-off-by: yanghongliang <yang_hongliang@hoperun.com>

common/BUILD.gn

@@ -16,6 +16,12 @@ import("//build/ohos.gni")
 print("common_group in")
 group("common_group") {
   deps = [
+    "third_party/tinyalsa:libtinyalsa",
+    "third_party/tinyalsa:tinycap",
+    "third_party/tinyalsa:tinyplay",
+    "third_party/tinyalsa:tinymix",
+    "third_party/v4l2-ctl:v4l2-ctl",
+    "third_party/media-ctl:media-ctl",
     "//device/rockchip/hardware/wifi:ap6xxx",
     "//device/rockchip/hardware/isp:isp",
     "//device/rockchip/hardware/mpp:mpp",

hardware/display/BUILD.gn

@@ -17,6 +17,8 @@ import("//build/ohos/ndk/ndk.gni")
 ohos_prebuilt_shared_library("display_gralloc") {
   if (target_cpu == "arm") {
     source = "lib/libdisplay_gralloc.z.so"
+  } else if (target_cpu == "arm64") {
+    source = "lib64/libdisplay_gralloc.z.so"
   }     
   subsystem_name = "hdf"
   part_name = "hdf"
@@ -27,6 +29,8 @@ ohos_prebuilt_shared_library("display_gralloc") {
 ohos_prebuilt_shared_library("display_gfx") {
   if (target_cpu == "arm") {
     source = "lib/libdisplay_gfx.z.so"
+  } else if (target_cpu == "arm64") {
+    source = "lib64/libdisplay_gfx.z.so"
   }     
   subsystem_name = "hdf"
   part_name = "hdf"
@@ -34,9 +38,11 @@ ohos_prebuilt_shared_library("display_gfx") {
   # output_name = "display_gfx.z"
 }
 
-ohos_prebuilt_shared_library("display_device") {
+ohos_prebuilt_shared_library("display_device_drm") {
   if (target_cpu == "arm") {
     source = "lib/libdisplay_device_drm.z.so"
+  } else if (target_cpu == "arm64") {
+    source = "lib64/libdisplay_device_drm.z.so"
   }     
   subsystem_name = "hdf"
   part_name = "hdf"
@@ -44,12 +50,24 @@ ohos_prebuilt_shared_library("display_device") {
   # output_name = "display_device_drm.z"
 }
 
-ohos_prebuilt_shared_library("display_layer") {
+ohos_prebuilt_shared_library("display_device") {
   if (target_cpu == "arm") {
-    source = "lib/libdisplay_layer.z.so"
+    source = "lib/libdisplay_device.z.so"
+  } else if (target_cpu == "arm64") {
+    source = "lib64/libdisplay_device.z.so"
   }     
   subsystem_name = "hdf"
   part_name = "hdf"
   install_enable = true
   # output_name = "display_device_drm.z"
 }
+
+#ohos_prebuilt_shared_library("display_layer") {
+#  if (target_cpu == "arm") {
+#    source = "lib/libdisplay_layer.z.so"
+#  }
+#  subsystem_name = "hdf"
+#  part_name = "hdf"
+#  install_enable = true
+  # output_name = "display_device_drm.z"
+#}

hardware/gpu/BUILD.gn

@@ -28,6 +28,8 @@ config("libmali-bifrost-g52-g2p0-wayland") {
 ohos_prebuilt_shared_library("mali-bifrost-g52-g2p0-wayland") {
   if (target_cpu == "arm") {
     source = "lib/libmali-bifrost-g52-g2p0-wayland.so"
+  } else if (target_cpu == "arm64") {
+    source = "lib64/libmali-bifrost-g52-g2p0-wayland.so"
   }     
   subsystem_name = "hdf"
   part_name = "hdf"

hardware/isp/BUILD.gn

@@ -10,21 +10,22 @@
 # 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.
-
 import("//build/ohos.gni")
 
-ISP_LIB_DIR = "//device/rockchip/hardware/isp/lib"
-ISP_ETC_DIR = "//device/rockchip/hardware/isp/etc"
-ISP_BIN_DIR = "//device/rockchip/hardware/isp/bin"
+ISP_DIR="//device/rockchip/hardware/isp"
 
 ohos_prebuilt_shared_library("librkaiq") {
-  source = "$ISP_LIB_DIR/librkaiq.z.so"
+  if (target_cpu == "arm") {
+      source = "$ISP_DIR/lib/librkaiq.z.so"
+  } else {
+      source = "$ISP_DIR/lib64/librkaiq.z.so"
+  }
   subsystem_name = "rockchip_products"
   install_enable = true
 }
 
 ohos_prebuilt_etc("gc8034_RK-CMK-8M-2-v1_CK8401") {
-  source = "$ISP_ETC_DIR/iqfiles/gc8034_RK-CMK-8M-2-v1_CK8401.json"
+  source = "$ISP_DIR/etc/iqfiles/gc8034_RK-CMK-8M-2-v1_CK8401.json"
   install_images = [ "system" ]
   relative_install_dir = "iqfiles"
   part_name = "rockchip_products"
@@ -32,7 +33,11 @@ ohos_prebuilt_etc("gc8034_RK-CMK-8M-2-v1_CK8401") {
 }
 
 ohos_prebuilt_executable("ispserver") {
-  source = "$ISP_BIN_DIR/ispserver"
+  if (target_cpu == "arm") {
+      source = "$ISP_DIR/bin/ispserver"
+  } else {
+      source = "$ISP_DIR/bin64/ispserver"
+  }
   part_name = "rockchip_products"
   install_enable = true
 }

hardware/mpp/BUILD.gn

@@ -15,13 +15,16 @@ import("//build/ohos.gni")
 import("//build/ohos/ndk/ndk.gni")
 
 ohos_prebuilt_shared_library("libmpp") {
-  if (target_cpu == "arm") { 
+  if (target_cpu == "arm") {
     source = "lib/librockchip_mpp.so"
   } else {
     source = "lib64/librockchip_mpp.so"
   }
   part_name = "rockchip_products"
   install_enable = true
+  symlink_target_name = [
+    "librockchip_mpp.so.1",
+  ]
 }
 
 group("mpp") {

hardware/rga/BUILD.gn

@@ -15,8 +15,10 @@ import("//build/ohos.gni")
 import("//build/ohos/ndk/ndk.gni")
 
 ohos_prebuilt_shared_library("librga") {
-  if (target_cpu == "arm") { 
+  if (target_cpu == "arm") {
     source = "lib/librga.z.so"
+  } else if (target_cpu == "arm64") {
+    source = "lib64/librga.z.so"
   }
   subsystem_name = "hdf"
   part_name = "hdf"

hardware/wifi/BUILD.gn

@@ -10,12 +10,12 @@
 # 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.
-
 import("//build/ohos.gni")
 
 AP6XXX_ETC_DIR = "//device/rockchip/hardware/wifi/ap6xxx"
-WIFI_BIN_DIR = "//device/rockchip/hardware/wifi/bin"
+DNS_CONFIG_DIR = "//device/rockchip/hardware/wifi"
 WIFI_LIB_DIR = "//device/rockchip/hardware/wifi/lib"
+WIFI_BIN_DIR = "//device/rockchip/hardware/wifi/bin"
 
 ohos_prebuilt_etc("clm_bcm43752a2_ag.blob") {
   source = "$AP6XXX_ETC_DIR/clm_bcm43752a2_ag.blob"
@@ -49,6 +49,13 @@ ohos_prebuilt_etc("nvram_ap6275s.txt") {
   install_enable = true
 }
 
+ohos_prebuilt_etc("resolv.conf") {
+  source = "$DNS_CONFIG_DIR/etc/resolv.conf"
+  install_images = [ "system" ]
+  part_name = "rockchip_products"
+  install_enable = true
+}
+
 ohos_prebuilt_executable("wpa_cli") {
   install_enable = true
   source = "$WIFI_BIN_DIR/wpa_cli"
@@ -85,10 +92,10 @@ group("ap6xxx") {
     ":fw_bcm43752a2_ag_apsta.bin",
     ":fw_bcm43752a2_ag.bin",
     ":nvram_ap6275s.txt",
+    ":resolv.conf",
     ":wpa_cli",
     ":wpa_supplicant",
     ":libwpa_client.z.so",
     ":libwpa.z.so",
-
   ]
 }

hardware/wifi/etc/resolv.conf

@@ -0,0 +1,2 @@
+nameserver 114.114.114.114
+nameserver 8.8.8.8

hardware/wifi/proc/sys/net/ipv4/ping_group_range

@@ -0,0 +1 @@
+0	10

rk3568/BUILD.gn

@@ -18,5 +18,6 @@ group("rk3568_group") {
   deps = [
     "kernel:kernel",
     "build/rootfs:init_configs",
+    "bootanimation:bootanimation",
   ]
 }

rk3568/bootanimation/BUILD.gn

@@ -0,0 +1,36 @@
+# Copyright (C) 2021 HiHope Open Source Organization .
+# 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.
+import("//build/ohos.gni")
+
+BOOTANIMATION_DIR = "//device/rockchip/rk3568/bootanimation"
+
+ohos_prebuilt_etc("bootanimation-720x1280") {
+  source = "$BOOTANIMATION_DIR/bootanimation-720x1280.raw"
+  part_name = "rockchip_products"
+  install_enable = true
+}
+
+ohos_prebuilt_etc("bootanimation-1920x1080") {
+  source = "$BOOTANIMATION_DIR/bootanimation-1920x1080.raw"
+  part_name = "rockchip_products"
+  install_enable = true
+}
+
+group("bootanimation") {
+  deps = [
+    ":bootanimation-720x1280",
+    ":bootanimation-1920x1080",
+  ]
+}
+
+

rk3568/build/rootfs/init.cfg

@@ -433,7 +433,8 @@
                 "chown system system /sys/kernel/ipv4/tcp_rmem_def",
                 "chown system system /sys/kernel/ipv4/tcp_rmem_max",
                 "chown root radio /proc/cmdline",
-                "setparam net.tcp.default_init_rwnd 60"
+                "setparam net.tcp.default_init_rwnd 60",
+                "start ispserver"
             ]
         }, {
             "name" : "param:sys.sysctl.extra_free_kbytes=*",
@@ -483,6 +484,10 @@
             "console" : 1,
             "uid" : "root",
             "gid" : ["shell", "log", "readproc"]
+        }, {
+            "name" : "ispserver",
+            "path" : ["/system/bin/ispserver"],
+            "critical" : 1
         }
     ]
 }

rk3568/build/rootfs/init.rk3568.usb.cfg

@@ -11,8 +11,7 @@
                 "write /config/usb_gadget/g1/os_desc/use 1",
                 "write /config/usb_gadget/g1/bcdDevice 0x0223",
                 "write /config/usb_gadget/g1/bcdUSB 0x0200",
-                "mkdir /config/usb_gadget/g1/strings 0770 shell shell",
-                "mkdir /config/usb_gadget/g1/strings/0x409 0770 shell shell",
+                "mkdir /config/usb_gadget/g1/strings/0x409 0770",
                 "copy /sys/block/mmcblk0/device/cid /config/usb_gadget/g1/strings/0x409/serialnumber",
                 "write /config/usb_gadget/g1/strings/0x409/manufacturer Rockchip",
                 "write /config/usb_gadget/g1/strings/0x409/product \"HDC Device\"",