fix(luckfox-config):Resolving conflicts between RGB and other pin multiplexing

feat(luckfox-config):Support for touch screens and FBTFT
feat(luckfox-config):Support for Ubuntu system
feat(ubuntu):Support using local root filesystem for submodule updates
feat(ubuntu):Support for WiFi on Luckfox Pico Ultra W using the Ubuntu system
perf(ubuntu):Improve the initial boot speed of RV1103 using the Ubuntu system
perf(kernel_dts):Improve EMMC read/write speed

Signed-off-by: luckfox-eng29 <eng29@luckfox.com>

.gitignore

@@ -3,4 +3,6 @@
 .BoardConfig.mk
 RK-RELEASE-NOTES-V1.4.1.txt
 IMAGE/
-output/
+output/
+project/app/wifi_app/wpa_supplicant.conf
+config/

project/build.sh

@@ -39,6 +39,7 @@ SDK_CONFIG_DIR=${SDK_ROOT_DIR}/config
 DTS_CONFIG=${SDK_CONFIG_DIR}/dts_config
 KERNEL_DEFCONFIG=${SDK_CONFIG_DIR}/kernel_defconfig
 BUILDROOT_DEFCONFIG=${SDK_CONFIG_DIR}/buildroot_defconfig
+UBUNTU_DIR=${SDK_SYSDRV_DIR}/tools/board/ubuntu
 
 if [ $(getconf _NPROCESSORS_ONLN) -eq 1 ]; then
 	export RK_JOBS=1
@@ -551,8 +552,6 @@ function build_check() {
 }
 
 function build_app() {
-	check_config RK_APP_TYPE || return 0
-
 	if [ "$RK_ENABLE_WIFI" = "y" ]; then
 		echo "Set Wifi SSID and PASSWD"
 		check_config LF_WIFI_PSK LF_WIFI_SSID || return 0
@@ -571,6 +570,8 @@ EOF
 		mv $WIFI_NEW_CONF $WIFI_CONF
 	fi
 
+	check_config RK_APP_TYPE || return 0
+
 	echo "============Start building app============"
 	echo "TARGET_APP_CONFIG=$RK_APP_DEFCONFIG $RK_APP_DEFCONFIG_FRAGMENT $RK_APP_TYPE"
 	echo "========================================="
@@ -1056,6 +1057,9 @@ function build_clean() {
 		make distclean -C ${SDK_APP_DIR}
 		rm -rf ${RK_PROJECT_OUTPUT_IMAGE} ${RK_PROJECT_OUTPUT}
 		rm -rf ${DTS_CONFIG} ${KERNEL_DEFCONFIG} ${BUILDROOT_DEFCONFIG}
+		rm -rf ${SDK_ROOT_DIR}/output ${SDK_ROOT_DIR}/config
+		rm -rf ${SDK_ROOT_DIR}/sysdrv/source/kernel/out
+		rm -rf ${BOARD_CONFIG}
 		;;
 	*)
 		msg_warn "clean [$1] not support, ignore"
@@ -1237,6 +1241,10 @@ echo SDK Version: ${GLOBAL_SDK_VERSION}
 EOF
 	chmod a+x $RK_PROJECT_PACKAGE_ROOTFS_DIR/bin/sdkinfo
 
+	if [ "$RK_BOOT_MEDIUM" == "emmc" ] && [ "$LF_TARGET_ROOTFS" == "ubuntu" ]; then
+		cp $WIFI_CONF $RK_PROJECT_PACKAGE_ROOTFS_DIR/etc
+	fi
+
 	__COPY_FILES $RK_PROJECT_PATH_APP/root $RK_PROJECT_PACKAGE_ROOTFS_DIR
 	__COPY_FILES $RK_PROJECT_PATH_MEDIA/root $RK_PROJECT_PACKAGE_ROOTFS_DIR
 	__COPY_FILES $SDK_ROOT_DIR/external $RK_PROJECT_PACKAGE_ROOTFS_DIR
@@ -1830,6 +1838,9 @@ __GET_BOOTARGS_FROM_BOARD_CFG() {
 
 __LINK_DEFCONFIG_FROM_BOARD_CFG() {
 	mkdir -p ${SDK_CONFIG_DIR}
+	if [[ "$LF_TARGET_ROOTFS" == "ubuntu" ]]; then
+		sudo chmod a+rw $SDK_CONFIG_DIR
+	fi
 
 	if [ -n "$RK_KERNEL_DTS" ]; then
 		rm -f $DTS_CONFIG
@@ -2149,6 +2160,7 @@ function build_save() {
 	STUB_PATH="$(echo $STUB_PATH | tr '[:lower:]' '[:upper:]')"
 	export STUB_PATH=$SDK_ROOT_DIR/$STUB_PATH
 	export STUB_PATCH_PATH=$STUB_PATH/PATCHES
+	export STUB_PARENT_PATH="$SDK_ROOT_DIR"/IMAGE
 	STUB_DEBUG_FILES_PATH="$STUB_PATH/DEBUG_FILES"
 	mkdir -p $STUB_PATH $STUB_PATCH_PATH
 
@@ -2172,6 +2184,11 @@ function build_save() {
 	echo "BUILD-ID: $(hostname):$(whoami)" >>$STUB_PATH/build_info.txt
 	build_info >>$STUB_PATH/build_info.txt
 	echo "save to $STUB_PATH"
+
+	if [[ "$LF_TARGET_ROOTFS" == "ubuntu" ]]; then
+		sudo chmod a+rw $STUB_PARENT_PATH
+	fi
+
 	finish_build
 }
 
@@ -2262,7 +2279,13 @@ if [[ "$LF_TARGET_ROOTFS" = "ubuntu" ]]; then
 			exit 0
 		fi
 	fi
-	git submodule update --init --recursive
+
+	if [ -d "$UBUNTU_DIR" ] && [ -f ${UBUNTU_DIR}/luckfox-ubuntu-22.04.3.tar.gz ]; then
+		msg_info "${UBUNTU_DIR} is not empty, skipping submodule update!"
+	else
+		msg_info "${UBUNTU_DIR} is empty or does not exist, updateing submodule!"
+		git submodule update --init --recursive
+	fi
 fi
 
 if echo $@ | grep -wqE "help|-h"; then
@@ -2341,4 +2364,3 @@ while [ $# -ne 0 ]; do
 done
 
 eval "${option:-build_allsave}"
-

project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1106_Luckfox_Pico_Ultra-IPC.mk

@@ -8,13 +8,13 @@
 export RK_CHIP=rv1106
 
 # app config
-export RK_APP_TYPE=RKIPC_RV1106
+# export RK_APP_TYPE=RKIPC_RV1106
 
 # Config CMA size in environment
-export RK_BOOTARGS_CMA_SIZE="66M"
+export RK_BOOTARGS_CMA_SIZE="1M"
 
 # Kernel dts
-export RK_KERNEL_DTS=rv1106g-luckfox-pico-ultra-w.dts
+export RK_KERNEL_DTS=rv1106g-luckfox-pico-ultra.dts
 
 #################################################
 #	BOOT_MEDIUM

project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1106_Luckfox_Pico_Ultra_W-IPC.mk

@@ -8,10 +8,10 @@
 export RK_CHIP=rv1106
 
 # app config
-export RK_APP_TYPE=RKIPC_RV1106
+# export RK_APP_TYPE=RKIPC_RV1106
 
 # Config CMA size in environment
-export RK_BOOTARGS_CMA_SIZE="66M"
+export RK_BOOTARGS_CMA_SIZE="1M"
 
 # Kernel dts
 export RK_KERNEL_DTS=rv1106g-luckfox-pico-ultra-w.dts

project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1103_Luckfox_Pico-IPC.mk

@@ -8,10 +8,10 @@
 export RK_CHIP=rv1106
 
 # app config
-export RK_APP_TYPE=RKIPC_RV1103
+# export RK_APP_TYPE=RKIPC_RV1103
 
 # Config CMA size in environment
-export RK_BOOTARGS_CMA_SIZE="24M"
+export RK_BOOTARGS_CMA_SIZE="1M"
 
 # Kernel dts
 export RK_KERNEL_DTS=rv1103g-luckfox-pico.dts

project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1103_Luckfox_Pico_Mini_A-IPC.mk

@@ -8,10 +8,10 @@
 export RK_CHIP=rv1106
 
 # app config
-export RK_APP_TYPE=RKIPC_RV1103
+# export RK_APP_TYPE=RKIPC_RV1103
 
 # Config CMA size in environment
-export RK_BOOTARGS_CMA_SIZE="24M"
+export RK_BOOTARGS_CMA_SIZE="1M"
 
 # Kernel dts
 export RK_KERNEL_DTS=rv1103g-luckfox-pico-mini-a.dts

project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1103_Luckfox_Pico_Mini_B-IPC.mk

@@ -8,10 +8,10 @@
 export RK_CHIP=rv1106
 
 # app config
-export RK_APP_TYPE=RKIPC_RV1103
+# export RK_APP_TYPE=RKIPC_RV1103
 
 # Config CMA size in environment
-export RK_BOOTARGS_CMA_SIZE="24M"
+export RK_BOOTARGS_CMA_SIZE="1M"
 
 # Kernel dts
 export RK_KERNEL_DTS=rv1103g-luckfox-pico-mini-b.dts

project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1103_Luckfox_Pico_Plus-IPC.mk

@@ -8,10 +8,10 @@
 export RK_CHIP=rv1106
 
 # app config
-export RK_APP_TYPE=RKIPC_RV1103
+# export RK_APP_TYPE=RKIPC_RV1103
 
 # Config CMA size in environment
-export RK_BOOTARGS_CMA_SIZE="24M"
+export RK_BOOTARGS_CMA_SIZE="1M"
 
 # Kernel dts
 export RK_KERNEL_DTS=rv1103g-luckfox-pico-plus.dts

project/cfg/BoardConfig_IPC/BoardConfig-SD_CARD-Ubuntu-RV1106_Luckfox_Pico_Pro_Max-IPC.mk

@@ -8,10 +8,10 @@
 export RK_CHIP=rv1106
 
 # app config
-export RK_APP_TYPE=RKIPC_RV1106
+# export RK_APP_TYPE=RKIPC_RV1106
 
 # Config CMA size in environment
-export RK_BOOTARGS_CMA_SIZE="66M"
+export RK_BOOTARGS_CMA_SIZE="1M"
 
 # Kernel dts
 export RK_KERNEL_DTS=rv1106g-luckfox-pico-pro-max.dts

sysdrv/Makefile

@@ -603,10 +603,12 @@ else
 	cp $(SYSDRV_DIR)/tools/board/buildroot/profile_defconfig $(SYSDRV_DIR_OUT_ROOTFS)/etc/profile
 	cp $(SYSDRV_DIR)/tools/board/buildroot/iomux $(SYSDRV_DIR_OUT_ROOTFS)/usr/bin/
 	cp $(SYSDRV_DIR)/tools/board/buildroot/S99hciinit $(SYSDRV_DIR_OUT_ROOTFS)/etc/init.d/
+	cp $(SYSDRV_DIR)/tools/board/buildroot/S99rtcinit $(SYSDRV_DIR_OUT_ROOTFS)/etc/init.d/
 	cp $(SYSDRV_DIR)/tools/board/buildroot/S50sshd $(SYSDRV_DIR_OUT_ROOTFS)/etc/init.d/
 	cp $(SYSDRV_DIR)/tools/board/buildroot/S99python $(SYSDRV_DIR_OUT_ROOTFS)/etc/init.d/
 	cp $(SYSDRV_DIR)/tools/board/luckfox_config/S99luckfoxconfigload $(SYSDRV_DIR_OUT_ROOTFS)/etc/init.d/
 	cp $(SYSDRV_DIR)/tools/board/luckfox_config/luckfox-config  $(SYSDRV_DIR_OUT_ROOTFS)/usr/bin/
+	cp $(SYSDRV_DIR)/tools/board/luckfox_config/luckfox_switch_rgb_resolution $(SYSDRV_DIR_OUT_ROOTFS)/usr/bin/
 	cp $(SYSDRV_DIR)/tools/board/android-tools/S90usb0config $(SYSDRV_DIR_OUT_ROOTFS)/etc/init.d/
 endif
 
@@ -631,12 +633,22 @@ ubuntu: prepare
 		rm $(SYSDRV_DIR_OUT_ROOTFS)/* -rf ;\
 		tar xzf $(SYSDRV_DIR)/tools/board/ubuntu/$(UBUNTU_VER).tar.gz -C $(SYSDRV_DIR_OUT_ROOTFS) ;\
 	);
+	cp $(SYSDRV_DIR)/tools/board/luckfox_config/luckfox-config ${SYSDRV_DIR_OUT_ROOTFS}/usr/bin/
+	cp $(SYSDRV_DIR)/tools/board/luckfox_config/ubuntu/etc/* ${SYSDRV_DIR_OUT_ROOTFS}/etc/
+	cp $(SYSDRV_DIR)/tools/board/luckfox_config/ubuntu/usr/bin/* ${SYSDRV_DIR_OUT_ROOTFS}/usr/bin/
+	cp -d $(SYSDRV_DIR)/tools/board/luckfox_config/ubuntu/usr/lib/* ${SYSDRV_DIR_OUT_ROOTFS}/usr/lib/
 ifeq ($(ENABLE_EMMC),YES)
 	cp $(SYSDRV_DIR)/tools/board/emmc/emmc_fstab $(SYSDRV_DIR_OUT_ROOTFS)/etc/fstab
 	cp $(SYSDRV_DIR)/tools/board/emmc/emmc_filesystem_resize.sh $(SYSDRV_DIR_OUT_ROOTFS)/usr/bin/filesystem_resize.sh
 	cp $(SYSDRV_DIR)/tools/board/emmc/emmc_rc.local $(SYSDRV_DIR_OUT_ROOTFS)/etc/rc.local
+	cp $(SYSDRV_DIR)/tools/board/emmc/emmc_wifi_bt_init.sh $(SYSDRV_DIR_OUT_ROOTFS)/usr/bin/wifi_bt_init.sh
+	cp $(SYSDRV_DIR)/tools/board/emmc/emmc_wifi_ko $(SYSDRV_DIR_OUT_ROOTFS)/usr/ko -r
+	cp $(SYSDRV_DIR)/tools/board/emmc/udhcp/usr/bin/udhcpc $(SYSDRV_DIR_OUT_ROOTFS)/usr/bin/udhcpc
+	cp $(SYSDRV_DIR)/tools/board/emmc/udhcp/usr/bin/udhcpd $(SYSDRV_DIR_OUT_ROOTFS)/usr/bin/udhcpd
+	mkdir -p $(SYSDRV_DIR_OUT_ROOTFS)/usr/share/udhcpc
+	cp $(SYSDRV_DIR)/tools/board/emmc/udhcp/usr/share/udhcpc/default.script $(SYSDRV_DIR_OUT_ROOTFS)/usr/share/udhcpc/default.script
+	cp $(SYSDRV_DIR)/tools/board/emmc/udhcp/etc/udhcpd.conf $(SYSDRV_DIR_OUT_ROOTFS)/etc/udhcpd.conf
 endif
-
 ubuntu_clean:
 	$(AT)rm -rf $(SYSDRV_DIR_OUT_ROOTFS)
 

sysdrv/drv_ko/wifi/insmod_wifi.sh

@@ -68,7 +68,7 @@ if [ $? -eq 0 ]; then
 fi
 
 #aic8800
-if [ -f /oem/usr/ko/aic8800_fdrv.ko ]; then
+if [ -n "$(cat /proc/device-tree/model | grep "W")" ]; then
 	insmod cfg80211.ko
 	insmod libarc4.ko
 	insmod ctr.ko

sysdrv/source/kernel/arch/arm/boot/dts/rv1103-luckfox-pico-ipc.dtsi

@@ -315,11 +315,23 @@
 	pinctrl-0 = <&spi0m0_clk &spi0m0_miso &spi0m0_mosi &spi0m0_cs0>;
 	#address-cells = <1>;
 	#size-cells = <0>;
-	spidev@0 {
-		compatible = "rockchip,spidev";
+
+  spidev@0 {
+    compatible = "rockchip,spidev";
 		spi-max-frequency = <50000000>;
 		reg = <0>;
 	};
+  fbtft@0{
+      compatible = "sitronix,st7789v";
+      reg = <0>;
+      spi-max-frequency = <20000000>;
+      fps = <30>;
+      buswidth = <8>;
+      debug = <0x7>;
+      led-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;//BL
+      dc = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>;      //DC
+      reset = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>;    //RES
+  };
 };
 // I2C
 &i2c3 {

sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico-plus.dts

@@ -12,6 +12,7 @@
 / {
 	model = "Luckfox Pico Plus";
 	compatible = "rockchip,rv1103g-38x38-ipc-v10", "rockchip,rv1103";
+	};
 };
 
 /**********SFC**********/
@@ -58,6 +59,9 @@
 	spidev@0 {
 		spi-max-frequency = <50000000>;
 	};
+  fbtft@0 {
+    spi-max-frequency = <50000000>;
+  };
 };
 
 /**********I2C**********/
@@ -90,5 +94,3 @@
 	status = "disabled";
 };
 
-
-

sysdrv/source/kernel/arch/arm/boot/dts/rv1103g-luckfox-pico.dts

@@ -46,6 +46,9 @@
 	spidev@0 {
 		spi-max-frequency = <50000000>;
 	};
+  fbtft@0 {
+    spi-max-frequency = <50000000>;
+  };
 };
 
 /**********I2C**********/

sysdrv/source/kernel/arch/arm/boot/dts/rv1106-luckfox-pico-pro-max-ipc.dtsi

@@ -299,10 +299,22 @@
 	#address-cells = <1>;
 	#size-cells = <0>;
 	spidev@0 {
-		compatible = "rockchip,spidev";
+    compatible = "rockchip,spidev";
 		spi-max-frequency = <50000000>;
 		reg = <0>;
 	};
+
+  fbtft@0{
+    compatible = "sitronix,st7789v";
+    reg = <0>;
+    spi-max-frequency = <20000000>;
+    fps = <30>;
+    buswidth = <8>;
+    debug = <0x7>;
+    led-gpios = <&gpio2 RK_PB0 GPIO_ACTIVE_LOW>;//BL
+    dc = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>;      //DC
+    reset = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>;    //RES
+  };
 };
 // I2C
 &i2c0 {
@@ -318,7 +330,7 @@
 };
 
 // &i2c4 {
-// 	pinctrl-0 = <&i2c4m0_xfer>;
+//  pinctrl-0 = <&i2c4m0_xfer>;
 // };
 
 // UART

sysdrv/source/kernel/arch/arm/boot/dts/rv1106-luckfox-pico-ultra-ipc.dtsi

@@ -56,34 +56,28 @@
 	panel: panel {
 		compatible = "simple-panel";
 		backlight = <&backlight>;
+
+		reset-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_LOW>;
+		reset-delay-ms = <200>;
 		status = "okay";
+
 		bus-format = <MEDIA_BUS_FMT_RGB666_1X18>;
 		width-mm = <85>;
 		height-mm = <85>;
 
-		reset {
-			reset-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_LOW>;
-			reset-delay-ms = <200>;
-			status = "okay";
-		};
-		enable {
-			enable-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;
-			enable-delay-ms = <20>;
-			status = "okay";
-		};
 		display-timings {
 			native-mode = <&timing0>;
 
 			timing0: timing0 {
-				clock-frequency = <0>;
-				hactive = <0>;
-				vactive = <0>;
-				hback-porch = <0>;
-				hfront-porch = <0>;
-				vback-porch = <0>;
-				vfront-porch = <0>;
-				hsync-len = <0>;
-				vsync-len = <0>;
+				clock-frequency = <30000000>;
+				hactive = <720>;
+				vactive = <720>;
+				hback-porch = <44>;
+				hfront-porch = <46>;
+				vback-porch = <18>;
+				vfront-porch = <16>;
+				hsync-len = <2>;
+				vsync-len = <2>;
 				hsync-active = <0>;
 				vsync-active = <0>;
 				de-active = <0>;
@@ -98,7 +92,8 @@
 		};
 	};
 
-	reserved-memory {
+	reserved_memory: reserved-memory {
+		status = "okay";
 		#address-cells = <1>;
 		#size-cells = <1>;
 		ranges;
@@ -107,10 +102,11 @@
 			reg = <0x0 0x0>;
 		};
 		linux,cma {
+			status = "okay";
 			compatible = "shared-dma-pool";
 			inactive;
 			reusable;
-			size = <0xA00000>;
+			size = <0xA00000>; //10M
 			linux,cma-default;
 		};
 	};
@@ -279,8 +275,8 @@
 &i2c4 {
 	status = "okay";
 	clock-frequency = <400000>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&i2c4m2_xfer>;
+	//pinctrl-names = "default";
+	//pinctrl-0 = <&i2c4m2_xfer>;
 
 	sc3336: sc3336@30 {
 		compatible = "smartsens,sc3336";
@@ -465,13 +461,27 @@
 };
 
 &route_rgb {
-  status = "okay";
+	status = "disabled";
 };
 
 &vop {
 	status = "okay";
 };
 
+&i2c3 {
+    clock-frequency = <100000>;
+    GT911:touchscreen {
+      compatible = "goodix,gt911";
+      reg = <0x14>;
+
+      interrupt-parent = <&gpio0>;
+      interrupts = <RK_PA3 IRQ_TYPE_EDGE_FALLING>;
+
+      reset-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
+      pinctrl-names = "default";
+    };
+};
+
 /**************************** PINCTRL ******************************/
 // SPI
 &spi0 {
@@ -492,12 +502,12 @@
 &i2c2 {
 	pinctrl-0 = <&i2c2m0_xfer>;
 };
-// &i2c3 {
-// 	pinctrl-0 = <&i2c3m0_xfer &i2c3m1_xfer &i2c3m2_xfer>;
-// };
-// &i2c4 {
-// 	pinctrl-0 = <&i2c4m0_xfer &i2c4m1_xfer &i2c4m2_xfer>;
-// };
+&i2c3 {
+	pinctrl-0 = <&i2c3m0_xfer &i2c3m1_xfer &i2c3m2_xfer &tp_rst &tp_irq>;
+};
+&i2c4 {
+	pinctrl-0 = <&i2c4m0_xfer &i2c4m1_xfer &i2c4m2_xfer>;
+};
 
 // UART
 &uart0 {
@@ -507,7 +517,7 @@
 	pinctrl-0 = <&uart1m1_xfer>;
 };
 &uart3 {
-	pinctrl-0 = <&uart3m0_xfer>;
+	pinctrl-0 = <&uart3m0_xfer &uart3m1_xfer>;
 };
 &uart4 {
 	pinctrl-0 = <&uart4m0_xfer>;
@@ -566,4 +576,14 @@
 			rockchip,pins = <1 RK_PC0 4 &pcfg_pull_none>;
 		};
 	};
+
+	touchscreen {
+		tp_rst:tp-rst {
+			rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		tp_irq:tp-irq {
+			rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
 };

sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-pro-max.dts

@@ -58,6 +58,9 @@
 	spidev@0 {
 		spi-max-frequency = <50000000>;
 	};
+  fbtft@0 {
+		spi-max-frequency = <50000000>;
+  };
 };
 
 /**********I2C**********/
@@ -89,5 +92,3 @@
 &rtc {
 	status = "okay";
 };
-
-

sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-ultra-w.dts

@@ -28,6 +28,13 @@
 
 /**********EMMC**********/
 &emmc {
+	bus-width = <8>;
+	cap-mmc-highspeed;
+	non-removable;
+	// mmc-hs200-1_8v;
+	rockchip,default-sample-phase = <90>;
+	no-sdio;
+	no-sd;
 	memory-region-ecsd = <&mmc_ecsd>;
 	post-power-on-delay-ms = <0>;
 	status = "okay";
@@ -110,4 +117,3 @@
 		spi-max-frequency = <50000000>;
 	};
 };
-

sysdrv/source/kernel/arch/arm/boot/dts/rv1106g-luckfox-pico-ultra.dts

@@ -27,6 +27,13 @@
 
 /**********EMMC**********/
 &emmc {
+	bus-width = <8>;
+	cap-mmc-highspeed;
+	non-removable;
+	// mmc-hs200-1_8v;
+	rockchip,default-sample-phase = <90>;
+	no-sdio;
+	no-sd;
 	memory-region-ecsd = <&mmc_ecsd>;
 	post-power-on-delay-ms = <0>;
 	status = "okay";

sysdrv/source/kernel/arch/arm/configs/luckfox_rv1106_linux_defconfig

@@ -144,10 +144,9 @@ CONFIG_KEYBOARD_ADC=y
 CONFIG_KEYBOARD_GPIO=y
 # CONFIG_INPUT_MOUSE is not set
 CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_TOUCHSCREEN_GOODIX=y
 CONFIG_TOUCHSCREEN_EDT_FT5X06=y
 # CONFIG_SERIO is not set
-# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_8250=y
 # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
@@ -212,6 +211,10 @@ CONFIG_ROCKCHIP_RGA_PROC_FS=y
 CONFIG_ROCKCHIP_RVE=m
 CONFIG_ROCKCHIP_RVE_PROC_FS=y
 CONFIG_ROCKCHIP_DVBM=m
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_SOUND=y
 CONFIG_SND=y
 # CONFIG_SND_PCM_TIMER is not set
@@ -225,7 +228,6 @@ CONFIG_SND_SOC_ROCKCHIP=y
 CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=y
 CONFIG_SND_SOC_RV1106=y
 CONFIG_SND_SIMPLE_CARD=y
-# CONFIG_HID is not set
 # CONFIG_USB_HID is not set
 CONFIG_USB=y
 CONFIG_USB_OTG=y

sysdrv/source/kernel/drivers/input/touchscreen/goodix.c

@@ -10,7 +10,6 @@
  *  2010 - 2012 Goodix Technology.
  */
 
-#define DEBUG
 
 #include <linux/kernel.h>
 #include <linux/dmi.h>

sysdrv/source/kernel/drivers/video/fbdev/core/fbcon.c

@@ -88,6 +88,8 @@
 #  define DPRINTK(fmt, args...)
 #endif
 
+#define CURSOR_ENABLE 0
+#define SHOW_CENTER 1
 /*
  * FIXME: Locking
  *
@@ -365,6 +367,7 @@ static int get_color(struct vc_data *vc, struct fb_info *info,
 
 static void fb_flashcursor(struct work_struct *work)
 {
+#if CURSOR_ENABLE
 	struct fb_info *info = container_of(work, struct fb_info, queue);
 	struct fbcon_ops *ops = info->fbcon_par;
 	struct vc_data *vc = NULL;
@@ -395,6 +398,7 @@ static void fb_flashcursor(struct work_struct *work)
 	ops->cursor(vc, info, mode, get_color(vc, info, c, 1),
 		    get_color(vc, info, c, 0));
 	console_unlock();
+#endif
 }
 
 static void cursor_timer_handler(struct timer_list *t)
@@ -599,6 +603,9 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
 	if (fb_get_color_depth(&info->var, &info->fix) == 1)
 		erase &= ~0x400;
 	logo_height = fb_prepare_logo(info, ops->rotate);
+#if SHOW_CENTER
+  logo_height += (info->var.yres/2) - (logo_height/2);
+#endif
 	logo_lines = DIV_ROUND_UP(logo_height, vc->vc_font.height);
 	q = (unsigned short *) (vc->vc_origin +
 				vc->vc_size_row * rows);
@@ -1329,6 +1336,7 @@ static void fbcon_clear_margins(struct vc_data *vc, int bottom_only)
 
 static void fbcon_cursor(struct vc_data *vc, int mode)
 {
+#if CURSOR_ENABLE
 	struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
 	struct fbcon_ops *ops = info->fbcon_par;
  	int c = scr_readw((u16 *) vc->vc_pos);
@@ -1350,6 +1358,7 @@ static void fbcon_cursor(struct vc_data *vc, int mode)
 
 	ops->cursor(vc, info, mode, get_color(vc, info, c, 1),
 		    get_color(vc, info, c, 0));
+#endif
 }
 
 static int scrollback_phys_max = 0;

sysdrv/source/kernel/drivers/video/fbdev/core/fbmem.c

@@ -38,7 +38,7 @@
 
 #include <asm/fb.h>
 
-
+#define SHOW_CENTER 1
     /*
      *  Frame buffer device initialization and setup routines
      */
@@ -520,6 +520,11 @@ static int fb_show_logo_line(struct fb_info *info, int rotate,
 		image.dy = y;
 	}
 
+#if SHOW_CENTER
+image.dx = (info->var.xres - logo->width) / 2;
+image.dy = (info->var.yres - logo->height) / 2;
+#endif
+
 	image.width = logo->width;
 	image.height = logo->height;
 

sysdrv/tools/board/buildroot/S99rtcinit

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+case $1 in
+start)
+	if [ "$(hwclock | grep "1969")" ]; then
+		echo "RTC time calibration"
+		date -s 2024-01-01
+		hwclock -w
+	else
+		echo "RTC does not require time calibration"
+	fi
+	;;
+*)
+	exit 1
+	;;
+esac

sysdrv/tools/board/buildroot/luckfox_pico_w_defconfig

@@ -85,3 +85,4 @@ BR2_PACKAGE_HTOP=y
 BR2_PACKAGE_UTIL_LINUX_LIBMOUNT=y
 BR2_PACKAGE_NANO=y
 BR2_PACKAGE_HOST_DTC=y
+BR2_PACKAGE_EVTEST=y

sysdrv/tools/board/buildroot/profile_defconfig

@@ -2,7 +2,7 @@ export PATH="/bin:/sbin:/usr/bin:/usr/sbin"
 
 export EDITOR='/bin/vi'
 
-export PS1='[\u@\h \W]$ '
+export PS1='[\u@\h \W]# '
 
 # Source configuration files from /etc/profile.d
 for i in /etc/profile.d/*.sh ; do

sysdrv/tools/board/emmc/emmc_rc.local

@@ -1,29 +1,11 @@
 #!/bin/bash
 
 /usr/bin/filesystem_resize.sh
+/usr/bin/wifi_bt_init.sh
+/usr/bin/luckfox_switch_rgb_resolution &
 /etc/init.d/S50usbdevice start
-
-# WIFI/BT
-if [ -f /oem/usr/ko/install_wifi.sh ]; then
-	#wifi
-	cd /oem/usr/ko
-	sh insmod_wifi.sh
-	cd -
-
-	#BT
-	if command -v hciattach &>/dev/null; then
-		if lsmod | grep -q "aic8800_fdrv"; then
-			hciattach -s 115200 /dev/ttyS1 any 115200 flow nosleep &
-			sleep 2
-			if hciconfig -a | grep -q "hci0"; then
-				hciconfig hci0 up &
-			else
-				echo "hci0 not found or not available."
-			fi
-		else
-			echo "aic8800_fdrv not found."
-		fi
-	else
-		echo "You need install hci tools"
-	fi
+luckfox-config load
+if [ -n "$(hwclock | grep "invalid")" ]; then
+	date -s 2024-01-01
+	hwclock -w
 fi

sysdrv/tools/board/emmc/emmc_wifi_bt_init.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+if [ "$(cat /proc/device-tree/model)" == "Luckfox Pico Ultra W" ]; then
+	systemctl stop wpa_supplicant
+	if [ -d /usr/ko ]; then
+		cd /usr/ko
+		if [ -z "$(ifconfig | grep "wlan0")" ]; then
+			./insmod_wifi.sh
+		else
+			# wait systemctl
+			sleep 0.5
+		fi
+	else
+		echo "Missing ko files!"
+	fi
+
+	if [ -d /var/run/wpa_supplicant ]; then
+		rm /var/run/wpa_supplicant/ -rf
+	fi
+
+	if [ -f /etc/wpa_supplicant.conf ] && [ -n "$(ifconfig | grep "wlan0")" ]; then
+		wpa_supplicant -B -i wlan0 -c /etc/wpa_supplicant.conf >/dev/null
+		chmod a+x /usr/share/udhcpc/default.script
+	fi
+else
+	echo "This Luckfox Pico model don't support WIFI!"
+fi

sysdrv/tools/board/emmc/emmc_wifi_ko/aic8800dc_fw/aic_userconfig_8800dc.txt

@@ -0,0 +1,56 @@
+# AIC USERCONFIG 2022/0803/1707
+
+# txpwr_lvl
+enable=1
+lvl_11b_11ag_1m_2g4=20
+lvl_11b_11ag_2m_2g4=20
+lvl_11b_11ag_5m5_2g4=20
+lvl_11b_11ag_11m_2g4=20
+lvl_11b_11ag_6m_2g4=20
+lvl_11b_11ag_9m_2g4=20
+lvl_11b_11ag_12m_2g4=20
+lvl_11b_11ag_18m_2g4=20
+lvl_11b_11ag_24m_2g4=18
+lvl_11b_11ag_36m_2g4=18
+lvl_11b_11ag_48m_2g4=16
+lvl_11b_11ag_54m_2g4=16
+lvl_11n_11ac_mcs0_2g4=20
+lvl_11n_11ac_mcs1_2g4=20
+lvl_11n_11ac_mcs2_2g4=20
+lvl_11n_11ac_mcs3_2g4=20
+lvl_11n_11ac_mcs4_2g4=18
+lvl_11n_11ac_mcs5_2g4=18
+lvl_11n_11ac_mcs6_2g4=16
+lvl_11n_11ac_mcs7_2g4=16
+lvl_11n_11ac_mcs8_2g4=16
+lvl_11n_11ac_mcs9_2g4=16
+lvl_11ax_mcs0_2g4=20
+lvl_11ax_mcs1_2g4=20
+lvl_11ax_mcs2_2g4=20
+lvl_11ax_mcs3_2g4=20
+lvl_11ax_mcs4_2g4=18
+lvl_11ax_mcs5_2g4=18
+lvl_11ax_mcs6_2g4=16
+lvl_11ax_mcs7_2g4=16
+lvl_11ax_mcs8_2g4=16
+lvl_11ax_mcs9_2g4=16
+lvl_11ax_mcs10_2g4=15
+lvl_11ax_mcs11_2g4=15
+
+# txpwr_ofst
+ofst_enable=0
+ofst_chan_1_4=0
+ofst_chan_5_9=0
+ofst_chan_10_13=0
+ofst_chan_36_64=0
+ofst_chan_100_120=0
+ofst_chan_122_140=0
+ofst_chan_142_165=0
+
+# xtal cap
+xtal_enable=0
+xtal_cap=24
+xtal_cap_fine=31
+
+
+

sysdrv/tools/board/emmc/emmc_wifi_ko/aic8800dc_fw/aic_userconfig_8800dw.txt

@@ -0,0 +1,56 @@
+# AIC USERCONFIG 2022/0803/1707
+
+# txpwr_lvl
+enable=1
+lvl_11b_11ag_1m_2g4=20
+lvl_11b_11ag_2m_2g4=20
+lvl_11b_11ag_5m5_2g4=20
+lvl_11b_11ag_11m_2g4=20
+lvl_11b_11ag_6m_2g4=20
+lvl_11b_11ag_9m_2g4=20
+lvl_11b_11ag_12m_2g4=20
+lvl_11b_11ag_18m_2g4=20
+lvl_11b_11ag_24m_2g4=18
+lvl_11b_11ag_36m_2g4=18
+lvl_11b_11ag_48m_2g4=16
+lvl_11b_11ag_54m_2g4=16
+lvl_11n_11ac_mcs0_2g4=20
+lvl_11n_11ac_mcs1_2g4=20
+lvl_11n_11ac_mcs2_2g4=20
+lvl_11n_11ac_mcs3_2g4=20
+lvl_11n_11ac_mcs4_2g4=18
+lvl_11n_11ac_mcs5_2g4=18
+lvl_11n_11ac_mcs6_2g4=16
+lvl_11n_11ac_mcs7_2g4=16
+lvl_11n_11ac_mcs8_2g4=16
+lvl_11n_11ac_mcs9_2g4=16
+lvl_11ax_mcs0_2g4=20
+lvl_11ax_mcs1_2g4=20
+lvl_11ax_mcs2_2g4=20
+lvl_11ax_mcs3_2g4=20
+lvl_11ax_mcs4_2g4=18
+lvl_11ax_mcs5_2g4=18
+lvl_11ax_mcs6_2g4=16
+lvl_11ax_mcs7_2g4=16
+lvl_11ax_mcs8_2g4=16
+lvl_11ax_mcs9_2g4=16
+lvl_11ax_mcs10_2g4=15
+lvl_11ax_mcs11_2g4=15
+
+# txpwr_ofst
+ofst_enable=0
+ofst_chan_1_4=0
+ofst_chan_5_9=0
+ofst_chan_10_13=0
+ofst_chan_36_64=0
+ofst_chan_100_120=0
+ofst_chan_122_140=0
+ofst_chan_142_165=0
+
+# xtal cap
+xtal_enable=0
+xtal_cap=24
+xtal_cap_fine=31
+
+
+

sysdrv/tools/board/emmc/emmc_wifi_ko/insmod_wifi.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+cmd=$(realpath $0)
+_DIR=$(dirname $cmd)
+cd $_DIR
+
+export PATH=$PATH:/ko
+
+#aic8800
+if [ -f /usr/ko/aic8800_fdrv.ko ]; then
+	mkdir -p /oem/usr/ko
+	cp /usr/ko/aic8800dc_fw /oem/usr/ko -r
+	insmod cfg80211.ko
+	insmod libarc4.ko
+	insmod ctr.ko
+	insmod ccm.ko
+	#insmod libaes.ko
+	#insmod aes_generic.ko
+	insmod aic8800_bsp.ko
+	sleep 0.2
+	insmod aic8800_fdrv.ko
+	sleep 2
+	insmod aic8800_btlpm.ko
+	sleep 0.1
+fi

sysdrv/tools/board/emmc/udhcp/etc/udhcpd.conf

@@ -0,0 +1,116 @@
+# Sample udhcpd configuration file (/etc/udhcpd.conf)
+
+# The start and end of the IP lease block
+
+start 		192.168.0.20	#default: 192.168.0.20
+end		192.168.0.254	#default: 192.168.0.254
+
+
+# The interface that udhcpd will use
+
+interface	eth0		#default: eth0
+
+
+# The maximim number of leases (includes addressesd reserved
+# by OFFER's, DECLINE's, and ARP conficts
+
+#max_leases	254		#default: 254
+
+
+# If remaining is true (default), udhcpd will store the time
+# remaining for each lease in the udhcpd leases file. This is
+# for embedded systems that cannot keep time between reboots.
+# If you set remaining to no, the absolute time that the lease
+# expires at will be stored in the dhcpd.leases file.
+
+#remaining	yes		#default: yes
+
+
+# The time period at which udhcpd will write out a dhcpd.leases
+# file. If this is 0, udhcpd will never automatically write a
+# lease file. (specified in seconds)
+
+#auto_time	7200		#default: 7200 (2 hours)
+
+
+# The amount of time that an IP will be reserved (leased) for if a
+# DHCP decline message is received (seconds).
+
+#decline_time	3600		#default: 3600 (1 hour)
+
+
+# The amount of time that an IP will be reserved (leased) for if an
+# ARP conflct occurs. (seconds
+
+#conflict_time	3600		#default: 3600 (1 hour)
+
+
+# How long an offered address is reserved (leased) in seconds
+
+#offer_time	60		#default: 60 (1 minute)
+
+# If a lease to be given is below this value, the full lease time is
+# instead used (seconds).
+
+#min_lease	60		#defult: 60
+
+
+# The location of the leases file
+
+#lease_file	/var/lib/misc/udhcpd.leases	#defualt: /var/lib/misc/udhcpd.leases
+
+# The location of the pid file
+#pidfile	/var/run/udhcpd.pid	#default: /var/run/udhcpd.pid
+
+# Everytime udhcpd writes a leases file, the below script will be called.
+# Useful for writing the lease file to flash every few hours.
+
+#notify_file				#default: (no script)
+
+#notify_file	dumpleases 	# <--- usefull for debugging
+
+# The following are bootp specific options, setable by udhcpd.
+
+#siaddr		192.168.0.22		#default: 0.0.0.0
+
+#sname		zorak			#default: (none)
+
+#boot_file	/var/nfs_root		#default: (none)
+
+# The remainer of options are DHCP options and can be specifed with the
+# keyword 'opt' or 'option'. If an option can take multiple items, such
+# as the dns option, they can be listed on the same line, or multiple
+# lines. The only option with a default is 'lease'.
+
+#Examles
+opt	dns	192.168.10.2 192.168.10.10
+option	subnet	255.255.255.0
+opt	router	192.168.10.2
+opt	wins	192.168.10.10
+option	dns	129.219.13.81	# appened to above DNS servers for a total of 3
+option	domain	local
+option	lease	864000		# 10 days of seconds
+
+
+# Currently supported options, for more info, see options.c
+#subnet
+#timezone
+#router
+#timesvr
+#namesvr
+#dns
+#logsvr
+#cookiesvr
+#lprsvr
+#bootsize
+#domain
+#swapsvr
+#rootpath
+#ipttl
+#mtu
+#broadcast
+#wins
+#lease
+#ntpsrv
+#tftp
+#bootfile

sysdrv/tools/board/emmc/udhcp/usr/share/udhcpc/default.script

@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# udhcpc script edited by Tim Riker <Tim@Rikers.org>
+
+[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
+
+RESOLV_CONF="/etc/resolv.conf"
+[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
+[ -n "$subnet" ] && NETMASK="netmask $subnet"
+
+case "$1" in
+	deconfig)
+		/sbin/ifconfig $interface 0.0.0.0
+		;;
+
+	renew|bound)
+		/sbin/ifconfig $interface $ip $BROADCAST $NETMASK
+
+		if [ -n "$router" ] ; then
+			echo "deleting routers"
+			while route del default gw 0.0.0.0 dev $interface ; do
+				:
+			done
+
+			for i in $router ; do
+				route add default gw $i dev $interface
+			done
+		fi
+
+		echo -n > $RESOLV_CONF
+		[ -n "$domain" ] && echo search $domain >> $RESOLV_CONF
+		for i in $dns ; do
+			echo adding dns $i
+			echo nameserver $i >> $RESOLV_CONF
+		done
+		;;
+esac
+
+exit 0

sysdrv/tools/board/luckfox_config/S99luckfoxconfigload

@@ -1,16 +1,17 @@
 #!/bin/sh
 
 load_luckfoxconfig() {
-  if [ -f /etc/luckfox.cfg ] && [ -f /usr/bin/luckfox-config ] ;then
-    luckfox-config load
-  fi
+	if [ -f /usr/bin/luckfox-config ]; then
+		luckfox-config load
+		luckfox_switch_rgb_resolution &
+	fi
 }
 
 case $1 in
-  start)
-    load_luckfoxconfig
-    ;;
-  *)
-    exit 1
-    ;;
+start)
+	load_luckfoxconfig
+	;;
+*)
+	exit 1
+	;;
 esac

sysdrv/tools/board/luckfox_config/ubuntu/etc/rc.local

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+/usr/bin/filesystem_resize.sh
+/etc/init.d/S50usbdevice start
+luckfox-config load
+if [ -n "$(hwclock | grep "invalid")" ]; then
+	date -s 2024-01-01
+	hwclock -w
+fi

sysdrv/tools/board/luckfox_config/ubuntu/usr/lib/libfdt.so.1

@@ -0,0 +1 @@
+libfdt.so.1.7.0