diff --git a/.github/workflows/test-build-kontron-vx3060-s2.yml b/.github/workflows/test-build-kontron-vx3060-s2.yml index 29e4b588..a4547e69 100644 --- a/.github/workflows/test-build-kontron-vx3060-s2.yml +++ b/.github/workflows/test-build-kontron-vx3060-s2.yml @@ -22,24 +22,24 @@ jobs: shopt -s nullglob sudo sed -i \ - -e "s|https\?://azure\.archive\.ubuntu\.com/ubuntu/?|http://mirror.arizona.edu/ubuntu/|g" \ + -e "s|https\?://azure\.archive\.ubuntu\.com/ubuntu/?|https://mirror.arizona.edu/ubuntu/|g" \ /etc/apt/sources.list || true for f in /etc/apt/sources.list.d/*.list; do sudo sed -i \ - -e "s|https\?://azure\.archive\.ubuntu\.com/ubuntu/?|http://mirror.arizona.edu/ubuntu/|g" \ + -e "s|https\?://azure\.archive\.ubuntu\.com/ubuntu/?|https://mirror.arizona.edu/ubuntu/|g" \ "$f" done for f in /etc/apt/sources.list.d/*.sources; do sudo sed -i \ - -e "s|https\?://azure\.archive\.ubuntu\.com/ubuntu/?|http://mirror.arizona.edu/ubuntu/|g" \ - -e "s|https\?://azure\.archive\.ubuntu\.com|http://mirror.arizona.edu|g" \ + -e "s|https\?://azure\.archive\.ubuntu\.com/ubuntu/?|https://mirror.arizona.edu/ubuntu/|g" \ + -e "s|https\?://azure\.archive\.ubuntu\.com|https://mirror.arizona.edu|g" \ "$f" done if grep -qE '^[[:space:]]*https?://azure\.archive\.ubuntu\.com/ubuntu/?' /etc/apt/apt-mirrors.txt; then - sudo sed -i 's|https\?://azure\.archive\.ubuntu\.com/ubuntu/|http://mirror.arizona.edu/ubuntu/|g' /etc/apt/apt-mirrors.txt + sudo sed -i 's|https\?://azure\.archive\.ubuntu\.com/ubuntu/|https://mirror.arizona.edu/ubuntu/|g' /etc/apt/apt-mirrors.txt fi - name: install req run: | diff --git a/.github/workflows/test-x86-fsp-qemu.yml b/.github/workflows/test-x86-fsp-qemu.yml index bc4b00b6..8c95b53c 100644 --- a/.github/workflows/test-x86-fsp-qemu.yml +++ b/.github/workflows/test-x86-fsp-qemu.yml @@ -22,24 +22,24 @@ jobs: shopt -s nullglob sudo sed -i \ - -e "s|https\?://azure\.archive\.ubuntu\.com/ubuntu/?|http://mirror.arizona.edu/ubuntu/|g" \ + -e "s|https\?://azure\.archive\.ubuntu\.com/ubuntu/?|https://mirror.arizona.edu/ubuntu/|g" \ /etc/apt/sources.list || true for f in /etc/apt/sources.list.d/*.list; do sudo sed -i \ - -e "s|https\?://azure\.archive\.ubuntu\.com/ubuntu/?|http://mirror.arizona.edu/ubuntu/|g" \ + -e "s|https\?://azure\.archive\.ubuntu\.com/ubuntu/?|https://mirror.arizona.edu/ubuntu/|g" \ "$f" done for f in /etc/apt/sources.list.d/*.sources; do sudo sed -i \ - -e "s|https\?://azure\.archive\.ubuntu\.com/ubuntu/?|http://mirror.arizona.edu/ubuntu/|g" \ - -e "s|https\?://azure\.archive\.ubuntu\.com|http://mirror.arizona.edu|g" \ + -e "s|https\?://azure\.archive\.ubuntu\.com/ubuntu/?|https://mirror.arizona.edu/ubuntu/|g" \ + -e "s|https\?://azure\.archive\.ubuntu\.com|https://mirror.arizona.edu|g" \ "$f" done if grep -qE '^[[:space:]]*https?://azure\.archive\.ubuntu\.com/ubuntu/?' /etc/apt/apt-mirrors.txt; then - sudo sed -i 's|https\?://azure\.archive\.ubuntu\.com/ubuntu/|http://mirror.arizona.edu/ubuntu/|g' /etc/apt/apt-mirrors.txt + sudo sed -i 's|https\?://azure\.archive\.ubuntu\.com/ubuntu/|https://mirror.arizona.edu/ubuntu/|g' /etc/apt/apt-mirrors.txt fi - name: install req run: | diff --git a/hal/nrf52.c b/hal/nrf52.c index b606a41c..f88ff228 100644 --- a/hal/nrf52.c +++ b/hal/nrf52.c @@ -26,10 +26,12 @@ #include "nrf52.h" #ifdef DEBUG_UART +#define UARTE_ENABLE_ENABLE 8u + void uart_init(void) { UART0_BAUDRATE = BAUD_115200; - UART0_ENABLE = 4; + UART0_ENABLE = UARTE_ENABLE_ENABLE; } static volatile uint8_t uart_tx_buf; diff --git a/tools/renode/docker-test.sh b/tools/renode/docker-test.sh index c2e6d0d1..bdeddf42 100755 --- a/tools/renode/docker-test.sh +++ b/tools/renode/docker-test.sh @@ -4,7 +4,7 @@ declare -r HOST_TEST_RESULTS_PATH=${HOST_ROOT_DIR}/test_results declare -r HOST_LOG_PATH=${HOST_TEST_RESULTS_PATH} declare -r HOST_LOG_FILENAME=${HOST_LOG_PATH}/logs.txt -declare -r DOCKER_IMAGE="${DOCKER_IMAGE:-ghcr.io/wolfssl/wolfboot-ci-renode:latest}" +declare -r DOCKER_IMAGE="${DOCKER_IMAGE:-ghcr.io/wolfssl/wolfboot-ci-renode:v1.5}" declare -r DOCKER_WORKSPACE=/workspace declare -r DOCKER_TEST_RESULTS_PATH=/tmp/test_results @@ -20,7 +20,7 @@ if ! docker run \ --env SCRIPT=${DOCKER_WORKSPACE}/renode-config.resc \ --workdir ${DOCKER_WORKSPACE} \ ${DOCKER_IMAGE} \ - /bin/bash -c "tools/scripts/renode-test-update.sh $@ 2>&1 > ${DOCKER_TEST_RESULTS_PATH}/logs.txt" + /bin/bash -c 'tools/scripts/renode-test-update.sh "$@" > '"${DOCKER_TEST_RESULTS_PATH}"'/logs.txt 2>&1' -- "$@" then echo "FAILED" exit_code=1