Merge remote-tracking branch 'origin/fully_linked' into arduino

* origin/fully_linked:
  Arduino.h: fix DIGITAL_PIN_EXISTS macro to avoid comment expansion issues
  gh: test sketch compilation after packaging core
  loader: fix rw612 and ek_ra8
  SerialUSB: create SerialUSB object only if CONFIG_USB_CDC_ACM=y
  core: use the new postbuild tool
  post-build: rework to use empty area in ELF header or add it in binaries
  loader: cleanups
  post-build: refactor to use flag package
  west.yml: use arduino remote
  build.sh: fix shields parameter
  portenta_c33: rebuild loader
  loader: move cache config to be board specific
  usb: start supporting USB_DEVICE_STACK_NEXT
  c33: rebuild loader
  zephyrClient: fix SSL overload
  wip: c33
  wip: linked build
  mass rebuild
  build_all: add c33
  c33: add artifacts
  boards: add portenta c33
  platform: dfu-util: allow skipping dfuse
  c33: fix pwm in loader
  TEMP: get rid of serialEvent
  serial: add missing include
  fixme: add bootloader reflasher for c33
  targets: add portenta c33
  loader: enable USB only for legacy stack
  loader: fix ringbuffer exports
  west.yml: use merged branch
  temp: fix display/camera coexistence
  giga: update branch to support display shield

Author: pillo79

.github/workflows/package_core.yml

@@ -30,3 +30,24 @@ jobs:
         with:
           name: Core
           path: arduino-core-zephyr-llext*
+
+      - name: Create Blink sketch
+        run: |
+          mkdir extra/Blink/
+          wget https://raw.githubusercontent.com/arduino/arduino-examples/refs/heads/main/examples/01.Basics/Blink/Blink.ino
+          mv Blink.ino extra/Blink/
+
+      - name: Compile Blink
+        uses: arduino/compile-sketches@main
+        with:
+          fqbn: arduino:zephyr:giga
+          platforms: |
+            # Use Board Manager to install the latest release of Arduino Zephyr Boards to get the toolchain
+            - name: "arduino:zephyr"
+              source-url: "https://downloads.arduino.cc/packages/package_zephyr_index.json"
+            - source-path: "./"
+              name: "arduino:zephyr"
+          sketch-paths: |
+            extra/Blink
+          verbose: 'false'
+          enable-deltas-report: 'false'

Kconfig

@@ -31,3 +31,23 @@ config ARDUINO_ENTRY
 	default y
 
 endif
+
+if USB_DEVICE_STACK_NEXT
+
+config USB_DEVICE_PRODUCT
+	string "USB Device Product"
+	default "Arduino Generic board"
+
+config USB_DEVICE_MANUFACTURER
+	string "USB Device Manufacturer"
+	default "Arduino"
+
+config USB_DEVICE_VID
+	hex "USB Device Vendor ID"
+	default 0x2341
+
+config USB_DEVICE_PID
+	hex "USB Device Product ID"
+	default 0x0001
+
+endif

boards.txt

@@ -1,4 +1,5 @@
-menu.debug=Mode
+menu.debug=Debug
+menu.mode=Mode
 
 giga.name=Arduino Giga R1
 giga.build.core=arduino
@@ -8,8 +9,8 @@ giga.build.compiler_path={runtime.tools.arm-zephyr-eabi-0.16.8.path}/bin/
 giga.menu.debug.false=Standard
 giga.menu.debug.true=Debug
 
-giga.menu.debug.false.post_build_arg=
-giga.menu.debug.true.post_build_arg=debug
+giga.menu.debug.false.postbuild_debug=
+giga.menu.debug.true.postbuild_debug=-debug
 
 giga.build.variant=arduino_giga_r1_m7
 giga.build.mcu=cortex-m7
@@ -81,8 +82,8 @@ nano33ble.build.compiler_path={runtime.tools.arm-zephyr-eabi-0.16.8.path}/bin/
 nano33ble.menu.debug.false=Standard
 nano33ble.menu.debug.true=Debug
 
-nano33ble.menu.debug.false.post_build_arg=
-nano33ble.menu.debug.true.post_build_arg=debug
+nano33ble.menu.debug.false.postbuild_debug=
+nano33ble.menu.debug.true.postbuild_debug=-debug
 
 nano33ble.build.variant=arduino_nano_33_ble_sense
 nano33ble.build.mcu=cortex-m4
@@ -151,8 +152,8 @@ ek_ra8d1.build.compiler_path={runtime.tools.arm-zephyr-eabi-0.16.8.path}/bin/
 ek_ra8d1.menu.debug.false=Standard
 ek_ra8d1.menu.debug.true=Debug
 
-ek_ra8d1.menu.debug.false.post_build_arg=
-ek_ra8d1.menu.debug.true.post_build_arg=debug
+ek_ra8d1.menu.debug.false.postbuild_debug=
+ek_ra8d1.menu.debug.true.postbuild_debug=-debug
 
 ek_ra8d1.build.variant=ek_ra8d1
 ek_ra8d1.build.mcu=cortex-m85+nomve
@@ -217,8 +218,8 @@ frdm_mcxn947.build.compiler_path={runtime.tools.arm-zephyr-eabi-0.16.8.path}/bin
 frdm_mcxn947.menu.debug.false=Standard
 frdm_mcxn947.menu.debug.true=Debug
 
-frdm_mcxn947.menu.debug.false.post_build_arg=
-frdm_mcxn947.menu.debug.true.post_build_arg=debug
+frdm_mcxn947.menu.debug.false.postbuild_debug=
+frdm_mcxn947.menu.debug.true.postbuild_debug=-debug
 
 frdm_mcxn947.build.variant=frdm_mcxn947_mcxn947_cpu0
 frdm_mcxn947.build.mcu=cortex-m33
@@ -277,8 +278,8 @@ portentah7.build.compiler_path={runtime.tools.arm-zephyr-eabi-0.16.8.path}/bin/
 portentah7.menu.debug.false=Standard
 portentah7.menu.debug.true=Debug
 
-portentah7.menu.debug.false.post_build_arg=
-portentah7.menu.debug.true.post_build_arg=debug
+portentah7.menu.debug.false.postbuild_debug=
+portentah7.menu.debug.true.postbuild_debug=-debug
 
 portentah7.build.variant=arduino_portenta_h7
 portentah7.build.mcu=cortex-m7
@@ -349,8 +350,8 @@ frdm_rw612.build.compiler_path={runtime.tools.arm-zephyr-eabi-0.16.8.path}/bin/
 frdm_rw612.menu.debug.false=Standard
 frdm_rw612.menu.debug.true=Debug
 
-frdm_rw612.menu.debug.false.post_build_arg=
-frdm_rw612.menu.debug.true.post_build_arg=debug
+frdm_rw612.menu.debug.false.postbuild_debug=
+frdm_rw612.menu.debug.true.postbuild_debug=-debug
 
 frdm_rw612.build.variant=frdm_rw612
 frdm_rw612.build.mcu=cortex-m33+nodsp
@@ -408,8 +409,8 @@ niclasense.build.compiler_path={runtime.tools.arm-zephyr-eabi-0.16.8.path}/bin/
 niclasense.menu.debug.false=Standard
 niclasense.menu.debug.true=Debug
 
-niclasense.menu.debug.false.post_build_arg=
-niclasense.menu.debug.true.post_build_arg=debug
+niclasense.menu.debug.false.postbuild_debug=
+niclasense.menu.debug.true.postbuild_debug=-debug
 
 niclasense.build.variant=arduino_nicla_sense_me
 niclasense.build.mcu=cortex-m4
@@ -472,3 +473,76 @@ niclasense.debug.server.openocd.scripts.0=interface/{programmer.protocol}.cfg
 niclasense.debug.server.openocd.scripts.1={programmer.transport_script}
 niclasense.debug.server.openocd.scripts.2=target/nrf52.cfg
 niclasense.debug.cortex-debug.custom.request=attach
+
+
+##########################################################################################
+
+portentac33.name=Portenta C33
+portentac33.build.core=arduino
+portentac33.build.crossprefix=arm-zephyr-eabi-
+portentac33.build.compiler_path={runtime.tools.arm-zephyr-eabi-0.16.8.path}/bin/
+
+portentac33.menu.debug.false=Standard
+portentac33.menu.debug.true=Debug
+
+portentac33.menu.debug.false.postbuild_debug=
+portentac33.menu.debug.true.postbuild_debug=-debug
+
+portentac33.menu.mode.llext=llext
+portentac33.menu.mode.linked=linked
+
+portentac33.menu.mode.linked.build.extra_extra_ldflags=-lc -lm -lgcc -L{build.variant.path} -Wl,--wrap=random -Wl,--wrap=calloc -Wl,--wrap=free -Wl,--wrap=malloc -Wl,--wrap=realloc 
+portentac33.menu.mode.linked.build.llext_link_flags=
+portentac33.menu.mode.linked.build.suffix=_linked
+portentac33.menu.mode.linked.build.ldscript={runtime.platform.path}/variants/linked/linker_script.ld
+portentac33.menu.mode.linked.upload.extension=bin.dfu
+portentac33.menu.mode.linked.postbuild_mode=-linked
+
+portentac33.build.variant=arduino_portenta_c33
+portentac33.build.mcu=cortex-m33
+portentac33.build.fpu=-mfpu=fpv5-sp-d16
+portentac33.build.architecture=cortex-m33
+portentac33.compiler.zephyr.arch.define=
+
+portentac33.build.board={build.variant}
+
+portentac33.build.float-abi=-mfloat-abi=hard
+portentac33.build.extra_flags=
+portentac33.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
+portentac33.build.board=arduino_portenta_c33
+portentac33.build.extra_ldflags=
+portentac33.compiler.zephyr.arch.define=
+portentac33.compiler.zephyr.defines=-DLL_EXTENSION_BUILD -DCONFIG_ARDUINO_API_SERIAL_BUFFER_SIZE=256 -DKERNEL -DK_HEAP_MEM_POOL_SIZE=122880 -DNDEBUG -DPICOLIBC_DOUBLE_PRINTF_SCANF -D__LINUX_ERRNO_EXTENSIONS__ -D__PROGRAM_START -D__ZEPHYR__=1 -imacros{build.variant.path}/llext-edk/include/zephyr/include/generated/zephyr/autoconf.h -imacros{build.variant.path}/llext-edk/include/zephyr/include/zephyr/toolchain/zephyr_stdint.h
+portentac33.compiler.zephyr.ldflags=-fno-exceptions -fno-rtti -fno-threadsafe-statics -fno-unwind-tables -fno-use-cxa-atexit
+portentac33.compiler.zephyr.cflags=-fno-strict-aliasing -fno-printf-return-value -fno-common -mthumb -mabi=aapcs -mfp16-format=ieee -mtp=soft -Wall -Wformat -Wformat-security -Wno-format-zero-length -Wdouble-promotion -Wno-pointer-sign -Wpointer-arith -Wexpansion-to-defined -Wno-unused-but-set-variable -Werror=implicit-int -fno-asynchronous-unwind-tables -ftls-model=local-exec -fno-reorder-functions --param=min-pagesize=0 -fno-defer-pop --specs=picolibc.specs -D_POSIX_THREADS -mlong-calls -nodefaultlibs
+portentac33.compiler.zephyr.cxxflags={compiler.zephyr.ldflags} -fdata-sections -ffunction-sections -fno-unwind-tables -fno-strict-aliasing -fno-printf-return-value -fno-common -mthumb -mabi=aapcs -mfp16-format=ieee -mtp=soft -Wall -Wformat -Wformat-security -Wno-format-zero-length -Wdouble-promotion -Wpointer-arith -Wexpansion-to-defined -Wno-unused-but-set-variable -fno-asynchronous-unwind-tables -ftls-model=local-exec -fno-reorder-functions --param=min-pagesize=0 -fno-defer-pop --specs=picolibc.specs -D_POSIX_THREADS -mlong-calls -nodefaultlibs
+portentac33.compiler.zephyr.includes={build.variant.path}/includes.txt
+portentac33.compiler.zephyr.extra_ldflags=-lstdc++ -lsupc++ -lnosys -nostdlib {build.extra_extra_ldflags}
+portentac33.compiler.zephyr=
+portentac33.vid.0=0x2341
+portentac33.pid.0=0x0068
+portentac33.upload_port.0.vid=0x2341
+portentac33.upload_port.0.pid=0x0068
+portentac33.upload.target=portentac33
+
+portentac33.upload.tool=dfu-util
+portentac33.upload.tool.default=dfu-util
+portentac33.upload.protocol=
+portentac33.upload.transport=
+portentac33.upload.vid=0x2341
+portentac33.upload.pid=0x0368
+portentac33.upload.interface=1
+portentac33.upload.use_1200bps_touch=true
+portentac33.upload.wait_for_upload_port=false
+portentac33.upload.native_usb=true
+portentac33.upload.maximum_size=1966080
+portentac33.upload.maximum_data_size=523624
+portentac33.upload.address=0x100000
+portentac33.upload.dfuse=-Q
+
+portentac33.bootloader.tool=dfu-util
+portentac33.bootloader.tool.default=dfu-util
+portentac33.bootloader.file=zephyr-arduino_portenta_c33.bin
+portentac33.bootloader.interface=0
+portentac33.bootloader.address=0x10000
+portentac33.bootloader.dfuse=-Q

cores/arduino/Arduino.h

@@ -17,11 +17,11 @@
 #include <math.h>
 
 #if DT_PROP_LEN(DT_PATH(zephyr_user), digital_pin_gpios) > 0
+/* Note: DT_REG_ADDR needs an expanded argument or it will not work properly */
+#define DIGITAL_PIN_MATCHES(dev_pha, pin, dev, num)                                                \
+	(((dev == DT_REG_ADDR(dev_pha)) && (num == pin)) ? 1 : 0)
 #define DIGITAL_PIN_EXISTS(n, p, i, dev, num)                                                      \
-	(((dev == DT_REG_ADDR(DT_PHANDLE_BY_IDX(n, p, i))) &&                                      \
-	  (num == DT_PHA_BY_IDX(n, p, i, pin)))                                                    \
-		 ? 1                                                                               \
-		 : 0)
+	DIGITAL_PIN_MATCHES(DT_PHANDLE_BY_IDX(n, p, i), DT_PHA_BY_IDX(n, p, i, pin), dev, num)
 
 /* Check all pins are defined only once */
 #define DIGITAL_PIN_CHECK_UNIQUE(i, _)                                                             \
@@ -142,4 +142,4 @@ void analogWriteResolution(int bits);
 // Allow namespace-less operations if Arduino.h is included
 using namespace arduino;
 
-#endif // __cplusplus
+#endif // __cplusplus

cores/arduino/SerialUSB.h

@@ -31,6 +31,6 @@ class SerialUSB_ : public ZephyrSerial {
 };
 }  // namespace arduino
 
-#if (DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) && CONFIG_USB_CDC_ACM)
+#if (DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) && (CONFIG_USB_CDC_ACM || CONFIG_USBD_CDC_ACM_CLASS))
 extern arduino::SerialUSB_ Serial;
 #endif

cores/arduino/USB.cpp

@@ -10,7 +10,7 @@
 #include <zephyr/usb/usb_device.h>
 #include <SerialUSB.h>
 
-#if (DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) && CONFIG_USB_CDC_ACM)
+#if ((DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm)) && (CONFIG_USB_CDC_ACM || CONFIG_USBD_CDC_ACM_CLASS))
 const struct device *const usb_dev = DEVICE_DT_GET(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), cdc_acm, 0));
 
 void usb_status_cb(enum usb_dc_status_code cb_status, const uint8_t *param) {
@@ -40,6 +40,58 @@ static void _baudChangeHandler(const struct device *dev, uint32_t rate)
     }
 }
 
+#if defined(CONFIG_USB_DEVICE_STACK_NEXT)
+
+extern "C" {
+    #include <zephyr/usb/usbd.h>
+    struct usbd_context *usbd_init_device(usbd_msg_cb_t msg_cb);
+}
+
+struct usbd_context *_usbd;
+
+int usb_disable() {
+    return usbd_disable(_usbd);
+}
+
+static void usbd_next_cb(struct usbd_context *const ctx, const struct usbd_msg *msg)
+{
+	if (usbd_can_detect_vbus(ctx)) {
+		if (msg->type == USBD_MSG_VBUS_READY) {
+			usbd_enable(ctx);
+		}
+
+		if (msg->type == USBD_MSG_VBUS_REMOVED) {
+			usbd_disable(ctx);
+		}
+	}
+
+	if (msg->type == USBD_MSG_CDC_ACM_LINE_CODING) {
+        uint32_t baudrate;
+		uart_line_ctrl_get(ctx->dev, UART_LINE_CTRL_BAUD_RATE, &baudrate);
+        _baudChangeHandler(nullptr, baudrate);
+	}
+}
+
+static int enable_usb_device_next(void)
+{
+	int err;
+
+	//_usbd = usbd_init_device(usbd_next_cb);
+	_usbd = usbd_init_device(nullptr);
+	if (_usbd == NULL) {
+		return -ENODEV;
+	}
+
+	if (!usbd_can_detect_vbus(_usbd)) {
+		err = usbd_enable(_usbd);
+		if (err) {
+			return err;
+		}
+	}
+	return 0;
+}
+#endif /* defined(CONFIG_USB_DEVICE_STACK_NEXT) */
+
 void arduino::SerialUSB_::_baudChangeDispatch(struct k_timer *timer) {
     arduino::SerialUSB_* dev = (arduino::SerialUSB_*)k_timer_user_data_get(timer);
     dev->_baudChangeHandler();
@@ -48,6 +100,7 @@ void arduino::SerialUSB_::_baudChangeDispatch(struct k_timer *timer) {
 
 void arduino::SerialUSB_::begin(unsigned long baudrate, uint16_t config) {
     if (!started) {
+        #ifndef CONFIG_USB_DEVICE_STACK_NEXT
         usb_enable(NULL);
         #ifndef CONFIG_CDC_ACM_DTE_RATE_CALLBACK_SUPPORT
         k_timer_init(&baud_timer, SerialUSB_::_baudChangeDispatch, NULL);
@@ -56,6 +109,9 @@ void arduino::SerialUSB_::begin(unsigned long baudrate, uint16_t config) {
         #else
         cdc_acm_dte_rate_callback_set(usb_dev, ::_baudChangeHandler);
         #endif
+        #else
+        enable_usb_device_next();
+        #endif
         ZephyrSerial::begin(baudrate, config);
         started = true;
     }