diff --git a/sdk/X-AIOS-LT00-V1.0.4/base/soc/qm10xd/linux/bsp/uboot/uboot/configs/quaming_qm10xd_demo_ld_nand_defconfig b/sdk/X-AIOS-LT00-V1.0.4/base/soc/qm10xd/linux/bsp/uboot/uboot/configs/quaming_qm10xd_demo_ld_nand_defconfig index edbc6b3ce..5879e17ea 100644 --- a/sdk/X-AIOS-LT00-V1.0.4/base/soc/qm10xd/linux/bsp/uboot/uboot/configs/quaming_qm10xd_demo_ld_nand_defconfig +++ b/sdk/X-AIOS-LT00-V1.0.4/base/soc/qm10xd/linux/bsp/uboot/uboot/configs/quaming_qm10xd_demo_ld_nand_defconfig @@ -17,7 +17,7 @@ CONFIG_TPL_SYS_MALLOC_F_LEN=0x400 CONFIG_SPI_BOOT=y CONFIG_BOOTDELAY=0 CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="quiet mtdswap.partitions=10 ubi.mtd=9 ubi.mtd=11 ubi.mtd=12 root=ubi1:rootfs init=/init rootfstype=ubifs mem=38M earlycon console=ttyS0,115200 mtdparts=spi_nfc:128k@0(boot-spl),128k@128k(boot-env),768k@256k(boot-uboot),1m@1m(logo),1m@2m(padding),1m@3m(misc),3m@4m(recovery),10m@7m(recovery-rootfs),4m@17m(boot),13m@21m(system),6m@34m(swapfile),12m@40m(rootfs),6m@52m(data),-@58m(usrdata)" +CONFIG_BOOTARGS="quiet mtdswap.partitions=10 ubi.mtd=9 ubi.mtd=11 ubi.mtd=12 root=ubi1:rootfs init=/init rootfstype=ubifs mem=38M earlycon console=ttyS0,115200 mtdparts=spi_nfc:128k@0(boot-spl),128k@128k(boot-env),768k@256k(boot-uboot),1m@1m(logo),1m@2m(padding),1m@3m(misc),3m@4m(recovery),10m@7m(recovery-rootfs),4m@17m(boot),13m@21m(system),6m@34m(swapfile),12m@40m(rootfs),-@52m(data)" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y @@ -80,7 +80,7 @@ CONFIG_MTD=y CONFIG_MTD_DEVICE=y CONFIG_MTD_PARTITIONS=y CONFIG_CMD_MTDPARTS=y -CONFIG_MTDPARTS_DEFAULT="mtdparts=spi_nfc:128k@0(boot-spl),128k@128k(boot-env),768k@256k(boot-uboot),1m@1m(logo),1m@2m(padding),1m@3m(misc),3m@4m(recovery),10m@7m(recovery-rootfs),4m@17m(boot),13m@21m(system),6m@34m(swapfile),12m@40m(rootfs),6m@52m(data),-@58m(usrdata)" +CONFIG_MTDPARTS_DEFAULT="mtdparts=spi_nfc:128k@0(boot-spl),128k@128k(boot-env),768k@256k(boot-uboot),1m@1m(logo),1m@2m(padding),1m@3m(misc),3m@4m(recovery),10m@7m(recovery-rootfs),4m@17m(boot),13m@21m(system),6m@34m(swapfile),12m@40m(rootfs),-@52m(data)" CONFIG_MTDIDS_DEFAULT="nand0=spi_nfc" CONFIG_CMD_LZMADEC=y # CONFIG_CMD_UNZIP=y diff --git a/sdk/X-AIOS-LT00-V1.0.4/core/package/hardware/deviceDrv/wifi/aic8800d/prebuilts/moto_ld/wifi/bin/wifi_init.sh b/sdk/X-AIOS-LT00-V1.0.4/core/package/hardware/deviceDrv/wifi/aic8800d/prebuilts/moto_ld/wifi/bin/wifi_init.sh index a57b34669..af3753fe4 100755 --- a/sdk/X-AIOS-LT00-V1.0.4/core/package/hardware/deviceDrv/wifi/aic8800d/prebuilts/moto_ld/wifi/bin/wifi_init.sh +++ b/sdk/X-AIOS-LT00-V1.0.4/core/package/hardware/deviceDrv/wifi/aic8800d/prebuilts/moto_ld/wifi/bin/wifi_init.sh @@ -78,7 +78,7 @@ fi sleep 1 lbh_server -p "ble_userconfig.json" -s ble uart 1500000 /dev/ttyS2 1>/dev/null 2>&1 & sleep 5 -cd /usrdata;./lbh_client 1>/dev/null 2>&1 & +cd /data;./lbh_client 1>/dev/null 2>&1 & sleep 5 echo -100 > /proc/$(pidof lbh_server)/oom_score_adj echo -100 > /proc/$(pidof lbh_client)/oom_score_adj diff --git a/sdk/X-AIOS-LT00-V1.0.4/cp.sh b/sdk/X-AIOS-LT00-V1.0.4/cp.sh index 65f70a719..3886fee98 100755 --- a/sdk/X-AIOS-LT00-V1.0.4/cp.sh +++ b/sdk/X-AIOS-LT00-V1.0.4/cp.sh @@ -1,4 +1,4 @@ -DIR=/media/hyx/061C-D1C9/ +DIR=/media/hyx/56BD-E4E7/ cd out/qm10xd_linux/qmimages cp code-size.txt $DIR cp data.ubi $DIR @@ -11,8 +11,6 @@ cp script.ini $DIR cp system.ubi $DIR cp u-boot.bin $DIR cp u-boot-spl-header.img $DIR -cp u-boot-spl-header_out.img $DIR -cp usrdata.ubi $DIR cp zImage-dtb $DIR cd - sudo eject $DIR diff --git a/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/usrdata/e_player b/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/data/e_player similarity index 100% rename from sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/usrdata/e_player rename to sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/data/e_player diff --git a/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/usrdata/lbh_client b/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/data/lbh_client similarity index 100% rename from sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/usrdata/lbh_client rename to sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/data/lbh_client diff --git a/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/partition-config.json b/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/partition-config.json index c9619526f..4fcd4781e 100755 --- a/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/partition-config.json +++ b/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/partition-config.json @@ -92,15 +92,8 @@ }, { "name": "data", - "size": "6MB", - "offset": "0x3400000", - "type": "userdata", - "filesystem_type": "ubi" - }, - { - "name": "usrdata", "size": "72MB", - "offset": "0x3A00000", + "offset": "0x3400000", "type": "userdata", "filesystem_type": "ubi" } diff --git a/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/partition-info.txt b/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/partition-info.txt index 067fe31ca..4be33a251 100755 --- a/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/partition-info.txt +++ b/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/partition-info.txt @@ -4,7 +4,6 @@ boot,raw,16 logo,raw,8 system,ubi,13631488 rootfs,ubi,12582912 -data,ubi,6291456 -usrdata,ubi,75497472 +data,ubi,75497472 writeback,raw,12 :: diff --git a/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/post_mkimg_copy_files.sh b/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/post_mkimg_copy_files.sh index 321c41773..4fb9872b5 100755 --- a/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/post_mkimg_copy_files.sh +++ b/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/post_mkimg_copy_files.sh @@ -83,9 +83,9 @@ elif [[ "$CONFIG_STORAGE_TYPE_SPINAND" = true ]]; then datahex_size=$(printf "%x" "$datafilesize") echo "data file hex size:$datahex_size" - usrdatafilesize=$(stat -c%s $QM_ALL_IMAGES/usrdata.ubi) - usrdatahex_size=$(printf "%x" "$usrdatafilesize") - echo "data file hex size:$usrdatahex_size" + #usrdatafilesize=$(stat -c%s $QM_ALL_IMAGES/usrdata.ubi) + #usrdatahex_size=$(printf "%x" "$usrdatafilesize") + #echo "data file hex size:$usrdatahex_size" recoveryfilesize=$(stat -c%s $QM_ALL_IMAGES/recovery.img) recoveryhex_size=$(printf "%x" "$recoveryfilesize") @@ -95,7 +95,7 @@ elif [[ "$CONFIG_STORAGE_TYPE_SPINAND" = true ]]; then recoveryfshex_size=$(printf "%x" "$recoveryfsfilesize") echo "recovery-rootfs file hex size:$recoveryfshex_size" - sed -i "s/splfilesize/$splhex_size/g; s/ubootfilesize/$uboothex_size/g; s/logofilesize/$logohex_size/g; s/kernelfilesize/$kernelhex_size/g; s/systemfilesize/$systemhex_size/g; s/rootfsfilesize/$rootfshex_size/g; s/usrdatafilesize/$usrdatahex_size/g; s/datafilesize/$datahex_size/g; s/recoveryfilesize/$recoveryhex_size/g;s/recoveryfsfilesize/$recoveryfshex_size/g" $QM_ALL_IMAGES/script.ini + sed -i "s/splfilesize/$splhex_size/g; s/ubootfilesize/$uboothex_size/g; s/logofilesize/$logohex_size/g; s/kernelfilesize/$kernelhex_size/g; s/systemfilesize/$systemhex_size/g; s/rootfsfilesize/$rootfshex_size/g; s/datafilesize/$datahex_size/g; s/recoveryfilesize/$recoveryhex_size/g;s/recoveryfsfilesize/$recoveryfshex_size/g" $QM_ALL_IMAGES/script.ini sed -i "s/splfilesize/$splhex_size/g; s/ubootfilesize/$uboothex_size/g; s/logofilesize/$logohex_size/g; s/kernelfilesize/$kernelhex_size/g; s/systemfilesize/$systemhex_size/g; s/rootfsfilesize/$rootfshex_size/g; s/datafilesize/$datahex_size/g; s/recoveryfsfilesize/$recoveryfshex_size/g" $QM_ALL_IMAGES/script-ota.ini echo "start create programmer version" mkdir -p $PROGRAMMER_DIR diff --git a/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/pre_mkimg_copy_files.sh b/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/pre_mkimg_copy_files.sh index 2226bcfd4..56bca971e 100755 --- a/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/pre_mkimg_copy_files.sh +++ b/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/pre_mkimg_copy_files.sh @@ -32,7 +32,8 @@ else DES_OUT_APP_DIR=$DES_OUT_ROOTFS_DIR/system/app fi -mkdir -p $DES_OUT_RES_DIR $DES_OUT_RES_DIR/launcher $DES_OUT_QUA_DIR $DES_OUT_APP_DIR $DES_OUT_FACTORY_DIR $DES_OUT_DATA_DIR $DES_OUT_USRDATA_DIR +#mkdir -p $DES_OUT_RES_DIR $DES_OUT_RES_DIR/launcher $DES_OUT_QUA_DIR $DES_OUT_APP_DIR $DES_OUT_FACTORY_DIR $DES_OUT_DATA_DIR $DES_OUT_USRDATA_DIR +mkdir -p $DES_OUT_RES_DIR $DES_OUT_RES_DIR/launcher $DES_OUT_QUA_DIR $DES_OUT_APP_DIR $DES_OUT_FACTORY_DIR $DES_OUT_DATA_DIR OVERLAY_QUA_DIR=$PRJ_TOP_DIR/product/$CONFIG_XOS_PROJECT_TYPE/qua_overlay OVERLAY_RES_DIR=$PRJ_TOP_DIR/product/$CONFIG_XOS_PROJECT_TYPE/res_overlay diff --git a/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/project_demo_ld_defconfig b/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/project_demo_ld_defconfig index 467ad8092..aadbc79da 100644 --- a/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/project_demo_ld_defconfig +++ b/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/project_demo_ld_defconfig @@ -29,7 +29,7 @@ CONFIG_STORAGE_TYPE_SPINAND=y CONFIG_STORAGE_SIZE_128MB=y CONFIG_STORAGE_TYPE="_nand" -CONFIG_QM_SYS_PARTI_NAME_LIST="uboot recovery boot logo system rootfs data usrdata" +CONFIG_QM_SYS_PARTI_NAME_LIST="uboot recovery boot logo system rootfs data" CONFIG_QM_SYS_PARTI_INFOFILE="partition-info.txt" CONFIG_QM_SYS_PARTI_DEFAULT_FS_TYPE="ext4" diff --git a/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/project_demo_ld_nand_defconfig b/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/project_demo_ld_nand_defconfig index c1057e216..dfa34ca4d 100755 --- a/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/project_demo_ld_nand_defconfig +++ b/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/project_demo_ld_nand_defconfig @@ -28,7 +28,7 @@ CONFIG_STORAGE_TYPE_SPINAND=y CONFIG_STORAGE_SIZE_128MB=y CONFIG_STORAGE_TYPE="_nand" -CONFIG_QM_SYS_PARTI_NAME_LIST="uboot recovery boot logo system rootfs data usrdata" +CONFIG_QM_SYS_PARTI_NAME_LIST="uboot recovery boot logo system rootfs data" CONFIG_QM_SYS_PARTI_INFOFILE="partition-info.txt" CONFIG_QM_SYS_PARTI_DEFAULT_FS_TYPE="ext4" diff --git a/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/etc/init.d/S04init_rootfs b/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/etc/init.d/S04init_rootfs index 15c27cfce..d4efe2748 100755 --- a/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/etc/init.d/S04init_rootfs +++ b/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/etc/init.d/S04init_rootfs @@ -9,8 +9,6 @@ mount -t ubifs -o ro ubi0:system /system & mount -o remount,rw /var mount -o remount,rw /tmp mount -t ubifs ubi2:data /data & -ubiattach /dev/ubi_ctrl -m 13 -mount -t ubifs ubi3:usrdata /usrdata & else mount -t jffs2 /dev/mtdblock7 /data fi diff --git a/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/etc/start_cast.sh b/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/etc/start_cast.sh deleted file mode 100755 index f4d22d322..000000000 --- a/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/etc/start_cast.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -touch /tmp/cast_test.flag -rm -rf /data/casting_video_*.h264 \ No newline at end of file diff --git a/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/etc/tniuds/system_info b/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/etc/tniuds/system_info new file mode 100644 index 000000000..f92344eed --- /dev/null +++ b/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/etc/tniuds/system_info @@ -0,0 +1,11 @@ + +project_id=0004001 + +fw_user=bbq +fw_time=20260330_100355 +fw_variant=user +fw_version=v5.0.2.3 + +launcher_name=eplayer_single +launcher_start_cmd=eplayer_single + diff --git a/sdk/X-AIOS-LT00-V1.0.4/tools/partition/qm10xd/los_spi-nand/demo_ld_nand/script.ini b/sdk/X-AIOS-LT00-V1.0.4/tools/partition/qm10xd/los_spi-nand/demo_ld_nand/script.ini index 7f33ab879..a3710364e 100755 --- a/sdk/X-AIOS-LT00-V1.0.4/tools/partition/qm10xd/los_spi-nand/demo_ld_nand/script.ini +++ b/sdk/X-AIOS-LT00-V1.0.4/tools/partition/qm10xd/los_spi-nand/demo_ld_nand/script.ini @@ -13,7 +13,6 @@ fatload usb 0:1 40008000 zImage-dtb;nand erase.part boot;nand write 40008000 boo fatload usb 0:1 40008000 system.ubi;nand erase.part system;nand write 40008000 system systemfilesize; fatload usb 0:1 40008000 rootfs.ubi;nand erase.part rootfs;nand write 40008000 rootfs rootfsfilesize; fatload usb 0:1 40008000 data.ubi;nand erase.part data;nand write 40008000 data datafilesize; -fatload usb 0:1 40008000 usrdata.ubi;nand erase.part usrdata;nand write 40008000 usrdata usrdatafilesize; env default -a;setenv bootcmd 'nand read 0x40007fc0 boot kernelfilesize;bootz 0x40007fc0 - -;';saveenv; setenv recoveryboot 'nand read 0x40008000 recovery recoveryfilesize;bootz 0x40008000 - -;';saveenv; setenv update 'usb start; fatload usb 0:1 41000000 script.ini; source 41000000; reboot;';saveenv;