samples: /driver: 修改设备树文件,增添相应 boards 与 .conf ,解决云端 build 失败问题

boards/arm/csk6_duomotai_devkit/csk6_duomotai_devkit.dts

@@ -54,7 +54,7 @@
                 led_rgb_red: led_rgb_red {
                         gpios = <&exgpiod 3 GPIO_ACTIVE_LOW>;
                 };
-                green_led: led_rgb_green: led_rgb_green {
+                led_rgb_green: led_rgb_green {
                         gpios = <&exgpiod 4 GPIO_ACTIVE_LOW>;
                 };
                 led_rgb_blue: led_rgb_blue {

samples/driver/counter_timer/sample.yaml

@@ -2,6 +2,6 @@ sample:
   name: counter_timer
 tests:
   csk.samples.driver.counter_timer:
-    platform_allow: csk6011a_nano csk6_duomotai_devkit
+    platform_allow: csk6011a_nano
     tags: csk6
     build_only: true

samples/driver/counter_timer/src/main.c

@@ -54,4 +54,5 @@ int main(void)
 		k_msleep(12000);
 		printk("restart\n");
 	}	
+	return 0;
 }

samples/driver/gpio_led/CMakeLists.txt

@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-set(SUPPORT_BOARDS csk6012_nano csk6011a_nano csk6012_c3_nano csk6011a_c3_nano)
+set(SUPPORT_BOARDS csk6012_nano csk6011a_nano csk6012_c3_nano csk6011a_c3_nano csk6_duomotai_devkit)
 if(NOT ${BOARD} IN_LIST SUPPORT_BOARDS)
     message("Please choose one of the following boards:")
     foreach(item ${SUPPORT_BOARDS})

samples/driver/gpio_led/boards/csk6_duomotai_devkit.conf

+CONFIG_GPIO=y
+CONFIG_GPIO_CSK6_CH32V003=y
\ No newline at end of file

samples/driver/gpio_led/prj.conf

-CONFIG_GPIO=y
+CONFIG_GPIO=y
\ No newline at end of file

samples/driver/gpio_led/sample.yaml

@@ -2,6 +2,8 @@ sample:
   name: gpio_led Sample
 tests:
   sample.basic.blinky:
+    platform_exclude:
+    - csk6_duomotai_devkit
     tags: LED gpio
     filter: dt_enabled_alias_with_parent_compat("led0", "gpio-leds")
     depends_on: gpio

samples/driver/uart/uart_configure/CMakeLists.txt

@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-set(SUPPORT_BOARDS csk6012_nano csk6011a_nano csk6012_c3_nano csk6011a_c3_nano)
+set(SUPPORT_BOARDS csk6012_nano csk6011a_nano csk6012_c3_nano csk6011a_c3_nano csk6_duomotai_devkit)
 if(NOT ${BOARD} IN_LIST SUPPORT_BOARDS)
     message("Please choose one of the following boards:")
     foreach(item ${SUPPORT_BOARDS})

samples/driver/uart/uart_configure/sample.yaml

 tests:
   sample.board.csk6.driver.uart.configure:
+    platform_allow: csk6011a_nano csk6_duomotai_devkit
     tags: csk6
     harness: console
     harness_config:

samples/driver/uart/uart_configure/src/main.c

@@ -23,24 +23,24 @@ void print_uart_config(const struct uart_config *cfg)
 	printk("parity: %d\n", cfg->parity);
 }
 
-void main(void)
+int main(void)
 {
 	const struct device *dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
 	struct uart_config cfg = {0};
 
 	if (!device_is_ready(dev)) {
 		printk("device:%s is not ready!\n", dev->name);
-		return;
+		return -1;
 	}
 
 	if (uart_config_get(dev, &cfg) != 0) {
 		printk("uart config get failed.\n");
-		return;
+		return -1;
 	}
 
 	if (cfg.baudrate == NEW_BAUDRATE) {
 		printk("current baudrate is same as new baudrate(%d).\n", NEW_BAUDRATE);
-		return;
+		return -1;
 	}
 
 	printk("current uart configuration:\n");
@@ -56,14 +56,14 @@ void main(void)
 
 	if (uart_configure(dev, &cfg) != 0) {
 		printk("uart configure failed.\n");
-		return;
+		return -1;
 	}
 
 	printk("uart configuration succeeded.\n");
 
 	if (uart_config_get(dev, &cfg) != 0) {
 		printk("uart config get failed.\n");
-		return;
+		return -1;
 	}
 	printk("config result:\n");
 	print_uart_config(&cfg);
@@ -72,4 +72,6 @@ void main(void)
 		printk("hello world\n");
 		k_msleep(500);
 	}
+
+	return 0;
 }

samples/subsys/display/lvgl/SimpleShow/CMakeLists.txt

@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-set(SUPPORT_BOARDS csk6012_nano csk6011a_nano)
+set(SUPPORT_BOARDS csk6012_nano csk6011a_nano csk6_duomotai_devkit)
 if(NOT ${BOARD} IN_LIST SUPPORT_BOARDS)
     message("Please choose one of the following boards:")
     foreach(item ${SUPPORT_BOARDS})

samples/subsys/display/lvgl/SimpleShow/src/main.c

@@ -16,7 +16,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(app);
 
-void main(void)
+int main(void)
 {
 	uint32_t count = 0U;
 	char count_str[11] = {0};
@@ -27,7 +27,7 @@ void main(void)
 	display_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_display));
 	if (!device_is_ready(display_dev)) {
 		LOG_ERR("Device not ready, aborting test");
-		return;
+		return -1;
 	}
 
 	if (IS_ENABLED(CONFIG_LV_Z_POINTER_KSCAN)) {
@@ -58,4 +58,5 @@ void main(void)
 		k_sleep(K_MSEC(10));
 		++count;
 	}
+	return 0;
 }

samples/subsys/display/lvgl/benchmark/CMakeLists.txt

@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-set(SUPPORT_BOARDS csk6012_nano csk6011a_nano)
+set(SUPPORT_BOARDS csk6012_nano csk6011a_nano csk6_duomotai_devkit)
 if(NOT ${BOARD} IN_LIST SUPPORT_BOARDS)
     message("Please choose one of the following boards:")
     foreach(item ${SUPPORT_BOARDS})

samples/subsys/display/lvgl/benchmark/src/main.c

@@ -15,14 +15,14 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(app);
 
-void main(void)
+int main(void)
 {
 	const struct device *display_dev;
 
 	display_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_display));
 	if (display_dev == NULL) {
 		LOG_ERR("Device not ready, aborting test");
-		return;
+		return -1;
 	}
 
 	display_blanking_off(display_dev);
@@ -34,4 +34,5 @@ void main(void)
 		lv_task_handler();
 		k_sleep(K_MSEC(10));
 	}
+	return 0;
 }

west.yml

@@ -9,7 +9,7 @@ manifest:
   projects:
     - name: zephyr
       repo-path: zephyr_downstream
-      revision: 0c847aa798aeb20e70c0149a17ea95146d91b6aa
+      revision: 4d619990254b061eb01d1cca1e9f5debe426f9c3
       import:
         name-allowlist:
           - cmsis