add system/factory and auto boot e_player

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),18m@21m(system),6m@39m(swapfile),12m@45m(rootfs),6m@57m(data),-@63m(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),6m@52m(data),-@58m(usrdata)"
 # 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),18m@21m(system),6m@39m(swapfile),12m@45m(rootfs),6m@57m(data),-@63m(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),6m@52m(data),-@58m(usrdata)"
 CONFIG_MTDIDS_DEFAULT="nand0=spi_nfc"
 CONFIG_CMD_LZMADEC=y
 # CONFIG_CMD_UNZIP=y

sdk/X-AIOS-LT00-V1.0.4/core/package/hardware/deviceDrv/wifi/aic8800d/prebuilts/moto_ld/wifi/bin/wifi_init.sh

@@ -2,8 +2,6 @@
 #sleep 2
 #echo "SDIO INIT SETTING"
 
-sleep 5
-
 #wifi driver capablit
 devmem 0x25b00018  32  0x00000000
 devmem 0x25b0001c  32  0x00000000
@@ -61,8 +59,10 @@ sleep 0.2
 
 #cd bin;./wifi_drv_ins.sh;cd ../
 #cp /vendor/qua/wifi/bin/* /bin/; cp /vendor/qua/wifi/lib/* /lib/
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/vendor/qua/wifi/lib:/system/qua/wifi/lib/
+#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/system/qua/lib:/system/qua/wifi/lib/:/lib
-export PATH=$PATH:/vendor/qua/BT:/vendor/qua/wifi/bin:/system/qua/BT:/system/qua/wifi/bin
+#export PATH=$PATH:/vendor/qua/BT:/vendor/qua/wifi/bin:/system/qua/BT:/system/qua/wifi/bin
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/lib:/vendor/qua/lib:/vendor/qua/wifi/lib:/system/qua/lib:/system/qua/wifi/lib
+export PATH=$PATH:/vendor/qua/ko:/vendor/qua/BT:/vendor/qua/wifi/bin:/usrdata:/system/qua/BT:/system/qua/wifi/bin
 cd /vendor/qua/wifi/ko;insmod aic8800_bsp.ko aic_fw_path=/vendor/qua/wifi/aic8800D80
 insmod aic8800_fdrv.ko;insmod aic8800_btlpm.ko;cd ../../BT;
 if [ ! -f /data/wifi/wpa_supplicant.conf ];then
@@ -75,15 +75,11 @@ if [ -f /data/wifi/wpa_supplicant.conf ];then
  udhcpc -T 2 -q -iwlan0 &
 fi
 #bt is not
-sleep 30
+sleep 1
 lbh_server -p "ble_userconfig.json" -s ble uart 1500000 /dev/ttyS2 1>/dev/null 2>&1 &
-echo -100 >  /proc/$(pidof lbh_server)/oom_score_adj
 sleep 5
-lbh_client 1>/dev/null 2>&1 &
+cd /usrdata;./lbh_client 1>/dev/null 2>&1 &
-lbh_client &
+sleep 5
-echo -100 >  /proc/$(pidof lbh_client)/oom_score_adj
+echo -100 > /proc/$(pidof lbh_server)/oom_score_adj
-
+echo -100 > /proc/$(pidof lbh_client)/oom_score_adj
-
+./e_player &
-
-
-

sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/partition-config.json

@@ -71,7 +71,7 @@
     },
     {
       "name": "system",
-      "size": "18MB",
+      "size": "13MB",
       "offset": "0x1500000",
       "type": "system",
       "filesystem_type": "ubi"
@@ -79,28 +79,28 @@
     {
       "name": "swapfile",
       "size": "6MB",
-      "offset": "0x2700000",
+      "offset": "0x2200000",
       "type": "swap",
       "filesystem_type": "raw"
     },
     {
       "name": "rootfs",
       "size": "12MB",
-      "offset": "0x2D00000",
+      "offset": "0x2800000",
       "type": "rootfs",
       "filesystem_type": "ubi"
     },
     {
       "name": "data",
       "size": "6MB",
-      "offset": "0x3900000",
+      "offset": "0x3400000",
       "type": "userdata",
       "filesystem_type": "ubi"
     },
     {
       "name": "usrdata",
-      "size": "65MB",
+      "size": "72MB",
-      "offset": "0x3F00000",
+      "offset": "0x3A00000",
       "type": "userdata",
       "filesystem_type": "ubi"
     }

sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/partition-info.txt

@@ -2,9 +2,9 @@ uboot,raw,1
 recovery,raw,16
 boot,raw,16
 logo,raw,8
-system,ubi,18874368
+system,ubi,13631488
 rootfs,ubi,12582912
 data,ubi,6291456
-usrdata,ubi,68157440
+usrdata,ubi,75497472
 writeback,raw,12
 ::

sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/pre_mkimg_copy_files.sh

@@ -24,6 +24,7 @@ if [ "$CONFIG_STORAGE_TYPE_SPINAND" = true ]; then
     DES_OUT_RES_DIR=$DES_OUT_ROOT_DIR/system/res
     DES_OUT_QUA_DIR=$DES_OUT_ROOT_DIR/system/qua
     DES_OUT_APP_DIR=$DES_OUT_ROOT_DIR/system/app
+    DES_OUT_FACTORY_DIR=$DES_OUT_ROOT_DIR/system/factory
 else
     echo "Using SPINOR storage type paths"
     DES_OUT_RES_DIR=$DES_OUT_ROOTFS_DIR/system/res
@@ -31,12 +32,13 @@ 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_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
 
 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
 OVERLAY_DATA_DIR=$PRJ_TOP_DIR/product/$CONFIG_XOS_PROJECT_TYPE/data
 OVERLAY_USRDATA_DIR=$PRJ_TOP_DIR/product/$CONFIG_XOS_PROJECT_TYPE/usrdata
+OVERLAY_FACTORY_DIR=$PRJ_TOP_DIR/product/$CONFIG_XOS_PROJECT_TYPE/rootfs_overlay/system/factory
 
 _soc_pkg_path=base/soc/qm10xd/linux
 echo "_soc_pkg_path: $_soc_pkg_path"
@@ -103,26 +105,27 @@ xz_decompress
 echo "copy to rootfs dir end"
 #
 ####copy to partion:
-echo "::copy files to $DES_OUT_APP_DIR"
+#echo "::copy files to $DES_OUT_APP_DIR"
-if [ -d "$DES_OUT_ROOT_DIR/../xos/bin/" ];then
+#if [ -d "$DES_OUT_ROOT_DIR/../xos/bin/" ];then
-cp -arf $DES_OUT_ROOT_DIR/../xos/bin/* $DES_OUT_APP_DIR
+#cp -arf $DES_OUT_ROOT_DIR/../xos/bin/* $DES_OUT_APP_DIR
-fi
+#rm -rf $DES_OUT_APP_DIR/qxosui
+#fi
 if [ -d "$DES_OUT_ROOT_DIR/../xos/lib/" ];then
 cp -arf $DES_OUT_ROOT_DIR/../xos/lib $DES_OUT_QUA_DIR
 rm -rf $DES_OUT_QUA_DIR/*.a
 fi
-if [ -d "$DES_OUT_ROOT_DIR/../xos/res/ttf" ];then
+#if [ -d "$DES_OUT_ROOT_DIR/../xos/res/ttf" ];then
-cp -arf $DES_OUT_ROOT_DIR/../xos/res/ttf $DES_OUT_RES_DIR
+#cp -arf $DES_OUT_ROOT_DIR/../xos/res/ttf $DES_OUT_RES_DIR
-fi
+#fi
-if [ -d "$DES_OUT_ROOT_DIR/../xos/res/skin" ];then
+#if [ -d "$DES_OUT_ROOT_DIR/../xos/res/skin" ];then
-cp -arf $DES_OUT_ROOT_DIR/../xos/res/skin $DES_OUT_RES_DIR
+#cp -arf $DES_OUT_ROOT_DIR/../xos/res/skin $DES_OUT_RES_DIR
-fi
+#fi
-if [ -d "$DES_OUT_ROOT_DIR/../xos/res/${CONFIG_XOS_PROJECT_TYPE}/res" ];then
+#if [ -d "$DES_OUT_ROOT_DIR/../xos/res/${CONFIG_XOS_PROJECT_TYPE}/res" ];then
-cp -arf $DES_OUT_ROOT_DIR/../xos/res/${CONFIG_XOS_PROJECT_TYPE}/res/* $DES_OUT_RES_DIR
+#cp -arf $DES_OUT_ROOT_DIR/../xos/res/${CONFIG_XOS_PROJECT_TYPE}/res/* $DES_OUT_RES_DIR
-fi
+#fi
-if [ -d "$DES_OUT_ROOT_DIR/../xos/res/${CONFIG_XOS_PROJECT_TYPE}/res_lazy" ];then
+#if [ -d "$DES_OUT_ROOT_DIR/../xos/res/${CONFIG_XOS_PROJECT_TYPE}/res_lazy" ];then
-cp -arf $DES_OUT_ROOT_DIR/../xos/res/${CONFIG_XOS_PROJECT_TYPE}/res_lazy/* $DES_OUT_RES_DIR
+#cp -arf $DES_OUT_ROOT_DIR/../xos/res/${CONFIG_XOS_PROJECT_TYPE}/res_lazy/* $DES_OUT_RES_DIR
-fi
+#fi
 #
 #
 
@@ -139,13 +142,13 @@ fi
 #overlay for res
 if [ -d "${OVERLAY_RES_DIR}/launcher/" ];then
     echo "::copy files to $OVERLAY_RES_DIR/launcher/"
-    cp -rfa $OVERLAY_RES_DIR/launcher/* $DES_OUT_RES_DIR/launcher
+    #cp -rfa $OVERLAY_RES_DIR/launcher/* $DES_OUT_RES_DIR/launcher
 fi
 
 if [ -d "${OVERLAY_RES_DIR}/res/" ];then
     OVERLAY_RES_RES=${OVERLAY_RES_DIR}/res/
     echo "::copy res_overlay res files from $OVERLAY_RES_RES, $DES_OUT_RES_DIR/ "
-    cp -arf $OVERLAY_RES_RES/* $DES_OUT_RES_DIR/
+    #cp -arf $OVERLAY_RES_RES/* $DES_OUT_RES_DIR/
 fi
 
 #data for data
@@ -158,12 +161,16 @@ if [ -d "${OVERLAY_USRDATA_DIR}" ];then
     echo "::copy files to $DES_OUT_USRDATA_DIR"
     cp -rfa $OVERLAY_USRDATA_DIR/* $DES_OUT_USRDATA_DIR/
 fi
+if [ -d "${OVERLAY_FACTORY_DIR}" ];then
+    echo "::copy files to $DES_OUT_FACTORY_DIR"
+    cp -rfa $OVERLAY_FACTORY_DIR/* $DES_OUT_FACTORY_DIR/
+fi
 
 #cp settings.json
 SRC_FILE_RESOURCES=$PRJ_TOP_DIR/product/${CONFIG_XOS_PROJECT_TYPE}/
-if [ -d "$SRC_FILE_RESOURCES" ];then
+#if [ -d "$SRC_FILE_RESOURCES" ];then
-        cp -arf $SRC_FILE_RESOURCES/*settings.json $DES_OUT_RES_DIR
+        #cp -arf $SRC_FILE_RESOURCES/*settings.json $DES_OUT_RES_DIR
-fi
+#fi
 
 #overlay for app
 

sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/bin/wifi_reconn.sh

@@ -1,54 +0,0 @@
-#!/bin/sh
-mkdir -p /tmp/run
-LOCKFILE="/tmp/run/$(basename "$0").lock"
-
-# Check if lock file exists
-if [ -f "$LOCKFILE" ]; then
-    PID=$(cat "$LOCKFILE")
-
-    # Check if process exists using /proc directory
-    if [ -d "/proc/$PID" ]; then
-        # Verify it's a valid process by checking executable
-        if [ -f "/proc/$PID/exe" ]; then
-            echo "Script is already running, PID: $PID" >&2
-            exit 1
-        fi
-    fi
-
-    # Stale lock file - remove it
-    echo "Removing stale lock file..." >&2
-    rm -f "$LOCKFILE"
-fi
-
-# Create new lock file
-echo $$ > "$LOCKFILE"
-
-# Cleanup function
-cleanup() {
-    rm -f "$LOCKFILE"
-    exit 0
-}
-
-# Trap termination signals
-trap 'cleanup' SIGINT SIGTERM SIGHUP SIGQUIT
-
-pkill  wpa_supplicant;
-pkill  udhcpc;
-sleep 1
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/vendor/qua/wifi/lib;
-wpa_supplicant -iwlan0 -D nl80211 -c /data/wifi/wpa_supplicant.conf -B &
-echo 0 >  /proc/$(pidof wpa_supplicant)/oom_score_adj
-sleep 1
-counter=0
-while true; do
-    interface_status=$(ip addr show wlan0 | grep LOWER_UP)
-    if [ -n "$interface_status" ] || [ $counter -gt 60 ]; then
-        echo "wlan0 is ap connected,time to start udhcpc"
-        udhcpc -q -iwlan0 &
-        break
-    fi
-    counter=$((counter + 1))
-    sleep 0.5
-done
-sleep 30
-exit 0

sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/bin/wifi_start.sh

@@ -1,68 +0,0 @@
-#!/bin/sh
-
-echo $#
-cd /bin
-cfg_path="/data/wifi/"
-mkdir -p ${cfg_path}
-if [ $# -ne 2 ]; then
-    echo "Usage: $0 arg1 arg2"
-    #exit 1
-else
-echo "input param!!"
-   # echo $2
-    if [  -f  "${cfg_path}wpa_supplicant.conf" ];then
-        rm "${cfg_path}wpa_supplicant.conf"
-        echo "wpa_supplicant.conf delsted!!"
-    else
-        echo "wpa_supplicant.conf not exist"
-    fi
-
-    echo "ctrl_interface=/var/wpa_supplicant" >> ${cfg_path}wpa_supplicant.conf
-echo " " >>  ${cfg_path}wpa_supplicant.conf
-
-echo "#wpa/wpa2/wpa3 auto" >>  ${cfg_path}wpa_supplicant.conf
-echo "network={" >>  ${cfg_path}wpa_supplicant.conf
-
-fi
-
-
-
-if [  -n  "$1" ]; then
-  echo "     ssid=\"$1\"" >> ${cfg_path}wpa_supplicant.conf
-else
-  echo "$1 is NULL"
-fi
-
-if [  -n  "$2" ]; then
-  echo "     psk=\"$2\"" >> ${cfg_path}wpa_supplicant.conf
-else
-  echo "$2 is NULL"
-fi
-
-
-if [ $# -ne 2 ]; then
-    echo "Usage: $0 less than 2"
-    #exit 1
-else
-echo "}" >> ${cfg_path}wpa_supplicant.conf
-echo " " >> ${cfg_path}wpa_supplicant.conf
-
-fi
-
-pkill wpa_supplicant;
-pkill  udhcpc;
-sleep 1
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/vendor/qua/wifi/lib;
-wpa_supplicant -iwlan0 -D nl80211 -c ..${cfg_path}wpa_supplicant.conf -B &
-sleep 1
-counter=0
-while true; do
-    interface_status=$(ip addr show wlan0 | grep LOWER_UP)
-    if [ -n "$interface_status" ] || [ $counter -gt 60 ]; then
-        udhcpc -q -iwlan0 &
-        break
-    fi
-    counter=$((counter + 1))
-    sleep 0.5
-done
-exit 0

sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/bin/wifi_stop.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-pkill -9 iw
-pkill -9 wpa_supplicant;
-pkill -9 udhcpc;
-rm /data/wifi/wpa_supplicant.conf
-sleep 1
-exit 0

sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/etc/init.d/S04init_rootfs

@@ -9,6 +9,8 @@ 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

sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/etc/init.d/S22qxosui

@@ -1,7 +1,7 @@
 #!/bin/sh
 #export the library path
 export LD_LIBRARY_PATH=/lib:/nfs/lib:/vendor/qua/lib:/vendor/qua/wifi/lib:$LD_LIBRARY_PATH
-export PATH=$PATH:/vendor/qua/ko:/vendor/qua/BT:/vendor/qua/wifi/bin
+export PATH=$PATH:/usrdata:/vendor/qua/ko:/vendor/qua/BT:/vendor/qua/wifi/bin
 check_cp_config()
 {
 	# if /data/config/param.ini not exist, cp from /config/param.ini
@@ -31,9 +31,9 @@ check_cp_config()
 check_cp_config
 
 #run qxosui
-cd /app
+#cd /app
-echo "start run /app/qxosui &"
+#echo "start run /app/qxosui &"
-ubiattach /dev/ubi_ctrl -m 13 
+#ubiattach /dev/ubi_ctrl -m 13 
-mount -t ubifs ubi3:usrdata /usrdata &
+#mount -t ubifs ubi3:usrdata /usrdata &
-./qxosui &
+#./qxosui &
 #./qxosui 2>&1 1>/dev/kmsg  &

sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/etc/profile

@@ -3,11 +3,8 @@
 echo
 echo -n "Processing /etc/profile... "
 
-export LD_LIBRARY_PATH=/lib:/nfs/lib:/vendor/qua/lib:/vendor/qua/wifi/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/lib:/vendor/qua/lib:/vendor/qua/wifi/lib:/system/qua/lib:/system/qua/wifi/lib
-export LD_LIBRARY_PATH=/usrdata/awtk/bin:$LD_LIBRARY_PATH
+export PATH=$PATH:/vendor/qua/ko:/vendor/qua/BT:/vendor/qua/wifi/bin:/usrdata:/system/qua/BT:/system/qua/wifi/bin
-export LD_LIBRARY_PATH=/usrdata/release/bin:$LD_LIBRARY_PATH
-
-export PATH=$PATH:/vendor/qua/ko:/vendor/qua/BT:/vendor/qua/wifi/bin
 
 # Read timezone from param.ini
 if [ -f /data/config/param.ini ]; then

sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/lib/libpng.so

@@ -1 +0,0 @@
-libpng16.so.16

sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/lib/libpng16.so

@@ -1 +0,0 @@
-libpng16.so.16

sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/lib/libturbojpeg.so

@@ -1 +0,0 @@
-libturbojpeg.so.0.3.0

sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/lib/libturbojpeg.so.0

@@ -1 +0,0 @@
-libturbojpeg.so.0.3.0

sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/usrdata/config/config.cfg

@@ -1,11 +0,0 @@
-# Auto-generated configuration file
-
-SHOP_CODE=0001
-URL_BASE=http://114.55.52.37:8000/
-MQTT=
-MQTT_USER=
-brightness=78
-openTime=
-closeTime=
-STATUS_BAR=true
-time_zone=8

sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/usrdata/config/system_properties.cfg

@@ -1,7 +0,0 @@
-# Auto-generated configuration file
-
-ID_0=700000000010
-SN=701003L
-secureKey=70f924396fec48759059e6aa3e9f96a2
-LANGUAGE=0
-factory_test=true