diff --git a/media/cfg/cfg.mk b/media/cfg/cfg.mk index 9efc1988e..1056a9fcf 100644 --- a/media/cfg/cfg.mk +++ b/media/cfg/cfg.mk @@ -6,7 +6,7 @@ export CONFIG_RK_MEDIA_CROSS=arm-rockchip830-linux-uclibcgnueabihf #------------------------------------------------ # Enable libdrm -export CONFIG_LIBDRM=y +export CONFIG_LIBDRM=n #------------------------------------------------ # Rockchip's MPP(Multimedia Processing Platform) @@ -40,25 +40,25 @@ export CONFIG_RK_RGA2_USE_LIBDRM=n # Rockchip's common algorithm # # Enable common_algorithm Build -export CONFIG_RK_COMMON_ALGORITHM=y +export CONFIG_RK_COMMON_ALGORITHM=n #------------------------------------------------ # Rockchip's rockit # # Enable Rockit Build -export CONFIG_RK_ROCKIT=y +export CONFIG_RK_ROCKIT=n #------------------------------------------------ # Rockchip's iva # # Enable iva Build -export CONFIG_RK_IVA=y +export CONFIG_RK_IVA=n #------------------------------------------------ # Rockchip's ive # # Enable ive Build -export CONFIG_RK_IVE=y +export CONFIG_RK_IVE=n #------------------------------------------------ # Rockchip's hardware crypto @@ -75,4 +75,4 @@ export CONFIG_RK_CRYPTO=n # liblvgl export CONFIG_LVGL=n -export CONFIG_RK_AVS=y +export CONFIG_RK_AVS=n diff --git a/media/luckfox/Makefile b/media/luckfox/Makefile index a2680a68f..ca968a474 100755 --- a/media/luckfox/Makefile +++ b/media/luckfox/Makefile @@ -4,7 +4,7 @@ ifeq ($(MEDIA_PARAM), ) include $(MEDIA_PARAM) endif -export CONFIG_LUCKFOX_TEST=y +export CONFIG_LUCKFOX_TEST=n export LC_ALL=C SHELL:=/bin/bash diff --git a/media/samples/Makefile b/media/samples/Makefile index 2757c6509..3b94adba0 100644 --- a/media/samples/Makefile +++ b/media/samples/Makefile @@ -4,7 +4,7 @@ ifeq ($(MEDIA_PARAM), ) include $(MEDIA_PARAM) endif -export CONFIG_RK_SAMPLE=y +export CONFIG_RK_SAMPLE=n export LC_ALL=C SHELL:=/bin/bash diff --git a/media/sysutils/Makefile b/media/sysutils/Makefile index e6d6bc3a0..869935959 100755 --- a/media/sysutils/Makefile +++ b/media/sysutils/Makefile @@ -4,7 +4,7 @@ ifeq ($(MEDIA_PARAM), ) include $(MEDIA_PARAM) endif -export CONFIG_RK_SYSUTILS=y +export CONFIG_RK_SYSUTILS=n export LC_ALL=C SHELL:=/bin/bash diff --git a/project/build.sh b/project/build.sh index 9bea0728d..fa60788de 100755 --- a/project/build.sh +++ b/project/build.sh @@ -1196,12 +1196,12 @@ function __MAKE_MOUNT_SCRIPT() { function __PACKAGE_OEM() { mkdir -p $RK_PROJECT_PACKAGE_OEM_DIR __PACKAGE_RESOURCES $RK_PROJECT_PACKAGE_OEM_DIR - if [ -d "$RK_PROJECT_PACKAGE_OEM_DIR/usr/share/iqfiles" ]; then - ( - cd $RK_PROJECT_PACKAGE_ROOTFS_DIR/etc - ln -sf ../oem/usr/share/iqfiles ./ - ) - fi + # if [ -d "$RK_PROJECT_PACKAGE_OEM_DIR/usr/share/iqfiles" ]; then + # ( + # cd $RK_PROJECT_PACKAGE_ROOTFS_DIR/etc + # ln -sf ../oem/usr/share/iqfiles ./ + # ) + # fi mkdir -p $(dirname $RK_PROJECT_FILE_OEM_SCRIPT) cat >$RK_PROJECT_FILE_OEM_SCRIPT </output/out/media_out/isp_iqfiles/$RK_CAMERA_SENSOR_IQFILES -# export RK_CAMERA_SENSOR_IQFILES="sc4336_OT01_40IRC_F16.json sc3336_CMK-OT2119-PC1_30IRC-F16.json" +export RK_CAMERA_SENSOR_IQFILES="sc3336_CMK-OT2119-PC1_30IRC-F16.json" #export RK_CAMERA_SENSOR_IQFILES="sc4336_OT01_40IRC_F16.json sc3336_CMK-OT2119-PC1_30IRC-F16.json sc530ai_CMK-OT2115-PC1_30IRC-F16.json" # Config sensor lens CAC calibrattion bin files diff --git a/project/cfg/BoardConfig_IPC/rv1103-spi_nor-post.sh b/project/cfg/BoardConfig_IPC/rv1103-spi_nor-post.sh index fd8801ebb..947782f45 100755 --- a/project/cfg/BoardConfig_IPC/rv1103-spi_nor-post.sh +++ b/project/cfg/BoardConfig_IPC/rv1103-spi_nor-post.sh @@ -3,12 +3,17 @@ cd $RK_PROJECT_PACKAGE_OEM_DIR/usr/lib/ rm face_mask_classify.data rm face_quality_v2.data +rm libsmartIr.so rm object_detection_ipc_cls7.data rm object_detection_ipc_cls7_v.data rm object_detection_pfp_896x512.data cd - +cp -rf $RK_PROJECT_PACKAGE_OEM_DIR/usr/lib/* $RK_PROJECT_PACKAGE_ROOTFS_DIR/usr/lib/ +cp -rf $RK_PROJECT_PACKAGE_OEM_DIR/usr/share/* $RK_PROJECT_PACKAGE_ROOTFS_DIR/usr/share/ +rm $RK_PROJECT_PACKAGE_ROOTFS_DIR/etc/profile.d/RkEnv.sh rm $RK_PROJECT_PACKAGE_ROOTFS_DIR/lib/libstdc++.so.6.0.25-gdb.py +rm -rf $RK_PROJECT_PACKAGE_ROOTFS_DIR/oem # delete nouse ko rm -f $RK_PROJECT_PACKAGE_OEM_DIR/usr/ko/gcm.ko diff --git a/sysdrv/source/buildroot/buildroot-2023.02.6 b/sysdrv/source/buildroot/buildroot-2023.02.6 index 3935eaaf6..5e4a5ee99 160000 --- a/sysdrv/source/buildroot/buildroot-2023.02.6 +++ b/sysdrv/source/buildroot/buildroot-2023.02.6 @@ -1 +1 @@ -Subproject commit 3935eaaf657f93bb4000542b717d88b1c080efa5 +Subproject commit 5e4a5ee991d3d6f562a50e01249e8db55a83fcb3