Merge pull request #437 from sifive/dev_freertos

Dev freertos
sifive · Mar 11, 2020 · 0ddc1a2 · 0ddc1a2
2 parents 7755849 + 9013e60
commit 0ddc1a2
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 13 deletions.
diff --git a/bsp/freedom-e310-arty/settings.mk b/bsp/freedom-e310-arty/settings.mk
@@ -8,4 +8,5 @@ RISCV_SERIES = sifive-3-series
 
 TARGET_TAGS = fpga openocd
 TARGET_DHRY_ITERS = 20000000
-TARGET_CORE_ITERS = 5000
+TARGET_CORE_ITERS = 5000
+TARGET_FREERTOS_WAIT_MS = 1000
diff --git a/bsp/qemu-sifive-e31/settings.mk b/bsp/qemu-sifive-e31/settings.mk
@@ -8,4 +8,5 @@ RISCV_SERIES = None
 
 TARGET_TAGS = qemu
 TARGET_DHRY_ITERS = 20000000
-TARGET_CORE_ITERS = 5000
+TARGET_CORE_ITERS = 5000
+TARGET_FREERTOS_WAIT_MS = 1000
diff --git a/bsp/qemu-sifive-s51/settings.mk b/bsp/qemu-sifive-s51/settings.mk
@@ -8,4 +8,5 @@ RISCV_SERIES = None
 
 TARGET_TAGS = qemu
 TARGET_DHRY_ITERS = 20000000
-TARGET_CORE_ITERS = 5000
+TARGET_CORE_ITERS = 5000
+TARGET_FREERTOS_WAIT_MS = 1000
diff --git a/bsp/qemu-sifive-u54/settings.mk b/bsp/qemu-sifive-u54/settings.mk
@@ -8,4 +8,5 @@ RISCV_SERIES = None
 
 TARGET_TAGS = qemu
 TARGET_DHRY_ITERS = 20000000
-TARGET_CORE_ITERS = 5000
+TARGET_CORE_ITERS = 5000
+TARGET_FREERTOS_WAIT_MS = 1000
diff --git a/bsp/qemu-sifive-u54mc/settings.mk b/bsp/qemu-sifive-u54mc/settings.mk
@@ -8,4 +8,5 @@ RISCV_SERIES = None
 
 TARGET_TAGS = qemu
 TARGET_DHRY_ITERS = 20000000
-TARGET_CORE_ITERS = 5000
+TARGET_CORE_ITERS = 5000
+TARGET_FREERTOS_WAIT_MS = 1000
diff --git a/bsp/sifive-hifive-unleashed/settings.mk b/bsp/sifive-hifive-unleashed/settings.mk
@@ -8,4 +8,5 @@ RISCV_SERIES = sifive-5-series
 
 TARGET_TAGS = board openocd
 TARGET_DHRY_ITERS = 20000000
-TARGET_CORE_ITERS = 5000
+TARGET_CORE_ITERS = 5000
+TARGET_FREERTOS_WAIT_MS = 1000
diff --git a/bsp/sifive-hifive1-revb/settings.mk b/bsp/sifive-hifive1-revb/settings.mk
@@ -8,4 +8,5 @@ RISCV_SERIES = sifive-3-series
 
 TARGET_TAGS = board jlink
 TARGET_DHRY_ITERS = 20000000
-TARGET_CORE_ITERS = 5000
+TARGET_CORE_ITERS = 5000
+TARGET_FREERTOS_WAIT_MS = 1000
diff --git a/bsp/sifive-hifive1/settings.mk b/bsp/sifive-hifive1/settings.mk
@@ -8,4 +8,5 @@ RISCV_SERIES = sifive-3-series
 
 TARGET_TAGS = board openocd
 TARGET_DHRY_ITERS = 20000000
-TARGET_CORE_ITERS = 5000
+TARGET_CORE_ITERS = 5000
+TARGET_FREERTOS_WAIT_MS = 1000
diff --git a/bsp/spike/settings.mk b/bsp/spike/settings.mk
@@ -8,4 +8,5 @@ RISCV_SERIES = None
 
 TARGET_TAGS = spike
 TARGET_DHRY_ITERS = 20000000
-TARGET_CORE_ITERS = 5000
+TARGET_CORE_ITERS = 5000
+TARGET_FREERTOS_WAIT_MS = 1000
diff --git a/scripts/esdk-settings-generator b/scripts/esdk-settings-generator
diff --git a/scripts/standalone.mk b/scripts/standalone.mk
@@ -170,6 +170,10 @@ endif
 RISCV_XCFLAGS += -DITERATIONS=$(TARGET_CORE_ITERS)
 endif
 
+ifeq ($(filter freertos,$(PROGRAM)),)
+RISCV_XCFLAGS += -DWAIT_MS=$(TARGET_FREERTOS_WAIT_MS)
+endif
+
 #############################################################
 # Software
 #############################################################

diff --git a/software/example-freertos-blinky b/software/example-freertos-blinky
diff --git a/wit-manifest.json b/wit-manifest.json
@@ -40,7 +40,7 @@
         "source": "[email protected]:sifive/openocdcfg-generator.git"
     },
     {
-        "commit": "cff1b713ac789bea21bcb794c6e376dd7d8ca8dc",
+        "commit": "c974863998bf05d96d25bbb153a6f6e80ffd90e2",
         "name": "esdk-settings-generator",
         "source": "[email protected]:sifive/esdk-settings-generator.git"
     },
@@ -220,7 +220,7 @@
         "source": "[email protected]:sifive/Segger_SystemView-metal.git"
     },
     {
-        "commit": "4d6cd59095ebf927a2d134838ce58d3af4498a6e",
+        "commit": "f0187939df63420c7373d3da777e7e423047c2be",
         "name": "example-freertos-blinky",
         "source": "[email protected]:sifive/example-freertos-blinky.git"
     },