From 0d960ea031f412f0e8f8b660efd448d7ccd5198c Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Sun, 21 May 2017 13:32:43 +0100
Subject: [PATCH] failing arm attempt

---
 kernel_module/external.mk |  9 ++++++++-
 run                       |  3 ++-
 runqemu                   | 37 ++++++++++++++++++++++++++-----------
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/kernel_module/external.mk b/kernel_module/external.mk
index 3dc5aad..878bd1e 100644
--- a/kernel_module/external.mk
+++ b/kernel_module/external.mk
@@ -9,7 +9,14 @@ KERNEL_MODULE_SITE = $(BR2_EXTERNAL_KERNEL_MODULE_PATH)
 KERNEL_MODULE_SITE_METHOD = local
 
 define KERNEL_MODULE_BUILD_CMDS
-	$(MAKE) -C '$(@D)' LINUX_DIR='$(LINUX_DIR)' PWD='$(@D)' CC='$(TARGET_CC)' LD='$(TARGET_LD)'
+	$(MAKE) \
+	  -C '$(@D)' \
+	  ARCH='$(KERNEL_ARCH)' \
+	  CC='$(TARGET_CC)' \
+	  CROSS_COMPILE='$(TARGET_CROSS)' \
+	  LD='$(TARGET_LD)' \
+	  LINUX_DIR='$(LINUX_DIR)' \
+	  PWD='$(@D)'
 endef
 
 define KERNEL_MODULE_INSTALL_TARGET_CMDS
diff --git a/run b/run
index 6ed3844..1dde507 100755
--- a/run
+++ b/run
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 set -e
 cd buildroot
-make BR2_EXTERNAL="$(pwd)/../kernel_module" qemu_x86_64_defconfig
+#make BR2_EXTERNAL="$(pwd)/../kernel_module" qemu_x86_64_defconfig
+make BR2_EXTERNAL="$(pwd)/../kernel_module" qemu_arm_vexpress_defconfig
 # Can't get rid of this for now.
 # http://stackoverflow.com/questions/44078245/is-it-possible-to-use-config-fragments-with-buildroots-config
 cat ../buildroot_config_fragment >> .config
diff --git a/runqemu b/runqemu
index 7606a9b..5210e98 100755
--- a/runqemu
+++ b/runqemu
@@ -23,18 +23,33 @@ done
 
 # If we turn on buildroot host QEMU some day.
 #cmd="./buildroot/output/host/usr/bin/qemu-system-x86_64 \
-cmd="qemu-system-x86_64 \
-  -M pc \
-  -append 'root=/dev/vda $extra_append' \
-  -drive file=buildroot/output/images/rootfs.ext2,if=virtio,format=raw \
-  -kernel buildroot/output/images/bzImage \
-  -m 128M \
-  -net nic,model=virtio \
-  -net user \
-  -smp 1 \
-  $extra_flags \
+#cmd="qemu-system-x86_64 \
+#-M pc \
+#-net nic,model=virtio \
+#-kernel buildroot/output/images/bzImage \
+#cmd="qemu-system-arm \
+  #-M vexpress-a9 \
+  #-append 'root=/dev/vda $extra_append' \
+  #-drive file=buildroot/output/images/rootfs.ext2,if=virtio,format=raw \
+  #-kernel buildroot/output/images/zImage \
+  #-m 128M \
+  #-net user \
+  #-smp 1 \
+  #$extra_flags \
+#;
+#"
+
+# TODO window opens, but hangs.
+qemu-system-arm \
+  -M vexpress-a9 \
+  -kernel buildroot/output/images/zImage \
+  -dtb buildroot/output/images/vexpress-v2p-ca9.dtb \
+  -drive file=buildroot/output/images/rootfs.ext2,if=scsi,format=raw \
+  -append "root=/dev/sda console=ttyAMA0,115200" \
+  -serial stdio \
 ;
-"
+#-net nic,model=rtl8139 \
+#-net user \
 
 if $debug && ! $nographic; then
   eval nohup "$cmd" &>/dev/null &