From f9fc59180db133619ca87802aaeb65b73b4461a6 Mon Sep 17 00:00:00 2001 From: Joakim Andersson Date: Sat, 21 Sep 2024 12:03:19 +0200 Subject: [PATCH] boot: zephyr: Remove broken target config header feature Remove broken target config header feature. This has been broken for more than 6 years, and seeing as nobody noticed it should be ok to remove it. Broken because if(EXISTS path-to-file-or-directory) uses relative path. From cmake documentation: "Behavior is well-defined only for explicit full paths". Secondly ${BOARD}.h does not account for changes introduced in hwmv2 where BOARD_QUALIFIER maybe should be handled as well. Also, who will put their board config files here? Signed-off-by: Joakim Andersson --- boot/zephyr/CMakeLists.txt | 4 ---- boot/zephyr/targets/arduino_101.h | 37 ------------------------------- 2 files changed, 41 deletions(-) delete mode 100644 boot/zephyr/targets/arduino_101.h diff --git a/boot/zephyr/CMakeLists.txt b/boot/zephyr/CMakeLists.txt index 7762a22c8..aec38d1af 100644 --- a/boot/zephyr/CMakeLists.txt +++ b/boot/zephyr/CMakeLists.txt @@ -48,11 +48,7 @@ endif() zephyr_library_include_directories( include - targets ) -if(EXISTS targets/${BOARD}.h) - zephyr_library_compile_definitions(MCUBOOT_TARGET_CONFIG="${BOARD}.h") -endif() # Zephyr port-specific sources. zephyr_library_sources( diff --git a/boot/zephyr/targets/arduino_101.h b/boot/zephyr/targets/arduino_101.h deleted file mode 100644 index 19095b383..000000000 --- a/boot/zephyr/targets/arduino_101.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2017 Intel Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @file - * @brief Bootloader device specific configuration. - */ - -/* - * NOTE: This flash layout is a simple one for demonstration purposes. - * It assumes we are building MCUboot as a 3rd-stage loader, leaving the - * stock bootloaders on the Arduino 101 untouched. - * - * In this configuration MCUboot will live at 0x40010000 - */ - -#define FLASH_DEV_NAME CONFIG_SOC_FLASH_QMSI_DEV_NAME -#define FLASH_ALIGN 4 -#define FLASH_AREA_IMAGE_0_OFFSET 0x40020000 -#define FLASH_AREA_IMAGE_0_SIZE 0x10000 -#define FLASH_AREA_IMAGE_1_OFFSET 0x40030000 -#define FLASH_AREA_IMAGE_1_SIZE 0x10000 -#define FLASH_AREA_IMAGE_SCRATCH_OFFSET 0x40040000 -#define FLASH_AREA_IMAGE_SCRATCH_SIZE 0x10000