@@ -88,21 +88,6 @@ setup_variables() {
88
88
-append " console=ttyAMA0 root=/dev/vda" )
89
89
export CROSS_COMPILE=aarch64-linux-gnu- ;;
90
90
91
- " x86_64" )
92
- case ${REPO} in
93
- common-* )
94
- config=x86_64_cuttlefish_defconfig
95
- qemu_cmdline=( -append " console=ttyS0"
96
- -initrd " images/x86_64/rootfs.cpio" ) ;;
97
- * )
98
- config=defconfig
99
- qemu_cmdline=( -drive " file=images/x86_64/rootfs.ext4,format=raw,if=ide"
100
- -append " console=ttyS0 root=/dev/sda" ) ;;
101
- esac
102
- # Use KVM if the processor supports it (first part) and the KVM module is loaded (second part)
103
- [[ $( grep -c -E ' vmx|svm' /proc/cpuinfo) -gt 0 && $( lsmod 2> /dev/null | grep -c kvm) -gt 0 ]] && qemu_cmdline=( " ${qemu_cmdline[@]} " -enable-kvm )
104
- image_name=bzImage
105
- qemu=" qemu-system-x86_64" ;;
106
91
" ppc32" )
107
92
config=ppc44x_defconfig
108
93
image_name=zImage
@@ -128,6 +113,22 @@ setup_variables() {
128
113
export ARCH=powerpc
129
114
export CROSS_COMPILE=powerpc64le-linux-gnu- ;;
130
115
116
+ " x86_64" )
117
+ case ${REPO} in
118
+ common-* )
119
+ config=x86_64_cuttlefish_defconfig
120
+ qemu_cmdline=( -append " console=ttyS0"
121
+ -initrd " images/x86_64/rootfs.cpio" ) ;;
122
+ * )
123
+ config=defconfig
124
+ qemu_cmdline=( -drive " file=images/x86_64/rootfs.ext4,format=raw,if=ide"
125
+ -append " console=ttyS0 root=/dev/sda" ) ;;
126
+ esac
127
+ # Use KVM if the processor supports it (first part) and the KVM module is loaded (second part)
128
+ [[ $( grep -c -E ' vmx|svm' /proc/cpuinfo) -gt 0 && $( lsmod 2> /dev/null | grep -c kvm) -gt 0 ]] && qemu_cmdline=( " ${qemu_cmdline[@]} " -enable-kvm )
129
+ image_name=bzImage
130
+ qemu=" qemu-system-x86_64" ;;
131
+
131
132
# Unknown arch, error out
132
133
* )
133
134
echo " Unknown ARCH specified!"
0 commit comments