Skip to content

Commit

Permalink
fix build errors
Browse files Browse the repository at this point in the history
  • Loading branch information
markCwatson committed Nov 18, 2023
1 parent b213a86 commit 98d1039
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 7 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ on:
jobs:
build:
runs-on: ubuntu-latest
container:
image: ghcr.io/zephyrproject-rtos/ci:latest
container: ghcr.io/zephyrproject-rtos/ci:v0.26.5
env:
CMAKE_PREFIX_PATH: /opt/toolchains

steps:
- name: Checkout code
Expand All @@ -27,8 +28,9 @@ jobs:

test:
runs-on: ubuntu-latest
container:
image: ghcr.io/zephyrproject-rtos/ci:latest
container: ghcr.io/zephyrproject-rtos/ci:v0.26.5
env:
CMAKE_PREFIX_PATH: /opt/toolchains

steps:
- name: Checkout code
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# This CMake file is picked by the Zephyr build system because it is defined
# as the module CMake entry point (see zephyr/module.yml).

zephyr_include_directories(include)
# zephyr_include_directories(include)

add_subdirectory(drivers)
# add_subdirectory(drivers)
2 changes: 1 addition & 1 deletion Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
# as the module Kconfig entry point (see zephyr/module.yml). You can browse
# module options by going to Zephyr -> Modules in Kconfig.

rsource "drivers/Kconfig"
# rsource "drivers/Kconfig"
25 changes: 25 additions & 0 deletions boards/arm/my_custom_board/my_custom_board.dts
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,28 @@
pinctrl-1 = <&uart0_sleep>;
pinctrl-names = "default", "sleep";
};

&flash0 {
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;

boot_partition: partition@0 {
label = "mcuboot";
reg = <0x00000000 0xc000>;
};
slot0_partition: partition@c000 {
label = "image-0";
reg = <0x0000C000 0x37000>;
};
slot1_partition: partition@43000 {
label = "image-1";
reg = <0x00043000 0x37000>;
};
storage_partition: partition@7a000 {
label = "storage";
reg = <0x0007a000 0x00006000>;
};
};
};

0 comments on commit 98d1039

Please sign in to comment.