diff --git a/README.md b/README.md index eeb3680d20956acddaee3b5f7026d5cf16966b04..2d463581678bc89277a036333e542b45a7640665 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# Phytium-OpenHarmony-D2000-X100 +# Phytium-OpenHarmony-Dxxxx-X100 ## 介绍 -该项目介绍,如何在飞腾信息科技有限公司的 Phytium D2000 + X100 DEV硬件平台上运行 OpenHarmony 标准系统[OpenHamony 4.1 release](https://gitee.com/openharmony/docs/blob/master/zh-cn/release-notes/OpenHarmony-v4.1-release.md)。 +该项目介绍,如何在飞腾信息科技有限公司的 Phytium D系列CPU + X100硬件平台上运行 OpenHarmony 标准系统[OpenHamony 4.1 release](https://gitee.com/openharmony/docs/blob/master/zh-cn/release-notes/OpenHarmony-v4.1-release.md)。 支持X100提供的视频解码硬件加速,以及图形显示硬件加速。 支持Linux kernel 5.10。 diff --git a/device_board_phytium/common/build_kernel/kernel.mk b/device_board_phytium/common/build_kernel/kernel.mk index 48d7e53f8f6b267cc2739ab68d83efb94e732aeb..8bdaf7898ea012b44ce4a3cb85e978efd589390c 100755 --- a/device_board_phytium/common/build_kernel/kernel.mk +++ b/device_board_phytium/common/build_kernel/kernel.mk @@ -15,7 +15,7 @@ # limitations under the License. PRODUCT_NAME=$(TARGET_PRODUCT) -OHOS_BUILD_HOME := $(realpath $(shell pwd)/../../../../../) +OHOS_BUILD_HOME := $(OUT_DIR)/../../.. KERNEL_SRC_TMP_PATH := $(OUT_DIR)/kernel/${KERNEL_VERSION} KERNEL_OBJ_TMP_PATH := $(OUT_DIR)/kernel/OBJ/${KERNEL_VERSION} ifeq ($(BUILD_TYPE), standard) diff --git a/device_board_phytium/common/tools/generate_image/generate_image.sh b/device_board_phytium/common/tools/generate_image/generate_image.sh index 0d718cbe079c581dc7b1c8cd8910e98956f5fd36..e527373c44947812f4b30ef9b56683af87dbfa37 100644 --- a/device_board_phytium/common/tools/generate_image/generate_image.sh +++ b/device_board_phytium/common/tools/generate_image/generate_image.sh @@ -92,6 +92,13 @@ else UBOOT_NAME="no_uboot" fi +#### The GPT partition table occupies 34 blocks of space, which may interfere with uboot. +#### If you need to package the uboot image, you can only use the partition format of msdos. +if [ -f $UBOOT_NAME ]&&[ $PART_MODE == "gpt" ]; then + echo -e "${red}Interference between GPT partition table and uboot, switch to MSDOS mode!!!${normal}" + PART_MODE="msdos" +fi + IMAGE_NAME_EX=$(awk '/^image_name_ex/{print $3}' "$CONFIG") IMAGE_NAME="${IMAGE_NAME_EX}_${IMAGE_NAME_END}.img" LABLE_RESERVE_SIZE=$(awk '/^label_reserve_size/{print $3}' "$CONFIG") diff --git a/device_board_phytium/d2000/patch/0014=foundation-filemanagement-storage_service=auto_mount_usb_storage_device.patch b/device_board_phytium/d2000/patch/0014=foundation-filemanagement-storage_service=auto_mount_usb_storage_device.patch new file mode 100755 index 0000000000000000000000000000000000000000..a12723acffc175b27ac73cfa805ffc742fa8d801 --- /dev/null +++ b/device_board_phytium/d2000/patch/0014=foundation-filemanagement-storage_service=auto_mount_usb_storage_device.patch @@ -0,0 +1,16 @@ +diff --git a/services/storage_daemon/disk_config b/services/storage_daemon/disk_config +index b2ff99d..1d140f1 100644 +--- a/services/storage_daemon/disk_config ++++ b/services/storage_daemon/disk_config +@@ -3,4 +3,8 @@ sysPattern /devices/platform/usbhost/fd000000.dwc3/* label disk flag 0 + sysPattern /devices/platform/fd800000.usb/* label disk flag 0 + sysPattern /devices/platform/soc/f9890000.ehci/* label disk flag 0 + sysPattern /devices/platform/hi_mci.1/mmc_host/mmc1/* label disk flag 0 +-sysPattern /devices/platform/hisi_usb/f8600000.dwc3/* label disk flag 0 +\ No newline at end of file ++sysPattern /devices/platform/hisi_usb/f8600000.dwc3/* label disk flag 0 ++sysPattern /devices/pci0000:00/0000:00:00.0/0000:01:00.0/0000:02:02.0/* label disk flag 0 ++sysPattern /devices/platform/soc/40000000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/0000:02:02.0/* label disk flag 0 ++sysPattern /devices/pci0000:00/0000:00:04.0/0000:12:00.0/* label disk flag 0 ++sysPattern /devices/platform/soc/40000000.pcie/pci0000:00/0000:00:04.0/0000:12:00.0/* label disk flag 0 +\ No newline at end of file diff --git a/phytium_env.sh b/phytium_env.sh index 61216dc61feb300a3d5b772b4253fca27686178a..70ab8b0c6c2cd9aebaf2a5eb29db9f64535a8c3c 100755 --- a/phytium_env.sh +++ b/phytium_env.sh @@ -116,7 +116,9 @@ function apply_git_patch(){ echo -e "\033[32m#### git apply $file end#### \033[0m" else echo -e "\n\033[32m#### git reset $git_path #### \033[0m" + git clean -df git checkout ./* + git lfs checkout echo -e "\033[32m#### git reset $git_path end #### \033[0m" fi #git status