Update main.yml

Author: MengWanYu

.github/workflows/main.yml

@@ -16,18 +16,22 @@ jobs:
       - name: 安装dtc工具
         run: sudo apt-get update && sudo apt-get install -y device-tree-compiler
 
-      # 关键修改：创建独立板级dts，避免修改原有dtsi
-      - name: 创建读书郎G60专属板级dts
+      - name: 创建读书郎G60专属板级dts（修正语法）
         run: |
           cd linux/kernel/arch/arm64/boot/dts
-          # 新建独立dts文件，继承sun50iw1p1.dtsi
           cat > sun50iw1p1-readboy-g60.dts << 'EOF'
           /dts-v1/;
-          #include "sun50iw1p1.dtsi"  // 继承芯片通用配置
+          #include "sun50iw1p1.dtsi"
+          #include <dt-bindings/interrupt-controller/irq.h>  // 补充中断相关头文件
+          #include <dt-bindings/gpio/gpio.h>                // 补充GPIO相关头文件
 
-          /* 读书郎G60 - 屏幕配置（800x1280） */
+          / {
+              model = "Readboy G60 (sun50iw1p1)";  // 设备型号（必填）
+              compatible = "readboy,g60", "allwinner,sun50iw1p1";  // 兼容属性（必填）
+          };
+
+          /* 屏幕配置（修正属性格式） */
           &display {
-              compatible = "allwinner,sun50iw1p1-display";
               status = "okay";
               display-timings {
                   native-mode = <&timing0>;
@@ -63,42 +67,65 @@ jobs:
               lcd_pwm_pol = <1>;
           };
 
-          /* 读书郎G60 - 存储分区配置 */
+          /* 存储分区配置（修正reg格式） */
           &mmc0 {
               status = "okay";
               bus-width = <8>;
               cap-mmc-highspeed;
               mmc-hs200-1_8v;
               max-frequency = <150000000>;
               non-removable;
-              partition@0 { label = "bootloader"; reg = <0x0 0x400000>; };
-              partition@400000 { label = "env"; reg = <0x400000 0x100000>; };
-              partition@500000 { label = "boot"; reg = <0x500000 0x800000>; };
-              partition@d00000 { label = "system"; reg = <0xd00000 0x40000000>; };
-              partition@40d00000 { label = "data"; reg = <0x40d00000 0x7f300000>; };
+
+              partitions {
+                  compatible = "fixed-partitions";
+                  #address-cells = <2>;
+                  #size-cells = <2>;
+
+                  partition@0 {
+                      label = "bootloader";
+                      reg = <0x0 0x0 0x0 0x400000>;  // 修正reg格式（64位地址：高32位 低32位）
+                  };
+                  partition@400000 {
+                      label = "env";
+                      reg = <0x0 0x400000 0x0 0x100000>;
+                  };
+                  partition@500000 {
+                      label = "boot";
+                      reg = <0x0 0x500000 0x0 0x800000>;
+                  };
+                  partition@d00000 {
+                      label = "system";
+                      reg = <0x0 0xd00000 0x0 0x40000000>;
+                  };
+                  partition@40d00000 {
+                      label = "data";
+                      reg = <0x0 0x40d00000 0x0 0x7f300000>;
+                  };
+              };
           };
 
-          /* 读书郎G60 - 触控配置（GT911） */
+          /* 触控配置（修正中断和GPIO格式） */
           &i2c0 {
               status = "okay";
               clock-frequency = <400000>;
+
               gt911@14 {
                   compatible = "goodix,gt911";
                   reg = <0x14>;
                   interrupt-parent = <&pio>;
-                  interrupts = <4 10 IRQ_TYPE_EDGE_FALLING>;
-                  reset-gpios = <&pio 4 9 GPIO_ACTIVE_LOW>;
+                  interrupts = <4 10 IRQ_TYPE_EDGE_FALLING>;  // 依赖irq.h头文件
+                  reset-gpios = <&pio 4 9 GPIO_ACTIVE_LOW>;   // 依赖gpio.h头文件
                   touchscreen-size-x = <800>;
                   touchscreen-size-y = <1280>;
               };
           };
           EOF
 
-      # 编译独立板级dts（避免冲突）
-      - name: 编译G60专属dtb
+      - name: 编译G60专属dtb（添加调试输出）
         run: |
           cd linux/kernel/arch/arm64/boot/dts
-          dtc -I dts -O dtb -o g60-readboy.dtb sun50iw1p1-readboy-g60.dts
+          # 用verbose模式编译，便于排查剩余错误
+          dtc -v -I dts -O dtb -o g60-readboy.dtb sun50iw1p1-readboy-g60.dts
 
       - name: 上传G60 dtb文件
         uses: actions/upload-artifact@v4