Skip to content

xtensa: sample_controller32: for Xtensa MPU support #748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 27, 2024
Merged

xtensa: sample_controller32: for Xtensa MPU support #748

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18a3308
xtensa: sample_controller32: for Xtensa MPU support
dcpleung Dec 15, 2023
f8efab1
ci: Disable xtensa-sample_controller32 testing
stephanosio Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ on:
- xtensa-nxp_rt500_adsp_zephyr-elf
- xtensa-nxp_rt600_adsp_zephyr-elf
- xtensa-sample_controller_zephyr-elf
- xtensa-sample_controller32_zephyr-elf
debug:
description: 'Debug'
type: choice
Expand Down Expand Up @@ -180,6 +181,7 @@ jobs:
xtensa-nxp_rt500_adsp_zephyr-elf) build_target_xtensa_nxp_rt500_adsp_zephyr_elf="y";;
xtensa-nxp_rt600_adsp_zephyr-elf) build_target_xtensa_nxp_rt600_adsp_zephyr_elf="y";;
xtensa-sample_controller_zephyr-elf) build_target_xtensa_sample_controller_zephyr_elf="y";;
xtensa-sample_controller32_zephyr-elf) build_target_xtensa_sample_controller32_zephyr_elf="y";;
esac

MATRIX_DEBUG="${{ github.event.inputs.debug }}"
Expand Down Expand Up @@ -222,6 +224,7 @@ jobs:
build_target_xtensa_nxp_rt500_adsp_zephyr_elf="y"
build_target_xtensa_nxp_rt600_adsp_zephyr_elf="y"
build_target_xtensa_sample_controller_zephyr_elf="y"
build_target_xtensa_sample_controller32_zephyr_elf="y"
fi

# Build 'linux_x86_64' by default if no host is selected
Expand Down Expand Up @@ -304,6 +307,7 @@ jobs:
[ "${build_target_xtensa_nxp_rt500_adsp_zephyr_elf}" == "y" ] && MATRIX_TARGETS+='"xtensa-nxp_rt500_adsp_zephyr-elf",'
[ "${build_target_xtensa_nxp_rt600_adsp_zephyr_elf}" == "y" ] && MATRIX_TARGETS+='"xtensa-nxp_rt600_adsp_zephyr-elf",'
[ "${build_target_xtensa_sample_controller_zephyr_elf}" == "y" ] && MATRIX_TARGETS+='"xtensa-sample_controller_zephyr-elf",'
[ "${build_target_xtensa_sample_controller32_zephyr_elf}" == "y" ] && MATRIX_TARGETS+='"xtensa-sample_controller32_zephyr-elf",'
MATRIX_TARGETS+=']'

# Generate test environment list
Expand Down Expand Up @@ -1582,6 +1586,9 @@ jobs:
xtensa-sample_controller_zephyr-elf)
PLATFORM_ARGS+="-p qemu_xtensa "
;;
xtensa-sample_controller32_zephyr-elf)
PLATFORM_ARGS+="-p qemu_xtensa/sample_controller32/mpu "
;;
Copy link
Member

@stephanosio stephanosio Sep 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be disabled until the board support is merged on the Zephyr side; otherwise, CI will fail.

Copy link
Member

@stephanosio stephanosio Sep 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

esac
done

Expand Down
9 changes: 9 additions & 0 deletions configs/xtensa-sample_controller32_zephyr-elf.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
CT_CONFIG_VERSION="3"
CT_EXPERIMENTAL=y
CT_OVERLAY_LOCATION="overlays"
CT_OVERLAY_NAME="sample_controller32"
CT_ARCH_XTENSA=y
CT_XTENSA_CUSTOM=y
CT_TARGET_VENDOR="sample_controller32_zephyr"
CT_TARGET_CFLAGS="-ftls-model=local-exec"
CT_CC_GCC_CONFIG_TLS=n
2 changes: 1 addition & 1 deletion meta-zephyr-sdk/recipes-devtools/qemu/zephyr-qemu_git.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f"

SRCREV = "2cc2e86de6e0e4316265d34e8e935afade8c422e"
SRCREV = "ffe03b7e85c17a3db65e53718b30393d2cf159ee"
SRC_URI = "git://github.com/zephyrproject-rtos/qemu.git;protocol=https;nobranch=1 \
https://github.com/zephyrproject-rtos/seabios/releases/download/zephyr-v1.0.0/bios-128k.bin;name=bios-128k \
https://github.com/zephyrproject-rtos/seabios/releases/download/zephyr-v1.0.0/bios-256k.bin;name=bios-256k \
Expand Down
Loading
Loading