diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eaf4f022..90a94d14 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -122,6 +122,7 @@ jobs: - nt98566_lite # Rockchip + - rv1106_lite - rv1109_lite - rv1126_lite diff --git a/br-ext-chip-rockchip/board/rv1106/rv1106.generic.config b/br-ext-chip-rockchip/board/rv1106/rv1106.generic.config index 0bed2645..8a3bb028 100644 --- a/br-ext-chip-rockchip/board/rv1106/rv1106.generic.config +++ b/br-ext-chip-rockchip/board/rv1106/rv1106.generic.config @@ -2,7 +2,7 @@ # Automatically generated file; DO NOT EDIT. # Linux/arm 5.10.160 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="arm-openipc-linux-gnueabihf-gcc.br_real (Buildroot -g2155daa) 13.3.0" +CONFIG_CC_VERSION_TEXT="arm-openipc-linux-gnueabihf-gcc.br_real (Buildroot -g171d54c) 13.3.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=130300 CONFIG_LD_VERSION=240000000 @@ -1018,8 +1018,8 @@ CONFIG_MTD_UBI=y CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set -# CONFIG_MTD_UBI_GLUEBI is not set -CONFIG_MTD_UBI_BLOCK=y +CONFIG_MTD_UBI_GLUEBI=y +# CONFIG_MTD_UBI_BLOCK is not set # CONFIG_MTD_HYPERBUS is not set CONFIG_DTC=y CONFIG_OF=y diff --git a/br-ext-chip-rockchip/configs/rv1106_lite_defconfig b/br-ext-chip-rockchip/configs/rv1106_lite_defconfig index 51e2dd61..a5866420 100644 --- a/br-ext-chip-rockchip/configs/rv1106_lite_defconfig +++ b/br-ext-chip-rockchip/configs/rv1106_lite_defconfig @@ -23,7 +23,7 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/$(OPENIPC_SOC_FAMILY)/rv1106.generic.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_XZ=y -BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="rv1103g-luckfox-pico-mini.img" +BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="rv1103g-luckfox-pico-plus.img" BR2_LINUX_KERNEL_IMAGE_NAME="zboot.img" # Filesystem @@ -37,6 +37,11 @@ BR2_PACKAGE_WIREGUARD_TOOLS=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y +BR2_TARGET_ROOTFS_UBI=y +BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 +BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y +BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/scripts/ubifs/ubinize_rockchip.cfg" +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 # OpenIPC BR2_OPENIPC_SOC_VENDOR="rockchip" @@ -46,6 +51,7 @@ BR2_OPENIPC_VARIANT="lite" BR2_OPENIPC_FLASH_SIZE="8" # Packages +BR2_PACKAGE_ROCKCHIP_OSDRV_RV11XX=y BR2_PACKAGE_DROPBEAR_OPENIPC=y BR2_PACKAGE_IPCTOOL=y BR2_PACKAGE_JSONFILTER=y diff --git a/general/package/rockchip-osdrv-rv11xx/files/kmod/.gitkeep b/general/package/rockchip-osdrv-rv11xx/files/kmod/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/general/package/rockchip-osdrv-rv11xx/files/kmod/mpp_vcodec.ko b/general/package/rockchip-osdrv-rv11xx/files/kmod/mpp_vcodec.ko new file mode 100644 index 00000000..af76c700 Binary files /dev/null and b/general/package/rockchip-osdrv-rv11xx/files/kmod/mpp_vcodec.ko differ diff --git a/general/package/rockchip-osdrv-rv11xx/files/kmod/rockit.ko b/general/package/rockchip-osdrv-rv11xx/files/kmod/rockit.ko new file mode 100644 index 00000000..68f1dcef Binary files /dev/null and b/general/package/rockchip-osdrv-rv11xx/files/kmod/rockit.ko differ diff --git a/general/package/rockchip-osdrv-rv11xx/files/lib/.gitkeep b/general/package/rockchip-osdrv-rv11xx/files/lib/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/general/package/rockchip-osdrv-rv11xx/files/script/load_rockchip b/general/package/rockchip-osdrv-rv11xx/files/script/load_rockchip index 1a248525..093de8d9 100755 --- a/general/package/rockchip-osdrv-rv11xx/files/script/load_rockchip +++ b/general/package/rockchip-osdrv-rv11xx/files/script/load_rockchip @@ -1 +1,15 @@ #!/bin/sh +MODULE=/lib/modules/5.10.160/rockchip + +modprobe sc3336 +modprobe video_rkcif +modprobe video_rkisp +modprobe phy-rockchip-csi2-dphy-hw +modprobe phy-rockchip-csi2-dphy + +echo 1 > /sys/module/video_rkcif/parameters/clr_unready_dev +echo 1 > /sys/module/video_rkisp/parameters/clr_unready_dev + +modprobe rga3 +insmod $MODULE/mpp_vcodec.ko +insmod $MODULE/rockit.ko diff --git a/general/package/rockchip-osdrv-rv11xx/files/sensor/.gitkeep b/general/package/rockchip-osdrv-rv11xx/files/sensor/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/general/package/rockchip-osdrv-rv11xx/files/sensor/config/.gitkeep b/general/package/rockchip-osdrv-rv11xx/files/sensor/config/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/general/package/rockchip-osdrv-rv11xx/rockchip-osdrv-rv11xx.mk b/general/package/rockchip-osdrv-rv11xx/rockchip-osdrv-rv11xx.mk index 1b10eb79..edefc5f8 100644 --- a/general/package/rockchip-osdrv-rv11xx/rockchip-osdrv-rv11xx.mk +++ b/general/package/rockchip-osdrv-rv11xx/rockchip-osdrv-rv11xx.mk @@ -10,20 +10,11 @@ ROCKCHIP_OSDRV_RV11XX_LICENSE = MIT ROCKCHIP_OSDRV_RV11XX_LICENSE_FILES = LICENSE define ROCKCHIP_OSDRV_RV11XX_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors - # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(ROCKCHIP_OSDRV_RV11XX_PKGDIR)/files/sensor/config/* - - $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/4.19.111/rockchip - # $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.19.111/rockchip $(ROCKCHIP_OSDRV_RV11XX_PKGDIR)/files/kmod/*.ko + $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/5.10.160/rockchip + $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/5.10.160/rockchip $(ROCKCHIP_OSDRV_RV11XX_PKGDIR)/files/kmod/* $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin - $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(ROCKCHIP_OSDRV_RV11XX_PKGDIR)/files/script/load* - - $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib/sensors - # $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(ROCKCHIP_OSDRV_RV11XX_PKGDIR)/files/sensor/*.so - - $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib - # $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(ROCKCHIP_OSDRV_RV11XX_PKGDIR)/files/lib/*.so + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(ROCKCHIP_OSDRV_RV11XX_PKGDIR)/files/script/* endef $(eval $(generic-package)) diff --git a/general/scripts/ubifs/ubinize_rockchip.cfg b/general/scripts/ubifs/ubinize_rockchip.cfg new file mode 100644 index 00000000..8a529a22 --- /dev/null +++ b/general/scripts/ubifs/ubinize_rockchip.cfg @@ -0,0 +1,34 @@ +[kernel] +mode=ubi +vol_id=0 +vol_type=dynamic +vol_name=kernel +vol_alignment=1 +vol_size=4MiB +image=BINARIES_DIR/zboot.img + +[rootfs] +mode=ubi +vol_id=1 +vol_type=dynamic +vol_name=rootfs +vol_alignment=1 +vol_size=10MiB +image=BINARIES_DIR/rootfs.squashfs + +[rootfs_data] +mode=ubi +vol_id=2 +vol_type=dynamic +vol_name=rootfs_data +vol_alignment=1 +vol_size=10MiB + +[other] +mode=ubi +vol_id=3 +vol_type=dynamic +vol_name=other +vol_alignment=1 +vol_size=10MiB +vol_flags=autoresize