From 66eeb1e8cc7d43e0773e4edd2182b7c3d9911c2e Mon Sep 17 00:00:00 2001 From: Aleksander Kaminski Date: Fri, 2 Feb 2024 15:58:00 +0100 Subject: [PATCH 01/43] Submodule update * phoenix-rtos-kernel 9cc5f71...b74cad0 (1): > Bump version to 3.1.0 --- phoenix-rtos-kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-rtos-kernel b/phoenix-rtos-kernel index 9cc5f718..b74cad02 160000 --- a/phoenix-rtos-kernel +++ b/phoenix-rtos-kernel @@ -1 +1 @@ -Subproject commit 9cc5f7186ea0e586c19474210185abeb5ed2df64 +Subproject commit b74cad02605f72721a1d43e01f7a2db41ef292f0 From 8b21ecaa121bbf14d2655602af4d442de05840a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Leczkowski?= Date: Mon, 5 Feb 2024 11:18:41 +0100 Subject: [PATCH 02/43] update submodules * phoenix-rtos-devices 3b004ed...da84831 (2): > stm32l4-multi/libuart: Remove modulos > stm32l4-multi/libuart: Add missing volatile * phoenix-rtos-kernel b74cad0...56a3b7a (1): > riscv64: add system reset handling * phoenix-rtos-lwip 79eed8f...9dd6b7c (2): > drivers/ephy: add support for alternative configurations > drivers/ephy: add MACPHY self-test * plo a42c24f...a688ce0 (1): > riscv64: add system reset handling --- phoenix-rtos-devices | 2 +- phoenix-rtos-kernel | 2 +- phoenix-rtos-lwip | 2 +- plo | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/phoenix-rtos-devices b/phoenix-rtos-devices index 3b004ed2..da848318 160000 --- a/phoenix-rtos-devices +++ b/phoenix-rtos-devices @@ -1 +1 @@ -Subproject commit 3b004ed242c3a5ab02ba7de8eb397619a1f37acc +Subproject commit da8483181015e2aa1e377eaf7ddfe0912ee93f2e diff --git a/phoenix-rtos-kernel b/phoenix-rtos-kernel index b74cad02..56a3b7a9 160000 --- a/phoenix-rtos-kernel +++ b/phoenix-rtos-kernel @@ -1 +1 @@ -Subproject commit b74cad02605f72721a1d43e01f7a2db41ef292f0 +Subproject commit 56a3b7a9718147ae4c3553f97f1f37fc3623525d diff --git a/phoenix-rtos-lwip b/phoenix-rtos-lwip index 79eed8f0..9dd6b7ce 160000 --- a/phoenix-rtos-lwip +++ b/phoenix-rtos-lwip @@ -1 +1 @@ -Subproject commit 79eed8f09c400fd30825b63b75648846f8e91314 +Subproject commit 9dd6b7ceba5daabf791fdd017b896c304f81bd9d diff --git a/plo b/plo index a42c24f2..a688ce0f 160000 --- a/plo +++ b/plo @@ -1 +1 @@ -Subproject commit a42c24f28ad15df02686fe647b1361c7e60c6f80 +Subproject commit a688ce0f86448d9653e74eaf9f55d995960f3b68 From eea3863a78ac43e82591dbe94ede3a4aafbe631b Mon Sep 17 00:00:00 2001 From: Gerard Swiderski Date: Mon, 5 Feb 2024 13:36:55 +0100 Subject: [PATCH 03/43] Submodule update * phoenix-rtos-devices da84831...7f980d4 (2): > ade7913: add optional power supply control > ade7913: extend rt117x flexpwm input capture api JIRA: NIL-465 --- phoenix-rtos-devices | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-rtos-devices b/phoenix-rtos-devices index da848318..7f980d4d 160000 --- a/phoenix-rtos-devices +++ b/phoenix-rtos-devices @@ -1 +1 @@ -Subproject commit da8483181015e2aa1e377eaf7ddfe0912ee93f2e +Subproject commit 7f980d4d095a488c123238519b28de2d0316d307 From fac16571fdcbdbba3189f2c9cc156818c4c220de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Leczkowski?= Date: Fri, 2 Feb 2024 16:12:44 +0100 Subject: [PATCH 04/43] _user/serverdemo: cast off_t to long long in printf off_t is now defined as 64-bit signed integer, which type may differ between systems. JIRA: RTOS-125 --- _user/serverdemo/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_user/serverdemo/main.c b/_user/serverdemo/main.c index 50fb29c6..50d858a9 100644 --- a/_user/serverdemo/main.c +++ b/_user/serverdemo/main.c @@ -50,7 +50,7 @@ static ssize_t server_handleRead(oid_t *oid, void *data, size_t len, off_t offse { /* This is where we handle read request (i.e. user is reading from the server). */ printf("serverdemo: Read from oid %u:%u of %zu bytes @offset %lld\n", - (unsigned)oid->port, (unsigned)oid->id, len, offset); + (unsigned)oid->port, (unsigned)oid->id, len, (long long)offset); /* Put something into the requester buffer. */ memset(data, 'x', len); @@ -64,7 +64,7 @@ static ssize_t server_handleWrite(oid_t *oid, const void *data, size_t len, off_ { /* This is where we handle write request (i.e. user is writing to the server). */ printf("serverdemo: Write to oid %u:%u of %zu bytes @offset %lld\n", - (unsigned)oid->port, (unsigned)oid->id, len, offset); + (unsigned)oid->port, (unsigned)oid->id, len, (long long)offset); /* Print out received data. */ printf("Data:"); From 4932b4ce60091fe6cf21896d6d633c1f75f3977f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Leczkowski?= Date: Wed, 7 Feb 2024 12:18:14 +0100 Subject: [PATCH 05/43] update submodules * libphoenix fed7350...10af1b0 (5): > riscv64/reboot: fix include path > unistd/alarm: update `tid` type > !sys/interrupt: update function signature > clean up includes > riscv64: add system reset handling * phoenix-rtos-build 14a4a73...132890f (1): > host-generic: install kernel headers * phoenix-rtos-corelibs 25343d8...3ec9db3 (2): > libstorage: use off_t instead of offs_t > update installed headers include path * phoenix-rtos-devices 7f980d4...ac27d41 (5): > dma: imx6ull, imxrt: fix handle type in `sdma_init` > multiple files: use off_t instead of offs_t > update installed headers include path > imxrt-multi: disallow CM4 lockup to reset system > imxrt-multi: add CM4 core reset * phoenix-rtos-filesystems 5d26712...8af595a (1): > multiple files: use off_t instead of offs_t * phoenix-rtos-kernel 56a3b7a...1c700bb (6): > Makefile: set headers install dir on host > remove offs_t definition > !proc/userintr: update cond type in `setHandler` > !proc/threads: update `id` type in `threadCreate` > !syscalls: update handle type > !clean up installed headers * phoenix-rtos-lwip 9dd6b7c...4109940 (2): > wi-fi/lwip: use off_t instead of offs_t > update installed headers include path * phoenix-rtos-tests d1ce098...783845a (2): > fs/test_fcntl: cast off_t to long long int printf > update installed headers include path * phoenix-rtos-utils b3486af...992f5fc (3): > multiple files: use off_t instead of offs_t > psh: cast `off_t` before printing > update installed headers include path * plo a688ce0...a26067c (2): > hal/ia32/efi/kernel: remove offs_t > update installed headers include path --- libphoenix | 2 +- phoenix-rtos-build | 2 +- phoenix-rtos-corelibs | 2 +- phoenix-rtos-devices | 2 +- phoenix-rtos-filesystems | 2 +- phoenix-rtos-kernel | 2 +- phoenix-rtos-lwip | 2 +- phoenix-rtos-tests | 2 +- phoenix-rtos-utils | 2 +- plo | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libphoenix b/libphoenix index fed73506..10af1b0c 160000 --- a/libphoenix +++ b/libphoenix @@ -1 +1 @@ -Subproject commit fed73506c974e66e72be6843b970c50b64908313 +Subproject commit 10af1b0c2f8e157bd2b218f9628e93d251fe9e1e diff --git a/phoenix-rtos-build b/phoenix-rtos-build index 14a4a737..132890f6 160000 --- a/phoenix-rtos-build +++ b/phoenix-rtos-build @@ -1 +1 @@ -Subproject commit 14a4a737e300fb82358cbd20d24fe4e2e4175aad +Subproject commit 132890f61645e080b63deb7357f7be1d45c5dbb1 diff --git a/phoenix-rtos-corelibs b/phoenix-rtos-corelibs index 25343d8d..3ec9db39 160000 --- a/phoenix-rtos-corelibs +++ b/phoenix-rtos-corelibs @@ -1 +1 @@ -Subproject commit 25343d8dd70b8cbe16f495a7bd03d0f51659c96a +Subproject commit 3ec9db397fea92fcb9dcda960c3f2fef0744c21b diff --git a/phoenix-rtos-devices b/phoenix-rtos-devices index 7f980d4d..ac27d41c 160000 --- a/phoenix-rtos-devices +++ b/phoenix-rtos-devices @@ -1 +1 @@ -Subproject commit 7f980d4d095a488c123238519b28de2d0316d307 +Subproject commit ac27d41c70aceca307401aa66047b988da6f044a diff --git a/phoenix-rtos-filesystems b/phoenix-rtos-filesystems index 5d267123..8af595a6 160000 --- a/phoenix-rtos-filesystems +++ b/phoenix-rtos-filesystems @@ -1 +1 @@ -Subproject commit 5d267123dbbdcc6cf4be134885dc68753470c39d +Subproject commit 8af595a6b37129b4a6cb7e0cb93705c4d6b3476b diff --git a/phoenix-rtos-kernel b/phoenix-rtos-kernel index 56a3b7a9..1c700bba 160000 --- a/phoenix-rtos-kernel +++ b/phoenix-rtos-kernel @@ -1 +1 @@ -Subproject commit 56a3b7a9718147ae4c3553f97f1f37fc3623525d +Subproject commit 1c700bbab4851a4d9010ddc4ff1b14fcada19295 diff --git a/phoenix-rtos-lwip b/phoenix-rtos-lwip index 9dd6b7ce..41099403 160000 --- a/phoenix-rtos-lwip +++ b/phoenix-rtos-lwip @@ -1 +1 @@ -Subproject commit 9dd6b7ceba5daabf791fdd017b896c304f81bd9d +Subproject commit 410994032ccea142357fe045efe78edd29d6c1e6 diff --git a/phoenix-rtos-tests b/phoenix-rtos-tests index d1ce0980..783845a3 160000 --- a/phoenix-rtos-tests +++ b/phoenix-rtos-tests @@ -1 +1 @@ -Subproject commit d1ce09803a9bcd51a67fc1fd3fc09db52017df32 +Subproject commit 783845a38c51eec00722b6368f885b92dceab914 diff --git a/phoenix-rtos-utils b/phoenix-rtos-utils index b3486af7..992f5fc1 160000 --- a/phoenix-rtos-utils +++ b/phoenix-rtos-utils @@ -1 +1 @@ -Subproject commit b3486af7d0bd0ca625981f440d90f4b9a64ba943 +Subproject commit 992f5fc1df34d2fcd3f7c26c2ba4efcdaae37cea diff --git a/plo b/plo index a688ce0f..a26067cf 160000 --- a/plo +++ b/plo @@ -1 +1 @@ -Subproject commit a688ce0f86448d9653e74eaf9f55d995960f3b68 +Subproject commit a26067cf71ca5cbe51bb3ed3c85c070895946f5e From 0f35de229136c44bdf98245beb0d76167be5ea42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Leczkowski?= Date: Tue, 13 Feb 2024 10:14:14 +0100 Subject: [PATCH 06/43] update submodules * libphoenix 10af1b0...371bbd4 (2): > strings/ffs: avoid possible recursion > stdlib/calloc: fix size overflow check * phoenix-rtos-kernel 1c700bb...7d9ba4d (1): > hal: armv8m: add reboot platformctl for nrf91 * phoenix-rtos-ports 7a859f9...46f7c3d (1): > busybox: fix ash segfaults after interrupting applet * phoenix-rtos-tests 783845a...84f3612 (2): > mem: add mprotect tests > libc: disable built-in optimizations --- libphoenix | 2 +- phoenix-rtos-kernel | 2 +- phoenix-rtos-ports | 2 +- phoenix-rtos-tests | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libphoenix b/libphoenix index 10af1b0c..371bbd4f 160000 --- a/libphoenix +++ b/libphoenix @@ -1 +1 @@ -Subproject commit 10af1b0c2f8e157bd2b218f9628e93d251fe9e1e +Subproject commit 371bbd4ff303b427aa15e84d06f1443f81a6f53b diff --git a/phoenix-rtos-kernel b/phoenix-rtos-kernel index 1c700bba..7d9ba4d4 160000 --- a/phoenix-rtos-kernel +++ b/phoenix-rtos-kernel @@ -1 +1 @@ -Subproject commit 1c700bbab4851a4d9010ddc4ff1b14fcada19295 +Subproject commit 7d9ba4d4687c14ba17981ef838c63e19ed530f33 diff --git a/phoenix-rtos-ports b/phoenix-rtos-ports index 7a859f93..46f7c3d1 160000 --- a/phoenix-rtos-ports +++ b/phoenix-rtos-ports @@ -1 +1 @@ -Subproject commit 7a859f93abdb712e58a55595e4d395df45791f97 +Subproject commit 46f7c3d1449f0aa8d9b72457a53b2c87faa047d6 diff --git a/phoenix-rtos-tests b/phoenix-rtos-tests index 783845a3..84f3612f 160000 --- a/phoenix-rtos-tests +++ b/phoenix-rtos-tests @@ -1 +1 @@ -Subproject commit 783845a38c51eec00722b6368f885b92dceab914 +Subproject commit 84f3612fc2ccb9572f5c20638477ebc137dc0bb9 From b74690243ae47169bd6aad5f98e0f279f46d8e72 Mon Sep 17 00:00:00 2001 From: Damian Loewnau Date: Tue, 13 Feb 2024 12:06:01 +0100 Subject: [PATCH 07/43] update submodules * phoenix-rtos-kernel 7d9ba4d...881a271 (1): > hal: fix return value for pctl_reboot get on stm32l4 * phoenix-rtos-tests 84f3612...65081d2 (1): > mem: disable test-mprotect-fault because of an issue * phoenix-rtos-utils 992f5fc...cdd944d (1): > psh/sysexec: Add option to deamonize a new process --- phoenix-rtos-kernel | 2 +- phoenix-rtos-tests | 2 +- phoenix-rtos-utils | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phoenix-rtos-kernel b/phoenix-rtos-kernel index 7d9ba4d4..881a2711 160000 --- a/phoenix-rtos-kernel +++ b/phoenix-rtos-kernel @@ -1 +1 @@ -Subproject commit 7d9ba4d4687c14ba17981ef838c63e19ed530f33 +Subproject commit 881a27110669ba900f0c0740657bf692bcfe30eb diff --git a/phoenix-rtos-tests b/phoenix-rtos-tests index 84f3612f..65081d21 160000 --- a/phoenix-rtos-tests +++ b/phoenix-rtos-tests @@ -1 +1 @@ -Subproject commit 84f3612fc2ccb9572f5c20638477ebc137dc0bb9 +Subproject commit 65081d211f5d2849041f41f1500b747208cc3223 diff --git a/phoenix-rtos-utils b/phoenix-rtos-utils index 992f5fc1..cdd944dd 160000 --- a/phoenix-rtos-utils +++ b/phoenix-rtos-utils @@ -1 +1 @@ -Subproject commit 992f5fc1df34d2fcd3f7c26c2ba4efcdaae37cea +Subproject commit cdd944dd5c9efbefce2ccf159387246f4d80e3e9 From a5d31c3e9a137e60db31e49b8affacef447f6d0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Leczkowski?= Date: Wed, 14 Feb 2024 16:09:53 +0100 Subject: [PATCH 08/43] update submodules * libphoenix 371bbd4...98671a0 (1): > include: remove EMSGSIZE errno * phoenix-rtos-filesystems 8af595a...ce3a122 (1): > meterfs: Add missing include * phoenix-rtos-kernel 881a271...331c7db (1): > unix: fix send() blocking (#521) * phoenix-rtos-tests 65081d2...9baba2f (2): > unity-harness: increase timeout on nightly > trunner: adjust soft reset time --- libphoenix | 2 +- phoenix-rtos-filesystems | 2 +- phoenix-rtos-kernel | 2 +- phoenix-rtos-tests | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libphoenix b/libphoenix index 371bbd4f..98671a06 160000 --- a/libphoenix +++ b/libphoenix @@ -1 +1 @@ -Subproject commit 371bbd4ff303b427aa15e84d06f1443f81a6f53b +Subproject commit 98671a064b3973e9ccac3c9db985002c295bb7a2 diff --git a/phoenix-rtos-filesystems b/phoenix-rtos-filesystems index 8af595a6..ce3a1221 160000 --- a/phoenix-rtos-filesystems +++ b/phoenix-rtos-filesystems @@ -1 +1 @@ -Subproject commit 8af595a6b37129b4a6cb7e0cb93705c4d6b3476b +Subproject commit ce3a122137689e46ed15dd8e30166c7146893a8d diff --git a/phoenix-rtos-kernel b/phoenix-rtos-kernel index 881a2711..331c7dba 160000 --- a/phoenix-rtos-kernel +++ b/phoenix-rtos-kernel @@ -1 +1 @@ -Subproject commit 881a27110669ba900f0c0740657bf692bcfe30eb +Subproject commit 331c7dba8c3e6ace2a866ef2f32cea0cfb60f77d diff --git a/phoenix-rtos-tests b/phoenix-rtos-tests index 65081d21..9baba2fa 160000 --- a/phoenix-rtos-tests +++ b/phoenix-rtos-tests @@ -1 +1 @@ -Subproject commit 65081d211f5d2849041f41f1500b747208cc3223 +Subproject commit 9baba2fad5acc74efc1c28ef2c23b0e0a9d1ef0c From f22bdf2162a25cf5885e8001857f70698e49d646 Mon Sep 17 00:00:00 2001 From: Gerard Swiderski Date: Mon, 19 Feb 2024 12:34:09 +0100 Subject: [PATCH 09/43] Update submodule * phoenix-rtos-build 132890f...9529c49 (1): > build: enable optional libposixsrv on STM32L4 JIRA: RTOS-641 --- phoenix-rtos-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-rtos-build b/phoenix-rtos-build index 132890f6..9529c499 160000 --- a/phoenix-rtos-build +++ b/phoenix-rtos-build @@ -1 +1 @@ -Subproject commit 132890f61645e080b63deb7357f7be1d45c5dbb1 +Subproject commit 9529c499f61be3740473111e2e55c51edbd004ff From 32564ab531629823d81999b35bbfaf68b1d72524 Mon Sep 17 00:00:00 2001 From: Gerard Swiderski Date: Mon, 19 Feb 2024 20:17:08 +0100 Subject: [PATCH 10/43] Update submodule * phoenix-rtos-devices ac27d41...6d3d858 (1): > stm32l4-multi: add support for optional libposixsrv JIRA: RTOS-641 --- phoenix-rtos-devices | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-rtos-devices b/phoenix-rtos-devices index ac27d41c..6d3d8586 160000 --- a/phoenix-rtos-devices +++ b/phoenix-rtos-devices @@ -1 +1 @@ -Subproject commit ac27d41c70aceca307401aa66047b988da6f044a +Subproject commit 6d3d8586a0a1b36ac3fb81241bf359131dd1b9dd From 04a14d3392c9b766f4a3cbd18b33d8e2a5fa29ab Mon Sep 17 00:00:00 2001 From: Gerard Swiderski Date: Fri, 16 Feb 2024 18:39:48 +0100 Subject: [PATCH 11/43] stm32l4: enable libposixsrv on stm32l4-nucleo Enable posixsrv on STM32L4 nucleo. JIRA: RTOS-641 --- _projects/armv7m4-stm32l4x6-nucleo/board_config.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/_projects/armv7m4-stm32l4x6-nucleo/board_config.h b/_projects/armv7m4-stm32l4x6-nucleo/board_config.h index 87043c37..68a3bd65 100644 --- a/_projects/armv7m4-stm32l4x6-nucleo/board_config.h +++ b/_projects/armv7m4-stm32l4x6-nucleo/board_config.h @@ -18,4 +18,7 @@ #define UART_CONSOLE 2 #define TTY2_DMA 1 +#define BUILTIN_POSIXSRV 1 + + #endif From 2fb084aea6f0af0736eb656137ebc48d3b09a8d2 Mon Sep 17 00:00:00 2001 From: "pawel.skiers" Date: Thu, 22 Feb 2024 15:29:58 +0100 Subject: [PATCH 12/43] build: Add support for different docker images Add support for .docker_build_img config files for docker-build.sh JIRA: CI-344 --- docker-build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-build.sh b/docker-build.sh index d6f6c2c1..78641450 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -1,6 +1,9 @@ #!/bin/bash DOCKER_IMG_NAME=phoenixrtos/build +if [ -e .docker_build_img ]; then + DOCKER_IMG_NAME="$(cat .docker_build_img)" +fi PATH_TO_PROJECT="$(dirname "$(realpath "${BASH_SOURCE[0]}")")/" DOCKER_USER="$(id -u):$(id -g)" From e5327852536e97a291ee9ac728eb697def114b43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Bia=C5=82ow=C4=85s?= Date: Thu, 22 Feb 2024 19:18:22 +0100 Subject: [PATCH 13/43] update submodules * libphoenix 98671a0...719dd2f (3): > arm/setjmp: align to 4, change 2 instructions to 16-bit > riscv64/setjmp: save FPU registers > setjmp: add arch-dependent `jmp_buf` definition * phoenix-rtos-devices 6d3d858...39323e8 (2): > adc/ad7779: imx6ull: fix ADC reset > dma: imx6ull: fix channel reconfigure * phoenix-rtos-filesystems ce3a122...38ddc13 (2): > ext2: improve code style > ext2: fix block allocation error * phoenix-rtos-tests 9baba2f...42f07d1 (5): > libc: scanf: fixing squareBrackets ranges > micropython: fix REPL harness > libc: stat: enable fifo_type test case > waitpid: increase wait time > enable most of the tests on riscv64-qemu --- libphoenix | 2 +- phoenix-rtos-devices | 2 +- phoenix-rtos-filesystems | 2 +- phoenix-rtos-tests | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libphoenix b/libphoenix index 98671a06..719dd2ff 160000 --- a/libphoenix +++ b/libphoenix @@ -1 +1 @@ -Subproject commit 98671a064b3973e9ccac3c9db985002c295bb7a2 +Subproject commit 719dd2ffcc676bc33333909e58a513fb51f45e06 diff --git a/phoenix-rtos-devices b/phoenix-rtos-devices index 6d3d8586..39323e88 160000 --- a/phoenix-rtos-devices +++ b/phoenix-rtos-devices @@ -1 +1 @@ -Subproject commit 6d3d8586a0a1b36ac3fb81241bf359131dd1b9dd +Subproject commit 39323e8804882dccebee26abd52ce31f673b3fee diff --git a/phoenix-rtos-filesystems b/phoenix-rtos-filesystems index ce3a1221..38ddc13d 160000 --- a/phoenix-rtos-filesystems +++ b/phoenix-rtos-filesystems @@ -1 +1 @@ -Subproject commit ce3a122137689e46ed15dd8e30166c7146893a8d +Subproject commit 38ddc13d23625f0c6b76128de1257f40fe2cacd7 diff --git a/phoenix-rtos-tests b/phoenix-rtos-tests index 9baba2fa..42f07d16 160000 --- a/phoenix-rtos-tests +++ b/phoenix-rtos-tests @@ -1 +1 @@ -Subproject commit 9baba2fad5acc74efc1c28ef2c23b0e0a9d1ef0c +Subproject commit 42f07d168e42d85d2d268b989b6e74d228605bb0 From 158a81c16de8c412ebdeb5c633d243c9631ebbeb Mon Sep 17 00:00:00 2001 From: Lukasz Leczkowski Date: Mon, 26 Feb 2024 09:59:51 +0100 Subject: [PATCH 14/43] .gitmodules: remove riscv-pk Submodule was removed from repo but not from this file. JIRA: RTOS-550 --- .gitmodules | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index fb2e534d..63629280 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,9 +40,6 @@ [submodule "plo"] path = plo url = https://github.com/phoenix-rtos/plo.git -[submodule "riscv/riscv-pk"] - path = riscv/riscv-pk - url = https://github.com/riscv/riscv-pk.git [submodule "riscv/opensbi"] path = riscv/opensbi url = https://github.com/riscv/opensbi.git From 32d7d840c1a579710a5c42dcb29faefdab770d65 Mon Sep 17 00:00:00 2001 From: Damian Loewnau Date: Mon, 26 Feb 2024 14:55:22 +0100 Subject: [PATCH 15/43] update submodules * phoenix-rtos-tests 42f07d1...e275b3d (2): > psh: apply black formatting to test-kill > psh: make test-kill more flexible --- phoenix-rtos-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-rtos-tests b/phoenix-rtos-tests index 42f07d16..e275b3d7 160000 --- a/phoenix-rtos-tests +++ b/phoenix-rtos-tests @@ -1 +1 @@ -Subproject commit 42f07d168e42d85d2d268b989b6e74d228605bb0 +Subproject commit e275b3d78147223f84e4f3e5b4061942473d5a9f From 599b37decbd2420ee1d4662379bcc8ef900630fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Bia=C5=82ow=C4=85s?= Date: Tue, 27 Feb 2024 15:27:34 +0100 Subject: [PATCH 16/43] update submodules * libphoenix 719dd2f...8e7daf8 (1): > include/setjmp: add alignment to `__jmp_buf` definition * phoenix-rtos-devices 39323e8...dd197db (1): > adc/ad7779: add support for setting DOUT drive strength * phoenix-rtos-utils cdd944d...f86c971 (2): > psh: fix top formatting > psh: reimplement 'kill' command --- libphoenix | 2 +- phoenix-rtos-devices | 2 +- phoenix-rtos-utils | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libphoenix b/libphoenix index 719dd2ff..8e7daf86 160000 --- a/libphoenix +++ b/libphoenix @@ -1 +1 @@ -Subproject commit 719dd2ffcc676bc33333909e58a513fb51f45e06 +Subproject commit 8e7daf86ce410aaae7c90f2fb8ba0a8d716fdb1d diff --git a/phoenix-rtos-devices b/phoenix-rtos-devices index 39323e88..dd197dbc 160000 --- a/phoenix-rtos-devices +++ b/phoenix-rtos-devices @@ -1 +1 @@ -Subproject commit 39323e8804882dccebee26abd52ce31f673b3fee +Subproject commit dd197dbcbf44ae39c71178fcbb30ff615ab2f120 diff --git a/phoenix-rtos-utils b/phoenix-rtos-utils index cdd944dd..f86c9719 160000 --- a/phoenix-rtos-utils +++ b/phoenix-rtos-utils @@ -1 +1 @@ -Subproject commit cdd944dd5c9efbefce2ccf159387246f4d80e3e9 +Subproject commit f86c9719beead05c4f6de4b9ea07d64438833be3 From d5acc76a8849d1e137f594497dfa703f28459d34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Wi=C5=9Bniewski?= Date: Tue, 5 Mar 2024 11:45:34 +0100 Subject: [PATCH 17/43] update submodule * phoenix-rtos-filesystems 38ddc13...fd34198 (1): > jffs2/phoenix-rtos: add `extern` keyword to init_user_ns --- phoenix-rtos-filesystems | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-rtos-filesystems b/phoenix-rtos-filesystems index 38ddc13d..fd341981 160000 --- a/phoenix-rtos-filesystems +++ b/phoenix-rtos-filesystems @@ -1 +1 @@ -Subproject commit 38ddc13d23625f0c6b76128de1257f40fe2cacd7 +Subproject commit fd34198111962cf544d1ddb3254bbe7c9a352510 From 345827ed493e6504a05a71db411033ad632bfd63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Wi=C5=9Bniewski?= Date: Tue, 5 Mar 2024 17:25:37 +0100 Subject: [PATCH 18/43] update submodule * phoenix-rtos-tests e275b3d...609cb06 (7): > libcache: remove variable declarations from header > libtinyaes: Fix formatting > Import libtinyaes tests > libc: enable socket test > libc: add macro for building test from custom sources > posix: disable failing unix socket test > posix: unix socket tests (peer socket close, poll) --- phoenix-rtos-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-rtos-tests b/phoenix-rtos-tests index e275b3d7..609cb06d 160000 --- a/phoenix-rtos-tests +++ b/phoenix-rtos-tests @@ -1 +1 @@ -Subproject commit e275b3d78147223f84e4f3e5b4061942473d5a9f +Subproject commit 609cb06d3695db4d83d7aaf9713e313b46cdb878 From 8b395dba9258382bb48f222d4416b5e3adc279e1 Mon Sep 17 00:00:00 2001 From: Aleksander Kaminski Date: Fri, 8 Mar 2024 16:03:08 +0100 Subject: [PATCH 19/43] Submodule update * libphoenix 8e7daf8...0b40e3f (1): > sys: remove duplicate kernel definitions from events.h & file.h * phoenix-rtos-build 9529c49...77c4211 (2): > make: add -fno-common to CFLAGS > host-generic: Add libtinyaes to core build * phoenix-rtos-corelibs 3ec9db3...e660606 (2): > libtinyaes: Enable and fix style > Add libtinyaes * phoenix-rtos-devices dd197db...05c71f3 (3): > usb/ehci: fix root hub descriptors > imxrt-multi/spi: Fix RX FIFO being read too early > stm32l4-multi/libuart: optimize infiniteRxHandler * phoenix-rtos-doc 0e50130...78c1bc4 (4): > corelibs: add library names to the headers > adapt headers to fit the convention better > adapt image references to MD format > libc: correct header format of functions docs * phoenix-rtos-kernel 331c7db...b412cbc (4): > include: add events.h and file.h headers > lib_strtoul: Fix endptr check > stroul: Adapt to MISRA, fix return type > sparcv8leon3: include cpu-specific headers in sparcv8leon3.h * phoenix-rtos-usb 7358b3f...6da7630 (2): > usb/hub.c: fix port reset checking > usb/dev.c: fix parsing of device configuration --- libphoenix | 2 +- phoenix-rtos-build | 2 +- phoenix-rtos-corelibs | 2 +- phoenix-rtos-devices | 2 +- phoenix-rtos-doc | 2 +- phoenix-rtos-kernel | 2 +- phoenix-rtos-usb | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libphoenix b/libphoenix index 8e7daf86..0b40e3fe 160000 --- a/libphoenix +++ b/libphoenix @@ -1 +1 @@ -Subproject commit 8e7daf86ce410aaae7c90f2fb8ba0a8d716fdb1d +Subproject commit 0b40e3fe28ce2e831906abb39e51c3349f9d2b80 diff --git a/phoenix-rtos-build b/phoenix-rtos-build index 9529c499..77c42111 160000 --- a/phoenix-rtos-build +++ b/phoenix-rtos-build @@ -1 +1 @@ -Subproject commit 9529c499f61be3740473111e2e55c51edbd004ff +Subproject commit 77c421113471ec056d8a9c711d6f7ceaba813f8f diff --git a/phoenix-rtos-corelibs b/phoenix-rtos-corelibs index 3ec9db39..e6606065 160000 --- a/phoenix-rtos-corelibs +++ b/phoenix-rtos-corelibs @@ -1 +1 @@ -Subproject commit 3ec9db397fea92fcb9dcda960c3f2fef0744c21b +Subproject commit e660606536b9a13ff02acd7ad62d72235d283735 diff --git a/phoenix-rtos-devices b/phoenix-rtos-devices index dd197dbc..05c71f3f 160000 --- a/phoenix-rtos-devices +++ b/phoenix-rtos-devices @@ -1 +1 @@ -Subproject commit dd197dbcbf44ae39c71178fcbb30ff615ab2f120 +Subproject commit 05c71f3f71cde4a96d2013068a9fc718fa41477c diff --git a/phoenix-rtos-doc b/phoenix-rtos-doc index 0e501301..78c1bc4c 160000 --- a/phoenix-rtos-doc +++ b/phoenix-rtos-doc @@ -1 +1 @@ -Subproject commit 0e501301092b2c39422813cab9f37280068f314f +Subproject commit 78c1bc4ca0c10b6388005455790828bf60c58683 diff --git a/phoenix-rtos-kernel b/phoenix-rtos-kernel index 331c7dba..b412cbc9 160000 --- a/phoenix-rtos-kernel +++ b/phoenix-rtos-kernel @@ -1 +1 @@ -Subproject commit 331c7dba8c3e6ace2a866ef2f32cea0cfb60f77d +Subproject commit b412cbc9a2cebdc3bcd6d95dbdb21b91272031ca diff --git a/phoenix-rtos-usb b/phoenix-rtos-usb index 7358b3f4..6da7630a 160000 --- a/phoenix-rtos-usb +++ b/phoenix-rtos-usb @@ -1 +1 @@ -Subproject commit 7358b3f44e0bbb66606381618f49437fd5f3cc75 +Subproject commit 6da7630a0bfc43b542fadc9a7ce7944cadd3d882 From 4e3318052e3c6bde9cd3cf0176c1cb1f7d6fdf76 Mon Sep 17 00:00:00 2001 From: lukileczo Date: Thu, 25 Jan 2024 14:14:35 +0100 Subject: [PATCH 20/43] sparcv8leon3: add uart DMA configuration JIRA: RTOS-748 --- .../sparcv8leon3-gr712rc-board/board_config.h | 11 +++++++++++ _projects/sparcv8leon3-gr716-mimas/board_config.h | 15 +++++++++++++-- _projects/sparcv8leon3-gr716-mini/board_config.h | 11 +++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/_projects/sparcv8leon3-gr712rc-board/board_config.h b/_projects/sparcv8leon3-gr712rc-board/board_config.h index b32d8145..aecd2572 100644 --- a/_projects/sparcv8leon3-gr712rc-board/board_config.h +++ b/_projects/sparcv8leon3-gr712rc-board/board_config.h @@ -59,6 +59,13 @@ #define UART4_ACTIVE 0 #define UART5_ACTIVE 0 +#define UART0_DMA 0 +#define UART1_DMA 0 +#define UART2_DMA 0 +#define UART3_DMA 0 +#define UART4_DMA 0 +#define UART5_DMA 0 + #define UART_CONSOLE_PLO 0 #define UART_CONSOLE_KERNEL 0 #define UART_CONSOLE_USER 0 @@ -115,5 +122,9 @@ #define TLB_IRQ 14 +/* DMA */ + +#define DMA_MAX_CNT 0 + #endif diff --git a/_projects/sparcv8leon3-gr716-mimas/board_config.h b/_projects/sparcv8leon3-gr716-mimas/board_config.h index 6fc889a8..702fbb9e 100644 --- a/_projects/sparcv8leon3-gr716-mimas/board_config.h +++ b/_projects/sparcv8leon3-gr716-mimas/board_config.h @@ -27,8 +27,8 @@ #define UART4_BASE ((void *)-1) #define UART5_BASE ((void *)-1) -#define UART0_IRQ 3 -#define UART1_IRQ 5 +#define UART0_IRQ 10 +#define UART1_IRQ 12 #define UART2_IRQ -1 #define UART3_IRQ -1 #define UART4_IRQ -1 @@ -59,6 +59,13 @@ #define UART4_ACTIVE 0 #define UART5_ACTIVE 0 +#define UART0_DMA 1 +#define UART1_DMA 0 +#define UART2_DMA 0 +#define UART3_DMA 0 +#define UART4_DMA 0 +#define UART5_DMA 0 + #define UART_CONSOLE_PLO 1 #define UART_CONSOLE_KERNEL 1 #define UART_CONSOLE_USER 1 @@ -114,5 +121,9 @@ #define SPW4_ACTIVE 0 #define SPW5_ACTIVE 0 +/* DMA */ + +#define DMA_MAX_CNT 1 + #endif diff --git a/_projects/sparcv8leon3-gr716-mini/board_config.h b/_projects/sparcv8leon3-gr716-mini/board_config.h index edbb956b..0b705853 100644 --- a/_projects/sparcv8leon3-gr716-mini/board_config.h +++ b/_projects/sparcv8leon3-gr716-mini/board_config.h @@ -59,6 +59,13 @@ #define UART4_ACTIVE 0 #define UART5_ACTIVE 0 +#define UART0_DMA 0 +#define UART1_DMA 0 +#define UART2_DMA 0 +#define UART3_DMA 0 +#define UART4_DMA 0 +#define UART5_DMA 0 + #define UART_CONSOLE_PLO 2 #define UART_CONSOLE_KERNEL 2 #define UART_CONSOLE_USER 2 @@ -114,5 +121,9 @@ #define SPW4_ACTIVE 0 #define SPW5_ACTIVE 0 +/* DMA */ + +#define DMA_MAX_CNT 0 + #endif From 731122da110a3738e34a525e91eb3054b3b77c69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Leczkowski?= Date: Thu, 15 Feb 2024 17:07:42 +0100 Subject: [PATCH 21/43] sparcv8leon3-gr716-mimas: shorten wait time in USER_SCRIPT JIRA: RTOS-748 --- _projects/sparcv8leon3-gr716-mimas/build.project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_projects/sparcv8leon3-gr716-mimas/build.project b/_projects/sparcv8leon3-gr716-mimas/build.project index 0157798a..b6bad3f5 100644 --- a/_projects/sparcv8leon3-gr716-mimas/build.project +++ b/_projects/sparcv8leon3-gr716-mimas/build.project @@ -23,7 +23,7 @@ USER_SCRIPT=( "app ${BOOT_DEVICE} -x dummyfs extram extram" "app ${BOOT_DEVICE} -x grlib-multi extram extram" "app ${BOOT_DEVICE} -x psh extram extram" - "wait 2000" + "wait 500" "go!" ) From 7357f91d58b8b9b49fb673367b96477d8b0946cc Mon Sep 17 00:00:00 2001 From: Damian Loewnau Date: Tue, 12 Mar 2024 19:29:52 +0100 Subject: [PATCH 22/43] ci: decrease aslr entropy on gh hosted runners Starting with image version 20240310.1.0, GitHub runners are using 32-bit entropy for ASLR: $ sudo sysctl -a | grep vm.mmap.rnd vm.mmap_rnd_bits = 32 vm.mmap_rnd_compat_bits = 16 This breaks all the asan-enabled builds, because older asan gets confused by memory mappings and crashes with segmentation fault. The issue is fixed in newer releases of llvm: llvm/llvm-project@fb77ca0 https://reviews.llvm.org/D148280 But these are not available in Ubuntu 22.04 image. This should be fixed by GitHub, but until new images are available reducing ASLR entropy manually to 28 bits to make builds work. GH Actions issue: https://github.com/actions/runner-images/issues/9491 phoenix-rtos-project issue: https://github.com/phoenix-rtos/phoenix-rtos-project/issues/1032 JIRA: CI-431 --- .github/workflows/ci-project.yml | 14 ++++++++++++++ .github/workflows/ci-submodule.yml | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/.github/workflows/ci-project.yml b/.github/workflows/ci-project.yml index 41054e8b..66d7d69f 100644 --- a/.github/workflows/ci-project.yml +++ b/.github/workflows/ci-project.yml @@ -47,6 +47,13 @@ jobs: - name: Add GCC problem matcher run: echo "::add-matcher::.github/problem-matchers/gcc.json" + # Issue caused by incompability between the amount of entropy bits in the specific linux kernel version (32) and ASAN (28) + # To be removed after updating Actions Runner Ubuntu image to the fixed version + # https://github.com/actions/runner-images/issues/9491 + # https://github.com/phoenix-rtos/phoenix-rtos-project/issues/1032 + - name: Decrease ASLR entropy due to temporary issue on gh-hosted runners + run: sudo sysctl vm.mmap_rnd_bits=28 + # step 2: use our custom action to build the project - name: Build id: build @@ -100,6 +107,13 @@ jobs: - name: Add sanitizers problem matcher run: echo "::add-matcher::.github/problem-matchers/sanitizer-errors.json" + # Issue caused by incompability between the amount of entropy bits in the specific linux kernel version (32) and ASAN (28) + # To be removed after updating Actions Runner Ubuntu image to the fixed version + # https://github.com/actions/runner-images/issues/9491 + # https://github.com/phoenix-rtos/phoenix-rtos-project/issues/1032 + - name: Decrease ASLR entropy due to temporary issue on gh-hosted runners + run: sudo sysctl vm.mmap_rnd_bits=28 + - name: Test runner id: runner uses: ./.github/actions/phoenix-runner diff --git a/.github/workflows/ci-submodule.yml b/.github/workflows/ci-submodule.yml index 80227bc7..038cac8b 100644 --- a/.github/workflows/ci-submodule.yml +++ b/.github/workflows/ci-submodule.yml @@ -63,6 +63,13 @@ jobs: - name: Add GCC problem matcher run: echo "::add-matcher::./.buildroot/phoenix-rtos-project/.github/problem-matchers/gcc.json" + # Issue caused by incompability between the amount of entropy bits in the specific linux kernel version (32) and ASAN (28) + # To be removed after updating Actions Runner Ubuntu image to the fixed version + # https://github.com/actions/runner-images/issues/9491 + # https://github.com/phoenix-rtos/phoenix-rtos-project/issues/1032 + - name: Decrease ASLR entropy due to temporary issue on gh-hosted runners + run: sudo sysctl vm.mmap_rnd_bits=28 + # step 3: use our custom action to build the project - name: Build id: build @@ -124,6 +131,13 @@ jobs: - name: Add sanitizers problem matcher run: echo "::add-matcher::.github/problem-matchers/sanitizer-errors.json" + # Issue caused by incompability between the amount of entropy bits in the specific linux kernel version (32) and ASAN (28) + # To be removed after updating Actions Runner Ubuntu image to the fixed version + # https://github.com/actions/runner-images/issues/9491 + # https://github.com/phoenix-rtos/phoenix-rtos-project/issues/1032 + - name: Decrease ASLR entropy due to temporary issue on gh-hosted runners + run: sudo sysctl vm.mmap_rnd_bits=28 + - name: Test runner id: runner uses: ./.github/actions/phoenix-runner From a2f1e41e993f03edf603c6b1a0624c7cbddb07af Mon Sep 17 00:00:00 2001 From: Mateusz Bloch Date: Wed, 13 Mar 2024 17:14:42 +0100 Subject: [PATCH 23/43] update submodule * libphoenix 0b40e3f...4a34bf6 (3): > arm/memcpy: optimize register usage > arch/arm: add optimized memcpy and memset implementation > arch/arm: reorganize common arm files * phoenix-rtos-devices 05c71f3...9a4b231 (4): > grlib drivers: remove per-cpu headers > grlib-multi: set device id values in create_dev > grlib-multi: add DMA support to UART driver > dma: add lib for GRDMAC2 controller * phoenix-rtos-kernel b412cbc...4593ac4 (3): > arm/memcpy: optimize register usage > arm: add optimized memcpy and memset implementations > include/posix-types.h: remove unnecessary include * phoenix-rtos-tests 609cb06...909cc0a (1): > requirements: add pyUSB --- libphoenix | 2 +- phoenix-rtos-devices | 2 +- phoenix-rtos-kernel | 2 +- phoenix-rtos-tests | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libphoenix b/libphoenix index 0b40e3fe..4a34bf63 160000 --- a/libphoenix +++ b/libphoenix @@ -1 +1 @@ -Subproject commit 0b40e3fe28ce2e831906abb39e51c3349f9d2b80 +Subproject commit 4a34bf6399afddf6bc52c095c88ce056b10dd824 diff --git a/phoenix-rtos-devices b/phoenix-rtos-devices index 05c71f3f..9a4b2318 160000 --- a/phoenix-rtos-devices +++ b/phoenix-rtos-devices @@ -1 +1 @@ -Subproject commit 05c71f3f71cde4a96d2013068a9fc718fa41477c +Subproject commit 9a4b231893715d93175c8685acc62d2c0992d679 diff --git a/phoenix-rtos-kernel b/phoenix-rtos-kernel index b412cbc9..4593ac4e 160000 --- a/phoenix-rtos-kernel +++ b/phoenix-rtos-kernel @@ -1 +1 @@ -Subproject commit b412cbc9a2cebdc3bcd6d95dbdb21b91272031ca +Subproject commit 4593ac4e348691f0b85d75f9abb8491692af12d6 diff --git a/phoenix-rtos-tests b/phoenix-rtos-tests index 609cb06d..909cc0ae 160000 --- a/phoenix-rtos-tests +++ b/phoenix-rtos-tests @@ -1 +1 @@ -Subproject commit 609cb06d3695db4d83d7aaf9713e313b46cdb878 +Subproject commit 909cc0aedad56813f63806e6cbb5bf7389e9d69a From 67d0bcfbea6cd85d518d15efa6771331503373ea Mon Sep 17 00:00:00 2001 From: Gerard Swiderski Date: Tue, 19 Mar 2024 18:10:04 +0100 Subject: [PATCH 24/43] Update submodules * phoenix-rtos-kernel 4593ac4...2339155 (1): > ia32/syspage: add ACPI MCFG table pointer * plo a26067c...901fdc2 (4): > ia32/pci: extend PCI bus function set > cmds: place commands in dedicated section > cmds: adjust return codes, add missing phfs_close > cmds: fix script command processing JIRA: RTOS-798 RTOS-800 --- phoenix-rtos-kernel | 2 +- plo | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phoenix-rtos-kernel b/phoenix-rtos-kernel index 4593ac4e..23391556 160000 --- a/phoenix-rtos-kernel +++ b/phoenix-rtos-kernel @@ -1 +1 @@ -Subproject commit 4593ac4e348691f0b85d75f9abb8491692af12d6 +Subproject commit 23391556becf0c14a05225bafce4e5d6cb600401 diff --git a/plo b/plo index a26067cf..901fdc2a 160000 --- a/plo +++ b/plo @@ -1 +1 @@ -Subproject commit a26067cf71ca5cbe51bb3ed3c85c070895946f5e +Subproject commit 901fdc2a7b932353be719bb23c3e43dee411641e From 7ddb2595873a6dded8434e89afb46add1fffb926 Mon Sep 17 00:00:00 2001 From: Mateusz Bloch Date: Wed, 20 Mar 2024 16:04:31 +0100 Subject: [PATCH 25/43] update submodule * phoenix-rtos-doc 78c1bc4...7a0b132 (9): > corelibs: libgraph & libswdg update > corelibs: update empty docs > hostutils: update empty docs > utils: update psd > psh: update psh-applets > psdisk: correct the images with output from terminal > kernel: replace images with transparency > quickstart: resize images > kernel: delete info about deprecated functions * phoenix-rtos-tests 909cc0a...ac5754d (2): > libc: unix-socket: separate test cases > libc: stat: enable fifo_type test case on stm32 --- phoenix-rtos-doc | 2 +- phoenix-rtos-tests | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phoenix-rtos-doc b/phoenix-rtos-doc index 78c1bc4c..7a0b1321 160000 --- a/phoenix-rtos-doc +++ b/phoenix-rtos-doc @@ -1 +1 @@ -Subproject commit 78c1bc4ca0c10b6388005455790828bf60c58683 +Subproject commit 7a0b1321357e6f996256caa7a0a8e6e2426f4ab9 diff --git a/phoenix-rtos-tests b/phoenix-rtos-tests index 909cc0ae..ac5754db 160000 --- a/phoenix-rtos-tests +++ b/phoenix-rtos-tests @@ -1 +1 @@ -Subproject commit 909cc0aedad56813f63806e6cbb5bf7389e9d69a +Subproject commit ac5754db3a481dbf591035d0f29c191aec9bd70d From 5f5eeda9d65e421422733419a4b85c4dd3b372fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Leczkowski?= Date: Fri, 15 Mar 2024 09:45:55 +0100 Subject: [PATCH 26/43] _user/serverdemo: adapt to msg api change JIRA: RTOS-792 --- _user/serverdemo/main.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/_user/serverdemo/main.c b/_user/serverdemo/main.c index 50d858a9..18ef6d4c 100644 --- a/_user/serverdemo/main.c +++ b/_user/serverdemo/main.c @@ -119,30 +119,28 @@ __attribute__((noreturn)) static void server_msgLoop(oid_t *oid) * sys/msg.h header. In this example we will handle * only selected types. */ case mtOpen: - msg.o.io.err = server_handleOpen(&msg.i.openclose.oid); + msg.o.err = server_handleOpen(&msg.oid); break; case mtClose: - msg.o.io.err = server_handleClose(&msg.i.openclose.oid); + msg.o.err = server_handleClose(&msg.oid); break; case mtRead: /* Buffer in msg.o.data is provided by the user and * was allocated in the server memory space by the kernel. */ - msg.o.io.err = server_handleRead(&msg.i.io.oid, - msg.o.data, msg.o.size, msg.i.io.offs); + msg.o.err = server_handleRead(&msg.oid, msg.o.data, msg.o.size, msg.i.io.offs); break; case mtWrite: /* Buffer in msg.i.data is provided by the user and * was allocated in the server memory space by the kernel. */ - msg.o.io.err = server_handleWrite(&msg.i.io.oid, - msg.i.data, msg.i.size, msg.i.io.offs); + msg.o.err = server_handleWrite(&msg.oid, msg.i.data, msg.i.size, msg.i.io.offs); break; default: /* All other types are not supported. */ - msg.o.io.err = -ENOSYS; + msg.o.err = -ENOSYS; break; } From 3bc411b39dbffad112256df708dffb15fe77d53f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Leczkowski?= Date: Thu, 21 Mar 2024 13:58:22 +0100 Subject: [PATCH 27/43] change msg API - `oid` is moved to common message part - `const` is added to input data pointer - `err` is moved to common `o` struct - `mtGetAttrAll` msg type is added - related changes in `*multi`, `*devctl`, `mount*` structs Submodule changes: * libphoenix 4a34bf6...4f278a7 (2): > !adapt to msg api changes > phoenix: add function to fill struct _attrs errors * phoenix-rtos-corelibs e660606...0a59a26 (1): > !libstorage: adapt to msg api change * phoenix-rtos-devices 9a4b231...ae37908 (2): > !adapt to msg api changes > imxrt-multi: increase stack size * phoenix-rtos-doc 7a0b132...d71efe6 (1): > kernel: add msg documentation * phoenix-rtos-filesystems fd34198...e16da86 (2): > !adapt to msg api changes > .gitignore: add .vscode to ignored files * phoenix-rtos-kernel 2339155...a3c9ac4 (1): > !change msg api * phoenix-rtos-lwip 4109940...e0b34d3 (3): > adapt to msg api changes > port/sockets.c: reformat code > .gitignore: add .vscode to ignored files * phoenix-rtos-posixsrv c544cb9...a89ca38 (1): > adapt to msg api change * phoenix-rtos-tests ac5754d...44c3d74 (1): > adapt to msg api changes * phoenix-rtos-usb 6da7630...cd8cb2a (1): > adapt to msg api change * phoenix-rtos-utils f86c971...ec2439d (1): > adapt to msg api change --- libphoenix | 2 +- phoenix-rtos-corelibs | 2 +- phoenix-rtos-devices | 2 +- phoenix-rtos-doc | 2 +- phoenix-rtos-filesystems | 2 +- phoenix-rtos-kernel | 2 +- phoenix-rtos-lwip | 2 +- phoenix-rtos-posixsrv | 2 +- phoenix-rtos-tests | 2 +- phoenix-rtos-usb | 2 +- phoenix-rtos-utils | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libphoenix b/libphoenix index 4a34bf63..4f278a74 160000 --- a/libphoenix +++ b/libphoenix @@ -1 +1 @@ -Subproject commit 4a34bf6399afddf6bc52c095c88ce056b10dd824 +Subproject commit 4f278a74d1eae50a8ceead3154b6d034ca5cfe05 diff --git a/phoenix-rtos-corelibs b/phoenix-rtos-corelibs index e6606065..0a59a263 160000 --- a/phoenix-rtos-corelibs +++ b/phoenix-rtos-corelibs @@ -1 +1 @@ -Subproject commit e660606536b9a13ff02acd7ad62d72235d283735 +Subproject commit 0a59a26342cddb6d6ae13c8ad7112bb3562c2734 diff --git a/phoenix-rtos-devices b/phoenix-rtos-devices index 9a4b2318..ae379087 160000 --- a/phoenix-rtos-devices +++ b/phoenix-rtos-devices @@ -1 +1 @@ -Subproject commit 9a4b231893715d93175c8685acc62d2c0992d679 +Subproject commit ae37908715678e3e419f32bb9e094d770fe043a2 diff --git a/phoenix-rtos-doc b/phoenix-rtos-doc index 7a0b1321..d71efe6d 160000 --- a/phoenix-rtos-doc +++ b/phoenix-rtos-doc @@ -1 +1 @@ -Subproject commit 7a0b1321357e6f996256caa7a0a8e6e2426f4ab9 +Subproject commit d71efe6dd7ae12a65b7245140dcacd71883d821b diff --git a/phoenix-rtos-filesystems b/phoenix-rtos-filesystems index fd341981..e16da862 160000 --- a/phoenix-rtos-filesystems +++ b/phoenix-rtos-filesystems @@ -1 +1 @@ -Subproject commit fd34198111962cf544d1ddb3254bbe7c9a352510 +Subproject commit e16da862ab6a7210d9c6ac79f4c028c15e0a37a3 diff --git a/phoenix-rtos-kernel b/phoenix-rtos-kernel index 23391556..a3c9ac41 160000 --- a/phoenix-rtos-kernel +++ b/phoenix-rtos-kernel @@ -1 +1 @@ -Subproject commit 23391556becf0c14a05225bafce4e5d6cb600401 +Subproject commit a3c9ac41b03b86d11f3a3ee04cc967a90261c5cd diff --git a/phoenix-rtos-lwip b/phoenix-rtos-lwip index 41099403..e0b34d3a 160000 --- a/phoenix-rtos-lwip +++ b/phoenix-rtos-lwip @@ -1 +1 @@ -Subproject commit 410994032ccea142357fe045efe78edd29d6c1e6 +Subproject commit e0b34d3a8f6b1c17ad1f1003d8432cde356bcd4b diff --git a/phoenix-rtos-posixsrv b/phoenix-rtos-posixsrv index c544cb95..a89ca38f 160000 --- a/phoenix-rtos-posixsrv +++ b/phoenix-rtos-posixsrv @@ -1 +1 @@ -Subproject commit c544cb95b7233ab10642148beb8f9aad6a57b8b5 +Subproject commit a89ca38f196051731680ab9c762692b843721a12 diff --git a/phoenix-rtos-tests b/phoenix-rtos-tests index ac5754db..44c3d741 160000 --- a/phoenix-rtos-tests +++ b/phoenix-rtos-tests @@ -1 +1 @@ -Subproject commit ac5754db3a481dbf591035d0f29c191aec9bd70d +Subproject commit 44c3d741fe096d7619ca01df24806d728d2b6214 diff --git a/phoenix-rtos-usb b/phoenix-rtos-usb index 6da7630a..cd8cb2a7 160000 --- a/phoenix-rtos-usb +++ b/phoenix-rtos-usb @@ -1 +1 @@ -Subproject commit 6da7630a0bfc43b542fadc9a7ce7944cadd3d882 +Subproject commit cd8cb2a7e25924647e2003011246c3e2f931ff8a diff --git a/phoenix-rtos-utils b/phoenix-rtos-utils index f86c9719..ec2439d5 160000 --- a/phoenix-rtos-utils +++ b/phoenix-rtos-utils @@ -1 +1 @@ -Subproject commit f86c9719beead05c4f6de4b9ea07d64438833be3 +Subproject commit ec2439d55da497e6bf376b7c577a83439ad20d6c From a987a488033551dbcc3b22a9e3adedaec022a8bd Mon Sep 17 00:00:00 2001 From: Aleksander Kaminski Date: Wed, 27 Mar 2024 18:31:03 +0100 Subject: [PATCH 28/43] Submodule update * libphoenix 4f278a7...5687309 (1): > Remove dead code * phoenix-rtos-devices ae37908...8c5aedd (3): > Add libtinyaes required by meterfs > !stm32l4-multi: Create iface special file using create_dev > fix warnings * phoenix-rtos-doc d71efe6...5c93577 (5): > building: add info about toolchain errors and warnings > quickstart: imx6ull: remove section about uploading system image to RAM > quickstart: unify convention of imx6ull related images > utils: correct a few headers > psdisk: correct the images with output from terminal * phoenix-rtos-kernel a3c9ac4...e403035 (2): > Comment or remove #if 0 > ia32: Remove dead code (multiboot) * phoenix-rtos-lwip e0b34d3...c52c569 (1): > fix warnings * phoenix-rtos-tests 44c3d74...d8f54fa (2): > host-flash/meterfs: Add libtinyaes > test-grlib-multi: fix warning * plo 901fdc2...90d34df (3): > hal/imxrt117x: enable FlexRAM initialization > hal/imxrt,stm32: include board config > ia32/acpi: add MCFG table handler --- libphoenix | 2 +- phoenix-rtos-devices | 2 +- phoenix-rtos-doc | 2 +- phoenix-rtos-kernel | 2 +- phoenix-rtos-lwip | 2 +- phoenix-rtos-tests | 2 +- plo | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libphoenix b/libphoenix index 4f278a74..56873099 160000 --- a/libphoenix +++ b/libphoenix @@ -1 +1 @@ -Subproject commit 4f278a74d1eae50a8ceead3154b6d034ca5cfe05 +Subproject commit 56873099f4fa75ed49b98f4e5a1b1d85209739a5 diff --git a/phoenix-rtos-devices b/phoenix-rtos-devices index ae379087..8c5aedde 160000 --- a/phoenix-rtos-devices +++ b/phoenix-rtos-devices @@ -1 +1 @@ -Subproject commit ae37908715678e3e419f32bb9e094d770fe043a2 +Subproject commit 8c5aedde747123adf3c5fc94dd4a61d4634b528f diff --git a/phoenix-rtos-doc b/phoenix-rtos-doc index d71efe6d..5c935770 160000 --- a/phoenix-rtos-doc +++ b/phoenix-rtos-doc @@ -1 +1 @@ -Subproject commit d71efe6dd7ae12a65b7245140dcacd71883d821b +Subproject commit 5c935770f6d64d57a112334d008c79cfaf84d732 diff --git a/phoenix-rtos-kernel b/phoenix-rtos-kernel index a3c9ac41..e4030356 160000 --- a/phoenix-rtos-kernel +++ b/phoenix-rtos-kernel @@ -1 +1 @@ -Subproject commit a3c9ac41b03b86d11f3a3ee04cc967a90261c5cd +Subproject commit e4030356222c8ed2d77ad67fafdb808dbcd4e957 diff --git a/phoenix-rtos-lwip b/phoenix-rtos-lwip index e0b34d3a..c52c5698 160000 --- a/phoenix-rtos-lwip +++ b/phoenix-rtos-lwip @@ -1 +1 @@ -Subproject commit e0b34d3a8f6b1c17ad1f1003d8432cde356bcd4b +Subproject commit c52c569803d9b77ae4fa7c92432f3182e9b6f5ef diff --git a/phoenix-rtos-tests b/phoenix-rtos-tests index 44c3d741..d8f54fa2 160000 --- a/phoenix-rtos-tests +++ b/phoenix-rtos-tests @@ -1 +1 @@ -Subproject commit 44c3d741fe096d7619ca01df24806d728d2b6214 +Subproject commit d8f54fa2d1bbf496c58d84a18a1e83cf036f7911 diff --git a/plo b/plo index 901fdc2a..90d34df1 160000 --- a/plo +++ b/plo @@ -1 +1 @@ -Subproject commit 901fdc2a7b932353be719bb23c3e43dee411641e +Subproject commit 90d34df105bb9e209495e5182fe5591047009ce4 From 7027e0cdce77d509c0813bd956f12982d1860377 Mon Sep 17 00:00:00 2001 From: Gerard Swiderski Date: Tue, 2 Apr 2024 10:10:36 +0200 Subject: [PATCH 29/43] Update submodules * phoenix-rtos-corelibs 0a59a26...a38e329 (1): > libtinyaes: fix header installation * phoenix-rtos-devices 8c5aedd...764c2ca (1): > imxrt-flash: remove redundant portRegister * phoenix-rtos-filesystems e16da86...2857a0f (2): > meterfs: Add file payload encryption option > meterfs: Refactor meterfs_checkfs() JIRA: RTOS-807 NIL-523 --- phoenix-rtos-corelibs | 2 +- phoenix-rtos-devices | 2 +- phoenix-rtos-filesystems | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phoenix-rtos-corelibs b/phoenix-rtos-corelibs index 0a59a263..a38e329d 160000 --- a/phoenix-rtos-corelibs +++ b/phoenix-rtos-corelibs @@ -1 +1 @@ -Subproject commit 0a59a26342cddb6d6ae13c8ad7112bb3562c2734 +Subproject commit a38e329dccfa1ed8567b76c5df1e03a39d16d51b diff --git a/phoenix-rtos-devices b/phoenix-rtos-devices index 8c5aedde..764c2ca1 160000 --- a/phoenix-rtos-devices +++ b/phoenix-rtos-devices @@ -1 +1 @@ -Subproject commit 8c5aedde747123adf3c5fc94dd4a61d4634b528f +Subproject commit 764c2ca10f7870e37758f0d48d299ff4bd354b04 diff --git a/phoenix-rtos-filesystems b/phoenix-rtos-filesystems index e16da862..2857a0fe 160000 --- a/phoenix-rtos-filesystems +++ b/phoenix-rtos-filesystems @@ -1 +1 @@ -Subproject commit e16da862ab6a7210d9c6ac79f4c028c15e0a37a3 +Subproject commit 2857a0fed78b650ce08d9d054ef33f962c7d629b From 469a76e99570d7aa9bfb75088a85dc0cce4b70e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrzej=20G=C5=82owi=C5=84ski?= Date: Fri, 29 Mar 2024 15:33:55 +0100 Subject: [PATCH 30/43] _projects: Adapt to PLO device selection * plo 90d34df...0ddf531 (3): > hal: Allow to set used PLO_DEVICES from outside > hal: Allow to pass PLO_COMMANDS from outside > make: Add comment about including hal first JIRA: DEND-366 --- _projects/armv7a7-imx6ull-evk/build.project | 2 +- _projects/riscv64-generic-qemu/build.project | 1 + _projects/riscv64-generic-spike/build.project | 1 + _projects/sparcv8leon3-gr716-mimas/build.project | 2 ++ _projects/sparcv8leon3-gr716-mini/build.project | 1 + plo | 2 +- 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/_projects/armv7a7-imx6ull-evk/build.project b/_projects/armv7a7-imx6ull-evk/build.project index 429a8381..b3d9e2b6 100644 --- a/_projects/armv7a7-imx6ull-evk/build.project +++ b/_projects/armv7a7-imx6ull-evk/build.project @@ -27,7 +27,7 @@ export PLO_NOR_BOOT=y # # PLO configuration # -export PLO_NOR=y +export PLO_DEVICES="flash-imx6ull uart-imx6ull usbc-cdc" # # Project specific build diff --git a/_projects/riscv64-generic-qemu/build.project b/_projects/riscv64-generic-qemu/build.project index aa3baf1e..c898c1be 100644 --- a/_projects/riscv64-generic-qemu/build.project +++ b/_projects/riscv64-generic-qemu/build.project @@ -8,6 +8,7 @@ [ "${BASH_SOURCE[0]}" -ef "$0" ] && echo "You should source this script, not execute it!" && exit 1 +export PLO_DEVICES="ram-storage uart-16550" b_image_project () { b_log "The images have been built for the ${TARGET} platform" diff --git a/_projects/riscv64-generic-spike/build.project b/_projects/riscv64-generic-spike/build.project index 386b9e2f..b9bae344 100644 --- a/_projects/riscv64-generic-spike/build.project +++ b/_projects/riscv64-generic-spike/build.project @@ -12,6 +12,7 @@ KERNEL_OFFS=$((0x1001000)) # Disk image kernel offset (in bytes) OFFS_USER_SCRIPT=$((0x1000000)) # Disk image user script offset (in bytes) +export PLO_DEVICES="ram-storage tty-spike" USER_SCRIPT=( "kernel ${BOOT_DEVICE}" diff --git a/_projects/sparcv8leon3-gr716-mimas/build.project b/_projects/sparcv8leon3-gr716-mimas/build.project index b6bad3f5..093ed972 100644 --- a/_projects/sparcv8leon3-gr716-mimas/build.project +++ b/_projects/sparcv8leon3-gr716-mimas/build.project @@ -10,6 +10,8 @@ BOOT_DEVICE="uart0" +export PLO_DEVICES="gpio-gr716 uart-grlib" + PREINIT_SCRIPT=( "map ocram 0x31000000 0x3101FFFF rwx" "map extram 0x40000000 0x401FFFFF rwx" diff --git a/_projects/sparcv8leon3-gr716-mini/build.project b/_projects/sparcv8leon3-gr716-mini/build.project index dc4d6dc3..394b756f 100644 --- a/_projects/sparcv8leon3-gr716-mini/build.project +++ b/_projects/sparcv8leon3-gr716-mini/build.project @@ -8,6 +8,7 @@ [ "${BASH_SOURCE[0]}" -ef "$0" ] && echo "You should source this script, not execute it!" && exit 1 +export PLO_DEVICES="gpio-gr716 uart-grlib flash-gr716" b_convert_project() { ./phoenix-rtos-build/scripts/gr716-convert.py "${PREFIX_PROG_STRIPPED}plo-${TARGET_FAMILY}-${TARGET_SUBFAMILY}.elf" -o "${PREFIX_PROG_STRIPPED}plo-${TARGET_FAMILY}-${TARGET_SUBFAMILY}.img" diff --git a/plo b/plo index 90d34df1..0ddf531c 160000 --- a/plo +++ b/plo @@ -1 +1 @@ -Subproject commit 90d34df105bb9e209495e5182fe5591047009ce4 +Subproject commit 0ddf531c4f57f14c4d95abcc33eb454e19856cbd From 47f270fa4bb890ef9a221d3d0d4ce2c08e2aa1f6 Mon Sep 17 00:00:00 2001 From: Gerard Swiderski Date: Wed, 3 Apr 2024 10:22:01 +0200 Subject: [PATCH 31/43] Update submodules * phoenix-rtos-devices 764c2ca...0b3e16e (1): > imxrt-flash: Add IS25LP256 NOR flash support * plo 0ddf531...0f9369b (1): > imxrt-flash: Add IS25LP256 NOR flash support JIRA: NIL-539 --- phoenix-rtos-devices | 2 +- plo | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phoenix-rtos-devices b/phoenix-rtos-devices index 764c2ca1..0b3e16ed 160000 --- a/phoenix-rtos-devices +++ b/phoenix-rtos-devices @@ -1 +1 @@ -Subproject commit 764c2ca10f7870e37758f0d48d299ff4bd354b04 +Subproject commit 0b3e16eddf20934e731a0f8982c88e9b83354479 diff --git a/plo b/plo index 0ddf531c..0f9369ba 160000 --- a/plo +++ b/plo @@ -1 +1 @@ -Subproject commit 0ddf531c4f57f14c4d95abcc33eb454e19856cbd +Subproject commit 0f9369ba6d9acb6158514947df21383dd6e71794 From cfbf4e955f7960a82ecfead54a00e87dbb1b56f0 Mon Sep 17 00:00:00 2001 From: Aleksander Kaminski Date: Fri, 5 Apr 2024 14:30:32 +0200 Subject: [PATCH 32/43] Submodule update * libphoenix 5687309...72389ef (1): > sys/mman: Set errno on mmap and munmap * phoenix-rtos-kernel e403035...79093ba (5): > vm, syscalls: Add user pointer checking > !syscalls: change mmap/munmap API to allow setting errno > process: return error on not existing codeMap > ia32: Increase KSTACK size > process: Fix potential races on kstack change (vfork) --- libphoenix | 2 +- phoenix-rtos-kernel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libphoenix b/libphoenix index 56873099..72389ef2 160000 --- a/libphoenix +++ b/libphoenix @@ -1 +1 @@ -Subproject commit 56873099f4fa75ed49b98f4e5a1b1d85209739a5 +Subproject commit 72389ef24d3d735d598d27508b3627e35ae326cf diff --git a/phoenix-rtos-kernel b/phoenix-rtos-kernel index e4030356..79093bae 160000 --- a/phoenix-rtos-kernel +++ b/phoenix-rtos-kernel @@ -1 +1 @@ -Subproject commit e4030356222c8ed2d77ad67fafdb808dbcd4e957 +Subproject commit 79093bae6bbfe7e9a5c64881d9a08bea9a708e09 From 9c059309e74840df54fa66b8a0d09e04864c77a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrzej=20G=C5=82owi=C5=84ski?= Date: Fri, 5 Apr 2024 14:56:22 +0200 Subject: [PATCH 33/43] _targets: Adapt to passing KERNEL_PHADDR on NOMMU * phoenix-rtos-build 77c4211...2aa1919 (4): > Introduce HAVE_MMU in target Makefile > target: pass address of NOMMU kernel from project > target: Fix assignments > add setup and test execution script (#182) JIRA: DEND-306 --- _targets/build.project.armv7m4-stm32l4x6 | 8 +++++++- _targets/build.project.armv7m7-imxrt105x | 9 +++++++-- _targets/build.project.armv7m7-imxrt106x | 8 +++++++- _targets/build.project.armv7m7-imxrt117x | 9 ++++++++- _targets/build.project.sparcv8leon3-gr716 | 9 ++++++++- phoenix-rtos-build | 2 +- 6 files changed, 38 insertions(+), 7 deletions(-) diff --git a/_targets/build.project.armv7m4-stm32l4x6 b/_targets/build.project.armv7m4-stm32l4x6 index f734ae47..c0bf5fa2 100644 --- a/_targets/build.project.armv7m4-stm32l4x6 +++ b/_targets/build.project.armv7m4-stm32l4x6 @@ -35,7 +35,6 @@ export PORTS_CURL=n # SIZE_PAGE=$((0x200)) PAGE_MASK=$((0xfffffe00)) -KERNEL_OFFS=$((0xd000)) # @@ -46,6 +45,13 @@ BOOT_DEVICE="flash0" NAME_USER_SCRIPT="user.plo" OFFS_USER_SCRIPT=$((0xc800)) MAGIC_USER_SCRIPT=$((0xdabaabad)) +KERNEL_OFFS=$((0xd000)) + + +# Physical kernel address +KERNEL_PHBASE=$((0x08000000)) # flash0 start address +KERNEL_PHOFFS=$KERNEL_OFFS +export KERNEL_PHADDR=$(printf "%08x" $(($KERNEL_PHBASE + KERNEL_PHOFFS))) # Pre-init script is launched before user script diff --git a/_targets/build.project.armv7m7-imxrt105x b/_targets/build.project.armv7m7-imxrt105x index d93506f5..77b9c74b 100644 --- a/_targets/build.project.armv7m7-imxrt105x +++ b/_targets/build.project.armv7m7-imxrt105x @@ -38,8 +38,6 @@ export PORTS_AZURE_SDK=n # SIZE_PAGE=$((0x200)) PAGE_MASK=$((0xfffffe00)) -KERNEL_OFFS=$((0x12000)) - # # Project specific build @@ -49,6 +47,13 @@ BOOT_DEVICE="flash0" NAME_USER_SCRIPT="user.plo" OFFS_USER_SCRIPT=$((0x11000)) MAGIC_USER_SCRIPT=$((0xdabaabad)) +KERNEL_OFFS=$((0x12000)) + + +# Physical kernel address +KERNEL_PHBASE=$((0x0)) # itcm start address +KERNEL_PHOFFS=$((0x0)) +export KERNEL_PHADDR=$(printf "%08x" $((KERNEL_PHBASE + KERNEL_PHOFFS))) # Pre-init script is launched before user script diff --git a/_targets/build.project.armv7m7-imxrt106x b/_targets/build.project.armv7m7-imxrt106x index 70b4effa..18a8109e 100644 --- a/_targets/build.project.armv7m7-imxrt106x +++ b/_targets/build.project.armv7m7-imxrt106x @@ -38,7 +38,6 @@ export PORTS_AZURE_SDK=n # SIZE_PAGE=$((0x200)) PAGE_MASK=$((0xfffffe00)) -KERNEL_OFFS=$((0x12000)) # @@ -49,6 +48,13 @@ BOOT_DEVICE="flash1" NAME_USER_SCRIPT="user.plo" OFFS_USER_SCRIPT=$((0x11000)) MAGIC_USER_SCRIPT=$((0xdabaabad)) +KERNEL_OFFS=$((0x12000)) + + +# Physical kernel address +KERNEL_PHBASE=$((0x0)) # itcm start address +KERNEL_PHOFFS=$((0x0)) +export KERNEL_PHADDR=$(printf "%08x" $((KERNEL_PHBASE + KERNEL_PHOFFS))) # Pre-init script is launched before user script diff --git a/_targets/build.project.armv7m7-imxrt117x b/_targets/build.project.armv7m7-imxrt117x index e983fd17..a7d55bf2 100644 --- a/_targets/build.project.armv7m7-imxrt117x +++ b/_targets/build.project.armv7m7-imxrt117x @@ -36,7 +36,6 @@ export PORTS_CURL=n # SIZE_PAGE=$((0x200)) PAGE_MASK=$((0xfffffe00)) -KERNEL_OFFS=$((0x12000)) # @@ -47,6 +46,14 @@ BOOT_DEVICE="flash0" NAME_USER_SCRIPT="user.plo" OFFS_USER_SCRIPT=$((0x11000)) MAGIC_USER_SCRIPT=$((0xdabaabad)) +KERNEL_OFFS=$((0x12000)) + + +# Physical kernel address +KERNEL_PHBASE=$((0x0)) # itcm start address +KERNEL_PHOFFS=$((0x0)) +export KERNEL_PHADDR=$(printf "%08x" $((KERNEL_PHBASE + KERNEL_PHOFFS))) + # Pre-init script is launched before user script PREINIT_SCRIPT=( diff --git a/_targets/build.project.sparcv8leon3-gr716 b/_targets/build.project.sparcv8leon3-gr716 index 88bba7bd..1e0a1c98 100644 --- a/_targets/build.project.sparcv8leon3-gr716 +++ b/_targets/build.project.sparcv8leon3-gr716 @@ -32,12 +32,19 @@ export PORTS_CURL=n # SIZE_PAGE=$((0x200)) PAGE_MASK=$((~(SIZE_PAGE - 1))) -KERNEL_OFFS=$((0xF000)) BOOT_DEVICE="flash0" # Default boot device NAME_USER_SCRIPT="user.plo" # User script name OFFS_USER_SCRIPT=$((0xE000)) MAGIC_USER_SCRIPT=$((0xdabaabad)) # User script magic value +KERNEL_OFFS=$((0xF000)) + + +# Physical kernel address +KERNEL_PHBASE=$((0x31000000)) # iram start address +KERNEL_PHOFFS=$((0x0)) +export KERNEL_PHADDR=$(printf "%08x" $((KERNEL_PHBASE + KERNEL_PHOFFS))) + PREINIT_SCRIPT=( "map dram 0x30000000 0x3000FFFF rw" diff --git a/phoenix-rtos-build b/phoenix-rtos-build index 77c42111..2aa1919c 160000 --- a/phoenix-rtos-build +++ b/phoenix-rtos-build @@ -1 +1 @@ -Subproject commit 77c421113471ec056d8a9c711d6f7ceaba813f8f +Subproject commit 2aa1919c60df3a150658c3a8c9c7951d2f99b791 From 399a1eb4a016233bac4b8fa3b652687c3ebd1fc8 Mon Sep 17 00:00:00 2001 From: Mateusz Bloch Date: Tue, 2 Apr 2024 13:48:47 +0200 Subject: [PATCH 34/43] revert: "ci: decrease aslr entropy on gh hosted runners" Commit reverted because these issues were resolved: https://github.com/actions/runner-images/issues/9491 https://github.com/phoenix-rtos/phoenix-rtos-project/issues/1032 This reverts commit 7357f91d58b8b9b49fb673367b96477d8b0946cc. --- .github/workflows/ci-project.yml | 14 -------------- .github/workflows/ci-submodule.yml | 14 -------------- 2 files changed, 28 deletions(-) diff --git a/.github/workflows/ci-project.yml b/.github/workflows/ci-project.yml index 66d7d69f..41054e8b 100644 --- a/.github/workflows/ci-project.yml +++ b/.github/workflows/ci-project.yml @@ -47,13 +47,6 @@ jobs: - name: Add GCC problem matcher run: echo "::add-matcher::.github/problem-matchers/gcc.json" - # Issue caused by incompability between the amount of entropy bits in the specific linux kernel version (32) and ASAN (28) - # To be removed after updating Actions Runner Ubuntu image to the fixed version - # https://github.com/actions/runner-images/issues/9491 - # https://github.com/phoenix-rtos/phoenix-rtos-project/issues/1032 - - name: Decrease ASLR entropy due to temporary issue on gh-hosted runners - run: sudo sysctl vm.mmap_rnd_bits=28 - # step 2: use our custom action to build the project - name: Build id: build @@ -107,13 +100,6 @@ jobs: - name: Add sanitizers problem matcher run: echo "::add-matcher::.github/problem-matchers/sanitizer-errors.json" - # Issue caused by incompability between the amount of entropy bits in the specific linux kernel version (32) and ASAN (28) - # To be removed after updating Actions Runner Ubuntu image to the fixed version - # https://github.com/actions/runner-images/issues/9491 - # https://github.com/phoenix-rtos/phoenix-rtos-project/issues/1032 - - name: Decrease ASLR entropy due to temporary issue on gh-hosted runners - run: sudo sysctl vm.mmap_rnd_bits=28 - - name: Test runner id: runner uses: ./.github/actions/phoenix-runner diff --git a/.github/workflows/ci-submodule.yml b/.github/workflows/ci-submodule.yml index 038cac8b..80227bc7 100644 --- a/.github/workflows/ci-submodule.yml +++ b/.github/workflows/ci-submodule.yml @@ -63,13 +63,6 @@ jobs: - name: Add GCC problem matcher run: echo "::add-matcher::./.buildroot/phoenix-rtos-project/.github/problem-matchers/gcc.json" - # Issue caused by incompability between the amount of entropy bits in the specific linux kernel version (32) and ASAN (28) - # To be removed after updating Actions Runner Ubuntu image to the fixed version - # https://github.com/actions/runner-images/issues/9491 - # https://github.com/phoenix-rtos/phoenix-rtos-project/issues/1032 - - name: Decrease ASLR entropy due to temporary issue on gh-hosted runners - run: sudo sysctl vm.mmap_rnd_bits=28 - # step 3: use our custom action to build the project - name: Build id: build @@ -131,13 +124,6 @@ jobs: - name: Add sanitizers problem matcher run: echo "::add-matcher::.github/problem-matchers/sanitizer-errors.json" - # Issue caused by incompability between the amount of entropy bits in the specific linux kernel version (32) and ASAN (28) - # To be removed after updating Actions Runner Ubuntu image to the fixed version - # https://github.com/actions/runner-images/issues/9491 - # https://github.com/phoenix-rtos/phoenix-rtos-project/issues/1032 - - name: Decrease ASLR entropy due to temporary issue on gh-hosted runners - run: sudo sysctl vm.mmap_rnd_bits=28 - - name: Test runner id: runner uses: ./.github/actions/phoenix-runner From 48568b2ef434c0e332c5170dcc6dc1a7d0da78be Mon Sep 17 00:00:00 2001 From: Aleksander Kaminski Date: Mon, 15 Apr 2024 10:08:19 +0200 Subject: [PATCH 35/43] Fix .gitignore JIRA: RTOS-820 --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4fd844ed..ac315f16 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -.gitignore _fs/* +!_fs/root-skel/ _build/* _boot/* .DS_Store From bdfd6964a06fcf36b48644b3fe35b4eda9fe2fc3 Mon Sep 17 00:00:00 2001 From: Aleksander Kaminski Date: Wed, 17 Apr 2024 14:53:13 +0200 Subject: [PATCH 36/43] Submodule update * phoenix-rtos-devices 0b3e16e...e224d74 (5): > tty/usbacm: Fix warning > imxrt-multi/uart: allow per instance UARTx_BUFSIZE > imxrt-multi/uart: add intermediate rxfifo (irq-thread) > imxrt-multi/uart: correct clk config and remove unused vars > imxrt/uart: fix config of default baudrate * phoenix-rtos-kernel 79093ba...2c209b7 (7): > vm: Add static to _page_alloc() > proc/longjmp: Do reschedule in inf loop > armv7m: Fix PSR when constructing signal ctx > Make longjmp arch independent > imxrt: Handle PENDSV comming from user space > stm32l4: Handle PENDSV comming from user space > stm32l4: Increase PENDSV priority * phoenix-rtos-tests d8f54fa...7099270 (1): > libtinyaes: adapt tests for execution in a test runner and CI * phoenix-rtos-usb cd8cb2a...1919ae8 (1): > Fix warning --- phoenix-rtos-devices | 2 +- phoenix-rtos-kernel | 2 +- phoenix-rtos-tests | 2 +- phoenix-rtos-usb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/phoenix-rtos-devices b/phoenix-rtos-devices index 0b3e16ed..e224d745 160000 --- a/phoenix-rtos-devices +++ b/phoenix-rtos-devices @@ -1 +1 @@ -Subproject commit 0b3e16eddf20934e731a0f8982c88e9b83354479 +Subproject commit e224d7457ebb3c8c4b8b4dc1799faf4859d02f2d diff --git a/phoenix-rtos-kernel b/phoenix-rtos-kernel index 79093bae..2c209b7c 160000 --- a/phoenix-rtos-kernel +++ b/phoenix-rtos-kernel @@ -1 +1 @@ -Subproject commit 79093bae6bbfe7e9a5c64881d9a08bea9a708e09 +Subproject commit 2c209b7cce4880c192bb158a37db471d74b0d6ec diff --git a/phoenix-rtos-tests b/phoenix-rtos-tests index d8f54fa2..70992707 160000 --- a/phoenix-rtos-tests +++ b/phoenix-rtos-tests @@ -1 +1 @@ -Subproject commit d8f54fa2d1bbf496c58d84a18a1e83cf036f7911 +Subproject commit 70992707f9acc2badccc2f84d4a712fa3128676f diff --git a/phoenix-rtos-usb b/phoenix-rtos-usb index cd8cb2a7..1919ae8d 160000 --- a/phoenix-rtos-usb +++ b/phoenix-rtos-usb @@ -1 +1 @@ -Subproject commit cd8cb2a7e25924647e2003011246c3e2f931ff8a +Subproject commit 1919ae8dbeb6331293fdb02cd214b624e1da34fa From b6314b542a13e178d6de77476f529e7a937643fc Mon Sep 17 00:00:00 2001 From: Daniel Sawka Date: Wed, 17 Apr 2024 13:09:24 +0200 Subject: [PATCH 37/43] _projects: Provide full mux config (+defaults) for imxrt eval kits JIRA: RTOS-771 --- .../armv7m7-imxrt105x-evk/board_config.h | 126 +++++++++++- .../armv7m7-imxrt106x-evk/board_config.h | 126 +++++++++++- .../armv7m7-imxrt117x-evk/board_config.h | 183 +++++++++++++++++- 3 files changed, 423 insertions(+), 12 deletions(-) diff --git a/_projects/armv7m7-imxrt105x-evk/board_config.h b/_projects/armv7m7-imxrt105x-evk/board_config.h index 4b27b0a7..81106217 100644 --- a/_projects/armv7m7-imxrt105x-evk/board_config.h +++ b/_projects/armv7m7-imxrt105x-evk/board_config.h @@ -3,8 +3,8 @@ * * Board config for armv7m7-imxrt105x-evk * - * Copyright 2022 Phoenix Systems - * Author: Lukasz Kosinski + * Copyright 2022, 2024 Phoenix Systems + * Author: Lukasz Kosinski, Daniel Sawka * * This file is part of Phoenix-RTOS. * @@ -24,8 +24,128 @@ */ #define PSEUDODEV 1 - /* #define BUILTIN_POSIXSRV 1 */ +/* Peripherals */ + + +#define UART_CONSOLE 1 + +/* UART */ + +#define UART1 1 +#define UART1_BAUDRATE 115200 +#define UART1_BUFSIZE 512 +#define UART1_TX_PIN ad_b0_12 +#define UART1_RX_PIN ad_b0_13 +#define UART1_HW_FLOWCTRL 0 +#define UART1_RTS_PIN ad_b0_15 +#define UART1_CTS_PIN ad_b0_14 + +/* +#define UART2 0 +#define UART2_BAUDRATE 115200 +#define UART2_BUFSIZE 512 +#define UART2_TX_PIN ad_b1_02 +#define UART2_RX_PIN ad_b1_03 +#define UART2_HW_FLOWCTRL 0 +#define UART2_RTS_PIN ad_b1_01 +#define UART2_CTS_PIN ad_b1_00 + +#define UART3 0 +#define UART3_BAUDRATE 115200 +#define UART3_BUFSIZE 512 +#define UART3_TX_PIN emc_13 +#define UART3_RX_PIN emc_14 +#define UART3_HW_FLOWCTRL 0 +#define UART3_RTS_PIN emc_16 +#define UART3_CTS_PIN emc_15 + +#define UART4 0 +#define UART4_BAUDRATE 115200 +#define UART4_BUFSIZE 512 +#define UART4_TX_PIN emc_19 +#define UART4_RX_PIN emc_20 +#define UART4_HW_FLOWCTRL 0 +#define UART4_RTS_PIN emc_18 +#define UART4_CTS_PIN emc_17 + +#define UART5 0 +#define UART5_BAUDRATE 115200 +#define UART5_BUFSIZE 512 +#define UART5_TX_PIN emc_23 +#define UART5_RX_PIN emc_24 +#define UART5_HW_FLOWCTRL 0 +#define UART5_RTS_PIN emc_27 +#define UART5_CTS_PIN emc_28 + +#define UART6 0 +#define UART6_BAUDRATE 115200 +#define UART6_BUFSIZE 512 +#define UART6_TX_PIN emc_25 +#define UART6_RX_PIN emc_26 +#define UART6_HW_FLOWCTRL 0 +#define UART6_RTS_PIN emc_29 +#define UART6_CTS_PIN emc_30 + +#define UART7 0 +#define UART7_BAUDRATE 115200 +#define UART7_BUFSIZE 512 +#define UART7_TX_PIN emc_31 +#define UART7_RX_PIN emc_32 +#define UART7_HW_FLOWCTRL 0 +#define UART7_RTS_PIN sd_b1_07 +#define UART7_CTS_PIN sd_b1_06 + +#define UART8 0 +#define UART8_BAUDRATE 115200 +#define UART8_BUFSIZE 512 +#define UART8_TX_PIN emc_38 +#define UART8_RX_PIN emc_39 +#define UART8_HW_FLOWCTRL 0 +#define UART8_RTS_PIN sd_b0_03 +#define UART8_CTS_PIN sd_b0_02 +*/ + +/* SPI */ + +/* +#define SPI1 0 +#define SPI1_SCK sd_b0_00 +#define SPI1_SDO sd_b0_02 +#define SPI1_SDI sd_b0_03 +#define SPI1_PCS0 sd_b0_01 +#define SPI1_PCS1 emc_31 +#define SPI1_PCS2 emc_40 +#define SPI1_PCS3 emc_41 + +#define SPI2 0 +#define SPI2_SCK sd_b1_07 +#define SPI2_SDO sd_b1_08 +#define SPI2_SDI sd_b1_09 +#define SPI2_PCS0 sd_b1_06 +#define SPI2_PCS1 emc_14 +#define SPI2_PCS2 sd_b1_10 +#define SPI2_PCS3 sd_b1_11 + +#define SPI3 0 +#define SPI3_SCK ad_b0_00 +#define SPI3_SDO ad_b0_01 +#define SPI3_SDI ad_b0_02 +#define SPI3_PCS0 ad_b0_03 +#define SPI3_PCS1 ad_b0_04 +#define SPI3_PCS2 ad_b0_05 +#define SPI3_PCS3 ad_b0_06 + +#define SPI4 0 +#define SPI4_SCK b0_03 +#define SPI4_SDO b0_02 +#define SPI4_SDI b0_01 +#define SPI4_PCS0 b0_00 +#define SPI4_PCS1 b1_03 +#define SPI4_PCS2 b1_02 +#define SPI4_PCS3 b1_11 +*/ + #endif diff --git a/_projects/armv7m7-imxrt106x-evk/board_config.h b/_projects/armv7m7-imxrt106x-evk/board_config.h index d39538e4..d4e8a138 100644 --- a/_projects/armv7m7-imxrt106x-evk/board_config.h +++ b/_projects/armv7m7-imxrt106x-evk/board_config.h @@ -3,8 +3,8 @@ * * Board config for armv7m7-imxrt106x-evk * - * Copyright 2022 Phoenix Systems - * Author: Lukasz Kosinski + * Copyright 2022, 2024 Phoenix Systems + * Author: Lukasz Kosinski, Daniel Sawka * * This file is part of Phoenix-RTOS. * @@ -22,8 +22,128 @@ */ /* #define PSEUDODEV 1 */ - #define BUILTIN_POSIXSRV 1 +/* Peripherals */ + + +#define UART_CONSOLE 1 + +/* UART */ + +#define UART1 1 +#define UART1_BAUDRATE 115200 +#define UART1_BUFSIZE 512 +#define UART1_TX_PIN ad_b0_12 +#define UART1_RX_PIN ad_b0_13 +#define UART1_HW_FLOWCTRL 0 +#define UART1_RTS_PIN ad_b0_15 +#define UART1_CTS_PIN ad_b0_14 + +/* +#define UART2 0 +#define UART2_BAUDRATE 115200 +#define UART2_BUFSIZE 512 +#define UART2_TX_PIN ad_b1_02 +#define UART2_RX_PIN ad_b1_03 +#define UART2_HW_FLOWCTRL 0 +#define UART2_RTS_PIN ad_b1_01 +#define UART2_CTS_PIN ad_b1_00 + +#define UART3 0 +#define UART3_BAUDRATE 115200 +#define UART3_BUFSIZE 512 +#define UART3_TX_PIN emc_13 +#define UART3_RX_PIN emc_14 +#define UART3_HW_FLOWCTRL 0 +#define UART3_RTS_PIN emc_16 +#define UART3_CTS_PIN emc_15 + +#define UART4 0 +#define UART4_BAUDRATE 115200 +#define UART4_BUFSIZE 512 +#define UART4_TX_PIN emc_19 +#define UART4_RX_PIN emc_20 +#define UART4_HW_FLOWCTRL 0 +#define UART4_RTS_PIN emc_18 +#define UART4_CTS_PIN emc_17 + +#define UART5 0 +#define UART5_BAUDRATE 115200 +#define UART5_BUFSIZE 512 +#define UART5_TX_PIN emc_23 +#define UART5_RX_PIN emc_24 +#define UART5_HW_FLOWCTRL 0 +#define UART5_RTS_PIN emc_27 +#define UART5_CTS_PIN emc_28 + +#define UART6 0 +#define UART6_BAUDRATE 115200 +#define UART6_BUFSIZE 512 +#define UART6_TX_PIN emc_25 +#define UART6_RX_PIN emc_26 +#define UART6_HW_FLOWCTRL 0 +#define UART6_RTS_PIN emc_29 +#define UART6_CTS_PIN emc_30 + +#define UART7 0 +#define UART7_BAUDRATE 115200 +#define UART7_BUFSIZE 512 +#define UART7_TX_PIN emc_31 +#define UART7_RX_PIN emc_32 +#define UART7_HW_FLOWCTRL 0 +#define UART7_RTS_PIN sd_b1_07 +#define UART7_CTS_PIN sd_b1_06 + +#define UART8 0 +#define UART8_BAUDRATE 115200 +#define UART8_BUFSIZE 512 +#define UART8_TX_PIN emc_38 +#define UART8_RX_PIN emc_39 +#define UART8_HW_FLOWCTRL 0 +#define UART8_RTS_PIN sd_b0_03 +#define UART8_CTS_PIN sd_b0_02 +*/ + +/* SPI */ + +/* +#define SPI1 0 +#define SPI1_SCK sd_b0_00 +#define SPI1_SDO sd_b0_02 +#define SPI1_SDI sd_b0_03 +#define SPI1_PCS0 sd_b0_01 +#define SPI1_PCS1 emc_31 +#define SPI1_PCS2 emc_40 +#define SPI1_PCS3 emc_41 + +#define SPI2 0 +#define SPI2_SCK sd_b1_07 +#define SPI2_SDO sd_b1_08 +#define SPI2_SDI sd_b1_09 +#define SPI2_PCS0 sd_b1_06 +#define SPI2_PCS1 emc_14 +#define SPI2_PCS2 sd_b1_10 +#define SPI2_PCS3 sd_b1_11 + +#define SPI3 0 +#define SPI3_SCK ad_b0_00 +#define SPI3_SDO ad_b0_01 +#define SPI3_SDI ad_b0_02 +#define SPI3_PCS0 ad_b0_03 +#define SPI3_PCS1 ad_b0_04 +#define SPI3_PCS2 ad_b0_05 +#define SPI3_PCS3 ad_b0_06 + +#define SPI4 0 +#define SPI4_SCK b0_03 +#define SPI4_SDO b0_02 +#define SPI4_SDI b0_01 +#define SPI4_PCS0 b0_00 +#define SPI4_PCS1 b1_03 +#define SPI4_PCS2 b1_02 +#define SPI4_PCS3 b1_11 +*/ + #endif diff --git a/_projects/armv7m7-imxrt117x-evk/board_config.h b/_projects/armv7m7-imxrt117x-evk/board_config.h index abf3303d..c883b23a 100644 --- a/_projects/armv7m7-imxrt117x-evk/board_config.h +++ b/_projects/armv7m7-imxrt117x-evk/board_config.h @@ -3,8 +3,8 @@ * * Board config for armv7m7-imxrt117x-evk * - * Copyright 2022 Phoenix Systems - * Author: Lukasz Kosinski + * Copyright 2022, 2024 Phoenix Systems + * Author: Lukasz Kosinski, Daniel Sawka * * This file is part of Phoenix-RTOS. * @@ -15,9 +15,6 @@ #define _BOARD_CONFIG_H_ -#define UART1 1 -#define UART_CONSOLE 1 - /* * libpseudodev and libposixsrv shall be used exclusively, libpseudodev uses * less resources, but libposixsrv provides POSIX support and may be resource @@ -25,8 +22,182 @@ */ /* #define PSEUDODEV 1 */ - #define BUILTIN_POSIXSRV 1 +/* Peripherals */ + + +#define UART_CONSOLE 1 + +/* UART */ + +#define UART1 1 +#define UART1_BAUDRATE 115200 +#define UART1_BUFSIZE 512 +#define UART1_TX_PIN ad_24 +#define UART1_RX_PIN ad_25 +#define UART1_HW_FLOWCTRL 0 +#define UART1_RTS_PIN ad_27 +#define UART1_CTS_PIN ad_26 + +/* +#define UART2 0 +#define UART2_BAUDRATE 115200 +#define UART2_BUFSIZE 512 +#define UART2_TX_PIN disp_b2_10 +#define UART2_RX_PIN disp_b2_11 +#define UART2_HW_FLOWCTRL 0 +#define UART2_RTS_PIN disp_b2_13 +#define UART2_CTS_PIN disp_b2_12 + +#define UART3 0 +#define UART3_BAUDRATE 115200 +#define UART3_BUFSIZE 512 +#define UART3_TX_PIN ad_30 +#define UART3_RX_PIN ad_31 +#define UART3_HW_FLOWCTRL 0 +#define UART3_RTS_PIN sd_b2_08 +#define UART3_CTS_PIN sd_b2_07 + +#define UART4 0 +#define UART4_BAUDRATE 115200 +#define UART4_BUFSIZE 512 +#define UART4_TX_PIN disp_b1_06 +#define UART4_RX_PIN disp_b1_04 +#define UART4_HW_FLOWCTRL 0 +#define UART4_RTS_PIN disp_b1_07 +#define UART4_CTS_PIN disp_b1_05 + +#define UART5 0 +#define UART5_BAUDRATE 115200 +#define UART5_BUFSIZE 512 +#define UART5_TX_PIN ad_28 +#define UART5_RX_PIN ad_29 +#define UART5_HW_FLOWCTRL 0 +#define UART5_RTS_PIN sd_b2_10 +#define UART5_CTS_PIN sd_b2_09 + +#define UART6 0 +#define UART6_BAUDRATE 115200 +#define UART6_BUFSIZE 512 +#define UART6_TX_PIN emc_b1_40 +#define UART6_RX_PIN emc_b1_41 +#define UART6_HW_FLOWCTRL 0 +#define UART6_RTS_PIN emc_b2_01 +#define UART6_CTS_PIN emc_b2_00 + +#define UART7 0 +#define UART7_BAUDRATE 115200 +#define UART7_BUFSIZE 512 +#define UART7_TX_PIN disp_b2_06 +#define UART7_RX_PIN disp_b2_07 +#define UART7_HW_FLOWCTRL 0 +#define UART7_RTS_PIN ad_03 +#define UART7_CTS_PIN ad_02 + +#define UART8 0 +#define UART8_BAUDRATE 115200 +#define UART8_BUFSIZE 512 +#define UART8_TX_PIN disp_b2_08 +#define UART8_RX_PIN disp_b2_09 +#define UART8_HW_FLOWCTRL 0 +#define UART8_RTS_PIN ad_05 +#define UART8_CTS_PIN ad_04 + +#define UART9 0 +#define UART9_BAUDRATE 115200 +#define UART9_BUFSIZE 512 +#define UART9_TX_PIN sd_b2_00 +#define UART9_RX_PIN sd_b2_01 +#define UART9_HW_FLOWCTRL 0 +#define UART9_RTS_PIN sd_b2_03 +#define UART9_CTS_PIN sd_b2_02 + +#define UART10 0 +#define UART10_BAUDRATE 115200 +#define UART10_BUFSIZE 512 +#define UART10_TX_PIN ad_15 +#define UART10_RX_PIN ad_16 +#define UART10_HW_FLOWCTRL 0 +#define UART10_RTS_PIN ad_35 +#define UART10_CTS_PIN ad_34 + +#define UART11 0 +#define UART11_BAUDRATE 115200 +#define UART11_BUFSIZE 512 +#define UART11_TX_PIN lpsr_08 +#define UART11_RX_PIN lpsr_09 +#define UART11_HW_FLOWCTRL 0 +#define UART11_RTS_PIN lpsr_11 +#define UART11_CTS_PIN lpsr_10 + +#define UART12 0 +#define UART12_BAUDRATE 115200 +#define UART12_BUFSIZE 512 +#define UART12_TX_PIN lpsr_00 +#define UART12_RX_PIN lpsr_01 +#define UART12_HW_FLOWCTRL 0 +#define UART12_RTS_PIN lpsr_04 +#define UART12_CTS_PIN lpsr_05 +*/ + +/* SPI */ + +/* +#define SPI1 0 +#define SPI1_SCK ad_28 +#define SPI1_SDO ad_30 +#define SPI1_SDI ad_31 +#define SPI1_PCS0 ad_29 +#define SPI1_PCS1 ad_18 +#define SPI1_PCS2 ad_19 +#define SPI1_PCS3 ad_20 + +#define SPI2 0 +#define SPI2_SCK sd_b2_07 +#define SPI2_SDO sd_b2_09 +#define SPI2_SDI sd_b2_10 +#define SPI2_PCS0 sd_b2_08 +#define SPI2_PCS1 sd_b2_11 +#define SPI2_PCS2 ad_22 +#define SPI2_PCS3 ad_23 + +#define SPI3 0 +#define SPI3_SCK disp_b1_04 +#define SPI3_SDO disp_b1_06 +#define SPI3_SDI disp_b1_05 +#define SPI3_PCS0 disp_b1_07 +#define SPI3_PCS1 disp_b1_08 +#define SPI3_PCS2 disp_b1_09 +#define SPI3_PCS3 disp_b1_10 + +#define SPI4 0 +#define SPI4_SCK disp_b2_12 +#define SPI4_SDO disp_b2_14 +#define SPI4_SDI disp_b2_13 +#define SPI4_PCS0 disp_b2_15 +#define SPI4_PCS1 sd_b2_04 +#define SPI4_PCS2 sd_b2_05 +#define SPI4_PCS3 sd_b2_06 + +#define SPI5 0 +#define SPI5_SCK lpsr_02 +#define SPI5_SDO lpsr_04 +#define SPI5_SDI lpsr_05 +#define SPI5_PCS0 lpsr_03 +#define SPI5_PCS1 lpsr_06 +#define SPI5_PCS2 lpsr_07 +#define SPI5_PCS3 lpsr_08 + +#define SPI6 0 +#define SPI6_SCK lpsr_10 +#define SPI6_SDO lpsr_11 +#define SPI6_SDI lpsr_12 +#define SPI6_PCS0 lpsr_09 +#define SPI6_PCS1 lpsr_08 +#define SPI6_PCS2 lpsr_07 +#define SPI6_PCS3 lpsr_06 +*/ + #endif From b3ee001200740d63dff754ff760bec011386c39f Mon Sep 17 00:00:00 2001 From: adamdebek Date: Wed, 17 Apr 2024 17:20:20 +0200 Subject: [PATCH 38/43] Submodule update * phoenix-rtos-tests 7099270...e6efa70 (4): > unity tests: return non zero exit code when test failed > busybox: enable tests on armv7a7-imx6ull > libuuid: enable tests on armv7m7 targets > trunner: adjust imx6ull soft reset time --- phoenix-rtos-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-rtos-tests b/phoenix-rtos-tests index 70992707..e6efa706 160000 --- a/phoenix-rtos-tests +++ b/phoenix-rtos-tests @@ -1 +1 @@ -Subproject commit 70992707f9acc2badccc2f84d4a712fa3128676f +Subproject commit e6efa706d76ddb55e23fa409717247123e4b7729 From 57f22eeebf0ac1d3c1572d47a082cd990b36a0f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Bia=C5=82ow=C4=85s?= Date: Tue, 23 Apr 2024 18:42:47 +0200 Subject: [PATCH 39/43] update submodules * phoenix-rtos-devices e224d74...3b4a2ab (8): > imxrt-multi/spi: reformat > imxrt-multi/spi: fix invalid mux initialization > stm32l4-multi: Add configuration of interface thread number > imxrt-multi: Create and handle UART9-12 devices only on valid targets > !imxrt-multi: Prepare for removal of default pin/mux definitions > imxrt-multi: Hierarchize config includes, clean up all includes > uart16550: place irq handler in .interrupt section on riscv64 > stm32l4-multi/uart: Set txend before setting txbeg for safety * phoenix-rtos-kernel 2c209b7...f7a3bf0 (5): > Bump version to 3.2.0 > hal/armv7m: Fix invalid memory accesses. > hal/armv7m: MISRA > armv8m: Apply changes regarding arch independent longjmp > Revert "proc/longjmp: Do reschedule in inf loop" * phoenix-rtos-tests e6efa70...d6bcaf7 (1): > trunner: change style of printing flash output * plo 0f9369b...f708624 (4): > hal/armv7m: Fix invalid memory accesses. > hal/armv7m: MISRA > cmds/call: stop script processing on '\0' > syspage_entryAdd: fix map size check --- phoenix-rtos-devices | 2 +- phoenix-rtos-kernel | 2 +- phoenix-rtos-tests | 2 +- plo | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/phoenix-rtos-devices b/phoenix-rtos-devices index e224d745..3b4a2ab9 160000 --- a/phoenix-rtos-devices +++ b/phoenix-rtos-devices @@ -1 +1 @@ -Subproject commit e224d7457ebb3c8c4b8b4dc1799faf4859d02f2d +Subproject commit 3b4a2ab91f16f739b9569ddc8d50349c7c57c21e diff --git a/phoenix-rtos-kernel b/phoenix-rtos-kernel index 2c209b7c..f7a3bf02 160000 --- a/phoenix-rtos-kernel +++ b/phoenix-rtos-kernel @@ -1 +1 @@ -Subproject commit 2c209b7cce4880c192bb158a37db471d74b0d6ec +Subproject commit f7a3bf029b5a23d6367a5f0c40c416d4ac833b13 diff --git a/phoenix-rtos-tests b/phoenix-rtos-tests index e6efa706..d6bcaf79 160000 --- a/phoenix-rtos-tests +++ b/phoenix-rtos-tests @@ -1 +1 @@ -Subproject commit e6efa706d76ddb55e23fa409717247123e4b7729 +Subproject commit d6bcaf7914f0b67befaf204683c097d823d855cb diff --git a/plo b/plo index 0f9369ba..f7086240 160000 --- a/plo +++ b/plo @@ -1 +1 @@ -Subproject commit 0f9369ba6d9acb6158514947df21383dd6e71794 +Subproject commit f7086240f038fd78b697057d27d0b06a49ffb537 From 04ff920347b528319d291575401e4ae7ea4c743e Mon Sep 17 00:00:00 2001 From: Daniel Sawka Date: Tue, 23 Apr 2024 23:45:16 +0200 Subject: [PATCH 40/43] Update pull request template (add "chore" type) --- .github/PULL_REQUEST_TEMPLATE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 7e8df491..e80afd5e 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -12,6 +12,7 @@ - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) +- [ ] Chore (refactoring, style fixes, git/CI config, submodule management, no code logic changes) From 81be3f0d25d19179f7c9b1bbb2a3f47e27a81614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Bia=C5=82ow=C4=85s?= Date: Thu, 25 Apr 2024 17:38:12 +0200 Subject: [PATCH 41/43] ci: run full campaign for every commit on release branch JIRA: CI-453 --- .github/workflows/ci-release.yml | 20 ++++++++++++++++++++ .github/workflows/ci.yml | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/ci-release.yml diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml new file mode 100644 index 00000000..c8fbb6be --- /dev/null +++ b/.github/workflows/ci-release.yml @@ -0,0 +1,20 @@ +# vim:sw=2:ts=2 +name: ci-release +# every commit/PR on release branch should pass FULL CI check + +on: + push: + branches: + - 'release/*' + pull_request: + branches: + - 'release/*' + +#TODO: this uses `latest` docker image instead of the release one +jobs: + call-ci: + uses: ./.github/workflows/ci-project.yml + with: + build_params: all tests + nightly: true + secrets: inherit diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index af5d919b..094c909c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,5 +13,5 @@ on: jobs: call-ci: - uses: phoenix-rtos/phoenix-rtos-project/.github/workflows/ci-project.yml@master + uses: ./.github/workflows/ci-project.yml secrets: inherit From 146f0244a99f8b351e013374395344e23795d195 Mon Sep 17 00:00:00 2001 From: KArkadiusz Date: Fri, 26 Apr 2024 14:40:16 +0200 Subject: [PATCH 42/43] scripts: add cpu_reset flag to ia32-generic-qemu-test.sh JIRA: CI-450 --- scripts/ia32-generic-qemu-test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/ia32-generic-qemu-test.sh b/scripts/ia32-generic-qemu-test.sh index 7375ebf2..2fa46ecb 100755 --- a/scripts/ia32-generic-qemu-test.sh +++ b/scripts/ia32-generic-qemu-test.sh @@ -11,4 +11,5 @@ exec qemu-system-i386 \ -drive "file=$(dirname "${BASH_SOURCE[0]}")/../_boot/ia32-generic-qemu/phoenix.disk,format=raw,media=disk,index=0" \ -nographic \ -monitor none \ - -netdev user,id=net0 -device rtl8139,netdev=net0 "$@" + -netdev user,id=net0 -device rtl8139,netdev=net0 "$@" \ + -d cpu_reset From 95f723f0e80ae938f1e4a1498c499eb2b896e64b Mon Sep 17 00:00:00 2001 From: Maska989 Date: Fri, 2 Feb 2024 09:03:27 +0100 Subject: [PATCH 43/43] armv7a9-qemu: Adjust serial device JIRA: CI-397 --- scripts/armv7a9-zynq7000-qemu-test.sh | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100755 scripts/armv7a9-zynq7000-qemu-test.sh diff --git a/scripts/armv7a9-zynq7000-qemu-test.sh b/scripts/armv7a9-zynq7000-qemu-test.sh new file mode 100755 index 00000000..e8f1f920 --- /dev/null +++ b/scripts/armv7a9-zynq7000-qemu-test.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# +# Shell script for running phoenix-rtos loader on Qemu fork from Xilinx (zynq-7000) +# +# Copyright 2021 Phoenix Systems +# Author: Hubert Buczynski, Damian Modzelewski +# + +IMG_PLO_ZYNQ7000="$(dirname "${BASH_SOURCE[0]}")/../_boot/armv7a9-zynq7000-qemu/plo.img" +IMG_FLASH_QEMU="$(dirname "${BASH_SOURCE[0]}")/../_boot/armv7a9-zynq7000-qemu/phoenix.disk" +DTB_ZYNQ7000="$(dirname "${BASH_SOURCE[0]}")/../scripts/zynq7000-zc702.dtb" + +for FILE in "$IMG_PLO_ZYNQ7000" "$IMG_FLASH_QEMU" "$DTB_ZYNQ7000"; do + if [ ! -f "$FILE" ]; then + echo "Missing required file: $FILE" + exit 1 + fi +done + +exec qemu-system-aarch64 \ + -M arm-generic-fdt-7series \ + -dtb "$DTB_ZYNQ7000" \ + -serial null \ + -serial stdio \ + -device loader,file="$IMG_PLO_ZYNQ7000" \ + -drive file="$IMG_FLASH_QEMU",if=mtd,format=raw,index=0