Fix build error by checking flash size

Author: multiplemonomials

TESTS/configs/greentea_baremetal.json5

@@ -24,12 +24,6 @@
         "mbed-trace.enable": true,
 
         // Disable colored traces in tests, as the test runner does not like the terminal control chars
-        "mbed-trace.default-config": "TRACE_ACTIVE_LEVEL_INFO | TRACE_CARRIAGE_RETURN",
-
-        // This allows use of Mbed TLS even on devices which do not have a cryptographic RNG.
-        // This option is used FOR TESTING ONLY as it prevents secure cryptography operation.
-        // If used in a real application, the application author is expected to provide overrides for reading & writing the seed:
-        // https://github.com/arduino/ArduinoCore-mbed/pull/445/files
-        "mbedtls.entropy-nv-seed": 1,
+        "mbed-trace.default-config": "TRACE_ACTIVE_LEVEL_INFO | TRACE_CARRIAGE_RETURN"
     }
 }

storage/kvstore/tests/TESTS/kvstore/general_tests_phase_1/CMakeLists.txt

@@ -10,6 +10,7 @@ mbed_greentea_add_test(
         mbed-storage-kvstore-general_tests_phase_1
     TEST_SKIPPED
         ${TEST_SKIPPED}
+    MIN_FLASH_BYTES 140000
     TEST_SOURCES
         main.cpp
     TEST_REQUIRED_LIBS

storage/kvstore/tests/TESTS/kvstore/general_tests_phase_1/main.cpp

@@ -89,7 +89,6 @@ static void kvstore_init()
 
     res = bd->init();
     TEST_ASSERT_EQUAL_ERROR_CODE(0, res);
-    int erase_val = bd->get_erase_value();
     // Clear out any stale data that might be left from a previous test.
     // Multiply by 2 because SecureStore requires two underlying block devices of this size
     size_t bytes_to_erase = align_up(2 * PAGES_ESTIMATE * bd->get_program_size(), bd->get_erase_size());
@@ -162,8 +161,6 @@ static void kvstore_deinit()
 
     TEST_SKIP_UNLESS(kvstore != NULL);
 
-    int erase_val = bd->get_erase_value();
-
     res = kvstore->deinit();
     TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
 

storage/kvstore/tests/TESTS/kvstore/general_tests_phase_2/CMakeLists.txt

@@ -5,12 +5,12 @@ if(NOT "DEVICE_TRNG=1" IN_LIST MBED_TARGET_DEFINITIONS)
     set(TEST_SKIPPED "This test requires TRNG support!")
 endif()
 
-
 mbed_greentea_add_test(
     TEST_NAME
         mbed-storage-kvstore-general_tests_phase_2
     TEST_SKIPPED
         ${TEST_SKIPPED}
+    MIN_FLASH_BYTES 140000
     TEST_SOURCES
         main.cpp
     TEST_REQUIRED_LIBS

storage/kvstore/tests/TESTS/kvstore/general_tests_phase_2/main.cpp

@@ -85,7 +85,6 @@ static void kvstore_init()
 
     res = bd->init();
     TEST_ASSERT_EQUAL_ERROR_CODE(0, res);
-    int erase_val = bd->get_erase_value();
     // Clear out any stale data that might be left from a previous test
     // Multiply by 2 because SecureStore requires two underlying block devices of this size
     size_t bytes_to_erase = align_up(2 * PAGES_ESTIMATE * bd->get_program_size(), bd->get_erase_size());
@@ -158,8 +157,6 @@ static void kvstore_deinit()
 
     TEST_SKIP_UNLESS(kvstore != NULL);
 
-    int erase_val = bd->get_erase_value();
-
     res = kvstore->deinit();
     TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
 

targets/upload_method_cfg/K64F.cmake

@@ -6,17 +6,6 @@
 # 1. Be sure to update the DAPLink firmware on the board via these instructions: https://os.mbed.com/blog/entry/DAPLink-bootloader-update/
 # 2. OpenOCD 0.12 flashes this device perfectly and can enter a debug session, but cannot hit breakpoints
 # 3. LinkServer can both flash and debug, so it's the recommended upload method for this device.
-# 4. LinkServer does appear to have a bug where it doesn't map the peripheral registers as valid memory, so you can't
-#    inspect them.  I was able to work around this by inserting a block like this into <LinkServer install dir>/devices/FRDM-K64F.json:
-#
-#         "name": "MK64FN1M0xxx12",
-#         "family": "K6x",
-#         "memory": [
-# +       {
-# +          "location": "0x40000000",
-# +          "size": "0x000f0000",
-# +          "type": "RAM"
-# +        },
 
 # General config parameters
 # -------------------------------------------------------------

tools/cmake/mbed_greentea.cmake

@@ -13,6 +13,8 @@ set(MBED_GREENTEA_SERIAL_PORT "" CACHE STRING "Serial port name to talk to the M
 # HOST_TESTS_DIR - Path to the "host_tests" directory.  If a relative path is provided, it will be
 #    interpreted relative to the source directory.
 # TEST_SKIPPED - Reason if suite is skipped
+# NEEDED_FLASH_BYTES - Minimum flash size, in bytes, needed to run this test. Test will be skipped if flash
+#    size is known and is less than this.
 #
 # calling the macro:
 # if(some_condition)
@@ -31,6 +33,7 @@ set(MBED_GREENTEA_SERIAL_PORT "" CACHE STRING "Serial port name to talk to the M
 #         mbed-xyz
 #     HOST_TESTS_DIR
 #         ${CMAKE_CURRENT_LIST_DIR}/host_tests
+#     NEEDED_FLASH_BYTES 140000
 #     TEST_SKIPPED
 #         ${skip_reason}
 # )
@@ -40,6 +43,7 @@ function(mbed_greentea_add_test)
     set(singleValueArgs
         TEST_NAME
         TEST_SKIPPED
+        NEEDED_FLASH_BYTES
     )
     set(multipleValueArgs
         TEST_INCLUDE_DIRS
@@ -58,6 +62,14 @@ function(mbed_greentea_add_test)
         message(FATAL_ERROR "Will not be able to run greentea tests without MBED_GREENTEA_SERIAL_PORT defined!")
     endif()
 
+    if(NOT "${MBED_GREENTEA_NEEDED_FLASH_BYTES}" STREQUAL "")
+        if("${MBED_CONFIG_DEFINITIONS}" MATCHES "MBED_ROM_SIZE=((0x[0-9A-Fa-f]+)|([0-9]+))")
+            if(${CMAKE_MATCH_1} LESS ${MBED_GREENTEA_NEEDED_FLASH_BYTES})
+                set(MBED_GREENTEA_TEST_SKIPPED "Not enough flash space!")
+            endif()
+        endif()
+    endif()
+
     # Add a "test-" prefix to help distinguish test targets in the target list
     set(MBED_GREENTEA_TEST_NAME "test-${MBED_GREENTEA_TEST_NAME}")