Some editations in novaboot launch configs.

diff --git a/.novaboot b/.novaboot
index 8d5871bbd954a57e3ce0ac0aaca70ab28681159a..001c82730c51cbcaf1e4e5cf548d43d696d94d74 100644 (file)
--- a/.novaboot
+++ b/.novaboot
@@ -1,2 +1,4 @@
 $targets{'qemu-jh-intel'} = '--qemu=qemu-system-x86_64 --qemu-flags="-machine q35 -m 1G -enable-kvm -smp 4 -usbdevice keyboard -cpu kvm64,-kvm_pv_eoi,-kvm_steal_time,-kvm_asyncpf,-kvmclock,+vmx,+x2apic -serial stdio -serial vc -device intel-hda,addr=1b.0 -device hda-duplex"';
 1;
+$targets{'qemu-jh-amd'} = '--qemu=qemu-system-x86_64 --qemu-flags="-machine q35 -m 1G -enable-kvm -smp 4 -usbdevice keyboard -cpu kvm64,-kvm_pv_eoi,-kvm_steal_time,-kvm_asyncpf,-kvmclock,+svm,+x2apic -serial stdio -serial vc -device intel-hda,addr=1b.0 -device hda-duplex"';
+1;

diff --git a/build/boot-linux b/build/boot-linux
index d6bc99af5093d1b31687ab39b62938632b5298de..e78e825a6b854dad18b913d08fe4296c58722e77 100755 (executable)
--- a/build/boot-linux
+++ b/build/boot-linux
@@ -1,4 +1,6 @@
 #!/usr/bin/env novaboot
 
-load buildroot/images/bzImage console=ttyS0,115200
+#
+load buildroot/images/bzImage console=ttyS0,115200 memmap=66M$0x3b000000 nohpet
 load buildroot/images/rootfs.cpio.gz
+

diff --git a/build/config-novaboot b/build/config-novaboot
new file mode 100644 (file)
index 0000000..69519e0
--- /dev/null
+++ b/build/config-novaboot
@@ -0,0 +1,2 @@
+load buildroot/images/rootfs.cpio.gz
+exec buildroot/images/bzImage console=ttyS0,115200 memmap=66M$0x3b000000 nohpet