Commit 3cd2cece authored by Gerard Marull-Paretas's avatar Gerard Marull-Paretas Committed by Andrzej Puzdrowski
Browse files

zephyr: migrate includes to <zephyr/...> 



Zephyr has prefixed all of its includes with <zephyr/...>. While the
_old_ mode can still be used (CONFIG_LEGACY_INCLUDE_PATH) and is still
enabled by default, it's better to be prepared for its removal in the
future.

Signed-off-by: default avatarGerard Marull-Paretas <gerard@teslabs.com>
parent 65e13140

boot/zephyr/arm_cleanup.c

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 
 * SPDX-License-Identifier: Apache-2.0

 */



#include <arch/arm/aarch32/cortex_m/cmsis.h>

#include <toolchain.h>

#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>

#include <zephyr/toolchain.h>



#if CONFIG_CPU_HAS_NXP_MPU

#include <fsl_sysmpu.h>

boot/zephyr/boot_serial_extensions.c

+3 −3
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ 
 * SPDX-License-Identifier: Apache-2.0

 */



#include <zephyr.h>

#include <drivers/flash.h>

#include <mgmt/mcumgr/zephyr_groups.h>

#include <zephyr/zephyr.h>

#include <zephyr/drivers/flash.h>

#include <zephyr/mgmt/mcumgr/zephyr_groups.h>



#include <flash_map_backend/flash_map_backend.h>

#include <sysflash/sysflash.h>

boot/zephyr/flash_map_extended.c

+3 −3
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ 
 * SPDX-License-Identifier: Apache-2.0

 */



#include <zephyr.h>

#include <devicetree.h>

#include <drivers/flash.h>

#include <zephyr/zephyr.h>

#include <zephyr/devicetree.h>

#include <zephyr/drivers/flash.h>



#include "target.h"

boot/zephyr/hooks_sample.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */



#include <assert.h>

#include <zephyr.h>

#include <zephyr/zephyr.h>

#include "bootutil/image.h"

#include "bootutil/bootutil.h"

#include "bootutil/fault_injection_hardening.h"

boot/zephyr/include/flash_map_backend/flash_map_backend.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#ifndef __FLASH_MAP_BACKEND_H__

#define __FLASH_MAP_BACKEND_H__



#include <storage/flash_map.h> // the zephyr flash_map

#include <zephyr/storage/flash_map.h> // the zephyr flash_map



#ifdef __cplusplus

extern "C" {

CRA Git | Maintained and supported by SUSTech CRA and CCSE