From 69abcd7cc3485f6f5740428863368e9566871008 Mon Sep 17 00:00:00 2001 From: yanghongliang Date: Tue, 23 Nov 2021 16:44:19 +0800 Subject: [PATCH 1/2] update device_hihope Signed-off-by: yanghongliang --- build/BUILD.gn | 4 ++-- build/README.en.md | 8 ++++---- build/README.zh.md | 8 ++++---- build/ohos.build | 2 +- compile.md | 2 +- hardware/BUILD.gn | 6 +++--- hardware/display/BUILD.gn | 4 ++-- hardware/isp/BUILD.gn | 2 +- hardware/wifi/BUILD.gn | 8 ++++---- rk3568/README.en.md | 4 ++-- rk3568/README_zh.md | 4 ++-- rk3568/bootanimation/BUILD.gn | 2 +- rk3568/camera/src/pipeline_core/BUILD.gn | 10 +++++----- rk3568/kernel/BUILD.gn | 2 +- rk3568/tools/linux/flash.py | 2 +- 15 files changed, 34 insertions(+), 34 deletions(-) diff --git a/build/BUILD.gn b/build/BUILD.gn index 86a380f..030c5bb 100755 --- a/build/BUILD.gn +++ b/build/BUILD.gn @@ -15,11 +15,11 @@ import("//build/ohos.gni") group("products_group") { if (device_name == "rk3568") { deps = [ - "//device/rockchip/rk3568:rk3568_group", + "//device/hihope/rk3568:rk3568_group", ] } deps += [ - "//device/rockchip/hardware:hardware_group", + "//device/hihope/hardware:hardware_group", ] } diff --git a/build/README.en.md b/build/README.en.md index 03b0c29..907ac8c 100644 --- a/build/README.en.md +++ b/build/README.en.md @@ -10,7 +10,7 @@ Currently, rk3568 are supported. ## Repositories Involved -1. device/rockchip/build -2. device/rockchip/common -3. device/rockchip/hardware -4. device/rockchip/rk3568 \ No newline at end of file +1. device/hihope/build +2. device/hihope/common +3. device/hihope/hardware +4. device/hihope/rk3568 diff --git a/build/README.zh.md b/build/README.zh.md index f9f947a..9965358 100644 --- a/build/README.zh.md +++ b/build/README.zh.md @@ -6,7 +6,7 @@ 目前支持rk3568 #### 对应仓库 -1. device/rockchip/build -2. device/rockchip/common -3. device/rockchip/hardware -4. device/rockchip/rk3568 +1. device/hihope/build +2. device/hihope/common +3. device/hihope/hardware +4. device/hihope/rk3568 diff --git a/build/ohos.build b/build/ohos.build index c163b9a..ba592fa 100755 --- a/build/ohos.build +++ b/build/ohos.build @@ -3,7 +3,7 @@ "parts": { "rockchip_products": { "module_list": [ - "//device/rockchip/build:products_group" + "//device/hihope/build:products_group" ] } } diff --git a/compile.md b/compile.md index 86864a8..ae94d2b 100644 --- a/compile.md +++ b/compile.md @@ -101,4 +101,4 @@ bash build/prebuilts_download.sh ## 镜像烧录 - 具体请参见[镜像烧录](https://gitee.com/hihope-rockchip/rkdownload/tree/master/%E7%83%A7%E5%86%99%E5%B7%A5%E5%85%B7)。 + 具体请参见[镜像烧录](rk3568/tools)。 diff --git a/hardware/BUILD.gn b/hardware/BUILD.gn index 4388a2d..e8541cb 100755 --- a/hardware/BUILD.gn +++ b/hardware/BUILD.gn @@ -15,8 +15,8 @@ import("//build/ohos.gni") group("hardware_group") { deps = [ - "//device/rockchip/hardware/wifi:ap6xxx", - "//device/rockchip/hardware/isp:isp", - "//device/rockchip/hardware/mpp:mpp", + "//device/hihope/hardware/wifi:ap6xxx", + "//device/hihope/hardware/isp:isp", + "//device/hihope/hardware/mpp:mpp", ] } diff --git a/hardware/display/BUILD.gn b/hardware/display/BUILD.gn index 5b423bb..ad79a61 100644 --- a/hardware/display/BUILD.gn +++ b/hardware/display/BUILD.gn @@ -88,7 +88,7 @@ ohos_shared_library("display_gfx") { "//drivers/adapter/uhdf2/adapter/osal/include/", "//utils/native/base/include", "//foundation/graphic/standard/utils/include", - "//device/rockchip/hardware/rga/include/", + "//device/hihope/hardware/rga/include/", "//base/hiviewdfx/interfaces/innerkits/libhilog/include", ] output_name = "display_gfx" @@ -96,7 +96,7 @@ ohos_shared_library("display_gfx") { deps = [ ":display_gralloc", "//utils/native/base:utils", - "//device/rockchip/hardware/rga:librga", + "//device/hihope/hardware/rga:librga", ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] diff --git a/hardware/isp/BUILD.gn b/hardware/isp/BUILD.gn index d277566..7bb5531 100755 --- a/hardware/isp/BUILD.gn +++ b/hardware/isp/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/ohos.gni") -ISP_DIR="//device/rockchip/hardware/isp" +ISP_DIR="//device/hihope/hardware/isp" ohos_prebuilt_shared_library("librkaiq") { if (target_cpu == "arm") { diff --git a/hardware/wifi/BUILD.gn b/hardware/wifi/BUILD.gn index b9ccfcb..3a7ce7f 100755 --- a/hardware/wifi/BUILD.gn +++ b/hardware/wifi/BUILD.gn @@ -12,10 +12,10 @@ # limitations under the License. import("//build/ohos.gni") -AP6XXX_ETC_DIR = "//device/rockchip/hardware/wifi/ap6xxx" -DNS_CONFIG_DIR = "//device/rockchip/hardware/wifi" -WIFI_LIB_DIR = "//device/rockchip/hardware/wifi/lib" -WIFI_BIN_DIR = "//device/rockchip/hardware/wifi/bin" +AP6XXX_ETC_DIR = "//device/hihope/hardware/wifi/ap6xxx" +DNS_CONFIG_DIR = "//device/hihope/hardware/wifi" +WIFI_LIB_DIR = "//device/hihope/hardware/wifi/lib" +WIFI_BIN_DIR = "//device/hihope/hardware/wifi/bin" ohos_prebuilt_etc("clm_bcm43752a2_ag.blob") { source = "$AP6XXX_ETC_DIR/clm_bcm43752a2_ag.blob" diff --git a/rk3568/README.en.md b/rk3568/README.en.md index 9125d85..b3aa165 100644 --- a/rk3568/README.en.md +++ b/rk3568/README.en.md @@ -7,7 +7,7 @@ This repository stores scripts for compiling and packing kernel image,burn tools ## contents ``` -/device/rockchip/rk3568 +/device/hihope/rk3568 ├── build # Compilation and construction of key cfg files ├── kernel # Compilation and packaging of the kernel image ├── loader # Pre-made image and instructions for use @@ -18,4 +18,4 @@ This repository stores scripts for compiling and packing kernel image,burn tools ## Repositories Involved -**device/rockchip/rk3568** +**device/hihope/rk3568** diff --git a/rk3568/README_zh.md b/rk3568/README_zh.md index 176f0d1..50792e3 100644 --- a/rk3568/README_zh.md +++ b/rk3568/README_zh.md @@ -7,7 +7,7 @@ rk3568内核镜像编译打包,烧录工具等。 ## 目录 ``` -/device/rockchip/rk3568 +/device/hihope/rk3568 ├── build # 关键cfg的编译构建 ├── kernel # kernel镜像的编译打包 ├── loader # 预制镜像及使用说明 @@ -18,5 +18,5 @@ rk3568内核镜像编译打包,烧录工具等。 ## 对应仓库 -**device/rockchip/rk3568** +**device/hihope/rk3568** diff --git a/rk3568/bootanimation/BUILD.gn b/rk3568/bootanimation/BUILD.gn index 4fd4cc0..a7f7f80 100755 --- a/rk3568/bootanimation/BUILD.gn +++ b/rk3568/bootanimation/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/ohos.gni") -BOOTANIMATION_DIR = "//device/rockchip/rk3568/bootanimation" +BOOTANIMATION_DIR = "//device/hihope/rk3568/bootanimation" ohos_prebuilt_etc("bootanimation-720x1280") { source = "$BOOTANIMATION_DIR/bootanimation-720x1280.raw" diff --git a/rk3568/camera/src/pipeline_core/BUILD.gn b/rk3568/camera/src/pipeline_core/BUILD.gn index 8e1f1f9..7b71ab5 100755 --- a/rk3568/camera/src/pipeline_core/BUILD.gn +++ b/rk3568/camera/src/pipeline_core/BUILD.gn @@ -71,7 +71,7 @@ ohos_shared_library("camera_pipeline_core") { "$camera_path/pipeline_core/pipeline_impl/src/strategy/stream_pipeline_strategy.cpp", "$camera_path/pipeline_core/pipeline_impl/src/stream_pipeline_core.cpp", "$camera_path/pipeline_core/src/pipeline_core.cpp", - "//device/rockchip/hardware/mpp/src/mpi_enc_utils.c", + "//device/hihope/hardware/mpp/src/mpi_enc_utils.c", ] include_dirs = [ "//utils/native/base/include", @@ -117,8 +117,8 @@ ohos_shared_library("camera_pipeline_core") { "//utils/native/base/include", "//foundation/multimedia/camera_standard/frameworks/innerkitsimpl/metadata/include", "$camera_device_name_path/camera/src/pipeline_core/node", - "//device/rockchip/hardware/rga/include", - "//device/rockchip/hardware/mpp/include", + "//device/hihope/hardware/rga/include", + "//device/hihope/hardware/mpp/include", "//third_party/libjpeg", # hcs parser @@ -134,8 +134,8 @@ ohos_shared_library("camera_pipeline_core") { "$camera_path/buffer_manager:camera_buffer_manager", "$camera_path/device_manager:camera_device_manager", "//foundation/multimedia/camera_standard/frameworks/innerkitsimpl/metadata:metadata", - "//device/rockchip/hardware/rga:librga", - "//device/rockchip/hardware/mpp:libmpp", + "//device/hihope/hardware/rga:librga", + "//device/hihope/hardware/mpp:libmpp", "//third_party/libjpeg:libjpeg_static", # hcs parser diff --git a/rk3568/kernel/BUILD.gn b/rk3568/kernel/BUILD.gn index 77c9dc5..034f9d5 100755 --- a/rk3568/kernel/BUILD.gn +++ b/rk3568/kernel/BUILD.gn @@ -25,7 +25,7 @@ action("kernel") { args = [ rebase_path(kernel_build_script_dir, root_build_dir), rebase_path("$root_build_dir/packages/phone/images"), - rebase_path("//device/rockchip/$device_name"), + rebase_path("//device/hihope/$device_name"), product_path, ] } diff --git a/rk3568/tools/linux/flash.py b/rk3568/tools/linux/flash.py index 103a73f..ba8f145 100755 --- a/rk3568/tools/linux/flash.py +++ b/rk3568/tools/linux/flash.py @@ -16,7 +16,7 @@ class FlashTool: self.rootDir = os.getcwd() self.outDir = '%s/out/ohos-%s-release' % (self.rootDir, arch) self.imageDir = '%s/packages/phone/images' % self.outDir - self.toolDir = '%s/device/rockchip/rk3566/tools' % self.rootDir + self.toolDir = '%s/device/hihope/rk3568/tools' % self.rootDir self.flashTool = 'sudo %s/linux/bin/flash.%s' % (self.toolDir, os.uname().machine) def QueryFlashMode(self): -- Gitee From effcaa603ca12ee6dd5a204fb7f7d36979f3a2f4 Mon Sep 17 00:00:00 2001 From: yanghongliang Date: Tue, 23 Nov 2021 19:59:10 +0800 Subject: [PATCH 2/2] update hardware README Signed-off-by: yanghongliang --- hardware/README.en.md | 14 +++++++------- hardware/README.zh.md | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/hardware/README.en.md b/hardware/README.en.md index 88f9982..843fcd0 100644 --- a/hardware/README.en.md +++ b/hardware/README.en.md @@ -1,4 +1,4 @@ -# rockchip hardware +# hihope hardware ## Introduction Media and wifi southbound interface implementation, framework and docking layer library directory。 @@ -6,9 +6,9 @@ Media and wifi southbound interface implementation, framework and docking layer Currently, rk3568 are supported. ## Repositories Involved -1. device_rockchip/hardware/display -2. device_rockchip/hardware/gpu -3. device_rockchip/hardware/isp -4. device_rockchip/hardware/mpp -5. device_rockchip/hardware/rga -6. device_rockchip/hardware/wifi +1. device_hihope/hardware/display +2. device_hihope/hardware/gpu +3. device_hihope/hardware/isp +4. device_hihope/hardware/mpp +5. device_hihope/hardware/rga +6. device_hihope/hardware/wifi diff --git a/hardware/README.zh.md b/hardware/README.zh.md index 5199124..7eb878e 100644 --- a/hardware/README.zh.md +++ b/hardware/README.zh.md @@ -1,4 +1,4 @@ -# rockchip hardware组件 +# hihope hardware组件 #### 简介 媒体及wifi南向接口实现、框架及对接层库目录。 @@ -6,9 +6,9 @@ 目前支持rk3568 #### 对应仓库 -1. device_rockchip/hardware/display -2. device_rockchip/hardware/gpu -3. device_rockchip/hardware/isp -4. device_rockchip/hardware/mpp -5. device_rockchip/hardware/rga -6. device_rockchip/hardware/wifi \ No newline at end of file +1. device_hihope/hardware/display +2. device_hihope/hardware/gpu +3. device_hihope/hardware/isp +4. device_hihope/hardware/mpp +5. device_hihope/hardware/rga +6. device_hihope/hardware/wifi -- Gitee