diff --git a/README.md b/README.md index 02a7b8cd1fcdeee9a9a1c337590bfc97eb4d264f..e2639a5d0ae0c6e54373863bd9ac0e41841d0d8e 100644 --- a/README.md +++ b/README.md @@ -188,7 +188,7 @@ LINUX_OVERRIDE_SRCDIR指定了一个本地的内核源码目录，这样就不 指定的内核源码目录。 这样开发人员首先在LINUX_OVERRIDE_SRCDIR指定的目录对内核进行修改，然后运行`make linux-rebuild`或者 `make linux-reconfigure`即可。 该命令首先将LINUX_OVERRIDE_SRCDIR中的内核源码同步到`output/build/linux-custom`目录，然后进行配置、编译、安装。 -如果想要编译、安装内核，并重新生成系统镜像，请运行`make linux-rebuild all`。 +如果想要编译、安装内核，并重新生成系统镜像，请运行`make linux-rebuild phyuboot-rebuild all`。 # 在开发板上启动文件系统 ## 在phytiumpi开发板上启动文件系统 @@ -196,12 +196,9 @@ LINUX_OVERRIDE_SRCDIR指定了一个本地的内核源码目录，这样就不 （1）将phytiumpi img 镜像（sdcard.img）写入sd卡： `$ sudo dd if=xxx/phytium-pi-os/output/images/sdcard.img of=/dev/sdb bs=1M` -本项目还提供了将img镜像烧录进sd卡并进行md5值校验的脚本，确保烧录正确。该脚本需在顶层目录下执行，用法为以下其中之一： -`$ sudo ./board/phytium/dd_and_checkMD5.sh /dev/sdx desktop` -`$ sudo ./board/phytium/dd_and_checkMD5.sh /dev/sdx no_desktop` -其中，/dev/sdx表示sd卡对应的设备节点名称； -如果编译的是phytiumpi_desktop_defconfig，使用第一条命令； -如果编译的是phytiumpi_defconfig，使用第二条命令。 +本项目还提供了将img镜像烧录进sd卡并进行md5值校验的脚本，确保烧录正确。该脚本需在顶层目录下执行，用法如下： +`$ sudo ./board/phytium/dd_and_checkMD5.sh /dev/sdx` +其中，/dev/sdx表示sd卡对应的设备节点名称。 （2）SD卡接到开发板，启动开发板电源，启动文件系统 （3）登陆开发板，执行lsblk 命令查看磁盘分区信息,SD 卡对应盘符为 /dev/mmcblk0. 需要将根目录分区 /dev/mmcblk0p1 进行扩容: diff --git a/board/phytium/dd_and_checkMD5.sh b/board/phytium/dd_and_checkMD5.sh index 43b38fe0f94d49ae7f5f97ba8b7a0f7d11d98531..35035e2f82b77a2581360972267f7865458656cf 100755 --- a/board/phytium/dd_and_checkMD5.sh +++ b/board/phytium/dd_and_checkMD5.sh @@ -1,18 +1,13 @@ #!/bin/bash # dd_and_checkMD5.sh - To dd sdcard.img into the disk and verify the MD5 valuses that # ensure sdcard.img is correctly written into the disk. -# dd_and_checkMD5.sh is suitable for the phytiumpi file system compiled from Phytium-Pi-OS and phytium-linux-buildroot. -# phytium-linux-buildroot Repository address: https://gitlab.phytium.com.cn/embedded/linux/phytium-linux-buildroot. -# Phytium-Pi-OS Repository address: https://gitlab.phytium.com.cn/embedded/linux/phytiumpios. +# dd_and_checkMD5.sh is suitable for the phytiumpi file system compiled from Phytium-Pi-OS. +# Phytium-Pi-OS Repository address: https://gitee.com/phytium_embedded/phytium-pi-os.git. usage() { - echo "Usage: sudo ./board/phytium/dd_and_checkMD5.sh [Disk_name] [Type_of_file_system]" + echo "Usage: sudo ./board/phytium/dd_and_checkMD5.sh [Disk_name]" echo " Disk_name: the disk you want to dd to. Such as /dev/sdb" - echo " Type_of_file_system:" - echo " desktop: phytium_xxx_desktop_defconfig from phytium-linux-buildroot or Phytium-Pi-OS" - echo " no_desktop: phytium_defconfig from Phytium-Pi-OS" - echo " busybox: phytium_defconfig from phytium-linux-buildroot" - echo " For examples: $0 /dev/sdb desktop" + echo " For examples:sudo $0 /dev/sdb" } while true; do @@ -33,11 +28,6 @@ check_args() echo "Parameter 1 does not meet the requirements." exit 1 fi - - if [[ $2 != "desktop" && $2 != "no_desktop" && $2 != "busybox" ]]; then - echo "Parameter 2 does not meet the requirements." - exit 1 - fi } check_disk_device() @@ -81,17 +71,11 @@ check_disk_device() } # The size of phytiumpi file system with or without a desktop may vary. -if [ "$2" == "desktop" ]; then - count=15424 -elif [ "$2" == "no_desktop" ]; then - count=6208 -else - count=2112 -fi + count=15424 main() { - check_args $1 $2 + check_args $1 check_disk_device $1 echo "----------------------------$(date)-----------------------" >> dd.log dd if=./output/images/sdcard.img of=$1 bs=1M count=$count >> dd.log 2>&1 diff --git a/configs/phytiumpi_defconfig b/configs/phytiumpi_defconfig index d7dd9295b7ca66ba52f127bf924f3f703718115f..ac222e38b51254486e156b42ba7062fa87f63245 100644 --- a/configs/phytiumpi_defconfig +++ b/configs/phytiumpi_defconfig @@ -35,7 +35,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitee.com/phytium_embedded/phytium-linux-kernel.git" # kernel 5.10 -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-5.10_v2.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="3d4c08f6ed3e1dd0732b2f9701439a0cb34190e5" BR2_LINUX_KERNEL_INTREE_DTS_NAME="phytium/phytiumpi_firefly" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_DEFCONFIG="phytium" diff --git a/configs/phytiumpi_desktop_defconfig b/configs/phytiumpi_desktop_defconfig index 68ce34081ea66d4f209e0b3b46f9a000a6d2866c..2a31b09b6ee9c07487a8c5d847e223527f6bdbc7 100644 --- a/configs/phytiumpi_desktop_defconfig +++ b/configs/phytiumpi_desktop_defconfig @@ -35,7 +35,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitee.com/phytium_embedded/phytium-linux-kernel.git" # kernel 5.10 -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-5.10_v2.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="3d4c08f6ed3e1dd0732b2f9701439a0cb34190e5" BR2_LINUX_KERNEL_INTREE_DTS_NAME="phytium/phytiumpi_firefly" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_DEFCONFIG="phytium" diff --git a/configs/phytiumpi_linux_5.10_rt.config b/configs/phytiumpi_linux_5.10_rt.config index 92bcc5caade9b415f00d558c0f4ce1340f7dc286..c51e02dd7983c0f4ff5f30949fa09aefa8587116 100644 --- a/configs/phytiumpi_linux_5.10_rt.config +++ b/configs/phytiumpi_linux_5.10_rt.config @@ -1,2 +1,2 @@ # kernel 5.10-rt -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-5.10-rt_v2.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="c5d2908c782302764ce3be2f692e3cdb1f590818" diff --git a/configs/phytiumpi_optee.config b/configs/phytiumpi_optee.config index f35215204b5f2119910f8ea98994805488bee2d2..b652ca81ff5df6d8119a6a865cbdc946da86ae4d 100644 --- a/configs/phytiumpi_optee.config +++ b/configs/phytiumpi_optee.config @@ -3,5 +3,5 @@ BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/phytium_ BR2_PACKAGE_PHYTIUM_OPTEE=y BR2_PACKAGE_PHYTIUM_OPTEE_CUSTOM_REPO_URL="https://gitee.com/phytium_embedded/phytium-optee.git" -BR2_PACKAGE_PHYTIUM_OPTEE_CUSTOM_REPO_VERSION="v2.3" +BR2_PACKAGE_PHYTIUM_OPTEE_CUSTOM_REPO_VERSION="v3.1" BR2_PACKAGE_PHYTIUM_OPTEE_BOARD="phytiumpi" diff --git a/package/phytium-tools/phytium-tools.mk b/package/phytium-tools/phytium-tools.mk index 5295e6642aeed289da272777885b029847e454b0..e92a1c7948e4ae62996482574d69c43cc0996d93 100644 --- a/package/phytium-tools/phytium-tools.mk +++ b/package/phytium-tools/phytium-tools.mk @@ -16,6 +16,7 @@ define PHYTIUM_TOOLS_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/share/images/desktop-base/ mkdir -p $(TARGET_DIR)/usr/share/lightdm/lightdm-gtk-greeter.conf.d/ mkdir -p $(TARGET_DIR)/usr/share/desktop-base/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/ + mkdir -p $(TARGET_DIR)/lib/firmware/rtw88/ $(INSTALL) -m 777 -D $(@D)/dark.jpg $(TARGET_DIR)/usr/share/images/desktop-base/ $(INSTALL) -m 755 -D $(@D)/01_debian.conf $(TARGET_DIR)/usr/share/lightdm/lightdm-gtk-greeter.conf.d/ $(INSTALL) -m 755 -D $(@D)/xfce4-desktop.xml $(TARGET_DIR)/usr/share/desktop-base/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/ @@ -24,6 +25,7 @@ define PHYTIUM_TOOLS_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -D $(@D)/resize.sh $(TARGET_DIR)/usr/bin/ $(INSTALL) -m 644 -D $(@D)/systemd-hciattach.service $(TARGET_DIR)/lib/systemd/system/ $(INSTALL) -m 755 -D $(@D)/runtime_replace_bootloader.sh $(TARGET_DIR)/usr/bin/ + $(INSTALL) -m 444 -D $(@D)/rtw8821c_fw.bin $(TARGET_DIR)/lib/firmware/rtw88/ endef $(eval $(generic-package)) diff --git a/package/phytium-tools/src/rtw8821c_fw.bin b/package/phytium-tools/src/rtw8821c_fw.bin new file mode 100644 index 0000000000000000000000000000000000000000..9beeb38c4bfb767aed5584ade886bc18e0fd61a0 Binary files /dev/null and b/package/phytium-tools/src/rtw8821c_fw.bin differ diff --git a/package/phytium-tools/src/runtime_replace_bootloader.sh b/package/phytium-tools/src/runtime_replace_bootloader.sh index a1233e6762b3df6f1f57e48ee6f998f5f5e07ff0..56002711cfa728beb20c19dc90ee2022bbb2b1df 100755 --- a/package/phytium-tools/src/runtime_replace_bootloader.sh +++ b/package/phytium-tools/src/runtime_replace_bootloader.sh @@ -39,6 +39,7 @@ main() dd if=/dev/mmcblk0 of=start.img bs=512 count=1 >> replace.log 2>&1 dd if=fip-all.bin of=/dev/mmcblk0 bs=1M count=4 >> replace.log 2>&1 dd if=start.img of=/dev/mmcblk0 bs=512 count=1 >> replace.log 2>&1 + rm -f start.img elif [ "$1" == "image" ]; then dd if=fitImage of=/dev/mmcblk0 bs=1M seek=4 count=60 >> replace.log 2>&1 else diff --git a/package/phyuboot/src/fip-all-optee-2GB.bin b/package/phyuboot/src/fip-all-optee-2GB.bin index 22a1a34e40e85dc1026e48f0640b715e1f4698e1..44dfdec51a107e406a943aa9bdadc336b4a6c1e8 100644 Binary files a/package/phyuboot/src/fip-all-optee-2GB.bin and b/package/phyuboot/src/fip-all-optee-2GB.bin differ diff --git a/package/phyuboot/src/fip-all-optee-4GB.bin b/package/phyuboot/src/fip-all-optee-4GB.bin index 9c7ef94a48a1ee53e4060894b1d78d947a3229f3..d0628b8cdfeb1d7739168a38371f8382c9cfe735 100644 Binary files a/package/phyuboot/src/fip-all-optee-4GB.bin and b/package/phyuboot/src/fip-all-optee-4GB.bin differ