Reduce the machines to soc/fvp and add the testing functionality (which is not yet tested).
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- kas/morello-fvp.yml | 29 ++++++++++++++++++++++++ kas/morello-linux-glibc.yml | 8 ------- kas/morello-linux-musl.yml | 8 ------- kas/{morello-bsp.yml => morello-soc.yml} | 4 ++-- 4 files changed, 31 insertions(+), 18 deletions(-) create mode 100644 kas/morello-fvp.yml delete mode 100644 kas/morello-linux-glibc.yml delete mode 100644 kas/morello-linux-musl.yml rename kas/{morello-bsp.yml => morello-soc.yml} (55%)
diff --git a/kas/morello-fvp.yml b/kas/morello-fvp.yml new file mode 100644 index 0000000..cdcc001 --- /dev/null +++ b/kas/morello-fvp.yml @@ -0,0 +1,29 @@ +header: + version: 11 + includes: + - base.yml +machine: morello-fvp + +local_conf_header: + testimage-config: | + + LICENSE_FLAGS_ACCEPTED:append = " Arm-FVP-EULA" + + TESTIMAGE_AUTO = "1" + + TEST_TARGET_IP ?= "127.0.0.1:8022" + TEST_SERVER_IP ?= "127.0.1.1" + + PACKAGECONFIG:remove:pn-openssh = "rng-tools" + CORE_IMAGE_EXTRA_INSTALL:append = " ssh-pregen-hostkeys" + IMAGE_FEATURES:append = " ssh-server-dropbear" + + IMAGE_CLASSES:append = " testimage" + INHERIT += "fvpboot" + + TEST_TARGET = "OEFVPSerialTarget" + TEST_SUITES = "linuxboot" + + FVP_CONSOLES[default] = "terminal_uart_ap" +target: + - morello-linux-image \ No newline at end of file diff --git a/kas/morello-linux-glibc.yml b/kas/morello-linux-glibc.yml deleted file mode 100644 index 485d2f2..0000000 --- a/kas/morello-linux-glibc.yml +++ /dev/null @@ -1,8 +0,0 @@ -header: - version: 11 - includes: - - base.yml -machine: morello-linux-glibc -target: - - multiconfig:morello-firmware:board-firmware-image - - multiconfig:morello-linux-glibc:morello-linux-image \ No newline at end of file diff --git a/kas/morello-linux-musl.yml b/kas/morello-linux-musl.yml deleted file mode 100644 index d4a31b4..0000000 --- a/kas/morello-linux-musl.yml +++ /dev/null @@ -1,8 +0,0 @@ -header: - version: 11 - includes: - - base.yml -machine: morello-linux-musl -target: - - multiconfig:morello-firmware:board-firmware-image - - multiconfig:morello-linux-musl:morello-linux-image \ No newline at end of file diff --git a/kas/morello-bsp.yml b/kas/morello-soc.yml similarity index 55% rename from kas/morello-bsp.yml rename to kas/morello-soc.yml index da5a612..b46f836 100644 --- a/kas/morello-bsp.yml +++ b/kas/morello-soc.yml @@ -2,6 +2,6 @@ header: version: 11 includes: - base.yml -machine: morello-bsp +machine: morello-soc target: - - board-firmware-image \ No newline at end of file + - morello-linux-image \ No newline at end of file