fix build errors

markCwatson · Nov 18, 2023 · f1bc943 · f1bc943
1 parent b213a86
commit f1bc943
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 13 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,20 +4,22 @@ on:
   push:
     branches: 
       - main
-      - 'dev_**'
+      - develop
   pull_request:
     branches:
       - main
+      - develop
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/zephyrproject-rtos/ci:latest
+    runs-on: ubuntu-22.04
+    container: ghcr.io/zephyrproject-rtos/ci:v0.26.5
+    env:
+      CMAKE_PREFIX_PATH: /opt/toolchains
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Setup Environment
       run: python scripts/pipeline-setup.py
@@ -26,13 +28,14 @@ jobs:
       run: west build -b my_custom_board -s app -p
 
   test:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/zephyrproject-rtos/ci:latest
+    runs-on: ubuntu-22.04
+    container: ghcr.io/zephyrproject-rtos/ci:v0.26.5
+    env:
+      CMAKE_PREFIX_PATH: /opt/toolchains
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Setup Environment
       run: python scripts/pipeline-setup.py

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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)
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # Use Zephyr's pre-built image (baed on Ubuntu Linux)
 # see https://github.com/zephyrproject-rtos/docker-image
-FROM ghcr.io/zephyrproject-rtos/ci:latest
+FROM ghcr.io/zephyrproject-rtos/ci:v0.26.5
 
 # Set the working directory
 WORKDIR /usr/src/app

diff --git a/Kconfig b/Kconfig
@@ -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"
diff --git a/boards/arm/my_custom_board/my_custom_board.dts b/boards/arm/my_custom_board/my_custom_board.dts
@@ -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>;
+      };
+  };
+};