[NXP][scripts][build_examples] Adding support to build applications with cmake using build_examples.py as the entry-point for RW61x

Signed-off-by: Dina Benamar <dina.benamarelmaaroufi@nxp.com>

Author: dinabenamar

scripts/build/build/targets.py

@@ -538,6 +538,8 @@ def BuildNxpTarget():
     target.AppendModifier(name="wifi", enable_wifi=True).OnlyIfRe('rw61x')
     target.AppendModifier(name="thread", enable_thread=True).ExceptIfRe('zephyr')
     target.AppendModifier(name="matter-shell", enable_shell=True).ExceptIfRe('k32w0|k32w1')
+    target.AppendModifier(name="factory-build", enable_factory_data_build=True).OnlyIfRe('rw61x')
+    target.AppendModifier(name="frdm", board_variant="frdm").OnlyIfRe('rw61x')
 
     return target
 

scripts/build/builders/nxp.py

@@ -129,9 +129,11 @@ def __init__(self,
                  disable_ble: bool = False,
                  enable_thread: bool = False,
                  enable_wifi: bool = False,
-                 disable_ipv4: bool = False,
                  enable_shell: bool = False,
-                 enable_ota: bool = False):
+                 enable_ota: bool = False,
+                 enable_factory_data_build: bool = False,
+                 disable_pairing_autostart: bool = False,
+                 board_variant: str = None):
         super(NxpBuilder, self).__init__(
             root=app.BuildRoot(root, board, os_env),
             runner=runner)
@@ -147,12 +149,14 @@ def __init__(self,
         self.enable_lit = enable_lit
         self.enable_rotating_id = enable_rotating_id
         self.has_sw_version_2 = has_sw_version_2
-        self.disable_ipv4 = disable_ipv4
         self.disable_ble = disable_ble
         self.enable_thread = enable_thread
         self.enable_wifi = enable_wifi
         self.enable_ota = enable_ota
         self.enable_shell = enable_shell
+        self.enable_factory_data_build = enable_factory_data_build
+        self.disable_pairing_autostart = disable_pairing_autostart
+        self.board_variant = board_variant
 
     def GnBuildArgs(self):
         args = []
@@ -204,18 +208,54 @@ def GnBuildArgs(self):
 
         return args
 
-    def WestBuildArgs(self):
-        args = []
+    def CmakeBuildFlags(self):
+        flags = []
         if self.enable_factory_data:
-            args.append('-DFILE_SUFFIX=fdata')
+            if self.os_env == NxpOsUsed.ZEPHYR:
+                flags.append('-DFILE_SUFFIX=fdata')
+            else:
+                flags.append("-DCONFIG_CHIP_FACTORY_DATA=true")
 
         if self.has_sw_version_2:
-            args.append('-DCONFIG_CHIP_DEVICE_SOFTWARE_VERSION=2')
+            flags.append("-DCONFIG_CHIP_DEVICE_SOFTWARE_VERSION=2")
+            flags.append("-DCONFIG_CHIP_DEVICE_SOFTWARE_VERSION_STRING=\"2.0\"")
+        
+        if self.enable_ota:
+            flags.append("-DCONFIG_CHIP_OTA_REQUESTOR=true")
+            if self.os_env == NxpOsUsed.FREERTOS and self.board == NxpBoard.RW61X:
+                flags.append("-DCONFIG_BOOTLOADER_MCUBOOT=true")
 
-        build_args = " -- " + " ".join(args) if len(args) > 0 else ""
-        return build_args
+        if self.disable_ble:
+            flags.append("-DCONFIG_BT=false")
+
+        if self.enable_wifi:
+            flags.append('-DCONFIG_CHIP_WIFI=true')
+
+        if self.enable_thread:
+            flags.append("-DCONFIG_NET_L2_OPENTHREAD=true -DCONFIG_CHIP_IPV4=false")
+
+        if self.enable_factory_data_build:
+            # Generate the factory data binary
+            flags.append("-DCONFIG_CHIP_FACTORY_DATA_BUILD=true -DCONFIG_CHIP_FACTORY_DATA=true")
+
+        if self.enable_shell:
+            flags.append("-DCONFIG_CHIP_LIB_SHELL=true")
+
+        if self.disable_pairing_autostart:
+            flags.append('-DCONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=false')
+
+        if self.board_variant:
+            if self.board == NxpBoard.RW61X:
+                flag_board_variant = "-DCONFIG_BOARD_VARIANT=\"%s\"" % self.board_variant
+            
+            flags.append(flag_board_variant)
+
+        build_flags = " ".join(flags) if len(flags) > 0 else ""    
+
+        return build_flags
 
     def generate(self):
+        build_flags = self.CmakeBuildFlags()
         if self.os_env == NxpOsUsed.ZEPHYR:
             if 'ZEPHYR_NXP_SDK_INSTALL_DIR' in os.environ:
                 cmd = 'export ZEPHYR_SDK_INSTALL_DIR="$ZEPHYR_NXP_SDK_INSTALL_DIR"\n'
@@ -225,14 +265,13 @@ def generate(self):
                 cmd += 'export ZEPHYR_BASE="$ZEPHYR_NXP_BASE"\n'
             else:
                 raise Exception("ZEPHYR_NXP_BASE need to be set")
-            build_args = self.WestBuildArgs()
             cmd += '''
-            west build -p --cmake-only -b {board_name} -d {out_folder} {example_folder} {build_args}
+            west build -p --cmake-only -b {board_name} -d {out_folder} {example_folder} {build_flags}
             '''.format(
                 board_name=self.board.Name(self.os_env),
                 out_folder=self.output_dir,
                 example_folder=self.app.BuildRoot(self.code_root, self.board, self.os_env),
-                build_args=build_args).strip()
+                build_flags=build_flags).strip()
             self._Execute(['bash', '-c', cmd], title='Generating ' + self.identifier)
         else:
             cmd = ''
@@ -248,29 +287,40 @@ def generate(self):
                         cmd += 'export NXP_K32W0_SDK_ROOT="' + str(p.sdk_storage_location_abspath) + '" \n '
                     elif p.sdk_name == 'common':
                         cmd += 'export NXP_SDK_ROOT="' + str(p.sdk_storage_location_abspath) + '" \n '
-            # add empty space at the end to avoid concatenation issue when there is no --args
-            cmd += 'gn gen --check --fail-on-unused-args --export-compile-commands --root=%s ' % self.root
 
-            extra_args = []
+            if self.board == NxpBoard.RW61X:
+                cmd += '''
+                cmake -GNinja {build_flags} -H{example_folder} -B{out_folder}
+                '''.format(
+                    build_flags=build_flags,
+                    example_folder=self.app.BuildRoot(self.code_root, self.board, self.os_env),
+                    out_folder=self.output_dir).strip()
+                self._Execute(['bash', '-c', cmd], title='Generating ' + self.identifier)
 
-            if self.options.pw_command_launcher:
-                extra_args.append('pw_command_launcher="%s"' % self.options.pw_command_launcher)
+            else:
+                # add empty space at the end to avoid concatenation issue when there is no --args
+                cmd += 'gn gen --check --fail-on-unused-args --export-compile-commands --root=%s ' % self.root
 
-            if self.options.enable_link_map_file:
-                extra_args.append('chip_generate_link_map_file=true')
+                extra_args = []
+
+                if self.options.pw_command_launcher:
+                    extra_args.append('pw_command_launcher="%s"' % self.options.pw_command_launcher)
+
+                if self.options.enable_link_map_file:
+                    extra_args.append('chip_generate_link_map_file=true')
 
-            if self.options.pregen_dir:
-                extra_args.append('chip_code_pre_generated_directory="%s"' % self.options.pregen_dir)
+                if self.options.pregen_dir:
+                    extra_args.append('chip_code_pre_generated_directory="%s"' % self.options.pregen_dir)
 
-            extra_args.extend(self.GnBuildArgs() or [])
-            if extra_args:
-                cmd += ' --args="%s' % ' '.join(extra_args) + '" '
+                extra_args.extend(self.GnBuildArgs() or [])
+                if extra_args:
+                    cmd += ' --args="%s' % ' '.join(extra_args) + '" '
 
-            cmd += self.output_dir
+                cmd += self.output_dir
 
-            title = 'Generating ' + self.identifier
+                title = 'Generating ' + self.identifier
 
-            self._Execute(['bash', '-c', cmd], title=title)
+                self._Execute(['bash', '-c', cmd], title=title)
 
     def build_outputs(self):
         name = 'chip-%s-%s' % (self.board.Name(self.os_env), self.app.NameSuffix())