Generalize test models to be reused

Change-Id: I47705cfde2788fa74f8bbcd07100188e4690dbf2
diff --git a/applications/baremetal/models/ethos-u55-32/keyword_spotting_cnn_small_int8/model.h b/applications/baremetal/models/ethos-u55-32/keyword_spotting_cnn_small_int8/model.h
index c0e15d5..bb3c5de 100644
--- a/applications/baremetal/models/ethos-u55-32/keyword_spotting_cnn_small_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-32/keyword_spotting_cnn_small_int8/model.h
@@ -18,12 +18,14 @@
 
 /*************************************************************************************
  * Model: keyword_spotting_cnn_small_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/cnn_small/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/cnn_small/tflite_int8
  * Vela optimisation: vela --accelerator-config ethos-u55-32 cnn_s_quantized.tflite
  * Hexdump: xxd -i cnn_s_quantized_vela.tflite model.h
  ************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 50000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 50000;
 
 const char *modelName = "keyword_spotting_cnn_small_int8";
 
@@ -4042,4 +4044,4 @@
     0x65, 0x6c, 0x61, 0x20, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x65, 0x64, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
     0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x10, 0x00, 0x0f, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0c, 0x00, 0x00,
     0x00, 0x0c, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x07, 0x00, 0x00, 0x00, 0x65, 0x74,
-    0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
\ No newline at end of file
+    0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};