The old bsp, glibc and musl machines are replaced with morello-soc and morello-fvp.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- conf/local.conf.sample | 3 +- conf/machine/include/morello-common.inc | 5 +- conf/machine/morello-bsp.conf | 9 --- conf/machine/morello-fvp.conf | 64 +++++++++++++++++++ conf/machine/morello-linux-musl.conf | 17 ----- ...ello-linux-glibc.conf => morello-soc.conf} | 15 +++-- conf/multiconfig/morello-firmware.conf | 1 - conf/multiconfig/morello-linux-glibc.conf | 1 - conf/multiconfig/morello-linux-musl.conf | 1 - 9 files changed, 75 insertions(+), 41 deletions(-) delete mode 100644 conf/machine/morello-bsp.conf create mode 100644 conf/machine/morello-fvp.conf delete mode 100644 conf/machine/morello-linux-musl.conf rename conf/machine/{morello-linux-glibc.conf => morello-soc.conf} (53%) delete mode 100644 conf/multiconfig/morello-firmware.conf delete mode 100644 conf/multiconfig/morello-linux-glibc.conf delete mode 100644 conf/multiconfig/morello-linux-musl.conf
diff --git a/conf/local.conf.sample b/conf/local.conf.sample index ef7bc7d..1752f41 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -1,5 +1,4 @@ -MACHINE ?= "morello-linux-glibc" -BBMULTICONFIG = "morello-firmware morello-linux-glibc" +MACHINE ?= "morello-fvp"
BB_NUMBER_THREADS ?= "${@oe.utils.cpu_count()}" PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}" diff --git a/conf/machine/include/morello-common.inc b/conf/machine/include/morello-common.inc index 84af134..2279c71 100644 --- a/conf/machine/include/morello-common.inc +++ b/conf/machine/include/morello-common.inc @@ -23,7 +23,4 @@ GLOBAL_ARCH_TRIPLE ?= "${C64_ARCH_TRIPLE}" GLOBAL_LIB_TRIPLE ?= "${C64_LIB_TRIPLE}" GLOBAL_ARCH_FLAGS ?= "${C64_ARCH_FLAGS}"
-TMPDIR_BSP = "tmp-bsp" -TMPDIR_LINUX = "tmp-linux" - -APP_DIR ?= "pure-cap-apps" +APP_DIR ?= "pure-cap-apps" \ No newline at end of file diff --git a/conf/machine/morello-bsp.conf b/conf/machine/morello-bsp.conf deleted file mode 100644 index 45b12fb..0000000 --- a/conf/machine/morello-bsp.conf +++ /dev/null @@ -1,9 +0,0 @@ -require conf/machine/include/morello-common.inc - -PREFERRED_VERSION_scp-firmware = "2.10%" -PREFERRED_VERSION_trusted-firmware-a = "2.7%" -PREFERRED_VERSION_board-firmware = "1.4" - -TMPDIR = "${TOPDIR}/${TMPDIR_BSP}" - -TCLIBCAPPEND = "" \ No newline at end of file diff --git a/conf/machine/morello-fvp.conf b/conf/machine/morello-fvp.conf new file mode 100644 index 0000000..94e9437 --- /dev/null +++ b/conf/machine/morello-fvp.conf @@ -0,0 +1,64 @@ +require conf/machine/include/morello-common.inc + +MACHINEOVERRIDES =. "morello-fvp:" + +PREFERRED_VERSION_scp-firmware = "2.10%" +PREFERRED_VERSION_trusted-firmware-a = "2.7%" +PREFERRED_VERSION_board-firmware = "1.4" + +TCLIBCAPPEND = "" + +BSP_GRUB_DIR ?= "${TMPDIR}/deploy/images/morello-fvp/grub-efi" +BSP_DTB_DIR ?= "${TMPDIR}/deploy/images/morello-fvp" + +TMPDIR = "${TOPDIR}/tmp-fvp" + +MUSL_INSTALL_DIR ?= "${libdir}/${GLOBAL_ARCH_TRIPLE}" + +IMAGE_BASENAME = "rootfs" +IMAGE_FSTYPES:append = " ext4" + +# The rootfs image that will go on a bootable drive +MORELLO_ROOTFS_IMAGE = "core-image-minimal" + +IMAGE_INSTALL:append = " linux-firmware-rtl8168" +IMAGE_INSTALL:append = " musl-libc busybox-morello pure-cap-app llvm-morello gdbserver gdb llvm-morello-staticdev" + +DISTRO ?= "poky" + +SERIAL_CONSOLES = "115200;ttyAMA0" + +# FVP Config +FVP_PROVIDER ?= "fvp-morello-native" +FVP_EXE ?= "FVP_Morello" + +# FVP Parameters +FVP_DATA += "Morello_Top.css.scp.armcortexm7ct=${DEPLOY_DIR_IMAGE}/rom-binaries/scp_romfw.bin@0x0" +FVP_DATA += "Morello_Top.css.mcp.armcortexm7ct=${DEPLOY_DIR_IMAGE}/rom-binaries/mcp_romfw.bin@0x0" + +FVP_CONFIG[css.trustedBootROMloader.fname] ?= "${DEPLOY_DIR_IMAGE}/rom-binaries/bl1.bin" + +FVP_CONFIG[Morello_Top.soc.scp_qspi_loader.fname] ?= "${DEPLOY_DIR_IMAGE}/scp_fw.bin" +FVP_CONFIG[Morello_Top.soc.mcp_qspi_loader.fname] ?= "${DEPLOY_DIR_IMAGE}/mcp_fw.bin" + +FVP_CONFIG[board.ap_qspi_loader.fname] ?= "${DEPLOY_DIR_IMAGE}/fip.bin" + +FVP_CONFIG[board.virtioblockdevice.image_path] ?= "${DEPLOY_DIR_IMAGE}/morello-linux-image-c64-glibc.img" + +FVP_CONFIG[board.virtio_net.hostbridge.userNetworking] ?= "1" +FVP_CONFIG[board.virtio_net.enabled] ?= "1" +FVP_CONFIG[board.virtio_net.transport] ?= "legacy" +FVP_CONFIG[board.virtio_net.hostbridge.userNetPorts] ?= "8022=22" + +FVP_CONFIG[css.scp.armcortexm7ct.INITVTOR] ?= "0x0" +FVP_CONFIG[css.mcp.armcortexm7ct.INITVTOR] ?= "0x0" + +FVP_CONFIG[css.pl011_uart_ap.unbuffered_output] ?= "1" +FVP_CONFIG[board.virtio_rng.enabled] ?= "1" +FVP_CONFIG[board.virtio_rng.seed] ?= "0" +FVP_CONFIG[num_clusters] ?= "2" +FVP_CONFIG[num_cores] ?= "2" + +FVP_CONFIG[disable_visualisation] ?= "true" + +FVP_TERMINALs[terminal_uart_ap] ?= "AP" \ No newline at end of file diff --git a/conf/machine/morello-linux-musl.conf b/conf/machine/morello-linux-musl.conf deleted file mode 100644 index f33e31b..0000000 --- a/conf/machine/morello-linux-musl.conf +++ /dev/null @@ -1,17 +0,0 @@ -require conf/machine/include/morello-common.inc - -MACHINEOVERRIDES =. "morello-linux-musl:" - -TARGET_OS ?= "linux-musl" - -PREFFERED_PROVIDER_morello-linux-image = "morello-linux-image-musl" -PREFFERED_PROVIDER_morello-initramfs = "morello-initramfs-musl" - -TCLIBC = "musl" - -BSP_GRUB_DIR ?= "${TOPDIR}/${TMPDIR_BSP}/deploy/images/morello-bsp/grub-efi" -BSP_DTB_DIR ?= "${TOPDIR}/${TMPDIR_BSP}/deploy/images/morello-bsp" - -TMPDIR = "${TOPDIR}/${TMPDIR_LINUX}" - -DISTRO = "" diff --git a/conf/machine/morello-linux-glibc.conf b/conf/machine/morello-soc.conf similarity index 53% rename from conf/machine/morello-linux-glibc.conf rename to conf/machine/morello-soc.conf index 3ffd19f..cc8e6de 100644 --- a/conf/machine/morello-linux-glibc.conf +++ b/conf/machine/morello-soc.conf @@ -1,14 +1,17 @@ require conf/machine/include/morello-common.inc
-MACHINEOVERRIDES =. "morello-linux-glibc:" +MACHINEOVERRIDES =. "morello-soc:"
-PREFFERED_PROVIDER_morello-linux-image = "morello-linux-image-glibc" -PREFFERED_PROVIDER_morello-initramfs = "morello-initramfs-glibc" +PREFERRED_VERSION_scp-firmware = "2.10%" +PREFERRED_VERSION_trusted-firmware-a = "2.7%" +PREFERRED_VERSION_board-firmware = "1.4"
-BSP_GRUB_DIR ?= "${TOPDIR}/${TMPDIR_BSP}/deploy/images/morello-bsp/grub-efi" -BSP_DTB_DIR ?= "${TOPDIR}/${TMPDIR_BSP}/deploy/images/morello-bsp" +TCLIBCAPPEND = ""
-TMPDIR = "${TOPDIR}/${TMPDIR_LINUX}" +BSP_GRUB_DIR ?= "${TMPDIR}/deploy/images/morello-soc/grub-efi" +BSP_DTB_DIR ?= "${TMPDIR}/deploy/images/morello-soc" + +TMPDIR = "${TOPDIR}/tmp-soc"
MUSL_INSTALL_DIR ?= "${libdir}/${GLOBAL_ARCH_TRIPLE}"
diff --git a/conf/multiconfig/morello-firmware.conf b/conf/multiconfig/morello-firmware.conf deleted file mode 100644 index 1473440..0000000 --- a/conf/multiconfig/morello-firmware.conf +++ /dev/null @@ -1 +0,0 @@ -MACHINE="morello-bsp" \ No newline at end of file diff --git a/conf/multiconfig/morello-linux-glibc.conf b/conf/multiconfig/morello-linux-glibc.conf deleted file mode 100644 index 9f9a8e8..0000000 --- a/conf/multiconfig/morello-linux-glibc.conf +++ /dev/null @@ -1 +0,0 @@ -MACHINE="morello-linux-glibc" \ No newline at end of file diff --git a/conf/multiconfig/morello-linux-musl.conf b/conf/multiconfig/morello-linux-musl.conf deleted file mode 100644 index f8660f3..0000000 --- a/conf/multiconfig/morello-linux-musl.conf +++ /dev/null @@ -1 +0,0 @@ -MACHINE="morello-linux-musl" \ No newline at end of file