Skip to content

Commit 54c1e3f

Browse files
pabigotutzig
authored andcommitted
zephyr: fix driver include paths
Zephyr will soon no longer add the drivers subdirectory of the include hierarchy to the search path, so references to driver headers must include the drivers/ prefix. Signed-off-by: Peter Bigot <[email protected]>
1 parent 2ee5f7f commit 54c1e3f

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

boot/boot_serial/src/boot_serial.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <power/reboot.h>
3131
#include <sys/byteorder.h>
3232
#include <sys/__assert.h>
33-
#include <flash.h>
33+
#include <drivers/flash.h>
3434
#include <sys/crc.h>
3535
#include <sys/base64.h>
3636
#include <cbor.h>

boot/zephyr/flash_map_extended.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
#include <zephyr.h>
9-
#include <flash.h>
9+
#include <drivers/flash.h>
1010

1111
#include "target.h"
1212

boot/zephyr/main.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
#include <assert.h>
1818
#include <zephyr.h>
19-
#include <gpio.h>
19+
#include <drivers/gpio.h>
2020
#include <sys/__assert.h>
21-
#include <flash.h>
21+
#include <drivers/flash.h>
2222
#include <drivers/timer/system_timer.h>
2323
#include <usb/usb_device.h>
2424
#include <soc.h>

boot/zephyr/serial_adapter.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#include <stdio.h>
18-
#include <uart.h>
18+
#include <drivers/uart.h>
1919
#include <assert.h>
2020
#include <string.h>
2121
#include <zephyr.h>

0 commit comments

Comments
 (0)