From bdd923406f11f1f4b97adb152e6cdb54c1019070 Mon Sep 17 00:00:00 2001 From: Stefan Kalkowski Date: Wed, 13 Jan 2021 10:15:10 +0100 Subject: [PATCH] base: remove SPEC variables of boards (fix #3971) * Remove SPEC declarations from mk/spec * Remove all board-specific REQUIRE declaratiions left * Replace [have_spec ] run-script declarations with have_board where necessary * Remove addition of BOARD variable to SPECS in toplevel Makefile * Move board-specific directories in base-hw out of specs --- repos/base-fiasco/etc/specs.conf | 2 +- .../{imx7.kernel => imx7d_sabre.kernel} | 0 .../config/{imx7.user => imx7d_sabre.user} | 0 repos/base-foc/etc/board.conf | 1 + repos/base-foc/etc/specs.conf | 4 -- .../base-foc/lib/import/import-syscall-foc.mk | 4 +- repos/base-foc/lib/mk/kernel-foc.inc | 11 ++- repos/base-foc/lib/mk/kernel-foc.mk | 3 + .../mk/spec/arm/kernel-foc-imx6q_sabrelite.mk | 4 ++ .../lib/mk/spec/arm/kernel-foc-imx7d_sabre.mk | 4 ++ .../lib/mk/spec/arm/kernel-foc-pbxa9.mk | 4 ++ .../lib/mk/spec/arm/kernel-foc-rpi.mk | 4 ++ .../spec/arm/syscall-foc-imx6q_sabrelite.mk | 4 ++ .../mk/spec/arm/syscall-foc-imx7d_sabre.mk | 4 ++ .../lib/mk/spec/arm/syscall-foc-pbxa9.mk | 4 ++ .../lib/mk/spec/arm/syscall-foc-rpi.mk | 4 ++ .../base-foc/lib/mk/spec/arm/syscall-foc.inc | 1 + .../lib/mk/spec/arm_64/kernel-foc-rpi3.mk | 4 ++ .../syscall-foc-rpi3.mk} | 6 +- .../lib/mk/spec/imx6q_sabrelite/kernel-foc.mk | 3 - .../mk/spec/imx6q_sabrelite/syscall-foc.mk | 5 -- .../lib/mk/spec/imx7d_sabre/kernel-foc.mk | 3 - .../lib/mk/spec/imx7d_sabre/syscall-foc.mk | 5 -- .../base-foc/lib/mk/spec/pbxa9/kernel-foc.mk | 3 - .../base-foc/lib/mk/spec/pbxa9/syscall-foc.mk | 5 -- repos/base-foc/lib/mk/spec/rpi/kernel-foc.mk | 3 - repos/base-foc/lib/mk/spec/rpi/syscall-foc.mk | 5 -- repos/base-foc/lib/mk/spec/rpi3/kernel-foc.mk | 3 - .../lib/mk/spec/x86_32/kernel-foc-pc.mk | 4 ++ .../base-foc/lib/mk/spec/x86_32/kernel-foc.mk | 3 - .../{syscall-foc.mk => syscall-foc-pc.mk} | 6 +- .../lib/mk/spec/x86_64/kernel-foc-pc.mk | 4 ++ .../base-foc/lib/mk/spec/x86_64/kernel-foc.mk | 3 - .../{syscall-foc.mk => syscall-foc-pc.mk} | 6 +- repos/base-foc/lib/mk/syscall-foc.inc | 4 +- repos/base-foc/lib/mk/syscall-foc.mk | 4 ++ .../base-foc/recipes/src/base-foc_content.inc | 16 ++--- repos/base-foc/src/core/foc/target.mk | 3 +- repos/base-foc/src/kernel/foc/target.mk | 5 +- repos/base-hw/etc/specs.conf | 19 +---- .../lib/mk/spec/arm_v6/bootstrap-hw-rpi.mk | 4 +- .../base-hw/lib/mk/spec/arm_v6/core-hw-rpi.mk | 2 +- .../mk/spec/arm_v7/bootstrap-hw-imx53_qsb.inc | 2 +- .../mk/spec/arm_v7/bootstrap-hw-imx53_qsb.mk | 2 +- .../spec/arm_v7/bootstrap-hw-imx53_qsb_tz.mk | 2 +- .../arm_v7/bootstrap-hw-imx6q_sabrelite.mk | 2 +- .../spec/arm_v7/bootstrap-hw-imx7d_sabre.mk | 4 +- .../mk/spec/arm_v7/bootstrap-hw-nit6_solox.mk | 2 +- .../lib/mk/spec/arm_v7/bootstrap-hw-pbxa9.mk | 4 +- .../mk/spec/arm_v7/bootstrap-hw-usb_armory.mk | 4 +- .../mk/spec/arm_v7/bootstrap-hw-virt_qemu.mk | 4 +- .../mk/spec/arm_v7/bootstrap-hw-wand_quad.mk | 2 +- .../mk/spec/arm_v7/bootstrap-hw-zynq_qemu.mk | 4 +- .../lib/mk/spec/arm_v7/core-hw-imx53_qsb.inc | 3 +- .../mk/spec/arm_v7/core-hw-imx53_qsb_tz.mk | 1 - .../mk/spec/arm_v7/core-hw-imx6q_sabrelite.mk | 2 +- .../lib/mk/spec/arm_v7/core-hw-imx7d_sabre.mk | 2 +- .../lib/mk/spec/arm_v7/core-hw-nit6_solox.mk | 2 +- .../lib/mk/spec/arm_v7/core-hw-pbxa9.mk | 2 +- .../lib/mk/spec/arm_v7/core-hw-usb_armory.mk | 4 +- .../lib/mk/spec/arm_v7/core-hw-virt_qemu.mk | 2 +- .../lib/mk/spec/arm_v7/core-hw-wand_quad.mk | 2 +- .../core-hw.inc => arm_v7/core-hw-zynq.inc} | 0 .../lib/mk/spec/arm_v7/core-hw-zynq_qemu.mk | 4 +- .../mk/spec/arm_v8/bootstrap-hw-imx8q_evk.mk | 4 +- .../lib/mk/spec/arm_v8/bootstrap-hw-rpi3.mk | 4 +- .../mk/spec/arm_v8/bootstrap-hw-virt_qemu.mk | 4 +- .../lib/mk/spec/arm_v8/core-hw-imx8q_evk.mk | 2 +- .../lib/mk/spec/arm_v8/core-hw-rpi3.mk | 2 +- .../lib/mk/spec/arm_v8/core-hw-virt_qemu.mk | 2 +- .../lib/mk/spec/x86_64/bootstrap-hw-muen.mk | 2 +- .../lib/mk/spec/x86_64/core-hw-muen.mk | 2 +- .../mk/spec/{muen => x86_64}/sinfo-muen.mk | 0 .../recipes/src/base-hw-imx53_qsb/content.mk | 4 -- .../src/base-hw-imx53_qsb_tz/content.mk | 4 -- .../src/base-hw-imx6q_sabrelite/content.mk | 4 -- .../src/base-hw-imx7d_sabre/content.mk | 4 -- .../recipes/src/base-hw-imx8q_evk/content.mk | 4 -- .../recipes/src/base-hw-muen/content.mk | 9 --- .../recipes/src/base-hw-nit6_solox/content.mk | 4 -- .../recipes/src/base-hw-pbxa9/content.mk | 4 -- .../recipes/src/base-hw-rpi/content.mk | 4 -- .../recipes/src/base-hw-rpi3/content.mk | 4 -- .../recipes/src/base-hw-virt_qemu/content.mk | 4 -- .../recipes/src/base-hw-zynq_qemu/content.mk | 4 -- .../{spec => board}/imx53_qsb/board.h | 0 .../{spec => board}/imx53_qsb/platform.cc | 0 .../imx53_qsb/platform_trustzone.cc | 0 .../{spec => board}/imx6q_sabrelite/board.h | 0 .../{spec => board}/imx7d_sabre/board.h | 0 .../{spec => board}/imx7d_sabre/platform.cc | 0 .../{spec => board}/imx8q_evk/board.h | 0 .../{spec => board}/imx8q_evk/platform.cc | 0 .../{spec => board}/nit6_solox/board.h | 0 .../bootstrap/{spec => board}/pbxa9/board.h | 0 .../{spec => board}/pbxa9/platform.cc | 0 .../src/bootstrap/{spec => board}/rpi/board.h | 0 .../bootstrap/{spec => board}/rpi/platform.cc | 0 .../bootstrap/{spec => board}/rpi3/board.h | 0 .../{spec => board}/rpi3/platform.cc | 0 .../{spec => board}/usb_armory/board.h | 0 .../{spec => board}/usb_armory/platform.cc | 0 .../{spec => board}/virt_qemu/board.h | 0 .../{spec => board}/virt_qemu/platform.cc | 0 .../{spec => board}/virt_qemu_64/board.h | 0 .../{spec => board}/virt_qemu_64/platform.cc | 0 .../{spec => board}/wand_quad/board.h | 0 .../{spec => board}/zynq_qemu/board.h | 0 .../zynq => board/zynq_qemu}/platform.cc | 0 .../core/{spec => board}/imx53_qsb/board.h | 0 .../{spec => board}/imx6q_sabrelite/board.h | 0 .../core/{spec => board}/imx7d_sabre/board.h | 0 .../core/{spec => board}/imx8q_evk/board.h | 0 .../core/{spec => board}/nit6_solox/board.h | 0 .../src/core/{spec => board}/pbxa9/board.h | 0 .../src/core/{spec => board}/rpi/board.h | 0 .../src/core/{spec => board}/rpi3/board.h | 0 .../core/{spec => board}/usb_armory/board.h | 0 .../core/{spec => board}/virt_qemu/board.h | 0 .../core/{spec => board}/virt_qemu_64/board.h | 0 .../core/{spec => board}/wand_quad/board.h | 0 .../core/{spec => board}/zynq_qemu/board.h | 0 repos/base-hw/src/kernel/spec/muen/target.mk | 6 +- repos/base-linux/etc/specs.conf | 2 +- repos/base-nova/etc/specs.conf | 2 +- repos/base-okl4/etc/specs.conf | 2 +- repos/base-pistachio/etc/specs.conf | 2 +- repos/base-sel4/etc/board.conf | 1 + repos/base-sel4/etc/specs.conf | 4 -- .../lib/import/import-syscall-sel4.mk | 4 +- .../syscall-sel4-imx6q_sabrelite.mk} | 0 .../syscall-sel4-imx7d_sabre.mk} | 0 .../{syscall-sel4.mk => syscall-sel4-pc.mk} | 0 .../{syscall-sel4.mk => syscall-sel4-pc.mk} | 0 repos/base-sel4/lib/mk/syscall-sel4.mk | 2 + .../src/base-sel4-imx6q_sabrelite/content.mk | 11 +-- .../src/base-sel4-imx7d_sabre/content.mk | 11 +-- .../recipes/src/base-sel4-x86/content.mk | 7 ++ repos/base-sel4/src/kernel/sel4/target.mk | 2 +- repos/base/mk/spec/imx53.mk | 6 -- repos/base/mk/spec/imx53_qsb.mk | 5 -- repos/base/mk/spec/imx6.mk | 5 -- repos/base/mk/spec/imx6q_sabrelite.mk | 5 -- repos/base/mk/spec/imx7d_sabre.mk | 3 - repos/base/mk/spec/nit6_solox.mk | 5 -- repos/base/mk/spec/pbxa9.mk | 16 ----- repos/base/mk/spec/rpi.mk | 5 -- repos/base/mk/spec/usb_armory.mk | 5 -- repos/base/mk/spec/wand_quad.mk | 5 -- repos/base/mk/spec/x86.mk | 3 - repos/base/mk/spec/x86_32.mk | 1 - repos/base/mk/spec/x86_64.mk | 1 - repos/base/mk/spec/zynq.mk | 8 --- repos/base/mk/spec/zynq_qemu.mk | 8 --- repos/base/run/migrate.run | 2 +- repos/base/run/platform_drv.inc | 69 +++++++------------ repos/base/run/smp.run | 12 ++-- repos/base/src/timer/epit/imx6/target.inc | 2 +- .../src/drivers/audio/pci_audio_drv/target.mk | 2 +- repos/dde_linux/run/nic_router_uplinks.run | 2 +- repos/dde_linux/run/usb_hid.run | 13 +--- repos/dde_linux/run/usb_hid_raw.run | 20 +++--- repos/dde_linux/run/usb_hid_reconnect.run | 2 +- repos/dde_linux/run/usb_net.run | 4 +- repos/gems/run/depot_autopilot.run | 10 +-- repos/gems/run/depot_download.run | 3 +- repos/gems/run/sculpt.run | 8 +-- repos/gems/run/tiled_wm.run | 6 -- repos/libports/run/acpica.run | 2 - repos/libports/run/fatfs_blkio.run | 4 +- repos/libports/run/fetchurl.inc | 7 +- repos/libports/run/ieee754.run | 2 +- repos/libports/run/libc_block.run | 2 +- repos/libports/run/libc_filesystem_test.inc | 6 +- .../libports/run/libc_vfs_filesystem_test.inc | 6 +- repos/libports/run/libc_vfs_fs_test.inc | 4 +- repos/libports/run/lwip.run | 8 +-- repos/libports/run/netty.inc | 6 +- repos/libports/run/netty_lwip.inc | 6 +- repos/libports/run/nic_bridge.run | 2 +- repos/libports/run/qt5_common.inc | 24 +++---- repos/libports/run/smartcard.run | 2 +- repos/os/run/cpu_balancer.run | 2 +- repos/os/run/cpu_bench.run | 2 +- repos/os/run/demo.run | 6 +- repos/os/run/fb_bench.run | 11 +-- repos/os/run/gpio_led.run | 2 +- repos/os/run/gpio_signal.run | 2 +- repos/os/run/input.run | 18 ++--- repos/os/run/nic_dump.run | 4 +- repos/os/run/nic_router_disable_arp.run | 2 +- repos/os/run/nic_router_flood.run | 4 +- repos/os/run/pci.run | 1 - repos/os/run/ping.run | 4 +- repos/os/run/ping_nic_router.run | 4 +- repos/os/run/sd_card_bench.run | 36 +++++----- repos/os/run/timeout.run | 6 +- repos/os/run/tz_vmm.run | 15 ++-- repos/os/run/vmm_arm.run | 4 +- .../os/src/drivers/framebuffer/sdl/target.mk | 2 +- repos/os/src/drivers/nvme/target.mk | 2 +- repos/os/src/test/gpio_led/target.mk | 1 - repos/os/src/test/gpio_signal/target.mk | 1 - repos/os/src/test/pci/target.mk | 2 +- repos/ports/run/netperf.inc | 2 +- repos/ports/run/netperf_lwip_wifi.run | 3 +- repos/ports/run/netperf_lxip_wifi.run | 5 +- repos/ports/run/tool_chain_auto.run | 2 +- repos/ports/run/vbox5_genode_usb_hid.run | 1 + repos/ports/run/vbox5_ubuntu_16_04_32.run | 2 +- repos/ports/run/vbox5_ubuntu_16_04_64.run | 2 +- repos/ports/run/vbox5_vm_ubuntu_16_04_32.run | 2 +- repos/ports/run/vbox5_vm_ubuntu_16_04_64.run | 2 +- repos/ports/run/vbox5_vm_win10_64.run | 2 +- repos/ports/run/vbox5_vm_win7_32.run | 2 +- repos/ports/run/vbox5_vm_win7_64.run | 2 +- repos/ports/run/vbox5_win10_64.run | 2 +- repos/ports/run/vbox5_win7_32.run | 2 +- repos/ports/run/vbox5_win7_64.run | 2 +- repos/ports/run/vbox5_win7_64_multiple.run | 2 +- repos/ports/run/vbox5_win7_64_raw.run | 2 +- repos/ports/run/vbox5_win7_64_share.run | 2 +- repos/ports/run/vbox_share.inc | 4 +- repos/ports/run/vbox_win.inc | 21 ++---- repos/ports/run/virtualbox.run | 16 ++--- repos/ports/run/virtualbox_auto.inc | 13 ++-- repos/ports/run/vm_stress_vbox5-debian32.run | 2 +- repos/ports/run/vm_stress_vbox5-debian64.run | 2 +- tool/builddir/build.mk | 3 - tool/run/boot_dir/foc | 26 +++---- tool/run/boot_dir/hw | 62 +++++++++-------- tool/run/boot_dir/sel4 | 16 ++--- tool/run/depot.inc | 42 +++++------ tool/run/image/muen | 4 +- tool/run/power_on/qemu | 14 ++-- tool/run/qemu.inc | 8 +-- 236 files changed, 454 insertions(+), 639 deletions(-) rename repos/base-foc/config/{imx7.kernel => imx7d_sabre.kernel} (100%) rename repos/base-foc/config/{imx7.user => imx7d_sabre.user} (100%) create mode 100644 repos/base-foc/etc/board.conf create mode 100644 repos/base-foc/lib/mk/kernel-foc.mk create mode 100644 repos/base-foc/lib/mk/spec/arm/kernel-foc-imx6q_sabrelite.mk create mode 100644 repos/base-foc/lib/mk/spec/arm/kernel-foc-imx7d_sabre.mk create mode 100644 repos/base-foc/lib/mk/spec/arm/kernel-foc-pbxa9.mk create mode 100644 repos/base-foc/lib/mk/spec/arm/kernel-foc-rpi.mk create mode 100644 repos/base-foc/lib/mk/spec/arm/syscall-foc-imx6q_sabrelite.mk create mode 100644 repos/base-foc/lib/mk/spec/arm/syscall-foc-imx7d_sabre.mk create mode 100644 repos/base-foc/lib/mk/spec/arm/syscall-foc-pbxa9.mk create mode 100644 repos/base-foc/lib/mk/spec/arm/syscall-foc-rpi.mk create mode 100644 repos/base-foc/lib/mk/spec/arm_64/kernel-foc-rpi3.mk rename repos/base-foc/lib/mk/spec/{rpi3/syscall-foc.mk => arm_64/syscall-foc-rpi3.mk} (68%) delete mode 100644 repos/base-foc/lib/mk/spec/imx6q_sabrelite/kernel-foc.mk delete mode 100644 repos/base-foc/lib/mk/spec/imx6q_sabrelite/syscall-foc.mk delete mode 100644 repos/base-foc/lib/mk/spec/imx7d_sabre/kernel-foc.mk delete mode 100644 repos/base-foc/lib/mk/spec/imx7d_sabre/syscall-foc.mk delete mode 100644 repos/base-foc/lib/mk/spec/pbxa9/kernel-foc.mk delete mode 100644 repos/base-foc/lib/mk/spec/pbxa9/syscall-foc.mk delete mode 100644 repos/base-foc/lib/mk/spec/rpi/kernel-foc.mk delete mode 100644 repos/base-foc/lib/mk/spec/rpi/syscall-foc.mk delete mode 100644 repos/base-foc/lib/mk/spec/rpi3/kernel-foc.mk create mode 100644 repos/base-foc/lib/mk/spec/x86_32/kernel-foc-pc.mk delete mode 100644 repos/base-foc/lib/mk/spec/x86_32/kernel-foc.mk rename repos/base-foc/lib/mk/spec/x86_32/{syscall-foc.mk => syscall-foc-pc.mk} (60%) create mode 100644 repos/base-foc/lib/mk/spec/x86_64/kernel-foc-pc.mk delete mode 100644 repos/base-foc/lib/mk/spec/x86_64/kernel-foc.mk rename repos/base-foc/lib/mk/spec/x86_64/{syscall-foc.mk => syscall-foc-pc.mk} (52%) create mode 100644 repos/base-foc/lib/mk/syscall-foc.mk rename repos/base-hw/lib/mk/spec/{zynq/core-hw.inc => arm_v7/core-hw-zynq.inc} (100%) rename repos/base-hw/lib/mk/spec/{muen => x86_64}/sinfo-muen.mk (100%) rename repos/base-hw/src/bootstrap/{spec => board}/imx53_qsb/board.h (100%) rename repos/base-hw/src/bootstrap/{spec => board}/imx53_qsb/platform.cc (100%) rename repos/base-hw/src/bootstrap/{spec => board}/imx53_qsb/platform_trustzone.cc (100%) rename repos/base-hw/src/bootstrap/{spec => board}/imx6q_sabrelite/board.h (100%) rename repos/base-hw/src/bootstrap/{spec => board}/imx7d_sabre/board.h (100%) rename repos/base-hw/src/bootstrap/{spec => board}/imx7d_sabre/platform.cc (100%) rename repos/base-hw/src/bootstrap/{spec => board}/imx8q_evk/board.h (100%) rename repos/base-hw/src/bootstrap/{spec => board}/imx8q_evk/platform.cc (100%) rename repos/base-hw/src/bootstrap/{spec => board}/nit6_solox/board.h (100%) rename repos/base-hw/src/bootstrap/{spec => board}/pbxa9/board.h (100%) rename repos/base-hw/src/bootstrap/{spec => board}/pbxa9/platform.cc (100%) rename repos/base-hw/src/bootstrap/{spec => board}/rpi/board.h (100%) rename repos/base-hw/src/bootstrap/{spec => board}/rpi/platform.cc (100%) rename repos/base-hw/src/bootstrap/{spec => board}/rpi3/board.h (100%) rename repos/base-hw/src/bootstrap/{spec => board}/rpi3/platform.cc (100%) rename repos/base-hw/src/bootstrap/{spec => board}/usb_armory/board.h (100%) rename repos/base-hw/src/bootstrap/{spec => board}/usb_armory/platform.cc (100%) rename repos/base-hw/src/bootstrap/{spec => board}/virt_qemu/board.h (100%) rename repos/base-hw/src/bootstrap/{spec => board}/virt_qemu/platform.cc (100%) rename repos/base-hw/src/bootstrap/{spec => board}/virt_qemu_64/board.h (100%) rename repos/base-hw/src/bootstrap/{spec => board}/virt_qemu_64/platform.cc (100%) rename repos/base-hw/src/bootstrap/{spec => board}/wand_quad/board.h (100%) rename repos/base-hw/src/bootstrap/{spec => board}/zynq_qemu/board.h (100%) rename repos/base-hw/src/bootstrap/{spec/zynq => board/zynq_qemu}/platform.cc (100%) rename repos/base-hw/src/core/{spec => board}/imx53_qsb/board.h (100%) rename repos/base-hw/src/core/{spec => board}/imx6q_sabrelite/board.h (100%) rename repos/base-hw/src/core/{spec => board}/imx7d_sabre/board.h (100%) rename repos/base-hw/src/core/{spec => board}/imx8q_evk/board.h (100%) rename repos/base-hw/src/core/{spec => board}/nit6_solox/board.h (100%) rename repos/base-hw/src/core/{spec => board}/pbxa9/board.h (100%) rename repos/base-hw/src/core/{spec => board}/rpi/board.h (100%) rename repos/base-hw/src/core/{spec => board}/rpi3/board.h (100%) rename repos/base-hw/src/core/{spec => board}/usb_armory/board.h (100%) rename repos/base-hw/src/core/{spec => board}/virt_qemu/board.h (100%) rename repos/base-hw/src/core/{spec => board}/virt_qemu_64/board.h (100%) rename repos/base-hw/src/core/{spec => board}/wand_quad/board.h (100%) rename repos/base-hw/src/core/{spec => board}/zynq_qemu/board.h (100%) create mode 100644 repos/base-sel4/etc/board.conf rename repos/base-sel4/lib/mk/spec/{imx6q_sabrelite/syscall-sel4.mk => arm/syscall-sel4-imx6q_sabrelite.mk} (100%) rename repos/base-sel4/lib/mk/spec/{imx7d_sabre/syscall-sel4.mk => arm/syscall-sel4-imx7d_sabre.mk} (100%) rename repos/base-sel4/lib/mk/spec/x86_32/{syscall-sel4.mk => syscall-sel4-pc.mk} (100%) rename repos/base-sel4/lib/mk/spec/x86_64/{syscall-sel4.mk => syscall-sel4-pc.mk} (100%) create mode 100644 repos/base-sel4/lib/mk/syscall-sel4.mk delete mode 100644 repos/base/mk/spec/imx53.mk delete mode 100644 repos/base/mk/spec/imx53_qsb.mk delete mode 100644 repos/base/mk/spec/imx6.mk delete mode 100644 repos/base/mk/spec/imx6q_sabrelite.mk delete mode 100644 repos/base/mk/spec/imx7d_sabre.mk delete mode 100644 repos/base/mk/spec/nit6_solox.mk delete mode 100644 repos/base/mk/spec/pbxa9.mk delete mode 100644 repos/base/mk/spec/rpi.mk delete mode 100644 repos/base/mk/spec/usb_armory.mk delete mode 100644 repos/base/mk/spec/wand_quad.mk delete mode 100644 repos/base/mk/spec/x86.mk delete mode 100644 repos/base/mk/spec/zynq.mk delete mode 100644 repos/base/mk/spec/zynq_qemu.mk diff --git a/repos/base-fiasco/etc/specs.conf b/repos/base-fiasco/etc/specs.conf index 0f422868aa..3c847318c3 100644 --- a/repos/base-fiasco/etc/specs.conf +++ b/repos/base-fiasco/etc/specs.conf @@ -1 +1 @@ -SPECS += fiasco x86_32 +SPECS += fiasco diff --git a/repos/base-foc/config/imx7.kernel b/repos/base-foc/config/imx7d_sabre.kernel similarity index 100% rename from repos/base-foc/config/imx7.kernel rename to repos/base-foc/config/imx7d_sabre.kernel diff --git a/repos/base-foc/config/imx7.user b/repos/base-foc/config/imx7d_sabre.user similarity index 100% rename from repos/base-foc/config/imx7.user rename to repos/base-foc/config/imx7d_sabre.user diff --git a/repos/base-foc/etc/board.conf b/repos/base-foc/etc/board.conf new file mode 100644 index 0000000000..8694fe37f6 --- /dev/null +++ b/repos/base-foc/etc/board.conf @@ -0,0 +1 @@ +BOARD ?= unknown diff --git a/repos/base-foc/etc/specs.conf b/repos/base-foc/etc/specs.conf index 3ef6e913a5..f5ae8ffc52 100644 --- a/repos/base-foc/etc/specs.conf +++ b/repos/base-foc/etc/specs.conf @@ -1,5 +1 @@ SPECS += foc - -ifneq ($(filter x86_%,$(SPECS)),) -SPECS += pci acpi ps2 vesa framebuffer -endif diff --git a/repos/base-foc/lib/import/import-syscall-foc.mk b/repos/base-foc/lib/import/import-syscall-foc.mk index 4f1c5e5542..0c83c5d14e 100644 --- a/repos/base-foc/lib/import/import-syscall-foc.mk +++ b/repos/base-foc/lib/import/import-syscall-foc.mk @@ -1,4 +1,6 @@ -L4_INCLUDE_DIR := $(LIB_CACHE_DIR)/syscall-foc/include +include $(call select_from_repositories,etc/board.conf) + +L4_INCLUDE_DIR := $(LIB_CACHE_DIR)/syscall-foc-$(BOARD)/build/include ifeq ($(filter-out $(SPECS),x86_32),) INC_DIR += $(L4_INCLUDE_DIR)/x86/l4f $(L4_INCLUDE_DIR)/x86 diff --git a/repos/base-foc/lib/mk/kernel-foc.inc b/repos/base-foc/lib/mk/kernel-foc.inc index 07709b33f5..e7bc679a58 100644 --- a/repos/base-foc/lib/mk/kernel-foc.inc +++ b/repos/base-foc/lib/mk/kernel-foc.inc @@ -1,7 +1,6 @@ -BOARD ?= unknown -FOC_BUILD_DIR = $(shell pwd)/$(BOARD)-build -FOC = $(FOC_BUILD_DIR)/foc -FOC_SRC := $(call select_from_ports,foc)/src/kernel/foc/kernel/fiasco +FOC_BUILD_DIR = $(shell pwd)/build +FOC = $(FOC_BUILD_DIR)/foc +FOC_SRC := $(call select_from_ports,foc)/src/kernel/foc/kernel/fiasco KERNEL_BUILD_OUTPUT_FILTER = 2>&1 | sed "s/^/ [fiasco.oc] /" @@ -30,7 +29,7 @@ $(FOC): $(FOC_BUILD_DIR) # library. # -LIBS += syscall-foc +LIBS += syscall-foc-$(BOARD) PKGS := l4re-core/crtn \ l4re-core/uclibc-headers \ @@ -42,7 +41,7 @@ PKGS := l4re-core/crtn \ drivers-frst/include drivers-frst/of drivers-frst/uart \ bootstrap -L4_BUILD_DIR := $(LIB_CACHE_DIR)/syscall-foc/$(BOARD)-build +L4_BUILD_DIR := $(LIB_CACHE_DIR)/syscall-foc-$(BOARD)/build # # Supress several warnings especially of the uclibc-minimal diff --git a/repos/base-foc/lib/mk/kernel-foc.mk b/repos/base-foc/lib/mk/kernel-foc.mk new file mode 100644 index 0000000000..49714e088b --- /dev/null +++ b/repos/base-foc/lib/mk/kernel-foc.mk @@ -0,0 +1,3 @@ +include $(REP_DIR)/etc/board.conf + +LIBS += kernel-foc-$(BOARD) diff --git a/repos/base-foc/lib/mk/spec/arm/kernel-foc-imx6q_sabrelite.mk b/repos/base-foc/lib/mk/spec/arm/kernel-foc-imx6q_sabrelite.mk new file mode 100644 index 0000000000..922490e165 --- /dev/null +++ b/repos/base-foc/lib/mk/spec/arm/kernel-foc-imx6q_sabrelite.mk @@ -0,0 +1,4 @@ +override BOARD := imx6q_sabrelite +KERNEL_CONFIG := $(REP_DIR)/config/$(BOARD).kernel + +include $(REP_DIR)/lib/mk/kernel-foc.inc diff --git a/repos/base-foc/lib/mk/spec/arm/kernel-foc-imx7d_sabre.mk b/repos/base-foc/lib/mk/spec/arm/kernel-foc-imx7d_sabre.mk new file mode 100644 index 0000000000..fe946473c0 --- /dev/null +++ b/repos/base-foc/lib/mk/spec/arm/kernel-foc-imx7d_sabre.mk @@ -0,0 +1,4 @@ +override BOARD := imx7d_sabre +KERNEL_CONFIG := $(REP_DIR)/config/$(BOARD).kernel + +include $(REP_DIR)/lib/mk/kernel-foc.inc diff --git a/repos/base-foc/lib/mk/spec/arm/kernel-foc-pbxa9.mk b/repos/base-foc/lib/mk/spec/arm/kernel-foc-pbxa9.mk new file mode 100644 index 0000000000..1500910d04 --- /dev/null +++ b/repos/base-foc/lib/mk/spec/arm/kernel-foc-pbxa9.mk @@ -0,0 +1,4 @@ +override BOARD := pbxa9 +KERNEL_CONFIG := $(REP_DIR)/config/$(BOARD).kernel + +include $(REP_DIR)/lib/mk/kernel-foc.inc diff --git a/repos/base-foc/lib/mk/spec/arm/kernel-foc-rpi.mk b/repos/base-foc/lib/mk/spec/arm/kernel-foc-rpi.mk new file mode 100644 index 0000000000..4608a841b1 --- /dev/null +++ b/repos/base-foc/lib/mk/spec/arm/kernel-foc-rpi.mk @@ -0,0 +1,4 @@ +override BOARD := rpi +KERNEL_CONFIG := $(REP_DIR)/config/$(BOARD).kernel + +include $(REP_DIR)/lib/mk/kernel-foc.inc diff --git a/repos/base-foc/lib/mk/spec/arm/syscall-foc-imx6q_sabrelite.mk b/repos/base-foc/lib/mk/spec/arm/syscall-foc-imx6q_sabrelite.mk new file mode 100644 index 0000000000..84caa35776 --- /dev/null +++ b/repos/base-foc/lib/mk/spec/arm/syscall-foc-imx6q_sabrelite.mk @@ -0,0 +1,4 @@ +override BOARD := imx6q_sabrelite +L4_ARCH := arm_armv7a + +include $(REP_DIR)/lib/mk/spec/arm/syscall-foc.inc diff --git a/repos/base-foc/lib/mk/spec/arm/syscall-foc-imx7d_sabre.mk b/repos/base-foc/lib/mk/spec/arm/syscall-foc-imx7d_sabre.mk new file mode 100644 index 0000000000..efe2503293 --- /dev/null +++ b/repos/base-foc/lib/mk/spec/arm/syscall-foc-imx7d_sabre.mk @@ -0,0 +1,4 @@ +override BOARD := imx7d_sabre +L4_ARCH := arm_armv7a + +include $(REP_DIR)/lib/mk/spec/arm/syscall-foc.inc diff --git a/repos/base-foc/lib/mk/spec/arm/syscall-foc-pbxa9.mk b/repos/base-foc/lib/mk/spec/arm/syscall-foc-pbxa9.mk new file mode 100644 index 0000000000..2deb9fa6bd --- /dev/null +++ b/repos/base-foc/lib/mk/spec/arm/syscall-foc-pbxa9.mk @@ -0,0 +1,4 @@ +override BOARD := pbxa9 +L4_ARCH := arm_armv7a + +include $(REP_DIR)/lib/mk/spec/arm/syscall-foc.inc diff --git a/repos/base-foc/lib/mk/spec/arm/syscall-foc-rpi.mk b/repos/base-foc/lib/mk/spec/arm/syscall-foc-rpi.mk new file mode 100644 index 0000000000..5ef37b0602 --- /dev/null +++ b/repos/base-foc/lib/mk/spec/arm/syscall-foc-rpi.mk @@ -0,0 +1,4 @@ +override BOARD := rpi +L4_ARCH := arm_armv6 + +include $(REP_DIR)/lib/mk/spec/arm/syscall-foc.inc diff --git a/repos/base-foc/lib/mk/spec/arm/syscall-foc.inc b/repos/base-foc/lib/mk/spec/arm/syscall-foc.inc index ee05955111..1f3546e569 100644 --- a/repos/base-foc/lib/mk/spec/arm/syscall-foc.inc +++ b/repos/base-foc/lib/mk/spec/arm/syscall-foc.inc @@ -1,6 +1,7 @@ L4_INC_TARGETS = arm/l4/sys \ arm/l4f/l4/sys \ arm/l4/vcpu +L4_CONFIG := $(call select_from_repositories,config/$(BOARD).user) CC_OPT += -Iinclude/arm diff --git a/repos/base-foc/lib/mk/spec/arm_64/kernel-foc-rpi3.mk b/repos/base-foc/lib/mk/spec/arm_64/kernel-foc-rpi3.mk new file mode 100644 index 0000000000..5cc372b076 --- /dev/null +++ b/repos/base-foc/lib/mk/spec/arm_64/kernel-foc-rpi3.mk @@ -0,0 +1,4 @@ +override BOARD := rpi3 +KERNEL_CONFIG := $(REP_DIR)/config/$(BOARD).kernel + +include $(REP_DIR)/lib/mk/kernel-foc.inc diff --git a/repos/base-foc/lib/mk/spec/rpi3/syscall-foc.mk b/repos/base-foc/lib/mk/spec/arm_64/syscall-foc-rpi3.mk similarity index 68% rename from repos/base-foc/lib/mk/spec/rpi3/syscall-foc.mk rename to repos/base-foc/lib/mk/spec/arm_64/syscall-foc-rpi3.mk index 33e9dfffa0..a7c3b55064 100644 --- a/repos/base-foc/lib/mk/spec/rpi3/syscall-foc.mk +++ b/repos/base-foc/lib/mk/spec/arm_64/syscall-foc-rpi3.mk @@ -1,6 +1,6 @@ -L4_CONFIG := $(call select_from_repositories,config/rpi3.user) - -L4_BIN_DIR := $(LIB_CACHE_DIR)/syscall-foc/rpi3-build/bin/arm64_armv8a +override BOARD := rpi3 +L4_ARCH := arm64_armv8a +L4_CONFIG := $(call select_from_repositories,config/$(BOARD).user) L4_INC_TARGETS = arm64/l4/sys \ arm64/l4f/l4/sys \ diff --git a/repos/base-foc/lib/mk/spec/imx6q_sabrelite/kernel-foc.mk b/repos/base-foc/lib/mk/spec/imx6q_sabrelite/kernel-foc.mk deleted file mode 100644 index c3cca9c693..0000000000 --- a/repos/base-foc/lib/mk/spec/imx6q_sabrelite/kernel-foc.mk +++ /dev/null @@ -1,3 +0,0 @@ -KERNEL_CONFIG := $(REP_DIR)/config/imx6q_sabrelite.kernel - -include $(REP_DIR)/lib/mk/kernel-foc.inc diff --git a/repos/base-foc/lib/mk/spec/imx6q_sabrelite/syscall-foc.mk b/repos/base-foc/lib/mk/spec/imx6q_sabrelite/syscall-foc.mk deleted file mode 100644 index f54d45567e..0000000000 --- a/repos/base-foc/lib/mk/spec/imx6q_sabrelite/syscall-foc.mk +++ /dev/null @@ -1,5 +0,0 @@ -L4_CONFIG := $(call select_from_repositories,config/imx6q_sabrelite.user) - -L4_BIN_DIR := $(LIB_CACHE_DIR)/syscall-foc/imx6q_sabrelite-build/bin/arm_armv7a - -include $(REP_DIR)/lib/mk/spec/arm/syscall-foc.inc diff --git a/repos/base-foc/lib/mk/spec/imx7d_sabre/kernel-foc.mk b/repos/base-foc/lib/mk/spec/imx7d_sabre/kernel-foc.mk deleted file mode 100644 index ffc60aa5d7..0000000000 --- a/repos/base-foc/lib/mk/spec/imx7d_sabre/kernel-foc.mk +++ /dev/null @@ -1,3 +0,0 @@ -KERNEL_CONFIG := $(REP_DIR)/config/imx7.kernel - -include $(REP_DIR)/lib/mk/kernel-foc.inc diff --git a/repos/base-foc/lib/mk/spec/imx7d_sabre/syscall-foc.mk b/repos/base-foc/lib/mk/spec/imx7d_sabre/syscall-foc.mk deleted file mode 100644 index 35cc89eb40..0000000000 --- a/repos/base-foc/lib/mk/spec/imx7d_sabre/syscall-foc.mk +++ /dev/null @@ -1,5 +0,0 @@ -L4_CONFIG := $(call select_from_repositories,config/imx7.user) - -L4_BIN_DIR := $(LIB_CACHE_DIR)/syscall-foc/imx7d_sabre-build/bin/arm_armv7a - -include $(REP_DIR)/lib/mk/spec/arm/syscall-foc.inc diff --git a/repos/base-foc/lib/mk/spec/pbxa9/kernel-foc.mk b/repos/base-foc/lib/mk/spec/pbxa9/kernel-foc.mk deleted file mode 100644 index bcc379af79..0000000000 --- a/repos/base-foc/lib/mk/spec/pbxa9/kernel-foc.mk +++ /dev/null @@ -1,3 +0,0 @@ -KERNEL_CONFIG := $(REP_DIR)/config/pbxa9.kernel - -include $(REP_DIR)/lib/mk/kernel-foc.inc diff --git a/repos/base-foc/lib/mk/spec/pbxa9/syscall-foc.mk b/repos/base-foc/lib/mk/spec/pbxa9/syscall-foc.mk deleted file mode 100644 index 7245f957fb..0000000000 --- a/repos/base-foc/lib/mk/spec/pbxa9/syscall-foc.mk +++ /dev/null @@ -1,5 +0,0 @@ -L4_CONFIG := $(call select_from_repositories,config/pbxa9.user) - -L4_BIN_DIR := $(LIB_CACHE_DIR)/syscall-foc/pbxa9-build/bin/arm_armv7a - -include $(REP_DIR)/lib/mk/spec/arm/syscall-foc.inc diff --git a/repos/base-foc/lib/mk/spec/rpi/kernel-foc.mk b/repos/base-foc/lib/mk/spec/rpi/kernel-foc.mk deleted file mode 100644 index 84fd104ddd..0000000000 --- a/repos/base-foc/lib/mk/spec/rpi/kernel-foc.mk +++ /dev/null @@ -1,3 +0,0 @@ -KERNEL_CONFIG := $(REP_DIR)/config/rpi.kernel - -include $(REP_DIR)/lib/mk/kernel-foc.inc diff --git a/repos/base-foc/lib/mk/spec/rpi/syscall-foc.mk b/repos/base-foc/lib/mk/spec/rpi/syscall-foc.mk deleted file mode 100644 index de6cb14e0b..0000000000 --- a/repos/base-foc/lib/mk/spec/rpi/syscall-foc.mk +++ /dev/null @@ -1,5 +0,0 @@ -L4_CONFIG := $(call select_from_repositories,config/rpi.user) - -L4_BIN_DIR := $(LIB_CACHE_DIR)/syscall-foc/rpi-build/bin/arm_armv6 - -include $(REP_DIR)/lib/mk/spec/arm/syscall-foc.inc diff --git a/repos/base-foc/lib/mk/spec/rpi3/kernel-foc.mk b/repos/base-foc/lib/mk/spec/rpi3/kernel-foc.mk deleted file mode 100644 index c999d8a747..0000000000 --- a/repos/base-foc/lib/mk/spec/rpi3/kernel-foc.mk +++ /dev/null @@ -1,3 +0,0 @@ -KERNEL_CONFIG := $(REP_DIR)/config/rpi3.kernel - -include $(REP_DIR)/lib/mk/kernel-foc.inc diff --git a/repos/base-foc/lib/mk/spec/x86_32/kernel-foc-pc.mk b/repos/base-foc/lib/mk/spec/x86_32/kernel-foc-pc.mk new file mode 100644 index 0000000000..d522edcb7d --- /dev/null +++ b/repos/base-foc/lib/mk/spec/x86_32/kernel-foc-pc.mk @@ -0,0 +1,4 @@ +override BOARD := pc +KERNEL_CONFIG := $(REP_DIR)/config/x86_32.kernel + +include $(REP_DIR)/lib/mk/kernel-foc.inc diff --git a/repos/base-foc/lib/mk/spec/x86_32/kernel-foc.mk b/repos/base-foc/lib/mk/spec/x86_32/kernel-foc.mk deleted file mode 100644 index 7879f0a52c..0000000000 --- a/repos/base-foc/lib/mk/spec/x86_32/kernel-foc.mk +++ /dev/null @@ -1,3 +0,0 @@ -KERNEL_CONFIG := $(REP_DIR)/config/x86_32.kernel - -include $(REP_DIR)/lib/mk/kernel-foc.inc diff --git a/repos/base-foc/lib/mk/spec/x86_32/syscall-foc.mk b/repos/base-foc/lib/mk/spec/x86_32/syscall-foc-pc.mk similarity index 60% rename from repos/base-foc/lib/mk/spec/x86_32/syscall-foc.mk rename to repos/base-foc/lib/mk/spec/x86_32/syscall-foc-pc.mk index 74642c289c..4c73e2e09c 100644 --- a/repos/base-foc/lib/mk/spec/x86_32/syscall-foc.mk +++ b/repos/base-foc/lib/mk/spec/x86_32/syscall-foc-pc.mk @@ -1,11 +1,11 @@ -L4_CONFIG := $(call select_from_repositories,config/x86_32.user) +override BOARD := pc +L4_ARCH := x86_586 +L4_CONFIG := $(call select_from_repositories,config/x86_32.user) L4_INC_TARGETS := x86/l4/sys x86/l4f/l4/sys x86/l4/vcpu CC_OPT += -Iinclude/x86 -L4_BIN_DIR := $(LIB_CACHE_DIR)/syscall-foc/pc-build/bin/x86_586 - include $(REP_DIR)/lib/mk/spec/x86/syscall-foc.inc vpath syscalls_direct.S $(L4_PKG_DIR)/l4sys/lib/src/ARCH-x86 diff --git a/repos/base-foc/lib/mk/spec/x86_64/kernel-foc-pc.mk b/repos/base-foc/lib/mk/spec/x86_64/kernel-foc-pc.mk new file mode 100644 index 0000000000..2fdbfedfc3 --- /dev/null +++ b/repos/base-foc/lib/mk/spec/x86_64/kernel-foc-pc.mk @@ -0,0 +1,4 @@ +override BOARD := pc +KERNEL_CONFIG := $(REP_DIR)/config/x86_64.kernel + +include $(REP_DIR)/lib/mk/kernel-foc.inc diff --git a/repos/base-foc/lib/mk/spec/x86_64/kernel-foc.mk b/repos/base-foc/lib/mk/spec/x86_64/kernel-foc.mk deleted file mode 100644 index 5526af2ac0..0000000000 --- a/repos/base-foc/lib/mk/spec/x86_64/kernel-foc.mk +++ /dev/null @@ -1,3 +0,0 @@ -KERNEL_CONFIG := $(REP_DIR)/config/x86_64.kernel - -include $(REP_DIR)/lib/mk/kernel-foc.inc diff --git a/repos/base-foc/lib/mk/spec/x86_64/syscall-foc.mk b/repos/base-foc/lib/mk/spec/x86_64/syscall-foc-pc.mk similarity index 52% rename from repos/base-foc/lib/mk/spec/x86_64/syscall-foc.mk rename to repos/base-foc/lib/mk/spec/x86_64/syscall-foc-pc.mk index fb2d76a9eb..7e2778098d 100644 --- a/repos/base-foc/lib/mk/spec/x86_64/syscall-foc.mk +++ b/repos/base-foc/lib/mk/spec/x86_64/syscall-foc-pc.mk @@ -1,9 +1,9 @@ -L4_CONFIG := $(call select_from_repositories,config/x86_64.user) +override BOARD := pc +L4_ARCH := amd64_K8 +L4_CONFIG := $(call select_from_repositories,config/x86_64.user) L4_INC_TARGETS := amd64/l4/sys amd64/l4f/l4/sys amd64/l4/vcpu CC_OPT += -Iinclude/amd64 -L4_BIN_DIR := $(LIB_CACHE_DIR)/syscall-foc/pc-build/bin/amd64_K8 - include $(REP_DIR)/lib/mk/spec/x86/syscall-foc.inc diff --git a/repos/base-foc/lib/mk/syscall-foc.inc b/repos/base-foc/lib/mk/syscall-foc.inc index c4df2a1d90..6289ab0aa8 100644 --- a/repos/base-foc/lib/mk/syscall-foc.inc +++ b/repos/base-foc/lib/mk/syscall-foc.inc @@ -6,9 +6,9 @@ # userland (L4re) that comes with Fiasco.OC. # -BOARD ?= unknown L4_SRC_DIR := $(call select_from_ports,foc)/src/kernel/foc -L4_BUILD_DIR := $(shell pwd)/$(BOARD)-build +L4_BUILD_DIR := $(shell pwd)/build +L4_BIN_DIR := $(LIB_CACHE_DIR)/syscall-foc-$(BOARD)/build/bin/$(L4_ARCH) # # Create mirror for architecture-specific L4sys header files diff --git a/repos/base-foc/lib/mk/syscall-foc.mk b/repos/base-foc/lib/mk/syscall-foc.mk new file mode 100644 index 0000000000..2806605891 --- /dev/null +++ b/repos/base-foc/lib/mk/syscall-foc.mk @@ -0,0 +1,4 @@ +include $(REP_DIR)/etc/board.conf + +LIBS += syscall-foc-$(BOARD) + diff --git a/repos/base-foc/recipes/src/base-foc_content.inc b/repos/base-foc/recipes/src/base-foc_content.inc index 7f510ded74..b4b26e44df 100644 --- a/repos/base-foc/recipes/src/base-foc_content.inc +++ b/repos/base-foc/recipes/src/base-foc_content.inc @@ -26,6 +26,14 @@ src/kernel/foc: src/kernel tar -C $(KERNEL_PORT_DIR)/src/kernel/foc --exclude=.git -cf - . |\ tar -C $@ -xf - +content: etc/board.conf remove_other_board_libs + +etc/board.conf: + echo "BOARD = $(BOARD)" > etc/board.conf + +remove_other_board_libs: lib/mk + find lib/mk/spec -name kernel-foc-*.mk -o -name syscall-foc-*.mk |\ + grep -v "foc-$(BOARD).mk" | xargs rm -rf content: for spec in x86_32 x86_64 arm arm_64; do \ @@ -33,11 +41,3 @@ content: done; sed -i "s/ld-foc/ld/" src/lib/ld/foc/target.mk sed -i "s/foc_timer_drv/timer/" src/timer/foc/target.mk - sed -i "s/BOARD.*unknown/BOARD = $(BOARD)/" src/core/foc/target.mk - sed -i "s/BOARD.*unknown/BOARD = $(BOARD)/" src/kernel/foc/target.mk - sed -i "s/BOARD.*unknown/BOARD = $(BOARD)/" lib/mk/syscall-foc.inc - sed -i "s/BOARD.*unknown/BOARD = $(BOARD)/" lib/mk/kernel-foc.inc - -content: enable_board_spec -enable_board_spec: etc/specs.conf - echo "SPECS += $(BOARD)" >> etc/specs.conf diff --git a/repos/base-foc/src/core/foc/target.mk b/repos/base-foc/src/core/foc/target.mk index 4279dc26d7..72e551dec2 100644 --- a/repos/base-foc/src/core/foc/target.mk +++ b/repos/base-foc/src/core/foc/target.mk @@ -1,4 +1,5 @@ -BOARD ?= unknown +include $(REP_DIR)/etc/board.conf + TARGET := foc-$(BOARD) LIBS := core-foc CORE_OBJ := core-foc-$(BOARD).o diff --git a/repos/base-foc/src/kernel/foc/target.mk b/repos/base-foc/src/kernel/foc/target.mk index 097e44ff01..7a956a0d99 100644 --- a/repos/base-foc/src/kernel/foc/target.mk +++ b/repos/base-foc/src/kernel/foc/target.mk @@ -1,8 +1,9 @@ -BOARD ?= unknown TARGET = kernel-foc LIBS = kernel-foc +include $(REP_DIR)/etc/board.conf + $(TARGET): $(INSTALL_DIR)/foc-$(BOARD) -$(INSTALL_DIR)/foc-$(BOARD): $(LIB_CACHE_DIR)/kernel-foc/$(BOARD)-build/fiasco +$(INSTALL_DIR)/foc-$(BOARD): $(LIB_CACHE_DIR)/kernel-foc-$(BOARD)/build/fiasco $(VERBOSE)ln -sf $< $@ diff --git a/repos/base-hw/etc/specs.conf b/repos/base-hw/etc/specs.conf index 79df93aece..64e076f3e4 100644 --- a/repos/base-hw/etc/specs.conf +++ b/repos/base-hw/etc/specs.conf @@ -1,18 +1 @@ -SPECS += genode hw - -ifeq ($(filter-out $(SPECS),x86_64),) -SPECS += pci ps2 vesa framebuffer - -ifneq ($(filter-out $(SPECS),muen),) -SPECS += acpi -endif -endif - -ifeq ($(filter-out $(SPECS),imx53_qsb_tz),) -SPECS += imx53_qsb trustzone -endif - -ifeq ($(filter-out $(SPECS),usb_armory),) -SPECS += trustzone -endif - +SPECS += hw diff --git a/repos/base-hw/lib/mk/spec/arm_v6/bootstrap-hw-rpi.mk b/repos/base-hw/lib/mk/spec/arm_v6/bootstrap-hw-rpi.mk index 4fd2345faf..591989ad40 100644 --- a/repos/base-hw/lib/mk/spec/arm_v6/bootstrap-hw-rpi.mk +++ b/repos/base-hw/lib/mk/spec/arm_v6/bootstrap-hw-rpi.mk @@ -1,6 +1,6 @@ -INC_DIR += $(REP_DIR)/src/bootstrap/spec/rpi +INC_DIR += $(REP_DIR)/src/bootstrap/board/rpi -SRC_CC += bootstrap/spec/rpi/platform.cc +SRC_CC += bootstrap/board/rpi/platform.cc SRC_CC += bootstrap/spec/arm/arm_v6_cpu.cc SRC_CC += hw/spec/32bit/memory_map.cc SRC_S += bootstrap/spec/arm/crt0.s diff --git a/repos/base-hw/lib/mk/spec/arm_v6/core-hw-rpi.mk b/repos/base-hw/lib/mk/spec/arm_v6/core-hw-rpi.mk index d777f12dae..6444cfede8 100644 --- a/repos/base-hw/lib/mk/spec/arm_v6/core-hw-rpi.mk +++ b/repos/base-hw/lib/mk/spec/arm_v6/core-hw-rpi.mk @@ -5,7 +5,7 @@ # # add include paths -INC_DIR += $(REP_DIR)/src/core/spec/rpi +INC_DIR += $(REP_DIR)/src/core/board/rpi # add C++ sources SRC_CC += platform_services.cc diff --git a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx53_qsb.inc b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx53_qsb.inc index 4161f94782..7b757c8cb9 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx53_qsb.inc +++ b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx53_qsb.inc @@ -1,7 +1,7 @@ TMP := $(call select_from_repositories,lib/mk/core-hw.inc) BASE_HW_DIR := $(TMP:%lib/mk/core-hw.inc=%) -INC_DIR += $(BASE_HW_DIR)/src/bootstrap/spec/imx53_qsb +INC_DIR += $(BASE_HW_DIR)/src/bootstrap/board/imx53_qsb SRC_S += bootstrap/spec/arm/crt0.s diff --git a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx53_qsb.mk b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx53_qsb.mk index 275bf7cea1..db2916cc78 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx53_qsb.mk +++ b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx53_qsb.mk @@ -1,3 +1,3 @@ -SRC_CC += bootstrap/spec/imx53_qsb/platform.cc +SRC_CC += bootstrap/board/imx53_qsb/platform.cc include $(REP_DIR)/lib/mk/spec/arm_v7/bootstrap-hw-imx53_qsb.inc diff --git a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx53_qsb_tz.mk b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx53_qsb_tz.mk index a75421e544..9e465cb894 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx53_qsb_tz.mk +++ b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx53_qsb_tz.mk @@ -1,3 +1,3 @@ -SRC_CC += bootstrap/spec/imx53_qsb/platform_trustzone.cc +SRC_CC += bootstrap/board/imx53_qsb/platform_trustzone.cc include $(REP_DIR)/lib/mk/spec/arm_v7/bootstrap-hw-imx53_qsb.inc diff --git a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx6q_sabrelite.mk b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx6q_sabrelite.mk index 05a959c3bb..e2416e906f 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx6q_sabrelite.mk +++ b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx6q_sabrelite.mk @@ -1,4 +1,4 @@ -INC_DIR += $(REP_DIR)/src/bootstrap/spec/imx6q_sabrelite +INC_DIR += $(REP_DIR)/src/bootstrap/board/imx6q_sabrelite SRC_S += bootstrap/spec/arm/crt0.s diff --git a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx7d_sabre.mk b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx7d_sabre.mk index d2cb7f4cdd..a67878aa29 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx7d_sabre.mk +++ b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-imx7d_sabre.mk @@ -1,8 +1,8 @@ -INC_DIR += $(REP_DIR)/src/bootstrap/spec/imx7d_sabre +INC_DIR += $(REP_DIR)/src/bootstrap/board/imx7d_sabre SRC_CC += bootstrap/spec/arm/cortex_a15_cpu.cc SRC_CC += bootstrap/spec/arm/gicv2.cc -SRC_CC += bootstrap/spec/imx7d_sabre/platform.cc +SRC_CC += bootstrap/board/imx7d_sabre/platform.cc SRC_CC += bootstrap/spec/arm/arm_v7_cpu.cc SRC_CC += hw/spec/32bit/memory_map.cc SRC_S += bootstrap/spec/arm/crt0.s diff --git a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-nit6_solox.mk b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-nit6_solox.mk index 2b28cd5ce8..99b3dda8ac 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-nit6_solox.mk +++ b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-nit6_solox.mk @@ -1,4 +1,4 @@ -INC_DIR += $(REP_DIR)/src/bootstrap/spec/nit6_solox +INC_DIR += $(REP_DIR)/src/bootstrap/board/nit6_solox SRC_S += bootstrap/spec/arm/crt0.s diff --git a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-pbxa9.mk b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-pbxa9.mk index 17f814579b..4370f4c089 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-pbxa9.mk +++ b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-pbxa9.mk @@ -1,11 +1,11 @@ -INC_DIR += $(REP_DIR)/src/bootstrap/spec/pbxa9 +INC_DIR += $(REP_DIR)/src/bootstrap/board/pbxa9 SRC_S += bootstrap/spec/arm/crt0.s SRC_CC += bootstrap/spec/arm/cpu.cc SRC_CC += bootstrap/spec/arm/cortex_a9_mmu.cc SRC_CC += bootstrap/spec/arm/gicv2.cc -SRC_CC += bootstrap/spec/pbxa9/platform.cc +SRC_CC += bootstrap/board/pbxa9/platform.cc SRC_CC += bootstrap/spec/arm/arm_v7_cpu.cc SRC_CC += hw/spec/32bit/memory_map.cc diff --git a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-usb_armory.mk b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-usb_armory.mk index 0c7856e204..2418ad7bf4 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-usb_armory.mk +++ b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-usb_armory.mk @@ -1,11 +1,11 @@ -INC_DIR += $(REP_DIR)/src/bootstrap/spec/usb_armory +INC_DIR += $(REP_DIR)/src/bootstrap/board/usb_armory SRC_S += bootstrap/spec/arm/crt0.s +SRC_CC += bootstrap/board/usb_armory/platform.cc SRC_CC += bootstrap/spec/arm/cortex_a8_mmu.cc SRC_CC += bootstrap/spec/arm/cpu.cc SRC_CC += bootstrap/spec/arm/imx_tzic.cc -SRC_CC += bootstrap/spec/usb_armory/platform.cc SRC_CC += bootstrap/spec/arm/arm_v7_cpu.cc SRC_CC += hw/spec/32bit/memory_map.cc diff --git a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-virt_qemu.mk b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-virt_qemu.mk index 9764104d4c..78903f63ba 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-virt_qemu.mk +++ b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-virt_qemu.mk @@ -1,9 +1,9 @@ -INC_DIR += $(REP_DIR)/src/bootstrap/spec/virt_qemu +INC_DIR += $(REP_DIR)/src/bootstrap/board/virt_qemu +SRC_CC += bootstrap/board/virt_qemu/platform.cc SRC_CC += bootstrap/spec/arm/arm_v7_cpu.cc SRC_CC += bootstrap/spec/arm/cortex_a15_cpu.cc SRC_CC += bootstrap/spec/arm/gicv2.cc -SRC_CC += bootstrap/spec/virt_qemu/platform.cc SRC_CC += hw/spec/32bit/memory_map.cc SRC_S += bootstrap/spec/arm/crt0.s diff --git a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-wand_quad.mk b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-wand_quad.mk index 88b5eb2e60..a586233b9a 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-wand_quad.mk +++ b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-wand_quad.mk @@ -1,4 +1,4 @@ -INC_DIR += $(REP_DIR)/src/bootstrap/spec/wand_quad +INC_DIR += $(REP_DIR)/src/bootstrap/board/wand_quad SRC_S += bootstrap/spec/arm/crt0.s diff --git a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-zynq_qemu.mk b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-zynq_qemu.mk index eacf28eaee..98a0d24fe5 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-zynq_qemu.mk +++ b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-zynq_qemu.mk @@ -1,11 +1,11 @@ -INC_DIR += $(REP_DIR)/src/bootstrap/spec/zynq_qemu +INC_DIR += $(REP_DIR)/src/bootstrap/board/zynq_qemu SRC_S += bootstrap/spec/arm/crt0.s +SRC_CC += bootstrap/board/zynq_qemu/platform.cc SRC_CC += bootstrap/spec/arm/cpu.cc SRC_CC += bootstrap/spec/arm/cortex_a9_mmu.cc SRC_CC += bootstrap/spec/arm/gicv2.cc -SRC_CC += bootstrap/spec/zynq/platform.cc SRC_CC += bootstrap/spec/arm/arm_v7_cpu.cc SRC_CC += hw/spec/32bit/memory_map.cc diff --git a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx53_qsb.inc b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx53_qsb.inc index 5efa092aae..8b827ec94d 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx53_qsb.inc +++ b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx53_qsb.inc @@ -6,8 +6,7 @@ # # add include paths -INC_DIR += $(REP_DIR)/src/core/spec/imx53_qsb -INC_DIR += $(REP_DIR)/src/core/spec/imx53 +INC_DIR += $(REP_DIR)/src/core/board/imx53_qsb SRC_CC += spec/arm/imx_epit.cc SRC_CC += spec/arm/imx_tzic.cc diff --git a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx53_qsb_tz.mk b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx53_qsb_tz.mk index c738b6b82e..cb8af5bdba 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx53_qsb_tz.mk +++ b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx53_qsb_tz.mk @@ -1,5 +1,4 @@ INC_DIR += $(REP_DIR)/src/core/spec/arm_v7/trustzone -INC_DIR += $(REP_DIR)/src/core/spec/imx53/trustzone SRC_CC += kernel/vm_thread_on.cc SRC_CC += spec/arm_v7/trustzone/kernel/vm.cc diff --git a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx6q_sabrelite.mk b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx6q_sabrelite.mk index d6800c16ad..12c4968139 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx6q_sabrelite.mk +++ b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx6q_sabrelite.mk @@ -7,7 +7,7 @@ # # add include paths -INC_DIR += $(REP_DIR)/src/core/spec/imx6q_sabrelite +INC_DIR += $(REP_DIR)/src/core/board/imx6q_sabrelite # add C++ sources SRC_CC += platform_services.cc diff --git a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx7d_sabre.mk b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx7d_sabre.mk index c3dc83942a..7ae7e10722 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx7d_sabre.mk +++ b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx7d_sabre.mk @@ -5,7 +5,7 @@ # # add include paths -INC_DIR += $(REP_DIR)/src/core/spec/imx7d_sabre +INC_DIR += $(REP_DIR)/src/core/board/imx7d_sabre INC_DIR += $(REP_DIR)/src/core/spec/arm/virtualization # add C++ sources diff --git a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-nit6_solox.mk b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-nit6_solox.mk index 57bf98eaf4..db73d57df1 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-nit6_solox.mk +++ b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-nit6_solox.mk @@ -7,7 +7,7 @@ # # add include paths -INC_DIR += $(REP_DIR)/src/core/spec/nit6_solox +INC_DIR += $(REP_DIR)/src/core/board/nit6_solox # add C++ sources SRC_CC += platform_services.cc diff --git a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-pbxa9.mk b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-pbxa9.mk index 6816f9fc35..b16663d51d 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-pbxa9.mk +++ b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-pbxa9.mk @@ -6,7 +6,7 @@ # # add include paths -INC_DIR += $(REP_DIR)/src/core/spec/pbxa9 +INC_DIR += $(REP_DIR)/src/core/board/pbxa9 # add C++ sources SRC_CC += platform_services.cc diff --git a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-usb_armory.mk b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-usb_armory.mk index fd18a9476f..a28a38c9ca 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-usb_armory.mk +++ b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-usb_armory.mk @@ -5,10 +5,8 @@ # # add include paths -INC_DIR += $(REP_DIR)/src/core/spec/usb_armory -INC_DIR += $(REP_DIR)/src/core/spec/imx53 +INC_DIR += $(REP_DIR)/src/core/board/usb_armory INC_DIR += $(REP_DIR)/src/core/spec/arm_v7/trustzone -INC_DIR += $(REP_DIR)/src/core/spec/imx53/trustzone # add C++ sources SRC_CC += kernel/vm_thread_on.cc diff --git a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-virt_qemu.mk b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-virt_qemu.mk index 091780e3fe..b71bde4016 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-virt_qemu.mk +++ b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-virt_qemu.mk @@ -1,4 +1,4 @@ -INC_DIR += $(REP_DIR)/src/core/spec/virt_qemu +INC_DIR += $(REP_DIR)/src/core/board/virt_qemu INC_DIR += $(REP_DIR)/src/core/spec/arm/virtualization # add C++ sources diff --git a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-wand_quad.mk b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-wand_quad.mk index d9b4337b1e..2857d56535 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-wand_quad.mk +++ b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-wand_quad.mk @@ -7,7 +7,7 @@ # # add include paths -INC_DIR += $(REP_DIR)/src/core/spec/wand_quad +INC_DIR += $(REP_DIR)/src/core/board/wand_quad # add C++ sources SRC_CC += platform_services.cc diff --git a/repos/base-hw/lib/mk/spec/zynq/core-hw.inc b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-zynq.inc similarity index 100% rename from repos/base-hw/lib/mk/spec/zynq/core-hw.inc rename to repos/base-hw/lib/mk/spec/arm_v7/core-hw-zynq.inc diff --git a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-zynq_qemu.mk b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-zynq_qemu.mk index fe4c1e701b..290240b12c 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-zynq_qemu.mk +++ b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-zynq_qemu.mk @@ -5,9 +5,9 @@ # # add include paths -INC_DIR += $(REP_DIR)/src/core/spec/zynq_qemu +INC_DIR += $(REP_DIR)/src/core/board/zynq_qemu NR_OF_CPUS = 1 # include less specific configuration -include $(REP_DIR)/lib/mk/spec/zynq/core-hw.inc +include $(REP_DIR)/lib/mk/spec/arm_v7/core-hw-zynq.inc diff --git a/repos/base-hw/lib/mk/spec/arm_v8/bootstrap-hw-imx8q_evk.mk b/repos/base-hw/lib/mk/spec/arm_v8/bootstrap-hw-imx8q_evk.mk index 2fea15f7b0..8091f75c09 100644 --- a/repos/base-hw/lib/mk/spec/arm_v8/bootstrap-hw-imx8q_evk.mk +++ b/repos/base-hw/lib/mk/spec/arm_v8/bootstrap-hw-imx8q_evk.mk @@ -1,8 +1,8 @@ -INC_DIR += $(REP_DIR)/src/bootstrap/spec/imx8q_evk +INC_DIR += $(REP_DIR)/src/bootstrap/board/imx8q_evk +SRC_CC += bootstrap/board/imx8q_evk/platform.cc SRC_CC += bootstrap/spec/arm/gicv3.cc SRC_CC += bootstrap/spec/arm_64/cortex_a53_mmu.cc -SRC_CC += bootstrap/spec/imx8q_evk/platform.cc SRC_CC += lib/base/arm_64/kernel/interface.cc SRC_CC += spec/64bit/memory_map.cc SRC_S += bootstrap/spec/arm_64/crt0.s diff --git a/repos/base-hw/lib/mk/spec/arm_v8/bootstrap-hw-rpi3.mk b/repos/base-hw/lib/mk/spec/arm_v8/bootstrap-hw-rpi3.mk index 31e583a410..1e68d681d5 100644 --- a/repos/base-hw/lib/mk/spec/arm_v8/bootstrap-hw-rpi3.mk +++ b/repos/base-hw/lib/mk/spec/arm_v8/bootstrap-hw-rpi3.mk @@ -1,7 +1,7 @@ -INC_DIR += $(REP_DIR)/src/bootstrap/spec/rpi3 +INC_DIR += $(REP_DIR)/src/bootstrap/board/rpi3 SRC_CC += bootstrap/spec/arm_64/cortex_a53_mmu.cc -SRC_CC += bootstrap/spec/rpi3/platform.cc +SRC_CC += bootstrap/board/rpi3/platform.cc SRC_CC += lib/base/arm_64/kernel/interface.cc SRC_CC += spec/64bit/memory_map.cc SRC_S += bootstrap/spec/arm_64/crt0.s diff --git a/repos/base-hw/lib/mk/spec/arm_v8/bootstrap-hw-virt_qemu.mk b/repos/base-hw/lib/mk/spec/arm_v8/bootstrap-hw-virt_qemu.mk index 741f19da70..f9dbd2af82 100644 --- a/repos/base-hw/lib/mk/spec/arm_v8/bootstrap-hw-virt_qemu.mk +++ b/repos/base-hw/lib/mk/spec/arm_v8/bootstrap-hw-virt_qemu.mk @@ -1,8 +1,8 @@ -INC_DIR += $(REP_DIR)/src/bootstrap/spec/virt_qemu_64 +INC_DIR += $(REP_DIR)/src/bootstrap/board/virt_qemu_64 SRC_CC += bootstrap/spec/arm/gicv3.cc SRC_CC += bootstrap/spec/arm_64/cortex_a53_mmu.cc -SRC_CC += bootstrap/spec/virt_qemu_64/platform.cc +SRC_CC += bootstrap/board/virt_qemu_64/platform.cc SRC_CC += lib/base/arm_64/kernel/interface.cc SRC_CC += spec/64bit/memory_map.cc SRC_S += bootstrap/spec/arm_64/crt0.s diff --git a/repos/base-hw/lib/mk/spec/arm_v8/core-hw-imx8q_evk.mk b/repos/base-hw/lib/mk/spec/arm_v8/core-hw-imx8q_evk.mk index 341584d81e..daef0d6f12 100644 --- a/repos/base-hw/lib/mk/spec/arm_v8/core-hw-imx8q_evk.mk +++ b/repos/base-hw/lib/mk/spec/arm_v8/core-hw-imx8q_evk.mk @@ -1,4 +1,4 @@ -INC_DIR += $(REP_DIR)/src/core/spec/imx8q_evk +INC_DIR += $(REP_DIR)/src/core/board/imx8q_evk INC_DIR += $(REP_DIR)/src/core/spec/arm/virtualization # add C++ sources diff --git a/repos/base-hw/lib/mk/spec/arm_v8/core-hw-rpi3.mk b/repos/base-hw/lib/mk/spec/arm_v8/core-hw-rpi3.mk index b1f5e9b67d..ecdb15c959 100644 --- a/repos/base-hw/lib/mk/spec/arm_v8/core-hw-rpi3.mk +++ b/repos/base-hw/lib/mk/spec/arm_v8/core-hw-rpi3.mk @@ -1,4 +1,4 @@ -INC_DIR += $(REP_DIR)/src/core/spec/rpi3 +INC_DIR += $(REP_DIR)/src/core/board/rpi3 # add C++ sources SRC_CC += kernel/vm_thread_off.cc diff --git a/repos/base-hw/lib/mk/spec/arm_v8/core-hw-virt_qemu.mk b/repos/base-hw/lib/mk/spec/arm_v8/core-hw-virt_qemu.mk index 6340c6329d..6bd6cc215e 100644 --- a/repos/base-hw/lib/mk/spec/arm_v8/core-hw-virt_qemu.mk +++ b/repos/base-hw/lib/mk/spec/arm_v8/core-hw-virt_qemu.mk @@ -1,4 +1,4 @@ -INC_DIR += $(REP_DIR)/src/core/spec/virt_qemu_64 +INC_DIR += $(REP_DIR)/src/core/board/virt_qemu_64 INC_DIR += $(REP_DIR)/src/core/spec/arm/virtualization # add C++ sources diff --git a/repos/base-hw/lib/mk/spec/x86_64/bootstrap-hw-muen.mk b/repos/base-hw/lib/mk/spec/x86_64/bootstrap-hw-muen.mk index 7b8a5c466b..dc835ef10e 100644 --- a/repos/base-hw/lib/mk/spec/x86_64/bootstrap-hw-muen.mk +++ b/repos/base-hw/lib/mk/spec/x86_64/bootstrap-hw-muen.mk @@ -1,4 +1,4 @@ -REQUIRES = muen +REQUIRES = x86_64 INC_DIR += $(REP_DIR)/src/bootstrap/spec/x86_64 diff --git a/repos/base-hw/lib/mk/spec/x86_64/core-hw-muen.mk b/repos/base-hw/lib/mk/spec/x86_64/core-hw-muen.mk index f9203e501e..28ef884f7a 100644 --- a/repos/base-hw/lib/mk/spec/x86_64/core-hw-muen.mk +++ b/repos/base-hw/lib/mk/spec/x86_64/core-hw-muen.mk @@ -5,7 +5,7 @@ # \date 2012-10-04 # -REQUIRES = muen +REQUIRES = x86_64 LIBS += sinfo-muen diff --git a/repos/base-hw/lib/mk/spec/muen/sinfo-muen.mk b/repos/base-hw/lib/mk/spec/x86_64/sinfo-muen.mk similarity index 100% rename from repos/base-hw/lib/mk/spec/muen/sinfo-muen.mk rename to repos/base-hw/lib/mk/spec/x86_64/sinfo-muen.mk diff --git a/repos/base-hw/recipes/src/base-hw-imx53_qsb/content.mk b/repos/base-hw/recipes/src/base-hw-imx53_qsb/content.mk index 7eb964b578..aafceac37d 100644 --- a/repos/base-hw/recipes/src/base-hw-imx53_qsb/content.mk +++ b/repos/base-hw/recipes/src/base-hw-imx53_qsb/content.mk @@ -1,7 +1,3 @@ BOARD = imx53_qsb include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc - -content: enable_board_spec -enable_board_spec: etc/specs.conf - echo "SPECS += imx53_qsb" >> etc/specs.conf diff --git a/repos/base-hw/recipes/src/base-hw-imx53_qsb_tz/content.mk b/repos/base-hw/recipes/src/base-hw-imx53_qsb_tz/content.mk index f6a19f67c6..df38abb77d 100644 --- a/repos/base-hw/recipes/src/base-hw-imx53_qsb_tz/content.mk +++ b/repos/base-hw/recipes/src/base-hw-imx53_qsb_tz/content.mk @@ -1,7 +1,3 @@ BOARD = imx53_qsb_tz include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc - -content: enable_board_spec -enable_board_spec: etc/specs.conf - echo "SPECS += imx53_qsb trustzone" >> etc/specs.conf diff --git a/repos/base-hw/recipes/src/base-hw-imx6q_sabrelite/content.mk b/repos/base-hw/recipes/src/base-hw-imx6q_sabrelite/content.mk index 6ecd480947..94c7c8e2fd 100644 --- a/repos/base-hw/recipes/src/base-hw-imx6q_sabrelite/content.mk +++ b/repos/base-hw/recipes/src/base-hw-imx6q_sabrelite/content.mk @@ -1,7 +1,3 @@ BOARD = imx6q_sabrelite include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc - -content: enable_board_spec -enable_board_spec: etc/specs.conf - echo "SPECS += imx6q_sabrelite" >> etc/specs.conf diff --git a/repos/base-hw/recipes/src/base-hw-imx7d_sabre/content.mk b/repos/base-hw/recipes/src/base-hw-imx7d_sabre/content.mk index a5dfafd83d..135981d663 100644 --- a/repos/base-hw/recipes/src/base-hw-imx7d_sabre/content.mk +++ b/repos/base-hw/recipes/src/base-hw-imx7d_sabre/content.mk @@ -1,7 +1,3 @@ BOARD = imx7d_sabre include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc - -content: enable_board_spec -enable_board_spec: etc/specs.conf - echo "SPECS += imx7d_sabre" >> etc/specs.conf diff --git a/repos/base-hw/recipes/src/base-hw-imx8q_evk/content.mk b/repos/base-hw/recipes/src/base-hw-imx8q_evk/content.mk index 8061530c64..6ddaf5c86e 100644 --- a/repos/base-hw/recipes/src/base-hw-imx8q_evk/content.mk +++ b/repos/base-hw/recipes/src/base-hw-imx8q_evk/content.mk @@ -1,7 +1,3 @@ BOARD = imx8q_evk include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc - -content: enable_board_spec -enable_board_spec: etc/specs.conf - echo "SPECS += imx8q_evk" >> etc/specs.conf diff --git a/repos/base-hw/recipes/src/base-hw-muen/content.mk b/repos/base-hw/recipes/src/base-hw-muen/content.mk index 209967bd4f..44c111dcb8 100644 --- a/repos/base-hw/recipes/src/base-hw-muen/content.mk +++ b/repos/base-hw/recipes/src/base-hw-muen/content.mk @@ -2,12 +2,3 @@ BOARD = muen include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc -content: enable_board_spec -enable_board_spec: etc/specs.conf - echo "SPECS += muen" >> etc/specs.conf - -content: src/acpi/target.mk -src/acpi/target.mk: - mkdir $(dir $@) - cp $(REP_DIR)/recipes/src/base-hw-muen/acpi_target_mk $@ - diff --git a/repos/base-hw/recipes/src/base-hw-nit6_solox/content.mk b/repos/base-hw/recipes/src/base-hw-nit6_solox/content.mk index a91e4962ee..dc41e99cb9 100644 --- a/repos/base-hw/recipes/src/base-hw-nit6_solox/content.mk +++ b/repos/base-hw/recipes/src/base-hw-nit6_solox/content.mk @@ -1,7 +1,3 @@ BOARD = nit6_solox include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc - -content: enable_board_spec -enable_board_spec: etc/specs.conf - echo "SPECS += nit6_solox" >> etc/specs.conf diff --git a/repos/base-hw/recipes/src/base-hw-pbxa9/content.mk b/repos/base-hw/recipes/src/base-hw-pbxa9/content.mk index 2e6b45c079..cf81fc0781 100644 --- a/repos/base-hw/recipes/src/base-hw-pbxa9/content.mk +++ b/repos/base-hw/recipes/src/base-hw-pbxa9/content.mk @@ -1,7 +1,3 @@ BOARD = pbxa9 include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc - -content: enable_board_spec -enable_board_spec: etc/specs.conf - echo "SPECS += pbxa9" >> etc/specs.conf diff --git a/repos/base-hw/recipes/src/base-hw-rpi/content.mk b/repos/base-hw/recipes/src/base-hw-rpi/content.mk index 481c815065..58bf77b875 100644 --- a/repos/base-hw/recipes/src/base-hw-rpi/content.mk +++ b/repos/base-hw/recipes/src/base-hw-rpi/content.mk @@ -1,7 +1,3 @@ BOARD = rpi include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc - -content: enable_board_spec -enable_board_spec: etc/specs.conf - echo "SPECS += rpi" >> etc/specs.conf diff --git a/repos/base-hw/recipes/src/base-hw-rpi3/content.mk b/repos/base-hw/recipes/src/base-hw-rpi3/content.mk index 4a5ff6612b..c587367a88 100644 --- a/repos/base-hw/recipes/src/base-hw-rpi3/content.mk +++ b/repos/base-hw/recipes/src/base-hw-rpi3/content.mk @@ -1,7 +1,3 @@ BOARD = rpi3 include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc - -content: enable_board_spec -enable_board_spec: etc/specs.conf - echo "SPECS += rpi3" >> etc/specs.conf diff --git a/repos/base-hw/recipes/src/base-hw-virt_qemu/content.mk b/repos/base-hw/recipes/src/base-hw-virt_qemu/content.mk index 87fbf761be..a09b73090b 100644 --- a/repos/base-hw/recipes/src/base-hw-virt_qemu/content.mk +++ b/repos/base-hw/recipes/src/base-hw-virt_qemu/content.mk @@ -1,7 +1,3 @@ BOARD = virt_qemu include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc - -content: enable_board_spec -enable_board_spec: etc/specs.conf - echo "SPECS += virt_qemu" >> etc/specs.conf diff --git a/repos/base-hw/recipes/src/base-hw-zynq_qemu/content.mk b/repos/base-hw/recipes/src/base-hw-zynq_qemu/content.mk index 5629ba8747..6f4158d13e 100644 --- a/repos/base-hw/recipes/src/base-hw-zynq_qemu/content.mk +++ b/repos/base-hw/recipes/src/base-hw-zynq_qemu/content.mk @@ -1,7 +1,3 @@ BOARD = zynq_qemu include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc - -content: enable_board_spec -enable_board_spec: etc/specs.conf - echo "SPECS += zynq_qemu" >> etc/specs.conf diff --git a/repos/base-hw/src/bootstrap/spec/imx53_qsb/board.h b/repos/base-hw/src/bootstrap/board/imx53_qsb/board.h similarity index 100% rename from repos/base-hw/src/bootstrap/spec/imx53_qsb/board.h rename to repos/base-hw/src/bootstrap/board/imx53_qsb/board.h diff --git a/repos/base-hw/src/bootstrap/spec/imx53_qsb/platform.cc b/repos/base-hw/src/bootstrap/board/imx53_qsb/platform.cc similarity index 100% rename from repos/base-hw/src/bootstrap/spec/imx53_qsb/platform.cc rename to repos/base-hw/src/bootstrap/board/imx53_qsb/platform.cc diff --git a/repos/base-hw/src/bootstrap/spec/imx53_qsb/platform_trustzone.cc b/repos/base-hw/src/bootstrap/board/imx53_qsb/platform_trustzone.cc similarity index 100% rename from repos/base-hw/src/bootstrap/spec/imx53_qsb/platform_trustzone.cc rename to repos/base-hw/src/bootstrap/board/imx53_qsb/platform_trustzone.cc diff --git a/repos/base-hw/src/bootstrap/spec/imx6q_sabrelite/board.h b/repos/base-hw/src/bootstrap/board/imx6q_sabrelite/board.h similarity index 100% rename from repos/base-hw/src/bootstrap/spec/imx6q_sabrelite/board.h rename to repos/base-hw/src/bootstrap/board/imx6q_sabrelite/board.h diff --git a/repos/base-hw/src/bootstrap/spec/imx7d_sabre/board.h b/repos/base-hw/src/bootstrap/board/imx7d_sabre/board.h similarity index 100% rename from repos/base-hw/src/bootstrap/spec/imx7d_sabre/board.h rename to repos/base-hw/src/bootstrap/board/imx7d_sabre/board.h diff --git a/repos/base-hw/src/bootstrap/spec/imx7d_sabre/platform.cc b/repos/base-hw/src/bootstrap/board/imx7d_sabre/platform.cc similarity index 100% rename from repos/base-hw/src/bootstrap/spec/imx7d_sabre/platform.cc rename to repos/base-hw/src/bootstrap/board/imx7d_sabre/platform.cc diff --git a/repos/base-hw/src/bootstrap/spec/imx8q_evk/board.h b/repos/base-hw/src/bootstrap/board/imx8q_evk/board.h similarity index 100% rename from repos/base-hw/src/bootstrap/spec/imx8q_evk/board.h rename to repos/base-hw/src/bootstrap/board/imx8q_evk/board.h diff --git a/repos/base-hw/src/bootstrap/spec/imx8q_evk/platform.cc b/repos/base-hw/src/bootstrap/board/imx8q_evk/platform.cc similarity index 100% rename from repos/base-hw/src/bootstrap/spec/imx8q_evk/platform.cc rename to repos/base-hw/src/bootstrap/board/imx8q_evk/platform.cc diff --git a/repos/base-hw/src/bootstrap/spec/nit6_solox/board.h b/repos/base-hw/src/bootstrap/board/nit6_solox/board.h similarity index 100% rename from repos/base-hw/src/bootstrap/spec/nit6_solox/board.h rename to repos/base-hw/src/bootstrap/board/nit6_solox/board.h diff --git a/repos/base-hw/src/bootstrap/spec/pbxa9/board.h b/repos/base-hw/src/bootstrap/board/pbxa9/board.h similarity index 100% rename from repos/base-hw/src/bootstrap/spec/pbxa9/board.h rename to repos/base-hw/src/bootstrap/board/pbxa9/board.h diff --git a/repos/base-hw/src/bootstrap/spec/pbxa9/platform.cc b/repos/base-hw/src/bootstrap/board/pbxa9/platform.cc similarity index 100% rename from repos/base-hw/src/bootstrap/spec/pbxa9/platform.cc rename to repos/base-hw/src/bootstrap/board/pbxa9/platform.cc diff --git a/repos/base-hw/src/bootstrap/spec/rpi/board.h b/repos/base-hw/src/bootstrap/board/rpi/board.h similarity index 100% rename from repos/base-hw/src/bootstrap/spec/rpi/board.h rename to repos/base-hw/src/bootstrap/board/rpi/board.h diff --git a/repos/base-hw/src/bootstrap/spec/rpi/platform.cc b/repos/base-hw/src/bootstrap/board/rpi/platform.cc similarity index 100% rename from repos/base-hw/src/bootstrap/spec/rpi/platform.cc rename to repos/base-hw/src/bootstrap/board/rpi/platform.cc diff --git a/repos/base-hw/src/bootstrap/spec/rpi3/board.h b/repos/base-hw/src/bootstrap/board/rpi3/board.h similarity index 100% rename from repos/base-hw/src/bootstrap/spec/rpi3/board.h rename to repos/base-hw/src/bootstrap/board/rpi3/board.h diff --git a/repos/base-hw/src/bootstrap/spec/rpi3/platform.cc b/repos/base-hw/src/bootstrap/board/rpi3/platform.cc similarity index 100% rename from repos/base-hw/src/bootstrap/spec/rpi3/platform.cc rename to repos/base-hw/src/bootstrap/board/rpi3/platform.cc diff --git a/repos/base-hw/src/bootstrap/spec/usb_armory/board.h b/repos/base-hw/src/bootstrap/board/usb_armory/board.h similarity index 100% rename from repos/base-hw/src/bootstrap/spec/usb_armory/board.h rename to repos/base-hw/src/bootstrap/board/usb_armory/board.h diff --git a/repos/base-hw/src/bootstrap/spec/usb_armory/platform.cc b/repos/base-hw/src/bootstrap/board/usb_armory/platform.cc similarity index 100% rename from repos/base-hw/src/bootstrap/spec/usb_armory/platform.cc rename to repos/base-hw/src/bootstrap/board/usb_armory/platform.cc diff --git a/repos/base-hw/src/bootstrap/spec/virt_qemu/board.h b/repos/base-hw/src/bootstrap/board/virt_qemu/board.h similarity index 100% rename from repos/base-hw/src/bootstrap/spec/virt_qemu/board.h rename to repos/base-hw/src/bootstrap/board/virt_qemu/board.h diff --git a/repos/base-hw/src/bootstrap/spec/virt_qemu/platform.cc b/repos/base-hw/src/bootstrap/board/virt_qemu/platform.cc similarity index 100% rename from repos/base-hw/src/bootstrap/spec/virt_qemu/platform.cc rename to repos/base-hw/src/bootstrap/board/virt_qemu/platform.cc diff --git a/repos/base-hw/src/bootstrap/spec/virt_qemu_64/board.h b/repos/base-hw/src/bootstrap/board/virt_qemu_64/board.h similarity index 100% rename from repos/base-hw/src/bootstrap/spec/virt_qemu_64/board.h rename to repos/base-hw/src/bootstrap/board/virt_qemu_64/board.h diff --git a/repos/base-hw/src/bootstrap/spec/virt_qemu_64/platform.cc b/repos/base-hw/src/bootstrap/board/virt_qemu_64/platform.cc similarity index 100% rename from repos/base-hw/src/bootstrap/spec/virt_qemu_64/platform.cc rename to repos/base-hw/src/bootstrap/board/virt_qemu_64/platform.cc diff --git a/repos/base-hw/src/bootstrap/spec/wand_quad/board.h b/repos/base-hw/src/bootstrap/board/wand_quad/board.h similarity index 100% rename from repos/base-hw/src/bootstrap/spec/wand_quad/board.h rename to repos/base-hw/src/bootstrap/board/wand_quad/board.h diff --git a/repos/base-hw/src/bootstrap/spec/zynq_qemu/board.h b/repos/base-hw/src/bootstrap/board/zynq_qemu/board.h similarity index 100% rename from repos/base-hw/src/bootstrap/spec/zynq_qemu/board.h rename to repos/base-hw/src/bootstrap/board/zynq_qemu/board.h diff --git a/repos/base-hw/src/bootstrap/spec/zynq/platform.cc b/repos/base-hw/src/bootstrap/board/zynq_qemu/platform.cc similarity index 100% rename from repos/base-hw/src/bootstrap/spec/zynq/platform.cc rename to repos/base-hw/src/bootstrap/board/zynq_qemu/platform.cc diff --git a/repos/base-hw/src/core/spec/imx53_qsb/board.h b/repos/base-hw/src/core/board/imx53_qsb/board.h similarity index 100% rename from repos/base-hw/src/core/spec/imx53_qsb/board.h rename to repos/base-hw/src/core/board/imx53_qsb/board.h diff --git a/repos/base-hw/src/core/spec/imx6q_sabrelite/board.h b/repos/base-hw/src/core/board/imx6q_sabrelite/board.h similarity index 100% rename from repos/base-hw/src/core/spec/imx6q_sabrelite/board.h rename to repos/base-hw/src/core/board/imx6q_sabrelite/board.h diff --git a/repos/base-hw/src/core/spec/imx7d_sabre/board.h b/repos/base-hw/src/core/board/imx7d_sabre/board.h similarity index 100% rename from repos/base-hw/src/core/spec/imx7d_sabre/board.h rename to repos/base-hw/src/core/board/imx7d_sabre/board.h diff --git a/repos/base-hw/src/core/spec/imx8q_evk/board.h b/repos/base-hw/src/core/board/imx8q_evk/board.h similarity index 100% rename from repos/base-hw/src/core/spec/imx8q_evk/board.h rename to repos/base-hw/src/core/board/imx8q_evk/board.h diff --git a/repos/base-hw/src/core/spec/nit6_solox/board.h b/repos/base-hw/src/core/board/nit6_solox/board.h similarity index 100% rename from repos/base-hw/src/core/spec/nit6_solox/board.h rename to repos/base-hw/src/core/board/nit6_solox/board.h diff --git a/repos/base-hw/src/core/spec/pbxa9/board.h b/repos/base-hw/src/core/board/pbxa9/board.h similarity index 100% rename from repos/base-hw/src/core/spec/pbxa9/board.h rename to repos/base-hw/src/core/board/pbxa9/board.h diff --git a/repos/base-hw/src/core/spec/rpi/board.h b/repos/base-hw/src/core/board/rpi/board.h similarity index 100% rename from repos/base-hw/src/core/spec/rpi/board.h rename to repos/base-hw/src/core/board/rpi/board.h diff --git a/repos/base-hw/src/core/spec/rpi3/board.h b/repos/base-hw/src/core/board/rpi3/board.h similarity index 100% rename from repos/base-hw/src/core/spec/rpi3/board.h rename to repos/base-hw/src/core/board/rpi3/board.h diff --git a/repos/base-hw/src/core/spec/usb_armory/board.h b/repos/base-hw/src/core/board/usb_armory/board.h similarity index 100% rename from repos/base-hw/src/core/spec/usb_armory/board.h rename to repos/base-hw/src/core/board/usb_armory/board.h diff --git a/repos/base-hw/src/core/spec/virt_qemu/board.h b/repos/base-hw/src/core/board/virt_qemu/board.h similarity index 100% rename from repos/base-hw/src/core/spec/virt_qemu/board.h rename to repos/base-hw/src/core/board/virt_qemu/board.h diff --git a/repos/base-hw/src/core/spec/virt_qemu_64/board.h b/repos/base-hw/src/core/board/virt_qemu_64/board.h similarity index 100% rename from repos/base-hw/src/core/spec/virt_qemu_64/board.h rename to repos/base-hw/src/core/board/virt_qemu_64/board.h diff --git a/repos/base-hw/src/core/spec/wand_quad/board.h b/repos/base-hw/src/core/board/wand_quad/board.h similarity index 100% rename from repos/base-hw/src/core/spec/wand_quad/board.h rename to repos/base-hw/src/core/board/wand_quad/board.h diff --git a/repos/base-hw/src/core/spec/zynq_qemu/board.h b/repos/base-hw/src/core/board/zynq_qemu/board.h similarity index 100% rename from repos/base-hw/src/core/spec/zynq_qemu/board.h rename to repos/base-hw/src/core/board/zynq_qemu/board.h diff --git a/repos/base-hw/src/kernel/spec/muen/target.mk b/repos/base-hw/src/kernel/spec/muen/target.mk index ac61770b01..758ed9fcbc 100644 --- a/repos/base-hw/src/kernel/spec/muen/target.mk +++ b/repos/base-hw/src/kernel/spec/muen/target.mk @@ -1,5 +1,5 @@ TARGET = muen -REQUIRES = x86_64 muen +REQUIRES = x86_64 MUEN_SRC_DIR = $(call select_from_ports,muen)/src/kernel/muen MUEN_BUILD_DIR = $(BUILD_BASE_DIR)/kernel MUEN_CONF_FILE = $(MUEN_BUILD_DIR)/muen.conf @@ -22,8 +22,6 @@ else BUILD_OPTS += BUILD_OUTPUT_NOCOLOR=true endif - -ifneq ($(filter muen, $(SPECS)),) $(TARGET): $(MUEN_DST_DIR) $(MSG_BUILD)Muen policy $(VERBOSE)$(BUILD_ENV) $(MAKE) -C $(MUEN_DST_DIR) $(BUILD_OPTS) policy-merge rts >> $(MUEN_LOG) 2>&1 @@ -52,7 +50,5 @@ clean_muen: $(VERBOSE)rm -rf $(MUEN_DST_DIR) $(VERBOSE)rm -f $(MUEN_CONF_FILE) $(VERBOSE)rm -f $(MUEN_LOG) -endif - .PHONY: $(TARGET) diff --git a/repos/base-linux/etc/specs.conf b/repos/base-linux/etc/specs.conf index b8df884c85..ef4b682cfe 100644 --- a/repos/base-linux/etc/specs.conf +++ b/repos/base-linux/etc/specs.conf @@ -1 +1 @@ -SPECS += linux sdl +SPECS += linux diff --git a/repos/base-nova/etc/specs.conf b/repos/base-nova/etc/specs.conf index cdc01511c3..90d9ea845f 100644 --- a/repos/base-nova/etc/specs.conf +++ b/repos/base-nova/etc/specs.conf @@ -1 +1 @@ -SPECS += nova acpi +SPECS += nova diff --git a/repos/base-okl4/etc/specs.conf b/repos/base-okl4/etc/specs.conf index 8da465ec45..302bdc2119 100644 --- a/repos/base-okl4/etc/specs.conf +++ b/repos/base-okl4/etc/specs.conf @@ -1 +1 @@ -SPECS += okl4 x86_32 +SPECS += okl4 diff --git a/repos/base-pistachio/etc/specs.conf b/repos/base-pistachio/etc/specs.conf index e069f3e0fa..d6a9249829 100644 --- a/repos/base-pistachio/etc/specs.conf +++ b/repos/base-pistachio/etc/specs.conf @@ -1 +1 @@ -SPECS += pistachio x86_32 +SPECS += pistachio diff --git a/repos/base-sel4/etc/board.conf b/repos/base-sel4/etc/board.conf new file mode 100644 index 0000000000..8694fe37f6 --- /dev/null +++ b/repos/base-sel4/etc/board.conf @@ -0,0 +1 @@ +BOARD ?= unknown diff --git a/repos/base-sel4/etc/specs.conf b/repos/base-sel4/etc/specs.conf index 7f8559a229..9e57a1ab41 100644 --- a/repos/base-sel4/etc/specs.conf +++ b/repos/base-sel4/etc/specs.conf @@ -1,5 +1 @@ SPECS += sel4 - -ifneq ($(filter $(SPECS),x86_32 x86_64),) -SPECS += acpi pci ps2 vesa framebuffer -endif diff --git a/repos/base-sel4/lib/import/import-syscall-sel4.mk b/repos/base-sel4/lib/import/import-syscall-sel4.mk index db6e4cbdf2..ed190d2343 100644 --- a/repos/base-sel4/lib/import/import-syscall-sel4.mk +++ b/repos/base-sel4/lib/import/import-syscall-sel4.mk @@ -1,4 +1,6 @@ -SEL4_INCLUDE_DIR := $(LIB_CACHE_DIR)/syscall-sel4/include +include $(call select_from_repositories,etc/board.conf) + +SEL4_INCLUDE_DIR := $(LIB_CACHE_DIR)/syscall-sel4-$(BOARD)/include # # Access kernel-interface headers that were installed when building the diff --git a/repos/base-sel4/lib/mk/spec/imx6q_sabrelite/syscall-sel4.mk b/repos/base-sel4/lib/mk/spec/arm/syscall-sel4-imx6q_sabrelite.mk similarity index 100% rename from repos/base-sel4/lib/mk/spec/imx6q_sabrelite/syscall-sel4.mk rename to repos/base-sel4/lib/mk/spec/arm/syscall-sel4-imx6q_sabrelite.mk diff --git a/repos/base-sel4/lib/mk/spec/imx7d_sabre/syscall-sel4.mk b/repos/base-sel4/lib/mk/spec/arm/syscall-sel4-imx7d_sabre.mk similarity index 100% rename from repos/base-sel4/lib/mk/spec/imx7d_sabre/syscall-sel4.mk rename to repos/base-sel4/lib/mk/spec/arm/syscall-sel4-imx7d_sabre.mk diff --git a/repos/base-sel4/lib/mk/spec/x86_32/syscall-sel4.mk b/repos/base-sel4/lib/mk/spec/x86_32/syscall-sel4-pc.mk similarity index 100% rename from repos/base-sel4/lib/mk/spec/x86_32/syscall-sel4.mk rename to repos/base-sel4/lib/mk/spec/x86_32/syscall-sel4-pc.mk diff --git a/repos/base-sel4/lib/mk/spec/x86_64/syscall-sel4.mk b/repos/base-sel4/lib/mk/spec/x86_64/syscall-sel4-pc.mk similarity index 100% rename from repos/base-sel4/lib/mk/spec/x86_64/syscall-sel4.mk rename to repos/base-sel4/lib/mk/spec/x86_64/syscall-sel4-pc.mk diff --git a/repos/base-sel4/lib/mk/syscall-sel4.mk b/repos/base-sel4/lib/mk/syscall-sel4.mk new file mode 100644 index 0000000000..7437686d87 --- /dev/null +++ b/repos/base-sel4/lib/mk/syscall-sel4.mk @@ -0,0 +1,2 @@ +include $(REP_DIR)/etc/board.conf +LIBS += syscall-sel4-$(BOARD) diff --git a/repos/base-sel4/recipes/src/base-sel4-imx6q_sabrelite/content.mk b/repos/base-sel4/recipes/src/base-sel4-imx6q_sabrelite/content.mk index 4bcfd8679e..82d866de9c 100644 --- a/repos/base-sel4/recipes/src/base-sel4-imx6q_sabrelite/content.mk +++ b/repos/base-sel4/recipes/src/base-sel4-imx6q_sabrelite/content.mk @@ -1,9 +1,5 @@ include $(GENODE_DIR)/repos/base/recipes/src/base_content.inc -content: enable_board_spec -enable_board_spec: etc/specs.conf - echo "SPECS += imx6q_sabrelite" >> etc/specs.conf - content: include/os/attached_mmio.h include/%.h: @@ -32,8 +28,15 @@ src/tool/sel4_tools: src/kernel/sel4 mkdir -p $@ cp -r $(ELFLOADER_PORT_DIR)/src/tool/sel4_tools/* $@ +content: etc/board.conf + +etc/board.conf: + echo "BOARD = imx6q_sabrelite" > etc/board.conf + content: mv lib/mk/spec/arm/ld-sel4.mk lib/mk/spec/arm/ld.mk; sed -i "s/ld-sel4/ld/" src/lib/ld/sel4/target.mk sed -i "s/imx6_timer_drv/timer/" src/timer/epit/imx6/target.inc + find lib/mk/spec -name kernel-sel4-*.mk -o -name syscall-sel4-*.mk |\ + grep -v "sel4-imx6q_sabrelite.mk" | xargs rm -rf diff --git a/repos/base-sel4/recipes/src/base-sel4-imx7d_sabre/content.mk b/repos/base-sel4/recipes/src/base-sel4-imx7d_sabre/content.mk index ab6da0e182..bb357a3ed8 100644 --- a/repos/base-sel4/recipes/src/base-sel4-imx7d_sabre/content.mk +++ b/repos/base-sel4/recipes/src/base-sel4-imx7d_sabre/content.mk @@ -1,9 +1,5 @@ include $(GENODE_DIR)/repos/base/recipes/src/base_content.inc -content: enable_board_spec -enable_board_spec: etc/specs.conf - echo "SPECS += imx7d_sabre" >> etc/specs.conf - content: include/os/attached_mmio.h include/%.h: @@ -32,8 +28,15 @@ src/tool/sel4_tools: src/kernel/sel4 mkdir -p $@ cp -r $(ELFLOADER_PORT_DIR)/src/tool/sel4_tools/* $@ +content: etc/board.conf + +etc/board.conf: + echo "BOARD = imx7d_sabre" > etc/board.conf + content: mv lib/mk/spec/arm/ld-sel4.mk lib/mk/spec/arm/ld.mk; sed -i "s/ld-sel4/ld/" src/lib/ld/sel4/target.mk sed -i "s/imx7_timer_drv/timer/" src/timer/gpt/imx7/target.inc + find lib/mk/spec -name kernel-sel4-*.mk -o -name syscall-sel4-*.mk |\ + grep -v "sel4-imx7d_sabre.mk" | xargs rm -rf diff --git a/repos/base-sel4/recipes/src/base-sel4-x86/content.mk b/repos/base-sel4/recipes/src/base-sel4-x86/content.mk index 68c43e1d09..7d706f6fd2 100644 --- a/repos/base-sel4/recipes/src/base-sel4-x86/content.mk +++ b/repos/base-sel4/recipes/src/base-sel4-x86/content.mk @@ -17,10 +17,17 @@ KERNEL_PORT_DIR := $(call port_dir,$(REP_DIR)/ports/sel4) src/kernel/sel4: src/kernel cp -r $(KERNEL_PORT_DIR)/src/kernel/sel4/* $@ +content: etc/board.conf + +etc/board.conf: + echo "BOARD = pc" > etc/board.conf + content: for spec in x86_32 x86_64 arm; do \ mv lib/mk/spec/$$spec/ld-sel4.mk lib/mk/spec/$$spec/ld.mk; \ done; sed -i "s/ld-sel4/ld/" src/lib/ld/sel4/target.mk sed -i "s/pit_timer_drv/timer/" src/timer/pit/target.inc + find lib/mk/spec -name kernel-sel4-*.mk -o -name syscall-sel4-*.mk |\ + grep -v "sel4-pc.mk" | xargs rm -rf diff --git a/repos/base-sel4/src/kernel/sel4/target.mk b/repos/base-sel4/src/kernel/sel4/target.mk index 5bb9406325..d7b42fd168 100644 --- a/repos/base-sel4/src/kernel/sel4/target.mk +++ b/repos/base-sel4/src/kernel/sel4/target.mk @@ -1,4 +1,4 @@ -BOARD ?= unknown +include $(REP_DIR)/etc/board.conf TARGET = sel4-$(BOARD) LIBS = kernel-sel4-$(BOARD) diff --git a/repos/base/mk/spec/imx53.mk b/repos/base/mk/spec/imx53.mk deleted file mode 100644 index 7669134d31..0000000000 --- a/repos/base/mk/spec/imx53.mk +++ /dev/null @@ -1,6 +0,0 @@ -SPECS += arm_v7a gpio framebuffer - -REP_INC_DIR += include/spec/imx53 - -include $(BASE_DIR)/mk/spec/arm_v7a.mk - diff --git a/repos/base/mk/spec/imx53_qsb.mk b/repos/base/mk/spec/imx53_qsb.mk deleted file mode 100644 index ceda40ebcf..0000000000 --- a/repos/base/mk/spec/imx53_qsb.mk +++ /dev/null @@ -1,5 +0,0 @@ -SPECS += imx53 - -REP_INC_DIR += include/spec/imx53_qsb - -include $(BASE_DIR)/mk/spec/imx53.mk diff --git a/repos/base/mk/spec/imx6.mk b/repos/base/mk/spec/imx6.mk deleted file mode 100644 index 159e7bcbc7..0000000000 --- a/repos/base/mk/spec/imx6.mk +++ /dev/null @@ -1,5 +0,0 @@ -SPECS += arm_v7a gpio - -REP_INC_DIR += include/spec/imx6 - -include $(BASE_DIR)/mk/spec/arm_v7a.mk diff --git a/repos/base/mk/spec/imx6q_sabrelite.mk b/repos/base/mk/spec/imx6q_sabrelite.mk deleted file mode 100644 index 8ccdd86e0f..0000000000 --- a/repos/base/mk/spec/imx6q_sabrelite.mk +++ /dev/null @@ -1,5 +0,0 @@ -SPECS += imx6 - -REP_INC_DIR += include/spec/imx6q_sabrelite - -include $(BASE_DIR)/mk/spec/imx6.mk diff --git a/repos/base/mk/spec/imx7d_sabre.mk b/repos/base/mk/spec/imx7d_sabre.mk deleted file mode 100644 index 0813ec30d1..0000000000 --- a/repos/base/mk/spec/imx7d_sabre.mk +++ /dev/null @@ -1,3 +0,0 @@ -SPECS += arm_v7a - -include $(BASE_DIR)/mk/spec/arm_v7a.mk diff --git a/repos/base/mk/spec/nit6_solox.mk b/repos/base/mk/spec/nit6_solox.mk deleted file mode 100644 index 0e484d2200..0000000000 --- a/repos/base/mk/spec/nit6_solox.mk +++ /dev/null @@ -1,5 +0,0 @@ -SPECS += imx6 - -REP_INC_DIR += include/spec/nit6_solox - -include $(BASE_DIR)/mk/spec/imx6.mk diff --git a/repos/base/mk/spec/pbxa9.mk b/repos/base/mk/spec/pbxa9.mk deleted file mode 100644 index e05c9c7645..0000000000 --- a/repos/base/mk/spec/pbxa9.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -# Enable peripherals of the platform -# -SPECS += pl050 pl11x ps2 pl180 lan9118 framebuffer - -# -# Pull in CPU specifics -# -SPECS += arm_v7a - -# -# Add device parameters to include search path -# -REP_INC_DIR += include/spec/pbxa9 - -include $(BASE_DIR)/mk/spec/arm_v7a.mk diff --git a/repos/base/mk/spec/rpi.mk b/repos/base/mk/spec/rpi.mk deleted file mode 100644 index aec33a3403..0000000000 --- a/repos/base/mk/spec/rpi.mk +++ /dev/null @@ -1,5 +0,0 @@ -SPECS += arm_v6 usb framebuffer gpio - -REP_INC_DIR += include/spec/rpi - -include $(BASE_DIR)/mk/spec/arm_v6.mk diff --git a/repos/base/mk/spec/usb_armory.mk b/repos/base/mk/spec/usb_armory.mk deleted file mode 100644 index 9f1dd8835c..0000000000 --- a/repos/base/mk/spec/usb_armory.mk +++ /dev/null @@ -1,5 +0,0 @@ -SPECS += imx53 - -REP_INC_DIR += include/spec/usb_armory - -include $(BASE_DIR)/mk/spec/imx53.mk diff --git a/repos/base/mk/spec/wand_quad.mk b/repos/base/mk/spec/wand_quad.mk deleted file mode 100644 index 531b62d86f..0000000000 --- a/repos/base/mk/spec/wand_quad.mk +++ /dev/null @@ -1,5 +0,0 @@ -SPECS += imx6 - -REP_INC_DIR += include/spec/wand_quad - -include $(BASE_DIR)/mk/spec/imx6.mk diff --git a/repos/base/mk/spec/x86.mk b/repos/base/mk/spec/x86.mk deleted file mode 100644 index 62bce43960..0000000000 --- a/repos/base/mk/spec/x86.mk +++ /dev/null @@ -1,3 +0,0 @@ -ifeq ($(filter $(SPECS),linux),) -SPECS += vesa pci ps2 framebuffer usb -endif diff --git a/repos/base/mk/spec/x86_32.mk b/repos/base/mk/spec/x86_32.mk index 631e04c661..b140b5db7c 100644 --- a/repos/base/mk/spec/x86_32.mk +++ b/repos/base/mk/spec/x86_32.mk @@ -17,4 +17,3 @@ LD_MARCH ?= -melf_i386 AS_MARCH ?= -march=i686 --32 include $(BASE_DIR)/mk/spec/32bit.mk -include $(BASE_DIR)/mk/spec/x86.mk diff --git a/repos/base/mk/spec/x86_64.mk b/repos/base/mk/spec/x86_64.mk index 4e041f4027..8dbb698660 100644 --- a/repos/base/mk/spec/x86_64.mk +++ b/repos/base/mk/spec/x86_64.mk @@ -21,4 +21,3 @@ CC_MARCH ?= -m64 -mcmodel=large LD_MARCH ?= -melf_x86_64 include $(BASE_DIR)/mk/spec/64bit.mk -include $(BASE_DIR)/mk/spec/x86.mk diff --git a/repos/base/mk/spec/zynq.mk b/repos/base/mk/spec/zynq.mk deleted file mode 100644 index e7e1ccfa17..0000000000 --- a/repos/base/mk/spec/zynq.mk +++ /dev/null @@ -1,8 +0,0 @@ -# -# Pull in CPU specifics -# -SPECS += arm_v7a - -REP_INC_DIR += include/spec/zynq - -include $(BASE_DIR)/mk/spec/arm_v7a.mk diff --git a/repos/base/mk/spec/zynq_qemu.mk b/repos/base/mk/spec/zynq_qemu.mk deleted file mode 100644 index af7f93796b..0000000000 --- a/repos/base/mk/spec/zynq_qemu.mk +++ /dev/null @@ -1,8 +0,0 @@ -# -# Pull in CPU specifics -# -SPECS += zynq - -REP_INC_DIR += include/spec/zynq_qemu - -include $(BASE_DIR)/mk/spec/zynq.mk diff --git a/repos/base/run/migrate.run b/repos/base/run/migrate.run index cc3cd573d3..12534ac927 100644 --- a/repos/base/run/migrate.run +++ b/repos/base/run/migrate.run @@ -4,7 +4,7 @@ if {![have_include "power_on/qemu"]} { puts "Run script is not supported on this platform" exit 0 } -if {[have_spec foc] && ([have_spec pbxa9] || [have_spec rpi3])} { +if {[have_spec foc] && ([have_board pbxa9] || [have_board rpi3])} { # foc kernel does detect solely 1 CPU */ puts "Run script is not supported on this platform" exit 0 diff --git a/repos/base/run/platform_drv.inc b/repos/base/run/platform_drv.inc index 51890f5691..679d2b9ff8 100644 --- a/repos/base/run/platform_drv.inc +++ b/repos/base/run/platform_drv.inc @@ -1,30 +1,9 @@ proc have_platform_drv {} { - if {[have_spec linux]} { - return 0 - } - - return [expr [have_spec imx53] \ - || [have_spec rpi] \ - || [have_spec x86]] -} - - -## -# Return 1 if the scenario depends on the USB driver on the used platform -# -# On most ARM platform, user input is provided by an USB HID device. On other -# platforms, the USB driver may be omitted. -# -proc need_usb_hid { } { - - # covered by fb_sdl - if {[have_spec linux]} { return 0 } - - # covered by ps2_drv - if {[have_spec x86]} { return 0 } - if {[have_spec pbxa9]} { return 0 } - - return [have_spec usb] + return [expr [have_board imx53_qsb] \ + || [have_board imx53_qsb_tz] \ + || [have_board rpi] \ + || [have_board muen] \ + || [have_board pc]] } @@ -32,10 +11,11 @@ proc need_usb_hid { } { # Return name of the USB driver binary # proc usb_host_drv_binary { } { - if {[have_spec rpi]} { return rpi_usb_host_drv } - if {[have_spec imx6q_sabrelite]} { return imx6q_sabrelite_usb_host_drv } - if {[have_spec imx8q_evk]} { return imx8q_evk_usb_host_drv } - if {[have_spec x86]} { return x86_pc_usb_host_drv } + if {[have_board rpi]} { return rpi_usb_host_drv } + if {[have_board imx6q_sabrelite]} { return imx6q_sabrelite_usb_host_drv } + if {[have_board imx8q_evk]} { return imx8q_evk_usb_host_drv } + if {[have_board muen]} { return x86_pc_usb_host_drv } + if {[have_board pc]} { return x86_pc_usb_host_drv } return no_usb_drv_available } @@ -44,8 +24,9 @@ proc usb_host_drv_binary { } { # Return name of the audio driver binary # proc audio_drv_binary { } { - if {[have_spec linux]} { return linux_audio_drv } - if {[have_spec x86]} { return pci_audio_drv } + if {[have_board linux]} { return linux_audio_drv } + if {[have_board muen]} { return pci_audio_drv } + if {[have_board pc]} { return pci_audio_drv } return no_audio_drv_available } @@ -53,7 +34,7 @@ proc audio_drv_binary { } { # Return attributes of the audio driver's node # proc audio_drv_start_attr { } { - if {[have_spec linux]} { return {ld="no"} } + if {[have_board linux]} { return {ld="no"} } return "" } @@ -68,8 +49,8 @@ proc acpi_drv_name { } { proc platform_drv_build_components {} { set drv_build_components "" lappend_if [have_platform_drv] drv_build_components drivers/platform - lappend_if [have_spec x86] drv_build_components server/report_rom - if {[have_spec x86]} { + if {[have_board pc] || [have_board muen]} { + lappend drv_build_components server/report_rom if {[acpi_drv_name] eq "acpi_drv"} { lappend drv_build_components drivers/acpi } @@ -87,19 +68,21 @@ proc append_platform_drv_build_components {} { } proc platform_drv_binary {} { - if {[have_spec imx53] } { return imx53_platform_drv } - if {[have_spec rpi] } { return rpi_platform_drv } - if {[have_spec x86] } { return platform_drv } + if {[have_board imx53_qsb]} { return imx53_platform_drv } + if {[have_board imx53_qsb_tz]} { return imx53_platform_drv } + if {[have_board rpi]} { return rpi_platform_drv } + if {[have_board pc]} { return platform_drv } + if {[have_board muen]} { return platform_drv } return no_platform_drv_available } proc platform_drv_boot_modules {} { set drv_boot_modules "" lappend_if [have_platform_drv] drv_boot_modules [platform_drv_binary] - lappend_if [have_spec x86] drv_boot_modules report_rom if {[have_spec x86]} { - if {[have_spec muen]} { + lappend drv_boot_modules report_rom + if {[have_board muen]} { lappend drv_boot_modules acpi } else { lappend drv_boot_modules [acpi_drv_name] @@ -172,7 +155,7 @@ proc platform_drv_config_config {} { proc platform_drv_config {} { set drv_config "" - if {[have_spec x86] && ![have_spec muen] && ![have_spec linux]} { + if {[have_board pc]} { append drv_config { @@ -259,10 +242,10 @@ proc platform_drv_config {} { append drv_config "[platform_drv_add_routing]" - append_if [expr [have_spec x86] && ![have_spec muen]] drv_config { + append_if [have_board pc] drv_config { } - append_if [expr [have_spec rpi] || [have_spec x86]] drv_config { + append_if [expr [have_board rpi] || [have_board pc]] drv_config { } append drv_config { diff --git a/repos/base/run/smp.run b/repos/base/run/smp.run index c0cf1e54b1..95ad041f90 100644 --- a/repos/base/run/smp.run +++ b/repos/base/run/smp.run @@ -10,7 +10,7 @@ if { [get_cmd_switch --autopilot] && [have_include "power_on/qemu"] } { exit 0 } -if { [have_spec muen] } { +if { [have_board muen] } { puts "Run script is not supported on this platform" exit 0 } @@ -45,12 +45,12 @@ if {[have_include "power_on/qemu"]} { # pbxa9 - foc does only use 1 cpu even if more are configured # pbxa9 - hw does not support multiple CPUs - if {[have_spec pbxa9]} { set want_cpus 1 } + if {[have_board pbxa9]} { set want_cpus 1 } # kernels only using one CPU even if more are configured - if {[have_spec okl4]} { set want_cpus 1 } - if {[have_spec pistachio]} { set want_cpus 1 } - if {[have_spec fiasco]} { set want_cpus 1 } - if {[have_spec zynq]} { set want_cpus 1 } + if {[have_spec okl4]} { set want_cpus 1 } + if {[have_spec pistachio]} { set want_cpus 1 } + if {[have_spec fiasco]} { set want_cpus 1 } + if {[have_board zynq_qemu]} { set want_cpus 1 } append qemu_args " -nographic -smp $want_cpus,cores=$want_cpus " } diff --git a/repos/base/src/timer/epit/imx6/target.inc b/repos/base/src/timer/epit/imx6/target.inc index a5b968b0bc..68fea18f9e 100644 --- a/repos/base/src/timer/epit/imx6/target.inc +++ b/repos/base/src/timer/epit/imx6/target.inc @@ -1,5 +1,5 @@ TARGET = imx6_timer_drv -REQUIRES = imx6 +REQUIRES = arm_v7 GEN_DIR := $(dir $(call select_from_repositories,src/timer/main.cc)) INC_DIR += $(GEN_DIR)/epit SRC_CC += epit/time_source.cc epit/imx6/timer.cc diff --git a/repos/dde_bsd/src/drivers/audio/pci_audio_drv/target.mk b/repos/dde_bsd/src/drivers/audio/pci_audio_drv/target.mk index 12f3e48767..9f089ea4bd 100644 --- a/repos/dde_bsd/src/drivers/audio/pci_audio_drv/target.mk +++ b/repos/dde_bsd/src/drivers/audio/pci_audio_drv/target.mk @@ -1,4 +1,4 @@ -REQUIRES = x86 pci +REQUIRES = x86 TARGET = pci_audio_drv SRC_CC = main.cc LIBS = dde_bsd_audio dde_bsd_audio_pci base diff --git a/repos/dde_linux/run/nic_router_uplinks.run b/repos/dde_linux/run/nic_router_uplinks.run index 95c7f5c071..71679ea424 100644 --- a/repos/dde_linux/run/nic_router_uplinks.run +++ b/repos/dde_linux/run/nic_router_uplinks.run @@ -1,4 +1,4 @@ -if {[expr ![have_spec nova] && ![have_spec sel4] && ![have_spec hw] && ![have_spec foc] || ![have_spec x86] || [have_include power_on/qemu] || [have_spec muen]]} { +if {[expr ![have_spec nova] && ![have_spec sel4] && ![have_spec hw] && ![have_spec foc] || ![have_spec x86] || [have_include power_on/qemu] || [have_board muen]]} { puts "\n Run script is not supported on this platform. \n"; exit 0 } proc wifi_ssid {} { diff --git a/repos/dde_linux/run/usb_hid.run b/repos/dde_linux/run/usb_hid.run index b4c28420b1..9f1311cce9 100644 --- a/repos/dde_linux/run/usb_hid.run +++ b/repos/dde_linux/run/usb_hid.run @@ -38,26 +38,19 @@ # input events on the host PC. # -if { [have_spec linux] || [have_spec muen] } { - puts "Run script does not support Linux and Muen." - exit 0 -} - if { [get_cmd_switch --autopilot] && [have_include "power_on/qemu"] } { puts "Run script does not support autopilot mode on Qemu" exit 0 } -if { [get_cmd_switch --autopilot] && - ![have_spec rpi] && - ![have_spec x86]} { +if {![have_board rpi] && ![have_board pc]} { puts "Run script does not support autopilot mode on this platform" exit 0 } proc usb_drv_binary { } { - if {[have_spec rpi]} { return rpi_usb_drv } - if {[have_spec x86]} { return usb_drv } + if {[have_board rpi]} { return rpi_usb_drv } + if {[have_board pc]} { return usb_drv } return no_usb_drv_available } diff --git a/repos/dde_linux/run/usb_hid_raw.run b/repos/dde_linux/run/usb_hid_raw.run index 1251f756c2..53ac9f4982 100644 --- a/repos/dde_linux/run/usb_hid_raw.run +++ b/repos/dde_linux/run/usb_hid_raw.run @@ -38,7 +38,7 @@ # input events on the host PC. # -if { [have_spec linux] || [have_spec muen] } { +if { [have_board linux] || [have_board muen] } { puts "Run script does not support Linux and Muen." exit 0 } @@ -49,16 +49,16 @@ if { [get_cmd_switch --autopilot] && [have_include "power_on/qemu"] } { } if { [get_cmd_switch --autopilot] && - ![have_spec rpi] && + ![have_board rpi] && ![have_spec x86] && - ![have_spec imx6q_sabrelite] && - ![have_spec imx8q_evk]} { + ![have_board imx6q_sabrelite] && + ![have_board imx8q_evk]} { puts "Run script does not support autopilot mode on this platform" exit 0 } proc platform_drv_config_non_x86 {} { - if {[have_spec imx8q_evk]} { + if {[have_board imx8q_evk]} { return { @@ -82,7 +82,7 @@ proc platform_drv_config_non_x86 {} { } } - if {[have_spec imx6q_sabrelite]} { + if {[have_board imx6q_sabrelite]} { return { @@ -108,7 +108,7 @@ proc platform_drv_config_non_x86 {} { } } - if {[have_spec rpi]} { + if {[have_board rpi]} { return { @@ -123,9 +123,9 @@ proc platform_drv_config_non_x86 {} { } proc platform_drv_binary_non_x86 {} { - if {[have_spec imx8q_evk]} { return imx8mq_platform_drv } - if {[have_spec imx6q_sabrelite]} { return platform_drv } - if {[have_spec rpi]} { return rpi_new_platform_drv } + if {[have_board imx8q_evk]} { return imx8mq_platform_drv } + if {[have_board imx6q_sabrelite]} { return platform_drv } + if {[have_board rpi]} { return rpi_new_platform_drv } return no_platform_drv_available } diff --git a/repos/dde_linux/run/usb_hid_reconnect.run b/repos/dde_linux/run/usb_hid_reconnect.run index d2b63c81e4..8dd75f6622 100644 --- a/repos/dde_linux/run/usb_hid_reconnect.run +++ b/repos/dde_linux/run/usb_hid_reconnect.run @@ -5,7 +5,7 @@ assert_spec x86 -if { [have_spec linux] || [have_spec muen] } { +if { [have_spec linux] || [have_board muen] } { puts "Run script does not support Linux and Muen." exit 0 } diff --git a/repos/dde_linux/run/usb_net.run b/repos/dde_linux/run/usb_net.run index e0394e1733..e3e25a4887 100644 --- a/repos/dde_linux/run/usb_net.run +++ b/repos/dde_linux/run/usb_net.run @@ -61,9 +61,9 @@ append config { } -append_if [have_spec arndale] config { +append_if [have_board arndale] config { } -append_if [have_spec rpi] config { +append_if [have_board rpi] config { } append_if [have_spec x86] config { } diff --git a/repos/gems/run/depot_autopilot.run b/repos/gems/run/depot_autopilot.run index 23ed8a2732..fac2d814da 100644 --- a/repos/gems/run/depot_autopilot.run +++ b/repos/gems/run/depot_autopilot.run @@ -757,11 +757,11 @@ proc non_executable_supported { } { # set skip_test(test-fault_detection) [expr [have_spec pistachio] || [have_spec fiasco]] set skip_test(test-fs_packet) [expr ![interactive] && [have_include "power_on/qemu"]] -set skip_test(test-libc) [expr [have_spec sel4] || [have_spec rpi] || [expr [have_spec pbxa9] && [have_spec foc]] || [expr [have_spec imx53] && [have_spec trustzone]]] -set skip_test(test-lx_block) [expr ![have_spec linux]] -set skip_test(test-rm_fault) [expr [have_spec linux] || ![non_executable_supported]] -set skip_test(test-rm_fault_no_nox) [expr [have_spec linux] || ![skip_test test-rm_fault]] -set skip_test(test-rm_nested) [expr [have_spec linux]] +set skip_test(test-libc) [expr [have_spec sel4] || [have_board rpi] || [expr [have_board pbxa9] && [have_spec foc]] || [have_board imx53_qsb_tz]] +set skip_test(test-lx_block) [expr ![have_board linux]] +set skip_test(test-rm_fault) [expr [have_board linux] || ![non_executable_supported]] +set skip_test(test-rm_fault_no_nox) [expr [have_board linux] || ![skip_test test-rm_fault]] +set skip_test(test-rm_nested) [expr [have_board linux]] set skip_test(test-slab) [expr ![interactive] && [have_include "power_on/qemu"]] set skip_test(test-spark_exception) [expr [have_spec arm]] set skip_test(test-tcp_bulk_lwip) [expr ![have_spec x86] && ![have_include "power_on/qemu"]] diff --git a/repos/gems/run/depot_download.run b/repos/gems/run/depot_download.run index 4a8735ef58..a6fc32519b 100644 --- a/repos/gems/run/depot_download.run +++ b/repos/gems/run/depot_download.run @@ -1,7 +1,6 @@ create_boot_directory -if {[have_spec linux] || [have_spec rpi3] || - [expr [have_spec imx53] && [have_spec trustzone]]} { +if {[have_board linux] || [have_board rpi3] || [have_board imx53_qsb_tz]} { puts "Run script does not support this platform." exit 0 } diff --git a/repos/gems/run/sculpt.run b/repos/gems/run/sculpt.run index d3587a51b0..85ea491073 100644 --- a/repos/gems/run/sculpt.run +++ b/repos/gems/run/sculpt.run @@ -1,4 +1,4 @@ -if {![have_spec pc] && ![have_spec imx8q_evk]} { +if {![have_board pc] && ![have_board imx8q_evk]} { puts "Platform is unsupported."; exit 0; } @@ -18,8 +18,8 @@ proc config_system_content {} { return {\ } } proc nic_drv {} { - if {[have_spec pc]} { return ipxe_nic_drv } - if {[have_spec imx8q_evk]} { return fec_nic_drv } + if {[have_board pc]} { return ipxe_nic_drv } + if {[have_board imx8q_evk]} { return fec_nic_drv } puts "\n Run script is not supported on this platform. \n"; exit 0; } @@ -523,7 +523,7 @@ file copy -force [genode_dir]/VERSION [run_dir]/genode/ file copy -force [genode_dir]/repos/gems/src/app/backdrop/genode_logo.png [run_dir]/genode/ file copy -force [genode_dir]/repos/gems/run/sculpt/drop_shadow.png [run_dir]/genode/ -if {[have_spec pc]} { +if {[have_board pc]} { file copy -force [genode_dir]/repos/gems/recipes/raw/drivers_managed-pc/event_filter.config \ [run_dir]/genode/event_filter.config diff --git a/repos/gems/run/tiled_wm.run b/repos/gems/run/tiled_wm.run index 68f7c1ef85..79f2c2ceb6 100644 --- a/repos/gems/run/tiled_wm.run +++ b/repos/gems/run/tiled_wm.run @@ -5,12 +5,6 @@ import_from_depot [depot_user]/src/qt5_component \ [depot_user]/src/dynamic_rom \ [depot_user]/src/test-tiled_wm -if {[have_spec odroid_xu]} { - puts "Run script does not support this platform." - exit 0 -} - - # # Generate config # diff --git a/repos/libports/run/acpica.run b/repos/libports/run/acpica.run index 53bac45c0a..cf75822097 100644 --- a/repos/libports/run/acpica.run +++ b/repos/libports/run/acpica.run @@ -1,5 +1,3 @@ -assert_spec acpi - if { ![have_spec hw] && ![have_spec nova] && diff --git a/repos/libports/run/fatfs_blkio.run b/repos/libports/run/fatfs_blkio.run index a0c2050e6e..22e62547ea 100644 --- a/repos/libports/run/fatfs_blkio.run +++ b/repos/libports/run/fatfs_blkio.run @@ -4,13 +4,13 @@ # \date 2017-07-31 # -if {[have_spec odroid_xu] || [have_spec zynq]} { +if {[have_board zynq_qemu]} { puts "Run script does not support this platform." exit 0 } # use SD on ARM -set use_sd_card_drv [expr [have_spec pbxa9]] +set use_sd_card_drv [expr [have_board pbxa9]] # use AHCI on x86 set use_ahci [expr [have_spec x86] && ![have_spec linux]] diff --git a/repos/libports/run/fetchurl.inc b/repos/libports/run/fetchurl.inc index dc45469bc4..81382b5418 100644 --- a/repos/libports/run/fetchurl.inc +++ b/repos/libports/run/fetchurl.inc @@ -4,13 +4,12 @@ # \date 2016-06-05 # -if {[have_spec rpi3] || - [expr [have_spec imx53] && [have_spec trustzone]]} { +if {[have_board rpi3] || [have_board imx53_qsb_tz]} { puts "Run script does not support this platform." exit 0 } -if {[get_cmd_switch --autopilot] && [have_spec linux]} { +if {[get_cmd_switch --autopilot] && [have_board linux]} { puts "Autopilot mode is not supported on this platform." exit 0 } @@ -28,7 +27,7 @@ if {[get_cmd_switch --autopilot] && [have_spec linux]} { proc socket_fs_plugin { } { set result "<[ip_stack]" - if {[have_spec linux]} { + if {[have_board linux]} { append result { ip_addr="10.0.2.55" netmask="255.255.255.0"} append result { gateway="10.0.2.1" nameserver="1.1.1.1"} } else { diff --git a/repos/libports/run/ieee754.run b/repos/libports/run/ieee754.run index 13f0159657..4ad7431a32 100644 --- a/repos/libports/run/ieee754.run +++ b/repos/libports/run/ieee754.run @@ -2,7 +2,7 @@ # Raspberry PI 1 needs "undef exc" handling emulation code in the kernel # for ieee754 full-compliant support # -if {[have_spec rpi]} { +if {[have_board rpi]} { puts "Run script does not support Raspberry Pi 1" exit 0 } diff --git a/repos/libports/run/libc_block.run b/repos/libports/run/libc_block.run index 3b53665bee..63d2b01d27 100644 --- a/repos/libports/run/libc_block.run +++ b/repos/libports/run/libc_block.run @@ -1,4 +1,4 @@ -set use_sd_card_drv [expr [have_spec pbxa9]] +set use_sd_card_drv [expr [have_board pbxa9]] set use_ahci_drv [expr [have_spec x86] && ![have_spec linux]] set use_vfs_block [have_spec linux] diff --git a/repos/libports/run/libc_filesystem_test.inc b/repos/libports/run/libc_filesystem_test.inc index c4c2bc9d76..ae92fdd7c9 100644 --- a/repos/libports/run/libc_filesystem_test.inc +++ b/repos/libports/run/libc_filesystem_test.inc @@ -4,19 +4,19 @@ # \date 2011-05-27 # -if {[have_spec odroid_xu] || [have_spec zynq]} { +if {[have_board zynq_qemu]} { puts "Run script does not support this platform." exit 0 } # use SD on Qemu/pbxa9 -set use_sd_card_drv [expr [have_include "power_on/qemu"] && [have_spec pbxa9]] +set use_sd_card_drv [expr [have_include "power_on/qemu"] && [have_board pbxa9]] # use AHCI on x86 set use_ahci [expr [have_spec x86] && ![have_spec linux]] # use vfs_block on Linux and Qemu/rpi3 -set use_vfs_block [expr [have_spec linux] || [expr [have_include "power_on/qemu"] && [have_spec rpi3]]] +set use_vfs_block [expr [have_spec linux] || [expr [have_include "power_on/qemu"] && [have_board rpi3]]] if {[catch { exec which $mkfs_cmd } ]} { puts stderr "Error: $mkfs_cmd not installed, aborting test"; exit } diff --git a/repos/libports/run/libc_vfs_filesystem_test.inc b/repos/libports/run/libc_vfs_filesystem_test.inc index 3deb3f8cbd..b128341586 100644 --- a/repos/libports/run/libc_vfs_filesystem_test.inc +++ b/repos/libports/run/libc_vfs_filesystem_test.inc @@ -14,19 +14,19 @@ # \arg test_boot_modules # -if {[have_spec odroid_xu] || [have_spec zynq]} { +if {[have_board zynq_qemu]} { puts "Run script does not support this platform." exit 0 } # use SD on ARM -set use_sd_card_drv [expr [have_spec pbxa9]] +set use_sd_card_drv [expr [have_board pbxa9]] # use AHCI on x86 set use_ahci [expr [have_spec x86] && ![have_spec linux]] # use vfs_block on Linux -set use_vfs_block [expr [have_spec linux] || [have_spec rpi3]] +set use_vfs_block [expr [have_spec linux] || [have_board rpi3]] if {[catch { exec which $mkfs_cmd } ]} { puts stderr "Error: $mkfs_cmd not installed, aborting test"; exit } diff --git a/repos/libports/run/libc_vfs_fs_test.inc b/repos/libports/run/libc_vfs_fs_test.inc index 19c17cfe26..add6c8d39b 100644 --- a/repos/libports/run/libc_vfs_fs_test.inc +++ b/repos/libports/run/libc_vfs_fs_test.inc @@ -4,12 +4,12 @@ # \date 2017-06-13 # -set use_sd_card_drv [expr [have_spec pbxa9]] +set use_sd_card_drv [expr [have_board pbxa9]] set use_ahci_drv [expr [have_spec x86] && ![have_spec linux]] set use_vfs_block [have_spec linux] set mkfs [installed_command $mkfs_cmd] -if {[expr ![have_spec pbxa9] && ![have_spec x86]]} { +if {[expr ![have_board pbxa9] && ![have_spec x86]]} { puts "Run script does not support this platform"; exit } # diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run index ba6ffc8e15..9a05446ccb 100644 --- a/repos/libports/run/lwip.run +++ b/repos/libports/run/lwip.run @@ -20,10 +20,10 @@ # tun/tap proxy driver at os/src/drivers/nic/linux) # -if {[expr [have_spec linux]] || - [expr [have_spec imx53] && [have_spec trustzone]] || - [have_spec rpi3] || - [expr [have_spec riscv]]} { +if {[have_board linux] || + [have_board imx53_qsb_tz] || + [have_board rpi3] || + [have_board spike]} { puts "\n Run script is not supported on this platform. \n"; exit 0 } set lynx [installed_command lynx] diff --git a/repos/libports/run/netty.inc b/repos/libports/run/netty.inc index 982c2f8bfc..0ff57fdfc9 100644 --- a/repos/libports/run/netty.inc +++ b/repos/libports/run/netty.inc @@ -106,9 +106,9 @@ append_qemu_nic_args # When using with a tap device manually replace append_qemu_nic_args with: #proc qemu_nic_model {} { -# if [have_spec x86] { return e1000 } -# if [have_spec lan9118] { return lan9118 } -# if [have_spec zynq] { return cadence_gem } +# if [have_spec x86] { return e1000 } +# if [have_board pbxa9] { return lan9118 } +# if [have_board zynq_qemu] { return cadence_gem } # return nic_model_missing #} #append qemu_args " -net nic,model=[qemu_nic_model] " diff --git a/repos/libports/run/netty_lwip.inc b/repos/libports/run/netty_lwip.inc index b198c6048c..c1c496b92f 100644 --- a/repos/libports/run/netty_lwip.inc +++ b/repos/libports/run/netty_lwip.inc @@ -65,9 +65,9 @@ append qemu_args " -nographic " append_qemu_nic_args #proc qemu_nic_model {} { -# if [have_spec x86] { return e1000 } -# if [have_spec lan9118] { return lan9118 } -# if [have_spec zynq] { return cadence_gem } +# if [have_spec x86] { return e1000 } +# if [have_board pbxa9] { return lan9118 } +# if [have_board zynq_qemu] { return cadence_gem } # return nic_model_missing #} #append qemu_args " -net nic,model=[qemu_nic_model] " diff --git a/repos/libports/run/nic_bridge.run b/repos/libports/run/nic_bridge.run index a45acbc884..0cb6c6dce1 100644 --- a/repos/libports/run/nic_bridge.run +++ b/repos/libports/run/nic_bridge.run @@ -3,7 +3,7 @@ if {![have_include power_on/qemu]} { exit 0 } -if {[have_spec rpi3]} { +if {[have_board rpi3]} { puts "\n Run script is not supported on this platform. \n"; exit 0 } diff --git a/repos/libports/run/qt5_common.inc b/repos/libports/run/qt5_common.inc index dbb8f901d8..037d5c446b 100644 --- a/repos/libports/run/qt5_common.inc +++ b/repos/libports/run/qt5_common.inc @@ -79,14 +79,10 @@ set qt5_event_filter_config { - } -append_if [have_spec ps2] qt5_event_filter_config { - } -append_if [have_spec usb] qt5_event_filter_config { - } -append_if [have_spec linux] qt5_event_filter_config { - } -append qt5_event_filter_config { + + + + @@ -107,14 +103,10 @@ append qt5_event_filter_config " append qt5_event_filter_config { - } -append_if [have_spec ps2] qt5_event_filter_config { - } -append_if [have_spec usb] qt5_event_filter_config { - } -append_if [have_spec linux] qt5_event_filter_config { - } -append qt5_event_filter_config { + + + + } set fd [open bin/qt5_event_filter.config w] diff --git a/repos/libports/run/smartcard.run b/repos/libports/run/smartcard.run index 8da874ea04..704c12c4b5 100644 --- a/repos/libports/run/smartcard.run +++ b/repos/libports/run/smartcard.run @@ -5,7 +5,7 @@ # configured for the application and for the USB driver. # -if { [have_include "power_on/qemu"] || [have_spec linux] || [have_spec muen] } { +if { [have_include "power_on/qemu"] || [have_spec linux] || [have_board muen] } { puts "Run script does not support Qemu, Linux, and Muen" exit 0 } diff --git a/repos/os/run/cpu_balancer.run b/repos/os/run/cpu_balancer.run index 5208a5ead8..309cc9b479 100644 --- a/repos/os/run/cpu_balancer.run +++ b/repos/os/run/cpu_balancer.run @@ -4,7 +4,7 @@ if {![have_include "power_on/qemu"]} { puts "Run script is not supported on this platform" exit 0 } -if {[have_spec foc] && ([have_spec pbxa9] || [have_spec rpi3])} { +if {[have_spec foc] && ([have_board pbxa9] || [have_board rpi3])} { # foc kernel does detect solely 1 CPU */ puts "Run script is not supported on this platform" exit 0 diff --git a/repos/os/run/cpu_bench.run b/repos/os/run/cpu_bench.run index 7c8f72207e..66fa2255cc 100644 --- a/repos/os/run/cpu_bench.run +++ b/repos/os/run/cpu_bench.run @@ -5,7 +5,7 @@ if { [get_cmd_switch --autopilot] } { } } -if {[have_spec linux] || [have_spec riscv]} { +if {[have_board linux] || [have_board spike]} { puts "\n Run script is not supported on this platform. \n"; exit 0 } diff --git a/repos/os/run/demo.run b/repos/os/run/demo.run index 9bf4eef4e7..64303aa0c0 100644 --- a/repos/os/run/demo.run +++ b/repos/os/run/demo.run @@ -1,6 +1,6 @@ -if {[have_spec imx6q_sabrelite] || - [have_spec imx7d_sabre] || - ([get_cmd_switch --autopilot] && [have_spec linux]) || +if {[have_board imx6q_sabrelite] || + [have_board imx7d_sabre] || + ([get_cmd_switch --autopilot] && [have_board linux]) || ([get_cmd_switch --autopilot] && [have_include "power_on/qemu"])} { puts "Run script does not support this platform." exit 0 diff --git a/repos/os/run/fb_bench.run b/repos/os/run/fb_bench.run index 9190f03a2f..49f333e074 100644 --- a/repos/os/run/fb_bench.run +++ b/repos/os/run/fb_bench.run @@ -1,8 +1,9 @@ -if {[have_spec imx7d_sabre] || - [have_spec imx6q_sabrelite] || - [have_spec rpi3] || - [have_spec zynq] || - [have_spec imx53] && [have_spec foc]} { +if {[have_board imx7d_sabre] || + [have_board imx6q_sabrelite] || + [have_board rpi3] || + [have_board zynq] || + [have_board imx53_qsb_tz] || + [have_board imx53_qsb] && [have_spec foc]} { puts "\n Run script is not supported on this platform. \n"; exit 0 } diff --git a/repos/os/run/gpio_led.run b/repos/os/run/gpio_led.run index bf6dd5385d..74d42df84a 100644 --- a/repos/os/run/gpio_led.run +++ b/repos/os/run/gpio_led.run @@ -1,7 +1,7 @@ # # Build # -if {[have_spec rpi] == 0} { +if {![have_board rpi]} { puts "Runs only on platforms with GPIO" exit 0 } diff --git a/repos/os/run/gpio_signal.run b/repos/os/run/gpio_signal.run index 1b142fa78c..ae2035d113 100644 --- a/repos/os/run/gpio_signal.run +++ b/repos/os/run/gpio_signal.run @@ -1,7 +1,7 @@ # # Build # -if {[have_spec rpi] == 0} { +if {![have_board rpi]} { puts "Runs only on platforms with GPIO" exit 0 } diff --git a/repos/os/run/input.run b/repos/os/run/input.run index 7535f3e34d..0c7b3b88ec 100644 --- a/repos/os/run/input.run +++ b/repos/os/run/input.run @@ -9,9 +9,10 @@ set build_components { core init timer server/dynamic_rom server/event_dump } source ${genode_dir}/repos/base/run/platform_drv.inc append_platform_drv_build_components -lappend_if [have_spec ps2] build_components drivers/ps2 -lappend_if [have_spec sdl] build_components drivers/framebuffer/sdl -lappend_if [have_spec sdl] build_components server/nitpicker +lappend_if [have_board pc] build_components drivers/ps2 +lappend_if [have_board muen] build_components drivers/ps2 +lappend_if [have_board linux] build_components drivers/framebuffer/sdl +lappend_if [have_board linux] build_components server/nitpicker build $build_components @@ -52,7 +53,7 @@ append config { append_platform_drv_config -append_if [have_spec ps2] config { +append_if [expr [have_board pc] || [have_board muen]] config { } -append_if [have_spec sdl] config { +append_if [have_board linux] config { @@ -156,9 +157,10 @@ set boot_modules { core ld.lib.so init timer dynamic_rom event_dump } # platform-specific modules append_platform_drv_boot_modules -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec sdl] boot_modules fb_sdl -lappend_if [have_spec sdl] boot_modules nitpicker +lappend_if [have_board pc] boot_modules ps2_drv +lappend_if [have_board muen] boot_modules ps2_drv +lappend_if [have_board linux] boot_modules fb_sdl +lappend_if [have_board linux] boot_modules nitpicker build_boot_image $boot_modules diff --git a/repos/os/run/nic_dump.run b/repos/os/run/nic_dump.run index 5b15cbfba4..5378f0b0d7 100644 --- a/repos/os/run/nic_dump.run +++ b/repos/os/run/nic_dump.run @@ -1,5 +1,5 @@ -if {[have_spec foc] || [have_spec linux] || [have_spec rpi3] || - [expr [have_spec imx53] && [have_spec trustzone]]} { +if {[have_spec foc] || [have_spec linux] || [have_board rpi3] || + [have_board imx53_qsb_tz]} { puts "Run script is not supported on this platform." exit 0 } diff --git a/repos/os/run/nic_router_disable_arp.run b/repos/os/run/nic_router_disable_arp.run index b6df26d6a1..41d2b8b6a9 100644 --- a/repos/os/run/nic_router_disable_arp.run +++ b/repos/os/run/nic_router_disable_arp.run @@ -1,5 +1,5 @@ if {![have_include power_on/qemu] || [have_spec foc] || [have_spec linux] || - [have_spec rpi3] || [expr [have_spec imx53] && [have_spec trustzone]]} { + [have_board rpi3] || [have_board imx53_qsb_tz]} { puts "Run script is not supported on this platform." exit 0 diff --git a/repos/os/run/nic_router_flood.run b/repos/os/run/nic_router_flood.run index 0cfb8f459b..f2045b0e63 100644 --- a/repos/os/run/nic_router_flood.run +++ b/repos/os/run/nic_router_flood.run @@ -1,7 +1,7 @@ if {![have_include power_on/qemu] || [have_spec foc] || - [have_spec rpi3] || - [expr [have_spec imx53] && [have_spec trustzone]]} { + [have_board rpi3] || + [have_board imx53_qsb_tz]} { puts "Run script is not supported on this platform." exit 0 diff --git a/repos/os/run/pci.run b/repos/os/run/pci.run index 1f436b05bb..30d1abd36c 100644 --- a/repos/os/run/pci.run +++ b/repos/os/run/pci.run @@ -1,4 +1,3 @@ -assert_spec pci # # Build # diff --git a/repos/os/run/ping.run b/repos/os/run/ping.run index 899f3d4b24..1e7d53b521 100644 --- a/repos/os/run/ping.run +++ b/repos/os/run/ping.run @@ -32,9 +32,7 @@ # ! sudo dhclient -v eth0 # -if {[have_spec foc] || [have_spec rpi3] || - [expr [have_spec imx53] && [have_spec trustzone]]} { - +if {[have_spec foc] || [have_board rpi3] || [have_board imx53_qsb_tz]} { puts "Run script is not supported on this platform." exit 0 } diff --git a/repos/os/run/ping_nic_router.run b/repos/os/run/ping_nic_router.run index d8eb2ecdb5..7a041f1035 100644 --- a/repos/os/run/ping_nic_router.run +++ b/repos/os/run/ping_nic_router.run @@ -1,5 +1,5 @@ -if {[have_spec foc] || [have_spec linux] || [have_spec rpi3] || - [expr [have_spec imx53] && [have_spec trustzone]]} { +if {[have_spec foc] || [have_spec linux] || [have_board rpi3] || + [have_board imx53_qsb_tz]} { puts "Run script is not supported on this platform." exit 0 } diff --git a/repos/os/run/sd_card_bench.run b/repos/os/run/sd_card_bench.run index ee8ee1bb68..9d17d3a4f9 100644 --- a/repos/os/run/sd_card_bench.run +++ b/repos/os/run/sd_card_bench.run @@ -3,38 +3,40 @@ # proc buffer_size_kib {} { - if {[have_spec pbxa9]} { return [expr 12 * 1024] } - if {[have_spec imx8q_evk]} { return [expr 1024] } - if {[have_spec imx6]} { return [expr 1024] } - if {[have_spec imx53]} { return [expr 1024] } - if {[have_spec rpi]} { return [expr 4 * 1024] } + if {[have_board pbxa9]} { return [expr 12 * 1024] } + if {[have_board imx8q_evk]} { return [expr 1024] } + if {[have_board imx6q_sabrelite]} { return [expr 1024] } + if {[have_board imx53_qsb]} { return [expr 1024] } + if {[have_board imx53_qsb_tz]} { return [expr 1024] } + if {[have_board rpi]} { return [expr 4 * 1024] } puts "\n Run script is not supported on this platform. \n"; exit 0; } proc sd_card_drv {} { - if {[have_spec pbxa9]} { return pl180_sd_card_drv } - if {[have_spec imx8q_evk]} { return imx8_sd_card_drv } - if {[have_spec imx6q_sabrelite]} { return imx6_sd_card_drv } - if {[have_spec imx53]} { return imx53_sd_card_drv } - if {[have_spec rpi]} { return rpi_sd_card_drv } + if {[have_board pbxa9]} { return pl180_sd_card_drv } + if {[have_board imx8q_evk]} { return imx8_sd_card_drv } + if {[have_board imx6q_sabrelite]} { return imx6_sd_card_drv } + if {[have_board imx53_qsb]} { return imx53_sd_card_drv } + if {[have_board imx53_qsb_tz]} { return imx53_sd_card_drv } + if {[have_board rpi]} { return rpi_sd_card_drv } puts "\n Run script is not supported on this platform. \n"; exit 0; } proc platform_drv {} { - if {[have_spec imx8q_evk]} { return imx8mq_platform_drv } + if {[have_board imx8q_evk]} { return imx8mq_platform_drv } return platform_drv } proc device_resources {} { - if {[have_spec pbxa9]} { + if {[have_board pbxa9]} { return { } } - if {[have_spec imx8q_evk]} { + if {[have_board imx8q_evk]} { return { @@ -44,21 +46,21 @@ proc device_resources {} { } } - if {[have_spec imx6q_sabrelite]} { + if {[have_board imx6q_sabrelite]} { return { } } - if {[have_spec imx53]} { + if {[have_board imx53_qsb] || [have_board imx53_qsb_tz]} { return { } } - if {[have_spec rpi]} { + if {[have_board rpi]} { return { @@ -151,5 +153,3 @@ run_genode_until "--- SD card benchmark finished ---" 120 if {[have_include power_on/qemu]} { if { [file exists $disk_image] != 0 } then { exec rm -f $disk_image - } -} diff --git a/repos/os/run/timeout.run b/repos/os/run/timeout.run index 0888fb4e67..ac4a04ae4b 100644 --- a/repos/os/run/timeout.run +++ b/repos/os/run/timeout.run @@ -7,9 +7,9 @@ # proc fast_polling_buf_size { } { - if {[expr [have_spec pbxa9] && [have_spec foc]]} { return 40000000 } - if {[expr [have_spec imx53_qsb_tz] && [have_spec hw]]} { return 40000000 } - if {[expr [have_spec rpi] && [have_spec hw]]} { return 40000000 } + if {[expr [have_board pbxa9] && [have_spec foc]]} { return 40000000 } + if {[expr [have_board imx53_qsb_tz] && [have_spec hw]]} { return 40000000 } + if {[expr [have_board rpi] && [have_spec hw]]} { return 40000000 } return 80000000 } diff --git a/repos/os/run/tz_vmm.run b/repos/os/run/tz_vmm.run index dda816affc..b93aa60a07 100644 --- a/repos/os/run/tz_vmm.run +++ b/repos/os/run/tz_vmm.run @@ -86,13 +86,12 @@ # assert_spec hw -assert_spec imx53 -assert_spec trustzone +assert_spec imx53_qsb_tz # determine platform specific configuration -set trusted_led [have_spec usb_armory] -set inversepath_linux [have_spec usb_armory] -set freescale_linux [have_spec imx53_qsb] +set trusted_led [have_board usb_armory] +set inversepath_linux [have_board usb_armory] +set freescale_linux [have_board imx53_qsb_tz] set initrd_rootfs $freescale_linux set mmc_rootfs $inversepath_linux set dtb $inversepath_linux @@ -100,15 +99,15 @@ set dtb $inversepath_linux set targets { core init server/tz_vmm } proc tz_vmm_binary {} { - if {[have_spec usb_armory]} { return usb_armory_tz_vmm } - if {[have_spec imx53_qsb]} { return imx53_qsb_tz_vmm } + if {[have_board usb_armory]} { return usb_armory_tz_vmm } + if {[have_board imx53_qsb]} { return imx53_qsb_tz_vmm } return no_tz_vmm_binary } if { $mmc_rootfs } { # choose interrupt for paravirtualized block - if { [have_spec imx53] } { set tz_vmm_block_irq 92 } + if { [have_board imx53_qsb_tz] } { set tz_vmm_block_irq 92 } # add targets that enable MMC access via paravirtualized block lappend targets timer diff --git a/repos/os/run/vmm_arm.run b/repos/os/run/vmm_arm.run index ed6298b782..cf06fec85d 100644 --- a/repos/os/run/vmm_arm.run +++ b/repos/os/run/vmm_arm.run @@ -6,8 +6,8 @@ assert_spec hw -if { ![have_spec imx7d_sabre] && ![have_spec imx8q_evk] && - ![have_spec virt_qemu]} { +if { ![have_board imx7d_sabre] && ![have_board imx8q_evk] && + ![have_board virt_qemu]} { puts "Run script is not supported on this platform" exit 0 } diff --git a/repos/os/src/drivers/framebuffer/sdl/target.mk b/repos/os/src/drivers/framebuffer/sdl/target.mk index 93199244dc..9932517746 100644 --- a/repos/os/src/drivers/framebuffer/sdl/target.mk +++ b/repos/os/src/drivers/framebuffer/sdl/target.mk @@ -1,6 +1,6 @@ TARGET = fb_sdl LIBS = lx_hybrid blit -REQUIRES = linux sdl +REQUIRES = linux SRC_CC = main.cc LX_LIBS = sdl INC_DIR += $(PRG_DIR) diff --git a/repos/os/src/drivers/nvme/target.mk b/repos/os/src/drivers/nvme/target.mk index 0e13210638..c40672f2ca 100644 --- a/repos/os/src/drivers/nvme/target.mk +++ b/repos/os/src/drivers/nvme/target.mk @@ -2,4 +2,4 @@ TARGET = nvme_drv SRC_CC = main.cc INC_DIR += $(PRG_DIR) LIBS += base -REQUIRES = pci +REQUIRES = x86 diff --git a/repos/os/src/test/gpio_led/target.mk b/repos/os/src/test/gpio_led/target.mk index a55b3217c4..606a5db472 100644 --- a/repos/os/src/test/gpio_led/target.mk +++ b/repos/os/src/test/gpio_led/target.mk @@ -1,5 +1,4 @@ TARGET = led_gpio_drv -REQUIRES = gpio SRC_CC = main.cc LIBS = base diff --git a/repos/os/src/test/gpio_signal/target.mk b/repos/os/src/test/gpio_signal/target.mk index 88f8de3dac..062a6ba12b 100644 --- a/repos/os/src/test/gpio_signal/target.mk +++ b/repos/os/src/test/gpio_signal/target.mk @@ -1,5 +1,4 @@ TARGET = signal_gpio_drv -REQUIRES = gpio SRC_CC = main.cc INC_DIR += $(PRG_DIR) LIBS = base diff --git a/repos/os/src/test/pci/target.mk b/repos/os/src/test/pci/target.mk index 907f5deee2..ba9724e545 100644 --- a/repos/os/src/test/pci/target.mk +++ b/repos/os/src/test/pci/target.mk @@ -1,4 +1,4 @@ TARGET = test-pci SRC_CC = test.cc LIBS = base -REQUIRES = pci +REQUIRES = x86 diff --git a/repos/ports/run/netperf.inc b/repos/ports/run/netperf.inc index da04b75ff8..8653bcbb4d 100644 --- a/repos/ports/run/netperf.inc +++ b/repos/ports/run/netperf.inc @@ -21,7 +21,7 @@ if {[have_include "power_on/qemu"] && exit 0 } -if {[expr [have_spec imx53] && [have_spec trustzone]]} { +if {[have_board imx53_qsb_tz]} { puts "Run script is not supported on this platform." exit 0 } diff --git a/repos/ports/run/netperf_lwip_wifi.run b/repos/ports/run/netperf_lwip_wifi.run index a84049effd..87b768beec 100644 --- a/repos/ports/run/netperf_lwip_wifi.run +++ b/repos/ports/run/netperf_lwip_wifi.run @@ -16,7 +16,8 @@ if { [have_spec muen] } { exit 0 } -if {[get_cmd_switch --autopilot] && [have_spec x86_32] && ![have_spec acpi]} { +if {[get_cmd_switch --autopilot] && [have_spec x86_32] && + ![expr [have_board foc] || [have_spec nova]]} { puts stderr "\nNetperf WIFI running with non-ACPI kernel on native x86_32 test machine is not supported because of wrong interrupt number in pci config space (should be 11 instead 10).\n" exit } diff --git a/repos/ports/run/netperf_lxip_wifi.run b/repos/ports/run/netperf_lxip_wifi.run index 1477c0470f..18c240bc93 100644 --- a/repos/ports/run/netperf_lxip_wifi.run +++ b/repos/ports/run/netperf_lxip_wifi.run @@ -11,12 +11,13 @@ if {[have_include "power_on/qemu"] || [have_include "power_on/linux"]} { exit 0 } -if { [have_spec muen] } { +if { [have_board muen] } { puts "Run script does not support Muen." exit 0 } -if {[get_cmd_switch --autopilot] && [have_spec x86_32] && ![have_spec acpi]} { +if {[get_cmd_switch --autopilot] && [have_spec x86_32] && + ![expr [have_board foc] || [have_spec nova]]} { puts stderr "\nNetperf WIFI running with non-ACPI kernel on native x86_32 test machine is not supported because of wrong interrupt number in pci config space (should be 11 instead 10).\n" exit } diff --git a/repos/ports/run/tool_chain_auto.run b/repos/ports/run/tool_chain_auto.run index 90c991bb17..eed5e169f7 100644 --- a/repos/ports/run/tool_chain_auto.run +++ b/repos/ports/run/tool_chain_auto.run @@ -4,7 +4,7 @@ if {[get_cmd_switch --autopilot] && [have_include "power_on/qemu"]} { } if {[have_spec pistachio] || [have_spec sel4] || - [expr [have_spec foc] && [have_spec imx7d_sabre]] } { + [expr [have_spec foc] && [have_board imx7d_sabre]] } { puts "Platform is unsupported." exit 0 } diff --git a/repos/ports/run/vbox5_genode_usb_hid.run b/repos/ports/run/vbox5_genode_usb_hid.run index c70320fd5d..c21341c737 100644 --- a/repos/ports/run/vbox5_genode_usb_hid.run +++ b/repos/ports/run/vbox5_genode_usb_hid.run @@ -237,6 +237,7 @@ exec -ignorestderr \ --genode-dir [genode_dir] \ --name usb_hid \ --specs "$specs" \ + --board "$board_var" \ --repositories "$repositories" \ --cross-dev-prefix "[cross_dev_prefix]" \ --include boot_dir/nova \ diff --git a/repos/ports/run/vbox5_ubuntu_16_04_32.run b/repos/ports/run/vbox5_ubuntu_16_04_32.run index 22e28537b1..1c9a15e0d5 100644 --- a/repos/ports/run/vbox5_ubuntu_16_04_32.run +++ b/repos/ports/run/vbox5_ubuntu_16_04_32.run @@ -20,7 +20,7 @@ set use_serial 1 set use_check_result 1 set use_usb [expr ![get_cmd_switch --autopilot]] -set use_ps2 [have_spec ps2] +set use_ps2 1 set use_vms 1 set use_cpu_load 1 diff --git a/repos/ports/run/vbox5_ubuntu_16_04_64.run b/repos/ports/run/vbox5_ubuntu_16_04_64.run index d93390f18a..b893e98f23 100644 --- a/repos/ports/run/vbox5_ubuntu_16_04_64.run +++ b/repos/ports/run/vbox5_ubuntu_16_04_64.run @@ -20,7 +20,7 @@ set use_serial 1 set use_check_result 1 set use_usb [expr ![get_cmd_switch --autopilot]] -set use_ps2 [have_spec ps2] +set use_ps2 1 set use_vms 1 set use_cpu_load 1 diff --git a/repos/ports/run/vbox5_vm_ubuntu_16_04_32.run b/repos/ports/run/vbox5_vm_ubuntu_16_04_32.run index 9339692be3..369cad5067 100644 --- a/repos/ports/run/vbox5_vm_ubuntu_16_04_32.run +++ b/repos/ports/run/vbox5_vm_ubuntu_16_04_32.run @@ -24,7 +24,7 @@ set use_serial 1 set use_check_result 1 set use_usb [expr ![get_cmd_switch --autopilot]] -set use_ps2 [have_spec ps2] +set use_ps2 1 set use_vms 1 set use_cpu_load 1 diff --git a/repos/ports/run/vbox5_vm_ubuntu_16_04_64.run b/repos/ports/run/vbox5_vm_ubuntu_16_04_64.run index 3bb11ee402..843593253a 100644 --- a/repos/ports/run/vbox5_vm_ubuntu_16_04_64.run +++ b/repos/ports/run/vbox5_vm_ubuntu_16_04_64.run @@ -20,7 +20,7 @@ set use_serial 1 set use_check_result 1 set use_usb [expr ![get_cmd_switch --autopilot]] -set use_ps2 [have_spec ps2] +set use_ps2 1 set use_vms 1 set use_cpu_load 1 diff --git a/repos/ports/run/vbox5_vm_win10_64.run b/repos/ports/run/vbox5_vm_win10_64.run index c25d015cef..27cf1baeaf 100644 --- a/repos/ports/run/vbox5_vm_win10_64.run +++ b/repos/ports/run/vbox5_vm_win10_64.run @@ -20,7 +20,7 @@ set use_serial 0 set use_check_result 1 set use_usb [expr ![get_cmd_switch --autopilot]] -set use_ps2 [have_spec ps2] +set use_ps2 1 set use_vms 1 set use_cpu_load 0 diff --git a/repos/ports/run/vbox5_vm_win7_32.run b/repos/ports/run/vbox5_vm_win7_32.run index 9c2439bff5..ebbf6ecc2d 100644 --- a/repos/ports/run/vbox5_vm_win7_32.run +++ b/repos/ports/run/vbox5_vm_win7_32.run @@ -20,7 +20,7 @@ set use_serial 0 set use_check_result 1 set use_usb [expr ![get_cmd_switch --autopilot]] -set use_ps2 [have_spec ps2] +set use_ps2 1 set use_vms 1 set use_cpu_load 0 diff --git a/repos/ports/run/vbox5_vm_win7_64.run b/repos/ports/run/vbox5_vm_win7_64.run index 6c57ff3159..54b70a1c25 100644 --- a/repos/ports/run/vbox5_vm_win7_64.run +++ b/repos/ports/run/vbox5_vm_win7_64.run @@ -20,7 +20,7 @@ set use_serial 0 set use_check_result 1 set use_usb [expr ![get_cmd_switch --autopilot]] -set use_ps2 [have_spec ps2] +set use_ps2 1 set use_vms 1 set use_cpu_load 0 diff --git a/repos/ports/run/vbox5_win10_64.run b/repos/ports/run/vbox5_win10_64.run index 167ead826f..7df52a8e66 100644 --- a/repos/ports/run/vbox5_win10_64.run +++ b/repos/ports/run/vbox5_win10_64.run @@ -20,7 +20,7 @@ set use_serial 0 set use_check_result 1 set use_usb [expr ![get_cmd_switch --autopilot]] -set use_ps2 [have_spec ps2] +set use_ps2 1 set use_vms 1 set use_cpu_load 0 diff --git a/repos/ports/run/vbox5_win7_32.run b/repos/ports/run/vbox5_win7_32.run index 6f56486455..b66f5b11f4 100644 --- a/repos/ports/run/vbox5_win7_32.run +++ b/repos/ports/run/vbox5_win7_32.run @@ -20,7 +20,7 @@ set use_serial 0 set use_check_result 1 set use_usb [expr ![get_cmd_switch --autopilot]] -set use_ps2 [have_spec ps2] +set use_ps2 1 set use_vms 1 set use_cpu_load 0 diff --git a/repos/ports/run/vbox5_win7_64.run b/repos/ports/run/vbox5_win7_64.run index bcb3f826cd..f6f85b6214 100644 --- a/repos/ports/run/vbox5_win7_64.run +++ b/repos/ports/run/vbox5_win7_64.run @@ -20,7 +20,7 @@ set use_serial 0 set use_check_result 1 set use_usb [expr ![get_cmd_switch --autopilot]] -set use_ps2 [have_spec ps2] +set use_ps2 1 set use_vms 1 set use_cpu_load 0 diff --git a/repos/ports/run/vbox5_win7_64_multiple.run b/repos/ports/run/vbox5_win7_64_multiple.run index ff2b7c3519..9e36342a36 100644 --- a/repos/ports/run/vbox5_win7_64_multiple.run +++ b/repos/ports/run/vbox5_win7_64_multiple.run @@ -31,7 +31,7 @@ set use_serial 0 set use_check_result 1 set use_usb [expr ![get_cmd_switch --autopilot]] -set use_ps2 [have_spec ps2] +set use_ps2 1 set use_vms 6 set affinity_space_width 8 diff --git a/repos/ports/run/vbox5_win7_64_raw.run b/repos/ports/run/vbox5_win7_64_raw.run index 47bc574f07..29ecf9d7af 100644 --- a/repos/ports/run/vbox5_win7_64_raw.run +++ b/repos/ports/run/vbox5_win7_64_raw.run @@ -19,7 +19,7 @@ set use_serial 0 set use_check_result 1 set use_usb [expr ![get_cmd_switch --autopilot]] -set use_ps2 [have_spec ps2] +set use_ps2 1 set use_vms 1 set use_cpu_load 0 diff --git a/repos/ports/run/vbox5_win7_64_share.run b/repos/ports/run/vbox5_win7_64_share.run index b4c21d7f11..2c7a4a718a 100644 --- a/repos/ports/run/vbox5_win7_64_share.run +++ b/repos/ports/run/vbox5_win7_64_share.run @@ -17,7 +17,7 @@ set use_serial 0 set use_check_result 1 set use_usb [expr ![get_cmd_switch --autopilot]] -set use_ps2 [have_spec ps2] +set use_ps2 1 set use_vms 1 set use_cpu_load 0 diff --git a/repos/ports/run/vbox_share.inc b/repos/ports/run/vbox_share.inc index 582d43367a..9b1dd2733c 100644 --- a/repos/ports/run/vbox_share.inc +++ b/repos/ports/run/vbox_share.inc @@ -63,13 +63,13 @@ if {[have_include "power_on/qemu"]} { } # Tested for nova and muen. -if {(![have_spec nova] && ![have_spec muen])} { +if {(![have_spec nova] && ![have_board muen])} { puts "Platform is unsupported." exit 0 } set virtualbox_binary "virtualbox-rem" -if {[have_spec muen]} { set virtualbox_binary "virtualbox-muen" } +if {[have_board muen]} { set virtualbox_binary "virtualbox-muen" } if {[have_spec nova]} { set virtualbox_binary "virtualbox-nova" } set virtualbox5_binary "virtualbox5-rem" if {[have_spec nova]} { set virtualbox5_binary "virtualbox5-nova" } diff --git a/repos/ports/run/vbox_win.inc b/repos/ports/run/vbox_win.inc index 06443d8b58..40a904595a 100644 --- a/repos/ports/run/vbox_win.inc +++ b/repos/ports/run/vbox_win.inc @@ -50,22 +50,15 @@ set config_of_app { - } -append config_of_app { + - } -append_if [expr $use_ps2] config_of_app { - } -append_if [expr $use_usb] config_of_app { - } -append config_of_app { + + + - } -append_if [expr $use_ps2] config_of_app { - } -append_if [expr $use_usb] config_of_app { - } -append config_of_app { + + + diff --git a/repos/ports/run/virtualbox.run b/repos/ports/run/virtualbox.run index 59f837b744..30032173bd 100644 --- a/repos/ports/run/virtualbox.run +++ b/repos/ports/run/virtualbox.run @@ -1,5 +1,5 @@ set use_net 0 -set use_ps2 [have_spec ps2] +set use_ps2 1 set use_usb 0 set use_serial 1 set use_top 1 @@ -99,18 +99,16 @@ append_if [expr $use_usb] config { } -append_if [have_spec framebuffer] config { +append_if [have_board pc] config { } -append_if [expr [have_spec framebuffer] && [have_include power_on/qemu]] config { +append_if [expr [have_board pc] && [have_include power_on/qemu]] config { } -append_if [expr [have_spec framebuffer] && [have_include power_on/qemu]] config { - } -append_if [have_spec framebuffer] config { +append_if [have_board pc] config { } -append_if [have_spec sdl] config { +append_if [have_board linux] config { } @@ -266,8 +264,8 @@ append boot_modules $virtualbox_binary # platform-specific modules lappend_if [expr $use_usb] boot_modules usb_drv lappend_if [expr $use_ps2] boot_modules ps2_drv -lappend_if [have_spec framebuffer] boot_modules vesa_fb_drv -lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_board pc] boot_modules vesa_fb_drv +lappend_if [have_board linux] boot_modules fb_sdl lappend_if [have_spec x86] boot_modules rtc_drv lappend_if [expr $use_top] boot_modules top lappend_if [expr $use_gui] boot_modules report_rom diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc index 56da730ecb..2d13e56f6b 100644 --- a/repos/ports/run/virtualbox_auto.inc +++ b/repos/ports/run/virtualbox_auto.inc @@ -350,7 +350,7 @@ append_if [expr $use_usb] config { } -append_if [have_spec framebuffer] config { +append_if [expr [have_board pc] || [have_board muen]] config { @@ -401,10 +401,11 @@ lappend_if [expr $use_cpu_load] boot_modules top lappend_if [have_spec nova] boot_modules log_core # platform-specific modules -lappend_if [expr $use_ps2] boot_modules ps2_drv -lappend_if [expr $use_usb] boot_modules usb_drv -lappend_if [expr $use_usb] boot_modules usb_report_filter -lappend_if [have_spec framebuffer] boot_modules vesa_fb_drv -lappend_if [have_spec x86] boot_modules rtc_drv +lappend_if [expr $use_ps2] boot_modules ps2_drv +lappend_if [expr $use_usb] boot_modules usb_drv +lappend_if [expr $use_usb] boot_modules usb_report_filter +lappend_if [have_board pc] boot_modules vesa_fb_drv +lappend_if [have_board muen] boot_modules vesa_fb_drv +lappend_if [have_spec x86] boot_modules rtc_drv append_platform_drv_boot_modules diff --git a/repos/ports/run/vm_stress_vbox5-debian32.run b/repos/ports/run/vm_stress_vbox5-debian32.run index 939045590e..74230769d0 100644 --- a/repos/ports/run/vm_stress_vbox5-debian32.run +++ b/repos/ports/run/vm_stress_vbox5-debian32.run @@ -17,7 +17,7 @@ set use_overlay_from_disk 1 set use_serial 1 set use_usb 0 -set use_ps2 [have_spec ps2] +set use_ps2 1 set use_vms 1 set use_cpu_load 0 diff --git a/repos/ports/run/vm_stress_vbox5-debian64.run b/repos/ports/run/vm_stress_vbox5-debian64.run index 9134c4484a..f29da65ad9 100644 --- a/repos/ports/run/vm_stress_vbox5-debian64.run +++ b/repos/ports/run/vm_stress_vbox5-debian64.run @@ -17,7 +17,7 @@ set use_overlay_from_disk 1 set use_serial 1 set use_usb 0 -set use_ps2 [have_spec ps2] +set use_ps2 [expr [have_board pbxa9] || [have_board pc]] set use_vms 1 set use_cpu_load 0 diff --git a/tool/builddir/build.mk b/tool/builddir/build.mk index 85487aebf7..a793c75baa 100644 --- a/tool/builddir/build.mk +++ b/tool/builddir/build.mk @@ -89,9 +89,6 @@ export SHELL := $(shell which bash) # Fetch SPECS configuration from all source repositories and the build directory # SPECS := -ifneq ($(BOARD),) -SPECS += $(BOARD) -endif -include $(foreach REP,$(REPOSITORIES),$(wildcard $(REP)/etc/specs.conf)) -include $(BUILD_BASE_DIR)/etc/specs.conf diff --git a/tool/run/boot_dir/foc b/tool/run/boot_dir/foc index 41f6c23eaa..8c9c2dba57 100644 --- a/tool/run/boot_dir/foc +++ b/tool/run/boot_dir/foc @@ -9,13 +9,13 @@ proc run_boot_string { } { return "\nL4 Bootstrapper" } proc core_link_address { } { - if {[have_spec x86 ]} { return "0x01100000" } - if {[have_spec rpi ]} { return "0x00800000" } - if {[have_spec rpi3 ]} { return "0x02000000" } - if {[have_spec pbxa9 ]} { return "0x76000000" } - if {[have_spec imx53 ]} { return "0x70140000" } - if {[have_spec imx6q_sabrelite ]} { return "0x14000000" } - if {[have_spec imx7d_sabre ]} { return "0x91000000" } + if {[have_spec x86 ]} { return "0x01100000" } + if {[have_board rpi ]} { return "0x00800000" } + if {[have_board rpi3 ]} { return "0x02000000" } + if {[have_board pbxa9 ]} { return "0x76000000" } + if {[have_board imx53_qsb]} { return "0x70140000" } + if {[have_board imx6q_sabrelite ]} { return "0x14000000" } + if {[have_board imx7d_sabre ]} { return "0x91000000" } puts stderr "Error: platform not supported, core link address unknown" exit 1 @@ -37,7 +37,7 @@ proc reset_target { {spawn_id_arg -1} } { } -proc l4_build_dir { } { return "[pwd]/var/libcache/syscall-foc/[board]-build" } +proc l4_build_dir { } { return "[pwd]/var/libcache/syscall-foc-[board]/build" } proc kernel_binary { } { return "[pwd]/bin/foc-[board]" } @@ -221,11 +221,11 @@ proc run_boot_dir {binaries} { # proc base_src { } { - if {[have_spec x86]} { return base-foc-pc } - if {[have_spec pbxa9]} { return base-foc-pbxa9 } - if {[have_spec rpi3]} { return base-foc-rpi3 } - if {[have_spec imx6q_sabrelite]} { return base-foc-imx6q_sabrelite } - if {[have_spec imx7d_sabre]} { return base-foc-imx7d_sabre } + if {[have_spec x86]} { return base-foc-pc } + if {[have_board pbxa9]} { return base-foc-pbxa9 } + if {[have_board rpi3]} { return base-foc-rpi3 } + if {[have_board imx6q_sabrelite]} { return base-foc-imx6q_sabrelite } + if {[have_board imx7d_sabre]} { return base-foc-imx7d_sabre } global specs diff --git a/tool/run/boot_dir/hw b/tool/run/boot_dir/hw index c951a310ae..d5a7578ccf 100644 --- a/tool/run/boot_dir/hw +++ b/tool/run/boot_dir/hw @@ -6,20 +6,22 @@ proc binary_name_timer { } { return "hw_timer_drv" } proc run_boot_string { } { return "\nkernel initialized" } proc bootstrap_link_address { } { - if {[have_spec "pbxa9"]} { return "0x70000000" } - if {[have_spec "usb_armory"]} { return "0x72000000" } - if {[have_spec "x86_64"]} { return "0x00200000" } - if {[have_spec "wand_quad"]} { return "0x10001000" } - if {[have_spec "imx6q_sabrelite"]} { return "0x10001000" } - if {[have_spec "imx53_qsb"]} { return "0x70010000" } - if {[have_spec "imx7d_sabre"]} { return "0x88000000" } - if {[have_spec "imx8q_evk"]} { return "0x40010000" } - if {[have_spec "zynq"]} { return "0x00100000" } - if {[have_spec "riscv"]} { return "0x81000000" } - if {[have_spec "rpi"]} { return "0x00800000" } - if {[have_spec "rpi3"]} { return "0x00800000" } - if {[have_spec "nit6_solox"]} { return "0x88000000" } - if {[have_spec "virt_qemu"]} { return "0x40000000" } + if {[have_board "pbxa9"]} { return "0x70000000" } + if {[have_board "usb_armory"]} { return "0x72000000" } + if {[have_board "pc"]} { return "0x00200000" } + if {[have_board "muen"]} { return "0x00200000" } + if {[have_board "wand_quad"]} { return "0x10001000" } + if {[have_board "imx6q_sabrelite"]} { return "0x10001000" } + if {[have_board "imx53_qsb"]} { return "0x70010000" } + if {[have_board "imx53_qsb_tz"]} { return "0x70010000" } + if {[have_board "imx7d_sabre"]} { return "0x88000000" } + if {[have_board "imx8q_evk"]} { return "0x40010000" } + if {[have_board "zynq_qemu"]} { return "0x00100000" } + if {[have_board "riscv"]} { return "0x81000000" } + if {[have_board "rpi"]} { return "0x00800000" } + if {[have_board "rpi3"]} { return "0x00800000" } + if {[have_board "nit6_solox"]} { return "0x88000000" } + if {[have_board "virt_qemu"]} { return "0x40000000" } puts "unknown platform no linker address known" exit -1 @@ -38,7 +40,7 @@ proc core_link_address { } { proc run_boot_dir {binaries} { # generate static ACPI report for platform driver on Muen - if {[have_spec "muen"]} { + if {[have_board "muen"]} { set fh [open "bin/acpi" "WRONLY CREAT TRUNC"] puts $fh "" close $fh @@ -172,7 +174,7 @@ proc run_boot_dir {binaries} { # Generate pulsar config file # set fh [open "[run_dir]/config-52-54-00-12-34-56" "WRONLY CREAT TRUNC"] - if {[have_spec "muen"]} { + if {[have_board "muen"]} { exec gzip [run_dir]/image.bin puts $fh " exec /boot/unzip" puts $fh " load /image.bin.gz" @@ -192,7 +194,7 @@ proc run_boot_dir {binaries} { set fh [open "[run_dir]/boot.cfg" "WRONLY CREAT TRUNC"] puts $fh "#!ipxe" - if {[have_spec "muen"]} { + if {[have_board "muen"]} { puts $fh "kernel image.bin" } else { install_pxe_bootloader_to_run_dir @@ -212,19 +214,19 @@ proc run_boot_dir {binaries} { # proc base_src { } { - if {[have_spec x86_64] && ![have_spec muen]} { return base-hw-pc } - if {[have_spec x86_64] && [have_spec muen]} { return base-hw-muen } - if {[have_spec pbxa9]} { return base-hw-pbxa9 } - if {[have_spec rpi]} { return base-hw-rpi } - if {[have_spec rpi3]} { return base-hw-rpi3 } - if {[have_spec imx6q_sabrelite]} { return base-hw-imx6q_sabrelite } - if {[have_spec imx7d_sabre]} { return base-hw-imx7d_sabre } - if {[have_spec imx8q_evk]} { return base-hw-imx8q_evk } - if {[have_spec nit6_solox]} { return base-hw-nit6_solox } - if {[have_spec imx53_qsb] && ![have_spec trustzone]} { return base-hw-imx53_qsb } - if {[have_spec imx53_qsb] && [have_spec trustzone]} { return base-hw-imx53_qsb_tz } - if {[have_spec zynq_qemu]} { return base-hw-zynq_qemu } - if {[have_spec virt_qemu]} { return base-hw-virt_qemu } + if {[have_spec x86_64] && ![have_board muen]} { return base-hw-pc } + if {[have_spec x86_64] && [have_board muen]} { return base-hw-muen } + if {[have_board pbxa9]} { return base-hw-pbxa9 } + if {[have_board rpi]} { return base-hw-rpi } + if {[have_board rpi3]} { return base-hw-rpi3 } + if {[have_board imx6q_sabrelite]} { return base-hw-imx6q_sabrelite } + if {[have_board imx7d_sabre]} { return base-hw-imx7d_sabre } + if {[have_board imx8q_evk]} { return base-hw-imx8q_evk } + if {[have_board nit6_solox]} { return base-hw-nit6_solox } + if {[have_board imx53_qsb]} { return base-hw-imx53_qsb } + if {[have_board imx53_qsb_tz]} { return base-hw-imx53_qsb_tz } + if {[have_board zynq_qemu]} { return base-hw-zynq_qemu } + if {[have_board virt_qemu]} { return base-hw-virt_qemu } global specs diff --git a/tool/run/boot_dir/sel4 b/tool/run/boot_dir/sel4 index 14f2dbafcb..e16f04c1c7 100644 --- a/tool/run/boot_dir/sel4 +++ b/tool/run/boot_dir/sel4 @@ -1,9 +1,9 @@ proc binary_name_ld_lib_so { } { return "ld-sel4.lib.so" } proc binary_name_core_o { } { return "core-sel4.o" } proc binary_name_timer { } { - if {[have_spec imx6]} { return "imx6_timer_drv" } - if {[have_spec imx7d_sabre]} { return "imx7_timer_drv" } - if {[have_spec x86]} { return "pit_timer_drv" } + if {[have_board imx6q_sabrelite]} { return "imx6_timer_drv" } + if {[have_board imx7d_sabre]} { return "imx7_timer_drv" } + if {[have_board pc]} { return "pit_timer_drv" } puts "unknown platform - no timer driver" exit -1 } @@ -98,9 +98,9 @@ proc run_boot_dir {binaries} { # Use seL4 elfloader tool to generate bootable image on ARM # if {[have_spec arm]} { - if {[have_spec imx6]} { + if {[have_board imx6q_sabrelite]} { set ::env(PLAT) imx6 - } elseif {[have_spec imx7d_sabre]} { + } elseif {[have_board imx7d_sabre]} { set ::env(PLAT) imx7 } else { puts "abort - unknown ARM board" @@ -159,9 +159,9 @@ proc run_boot_dir {binaries} { # proc base_src { } { - if {[have_spec x86]} { return base-sel4-x86 } - if {[have_spec imx6q_sabrelite]} { return base-sel4-imx6q_sabrelite } - if {[have_spec imx7d_sabre]} { return base-sel4-imx7d_sabre } + if {[have_spec x86]} { return base-sel4-x86 } + if {[have_board imx6q_sabrelite]} { return base-sel4-imx6q_sabrelite } + if {[have_board imx7d_sabre]} { return base-sel4-imx7d_sabre } global specs diff --git a/tool/run/depot.inc b/tool/run/depot.inc index 0a70438fa8..b8303e1380 100644 --- a/tool/run/depot.inc +++ b/tool/run/depot.inc @@ -459,15 +459,16 @@ proc check_for_missing_depot_archives { } { proc drivers_interactive_pkg { } { - if {[have_spec muen]} { return drivers_interactive-muen } - if {[have_spec linux]} { return drivers_interactive-linux } - if {[have_spec x86]} { return drivers_interactive-pc } - if {[have_spec pbxa9]} { return drivers_interactive-pbxa9 } - if {[have_spec imx53_qsb]} { return drivers_interactive-imx53_qsb } - if {[have_spec rpi]} { return drivers_interactive-rpi } - if {[have_spec imx8q_evk]} { return drivers_interactive-imx8q_evk } - if {[have_spec panda]} { return drivers_interactive-panda } - if {[have_spec arndale]} { return drivers_interactive-arndale } + if {[have_board muen]} { return drivers_interactive-muen } + if {[have_board linux]} { return drivers_interactive-linux } + if {[have_board pc]} { return drivers_interactive-pc } + if {[have_board pbxa9]} { return drivers_interactive-pbxa9 } + if {[have_board imx53_qsb]} { return drivers_interactive-imx53_qsb } + if {[have_board imx53_qsb_tz]} { return drivers_interactive-imx53_qsb } + if {[have_board rpi]} { return drivers_interactive-rpi } + if {[have_board imx8q_evk]} { return drivers_interactive-imx8q_evk } + if {[have_board panda]} { return drivers_interactive-panda } + if {[have_board arndale]} { return drivers_interactive-arndale } puts stderr "drivers_interactive package undefined for this build configuration" exit 1 @@ -476,18 +477,17 @@ proc drivers_interactive_pkg { } { proc drivers_nic_pkg { } { - if {[have_spec x86] && ![have_spec muen] && - ![have_spec linux]} { return drivers_nic-pc } - if {[have_spec muen]} { return drivers_nic-muen } - if {[have_spec linux]} { return drivers_nic-linux } - if {[have_spec pbxa9]} { return drivers_nic-pbxa9 } - if {[have_spec rpi]} { return drivers_nic-rpi } - if {[have_spec zynq_qemu]} { return drivers_nic-zynq } - if {[have_spec imx53_qsb]} { return drivers_nic-imx53_qsb } - if {[have_spec imx6q_sabrelite]} { return drivers_nic-imx6q_sabrelite } - if {[have_spec imx7d_sabre]} { return drivers_nic-imx7d_sabre } - if {[have_spec imx8q_evk]} { return drivers_nic-imx8q_evk } - if {[have_spec virt_qemu]} { return drivers_nic-virt_qemu } + if {[have_board pc]} { return drivers_nic-pc } + if {[have_board muen]} { return drivers_nic-muen } + if {[have_board linux]} { return drivers_nic-linux } + if {[have_board pbxa9]} { return drivers_nic-pbxa9 } + if {[have_board rpi]} { return drivers_nic-rpi } + if {[have_board zynq_qemu]} { return drivers_nic-zynq } + if {[have_board imx53_qsb]} { return drivers_nic-imx53_qsb } + if {[have_board imx6q_sabrelite]} { return drivers_nic-imx6q_sabrelite } + if {[have_board imx7d_sabre]} { return drivers_nic-imx7d_sabre } + if {[have_board imx8q_evk]} { return drivers_nic-imx8q_evk } + if {[have_board virt_qemu]} { return drivers_nic-virt_qemu } puts stderr "drivers_nic package undefined for this build configuration" exit 1 diff --git a/tool/run/image/muen b/tool/run/image/muen index 05f1a378ac..de6c6316cf 100644 --- a/tool/run/image/muen +++ b/tool/run/image/muen @@ -43,8 +43,8 @@ proc muen_spark_path { } { # \param elf_img ELF binary of Genode subject # proc run_image {elf_img} { - if {![have_spec "muen"]} { - puts stderr "Error: Missing SPEC muen, unsupported platform" + if {![have_board "muen"]} { + puts stderr "You've to build for the BOARD=muen" exit -1 } diff --git a/tool/run/power_on/qemu b/tool/run/power_on/qemu index 54c2897faa..874b981941 100644 --- a/tool/run/power_on/qemu +++ b/tool/run/power_on/qemu @@ -71,7 +71,7 @@ proc run_power_on { } { # In the raspi3 model the first UART is never used as # log output, but the second # - if {[have_spec rpi3]} { append qemu_args " -serial null " } + if {[have_board rpi3]} { append qemu_args " -serial null " } append qemu_args " -serial mon:stdio " } @@ -93,7 +93,7 @@ proc run_power_on { } { } # tweak emulated platform for specific platforms - if {[have_spec pbxa9]} { + if {[have_board pbxa9]} { # # For PBXA9 qemu adjusts provided RAM chips to the -m arg. Thus we # filter user values and force value that enables all chips that Genode @@ -103,11 +103,11 @@ proc run_power_on { } { append qemu_args " -m 768" append qemu_args " -M realview-pbx-a9" } - if {[have_spec vpb926]} { append qemu_args " -M versatilepb -m 128 " } - if {[have_spec zynq_qemu]} { append qemu_args " -M xilinx-zynq-a9 -cpu cortex-a9 -m 256 " } - if {[have_spec rpi3]} { append qemu_args " -M raspi3 -m 512 " } + if {[have_board vpb926]} { append qemu_args " -M versatilepb -m 128 " } + if {[have_board zynq_qemu]} { append qemu_args " -M xilinx-zynq-a9 -cpu cortex-a9 -m 256 " } + if {[have_board rpi3]} { append qemu_args " -M raspi3 -m 512 " } - if {[have_spec virt_qemu]} { + if {[have_board virt_qemu]} { append qemu_args " -M virt,virtualization=true" if {[have_spec arm_v8a]} { append qemu_args ",gic-version=3 -cpu cortex-a53 -smp 4" @@ -119,7 +119,7 @@ proc run_power_on { } { } # on x86, we support booting via pxe or iso/disk image - if {[have_spec x86]} { + if {[have_board pc]} { if {![regexp -- {-m} $qemu_args dummy]} { if {[have_spec okl4]} { # okl4 system integration specifies RAM from 32 to 800 MiB diff --git a/tool/run/qemu.inc b/tool/run/qemu.inc index 7e9707d737..41657fadd1 100644 --- a/tool/run/qemu.inc +++ b/tool/run/qemu.inc @@ -15,9 +15,9 @@ proc qemu_args { } { } proc qemu_nic_model {} { - if [have_spec lan9118] { return lan9118 } - if [have_spec zynq] { return cadence_gem } - if [have_spec x86] { return e1000 } + if [have_board pbxa9] { return lan9118 } + if [have_board zynq_qemu] { return cadence_gem } + if [have_board pc] { return e1000 } return nic_model_missing } @@ -29,7 +29,7 @@ proc append_qemu_nic_args { { extra_netdev_args "" } } { append qemu_args ",$extra_netdev_args" } - if {[have_spec virt_qemu]} { + if {[have_board virt_qemu]} { append qemu_args " -global virtio-mmio.force-legacy=false " append qemu_args " -device virtio-net-device,bus=virtio-mmio-bus.0,netdev=net0 " } else {