[NXP] setup_discriminator argument value was only applied when OTA requestor enabled

Martin-NXP · Martin-NXP · commit f78dd33494eb · 2024-09-18T14:48:03.000+02:00
(cherry picked from commit fa9de443e3129ecf7befb4404fb2dd0efc213a29)
diff --git a/examples/thermostat/nxp/rt/rw61x/BUILD.gn b/examples/thermostat/nxp/rt/rw61x/BUILD.gn
@@ -105,6 +105,10 @@ rt_sdk("sdk") {
       "CHIP_DEVICE_CONFIG_ENABLE_TBR=1",
     ]
   }
+    
+  defines += [
+    "CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR=${setup_discriminator}",
+  ]
 }
 
 # Create the SDK driver instance.
@@ -270,10 +274,6 @@ rt_executable("thermostat") {
       # Consequently, some sections will need to be shifted
       ldflags += [ "-Wl,--defsym=__m_mcuboot_size__=0x20000" ]
     }
-
-    defines += [
-      "CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR=${setup_discriminator}",
-    ]
   }
 
   output_dir = root_out_dir

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,10 @@ rt_sdk("sdk") {`
`105`	`105`	`"CHIP_DEVICE_CONFIG_ENABLE_TBR=1",`
`106`	`106`	`]`
`107`	`107`	`}`
	`108`	`+`
	`109`	`+ defines += [`
	`110`	`+ "CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR=${setup_discriminator}",`
	`111`	`+ ]`
`108`	`112`	`}`
`109`	`113`
`110`	`114`	`# Create the SDK driver instance.`
`@@ -270,10 +274,6 @@ rt_executable("thermostat") {`
`270`	`274`	`# Consequently, some sections will need to be shifted`
`271`	`275`	`ldflags += [ "-Wl,--defsym=__m_mcuboot_size__=0x20000" ]`
`272`	`276`	`}`
`273`		`-`
`274`		`- defines += [`
`275`		`- "CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR=${setup_discriminator}",`
`276`		`- ]`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`output_dir = root_out_dir`