From 5362dd46a10d9a8f469e5ca9145d2628a64f6ac4 Mon Sep 17 00:00:00 2001 From: Andrzej Puzdrowski Date: Thu, 15 Dec 2016 13:46:29 +0100 Subject: [PATCH] fix: align nRF5 v13 sdk struct to origin --- .../porting_tools/sdk_update.py | 49 +++++++++++-------- .../porting_tools/update_desc.json | 2 + .../sdio/{ => config}/sdio_config.h | 0 .../bootloader/{ => ble_dfu}/nrf_ble_dfu.c | 0 .../bootloader/{ => ble_dfu}/nrf_ble_dfu.h | 0 .../libraries/bootloader/{ => dfu}/nrf_dfu.c | 0 .../libraries/bootloader/{ => dfu}/nrf_dfu.h | 0 .../bootloader/{ => dfu}/nrf_dfu_flash.c | 0 .../bootloader/{ => dfu}/nrf_dfu_flash.h | 0 .../bootloader/{ => dfu}/nrf_dfu_mbr.c | 0 .../bootloader/{ => dfu}/nrf_dfu_mbr.h | 0 .../{ => dfu}/nrf_dfu_req_handler.h | 0 .../bootloader/{ => dfu}/nrf_dfu_settings.c | 0 .../bootloader/{ => dfu}/nrf_dfu_settings.h | 0 .../bootloader/{ => dfu}/nrf_dfu_transport.c | 0 .../bootloader/{ => dfu}/nrf_dfu_transport.h | 0 .../bootloader/{ => dfu}/nrf_dfu_types.h | 0 .../bootloader/{ => dfu}/nrf_dfu_utils.c | 0 .../bootloader/{ => dfu}/nrf_dfu_utils.h | 0 .../log/{ => src}/nrf_log_backend_serial.c | 0 .../log/{ => src}/nrf_log_ctrl_internal.h | 0 .../log/{ => src}/nrf_log_frontend.c | 0 .../log/{ => src}/nrf_log_internal.h | 0 23 files changed, 31 insertions(+), 20 deletions(-) rename targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/sdio/{ => config}/sdio_config.h (100%) rename targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/{ => ble_dfu}/nrf_ble_dfu.c (100%) rename targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/{ => ble_dfu}/nrf_ble_dfu.h (100%) rename targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/{ => dfu}/nrf_dfu.c (100%) rename targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/{ => dfu}/nrf_dfu.h (100%) rename targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/{ => dfu}/nrf_dfu_flash.c (100%) rename targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/{ => dfu}/nrf_dfu_flash.h (100%) rename targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/{ => dfu}/nrf_dfu_mbr.c (100%) rename targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/{ => dfu}/nrf_dfu_mbr.h (100%) rename targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/{ => dfu}/nrf_dfu_req_handler.h (100%) rename targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/{ => dfu}/nrf_dfu_settings.c (100%) rename targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/{ => dfu}/nrf_dfu_settings.h (100%) rename targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/{ => dfu}/nrf_dfu_transport.c (100%) rename targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/{ => dfu}/nrf_dfu_transport.h (100%) rename targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/{ => dfu}/nrf_dfu_types.h (100%) rename targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/{ => dfu}/nrf_dfu_utils.c (100%) rename targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/{ => dfu}/nrf_dfu_utils.h (100%) rename targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/log/{ => src}/nrf_log_backend_serial.c (100%) rename targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/log/{ => src}/nrf_log_ctrl_internal.h (100%) rename targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/log/{ => src}/nrf_log_frontend.c (100%) rename targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/log/{ => src}/nrf_log_internal.h (100%) diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/porting_tools/sdk_update.py b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/porting_tools/sdk_update.py index a02ea559de..752afaa2a4 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/porting_tools/sdk_update.py +++ b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/porting_tools/sdk_update.py @@ -145,7 +145,7 @@ def upgrade_copying_list(copy_list, pathes_sdk, dest_mbed_dir_path, print_list): -def upgrade_copying_list_by_dirs(copy_list, list_sdk, force_copy_dirs_list, verbose = False): +def upgrade_copying_list_by_dirs(copy_list, list_sdk, force_copy_dirs_list, port_relative_dir = '',verbose = False): print_list = [] for pathes_sdk in list_sdk: @@ -166,6 +166,7 @@ def upgrade_copying_list_by_dirs(copy_list, list_sdk, force_copy_dirs_list, verb if post_path != '.': # destynation is a nested directory corect_hard_copy_dir = os.path.join(hard_copy_dir["mbed_dir"], post_path) + corect_hard_copy_dir = os.path.join(port_relative_dir, corect_hard_copy_dir) upgrade_copying_list(copy_list, pathes_sdk, corect_hard_copy_dir, print_list) break @@ -178,7 +179,7 @@ def upgrade_copying_list_by_dirs(copy_list, list_sdk, force_copy_dirs_list, verb str_verbose = "{0} --> {1}" print(str_verbose.format(item["id"], item["dest_path"])) -def upgrade_copying_list_by_files(copy_list, list_sdk, force_copy_files_list, verbose = False): +def upgrade_copying_list_by_files(copy_list, list_sdk, force_copy_files_list, port_relative_dir ='',verbose = False): print_list = [] for pathes_sdk in list_sdk: @@ -189,7 +190,10 @@ def upgrade_copying_list_by_files(copy_list, list_sdk, force_copy_files_list, ve for hard_copy_file in force_copy_files_list: if pathes_sdk["id"] == hard_copy_file["sdk_file"]: make_hard_copy = True - upgrade_copying_list(copy_list, pathes_sdk, hard_copy_file["mbed_dir"], print_list) + + corect_hard_copy_dir = os.path.join(port_relative_dir, hard_copy_file["mbed_dir"]) + + upgrade_copying_list(copy_list, pathes_sdk, corect_hard_copy_dir, print_list) break print("\r\nforced copy of files by files: {0:#d}".format(len(print_list))) @@ -199,22 +203,27 @@ def upgrade_copying_list_by_files(copy_list, list_sdk, force_copy_files_list, ve str_verbose = "{0} --> {1}" print(str_verbose.format(item["id"], item["dest_path"])) -def copy_one_file(src, dest, verbose=False): +def copy_one_file(src, dest, verbose=False,dry_run=False): dirs_to_created = os.path.dirname(dest) if not os.path.exists(dirs_to_created): - os.makedirs(dirs_to_created) - print('makerdirs: {0}'.format(dirs_to_created)) + if not dry_run: + os.makedirs(dirs_to_created) + + if verbose: + print('makerdirs: {0}'.format(dirs_to_created)) - shutil.copyfile(src, dest) - print('copy: {0} --> {1}'.format(src, dest)) - - + if not dry_run: + shutil.copyfile(src, dest) + + if verbose: + print('copy: {0} --> {1}'.format(src, dest)) + if __name__ == '__main__': argument_parser = argparse.ArgumentParser() - argument_parser.add_argument('-n', '--dry_run', help='Dry run', action='store_true') + argument_parser.add_argument('-r', '--run', help='run', action='store_true') argument_parser.add_argument('-v', '--verbose', help='Verbose mode', action='store_true') #argument_parser.add_argument('-r', '--rename_only', help='rename only', action='store_true') @@ -222,7 +231,7 @@ if __name__ == '__main__': verbose = False - if parser_args['verbose'] or parser_args['dry_run']: + if parser_args['verbose'] or not parser_args['run']: verbose = True with open('update_desc.json') as data_file: @@ -237,6 +246,7 @@ if __name__ == '__main__': force_copy_dirs_list = update_desc['force_copy_dirs_list'] sdk_dirs_in_mbed = update_desc['sdk_dirs_in_mbed'] sdk_component_path = update_desc['sdk_component_path'] + port_relative_dir = update_desc['port_relative_dir_in_mbed'] list_sdk = get_file_pathes_couples(sdk_component_path, ignore_dirs_list, @@ -252,17 +262,16 @@ if __name__ == '__main__': copy_list = get_copying_automatic_list(list_mbed, list_sdk, mbed_port_path, verbose) - upgrade_copying_list_by_dirs(copy_list, list_sdk, force_copy_dirs_list, verbose) - upgrade_copying_list_by_files(copy_list, list_sdk, force_copy_files_list, verbose) + upgrade_copying_list_by_dirs(copy_list, list_sdk, force_copy_dirs_list, port_relative_dir, verbose) + upgrade_copying_list_by_files(copy_list, list_sdk, force_copy_files_list, port_relative_dir, verbose) - rename_dirs(sdk_dirs_in_mbed, '_old_sdk', parser_args['dry_run']) + rename_dirs(sdk_dirs_in_mbed, '_old_sdk', not parser_args['run']) - if not parser_args['dry_run']: - for copy_item in copy_list: - src = os.path.join('.',copy_item["src_path"]) - dest = os.path.join('.',copy_item["dest_path"]) + for copy_item in copy_list: + src = os.path.join('.',copy_item["src_path"]) + dest = os.path.join('.',copy_item["dest_path"]) - copy_one_file(src, dest, verbose) + copy_one_file(src, dest, verbose, not parser_args['run']) with open('sdk_update_result.json', 'w') as fp: json.dump(copy_list, fp) diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/porting_tools/update_desc.json b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/porting_tools/update_desc.json index 0caeea001f..abbb58c4bb 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/porting_tools/update_desc.json +++ b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/porting_tools/update_desc.json @@ -116,5 +116,7 @@ "..\\TARGET_MCU_NRF52832\\sdk" ], + "port_relative_dir_in_mbed" : "..", + "sdk_component_path": "C:\\nRF5_SDK_13.0.0-1.alpha_055eef3\\components" } \ No newline at end of file diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/sdio/sdio_config.h b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/sdio/config/sdio_config.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/sdio/sdio_config.h rename to targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/sdio/config/sdio_config.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_ble_dfu.c b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/ble_dfu/nrf_ble_dfu.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_ble_dfu.c rename to targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/ble_dfu/nrf_ble_dfu.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_ble_dfu.h b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/ble_dfu/nrf_ble_dfu.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_ble_dfu.h rename to targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/ble_dfu/nrf_ble_dfu.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu.c b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu.c rename to targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu.h b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu.h rename to targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_flash.c b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_flash.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_flash.c rename to targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_flash.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_flash.h b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_flash.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_flash.h rename to targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_flash.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_mbr.c b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_mbr.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_mbr.c rename to targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_mbr.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_mbr.h b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_mbr.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_mbr.h rename to targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_mbr.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_req_handler.h b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_req_handler.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_req_handler.h rename to targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_req_handler.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_settings.c b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_settings.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_settings.c rename to targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_settings.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_settings.h b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_settings.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_settings.h rename to targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_settings.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_transport.c b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_transport.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_transport.c rename to targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_transport.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_transport.h b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_transport.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_transport.h rename to targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_transport.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_types.h b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_types.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_types.h rename to targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_types.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_utils.c b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_utils.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_utils.c rename to targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_utils.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_utils.h b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_utils.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/nrf_dfu_utils.h rename to targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/bootloader/dfu/nrf_dfu_utils.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/log/nrf_log_backend_serial.c b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/log/src/nrf_log_backend_serial.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/log/nrf_log_backend_serial.c rename to targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/log/src/nrf_log_backend_serial.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/log/nrf_log_ctrl_internal.h b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/log/src/nrf_log_ctrl_internal.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/log/nrf_log_ctrl_internal.h rename to targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/log/src/nrf_log_ctrl_internal.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/log/nrf_log_frontend.c b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/log/src/nrf_log_frontend.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/log/nrf_log_frontend.c rename to targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/log/src/nrf_log_frontend.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/log/nrf_log_internal.h b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/log/src/nrf_log_internal.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/log/nrf_log_internal.h rename to targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/log/src/nrf_log_internal.h