diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index a07647e..f77f1c2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,7 @@ -AC_INIT([Hyra], [1.6], [ian@osmora.org]) +AC_INIT([Hyra], [2.1], [ian@osmora.org]) TARGET="amd64" +QEMU="qemu-system-x86_64" PROJECT_ROOT=`pwd` BOOT_FW="BOOTX64.EFI" AC_ARG_ENABLE([aarch64], @@ -16,8 +17,9 @@ KERN_CFLAGS_AMD64="-fexceptions --std=gnu11 -ffreestanding -fno-stack-protector -Werror=incompatible-pointer-types -Werror=int-to-pointer-cast \\ -Werror=return-type -Wunused -mno-80387 -mno-mmx -mno-3dnow \\ -mno-sse -mno-sse2 -mno-red-zone -mcmodel=kernel -pedantic \\ - -I sys/include/ -I sys/include/lib/ -D_KERNEL -Wno-pointer-sign -MMD \\ - -Wno-gnu-zero-variadic-macro-arguments -Wno-c2x-extensions -Wno-language-extension-token -Wno-tautological-constant-out-of-range-compare" + -Isys/include/ -I sys/include/lib/ -D_KERNEL -Wno-pointer-sign -MMD \\ + -Isys/include/dev/acpi/uacpi/ -nostdinc -Wno-format-pedantic \\ + -Wno-format-pedantic -Wno-gnu-zero-variadic-macro-arguments -Wno-c2x-extensions -Wno-language-extension-token -Wno-tautological-constant-out-of-range-compare" KERN_CFLAGS_AARCH64="-fexceptions --std=gnu11 -ffreestanding -fno-stack-protector -fno-pic \\ @@ -27,19 +29,28 @@ KERN_CFLAGS_AARCH64="-fexceptions --std=gnu11 -ffreestanding -fno-stack-protecto -Werror=incompatible-pointer-types -Werror=int-to-pointer-cast \\ -Werror=return-type -Wunused -pedantic \\ -I sys/include/ -I sys/include/lib/ -D_KERNEL -Wno-pointer-sign -MMD \\ - -Wno-gnu-zero-variadic-macro-arguments -Wno-c2x-extensions -Wno-language-extension-token -Wno-tautological-constant-out-of-range-compare" + -Wno-format-pedantic -Wno-gnu-zero-variadic-macro-arguments -Wno-c2x-extensions \\ + -Isys/include/dev/acpi/uacpi/ -nostdinc -Wno-format-pedantic \\ + -Wno-language-extension-token -Wno-tautological-constant-out-of-range-compare" QEMU_FLAGS_AMD64="--enable-kvm -monitor stdio \\ -M q35 -m 1G -smp 4 -cpu host \\ -cdrom Hyra.iso" +QEMU_FLAGS_AARCH64="-monitor stdio \\ + -M versatilepb -m 256M -smp 1 \\ + -cdrom Hyra.iso" + KERN_CFLAGS="$KERN_CFLAGS_AMD64" +QEMU_FLAGS=$QEMU_FLAGS_AMD64 if test "x$TARGET" = "xaarch64" then KERN_CFLAGS="$KERN_CFLAGS_AARCH64" BOOT_FW="BOOTAA64.EFI" + QEMU_FLAGS=$QEMU_FLAGS_AARCH64 + QEMU="qemu-system-aarch64" fi @@ -50,12 +61,11 @@ AC_SUBST(HYRA_BUILDDATE, [$HYRA_BUILDDATE]) AC_SUBST(HYRA_BUILDBRANCH, [$HYRA_BUILDBRANCH]) AC_SUBST(KERNEL_CFLAGS, [$KERN_CFLAGS]) -AC_SUBST(QEMU_FLAGS, [$QEMU_FLAGS_AMD64]) -AC_SUBST(QEMU, [qemu-system-x86_64]) AC_SUBST(BOOT_FW, [$BOOT_FW]) AC_SUBST(ARCH, [$TARGET]) +AC_SUBST(QEMU_FLAGS, [$QEMU_FLAGS]) +AC_SUBST(QEMU, [$QEMU]) AC_SUBST(PROJECT_ROOT, [$PROJECT_ROOT]) AC_SUBST(TOOLCHAIN, [clang]) -AC_SUBST(RAMFS_TOOL, [tools/omar/bin/omar]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT |