enable qemu networking and ssh key login (#312)

boards/qemu-linuxboot.config

@@ -23,6 +23,7 @@ CONFIG_LINUX_USB=y
 #CONFIG_LINUX_IGB=y
 #CONFIG_LINUX_MEGARAID=y
 #CONFIG_LINUX_E1000E=y
+CONFIG_LINUX_E1000=y
 CONFIG_LINUX_SCSI_GDTH=y
 CONFIG_LINUX_ATA=y
 CONFIG_LINUX_AHCI=y
@@ -34,12 +35,18 @@ CONFIG_BOOT_REQ_ROLLBACK=n
 CONFIG_BOOT_DEV="/dev/sda1"
 CONFIG_USB_BOOT_DEV="/dev/sdb1"
 
-run: $(build)/$(BOARD)/linuxboot.rom
+# You can ssh into the qemu instance by running
+# ssh -p 5555 root@localhost
+# The LinuxBoot firmware should set its ip address to 10.0.2.15
+# or run udhcpc to get a qemu address
+
+run: linuxboot.intermediate
 	qemu-system-x86_64 \
 		-machine q35,smm=on  \
 		-global ICH9-LPC.disable_s3=1 \
 		-global driver=cfi.pflash01,property=secure,value=on \
+		-redir tcp:5555::22 \
 		--serial $(or $(SERIAL),/dev/tty) \
-		-drive if=pflash,format=raw,unit=0,file=$<
+		-drive if=pflash,format=raw,unit=0,file=$(build)/$(BOARD)/linuxboot.rom
 	stty sane
 

config/linux-linuxboot.config

@@ -680,7 +680,9 @@ CONFIG_NET_PTP_CLASSIFY=y
 # CONFIG_BRIDGE is not set
 CONFIG_HAVE_NET_DSA=y
 # CONFIG_NET_DSA is not set
-# CONFIG_VLAN_8021Q is not set
+CONFIG_VLAN_8021Q=y
+# CONFIG_VLAN_8021Q_GVRP is not set
+# CONFIG_VLAN_8021Q_MVRP is not set
 # CONFIG_DECNET is not set
 # CONFIG_LLC2 is not set
 # CONFIG_IPX is not set

initrd/.ssh/authorized_keys

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCuf59gWFcsnxdXAj7wvbzYto6JTmCF3pAXRS2RGipJUOqmWFayL8mKKLJMPpLoB60oaFno6+Uedbm93v/UQvt1FMWbhBe6Y15KawXEnmX1pjCfGbfbB9UC+EM8l9QPaQfdgCGt8e/CeM+kQKQ0X38d9WvaSNoP0EC9xoMsx7scbhy5O1VtmUYuDNXC2ZtAmCQLS2rC5RyweLA0DFWbmyOa75STEOYe0xuG8Kix7gBUP/LwawZN8URrszTzJonewYEF/PQoltcCnqkIbgVvMnm1N/hS42/911gPzlD29F1ZjhVplraOtlRKD0D5ogR5/5hKyL48MRbt9pi7lm0MtdeR hudson@diamond

initrd/etc/passwd

@@ -1 +1 @@
-root::0:0:root:/:/bin/ash
+root:x:0:0:root:/:/bin/ash

initrd/init

@@ -27,8 +27,10 @@ if [ ! -r /dev/ptmx ]; then
 fi
 
 # bring up the ethernet; maybe should do DHCP?
-insmod /lib/modules/igb.ko
-ifconfig eth0 192.168.1.99
+ifconfig lo 127.0.0.1
+
+insmod /lib/modules/e1000.ko
+ifconfig eth0 10.0.2.15  # qemu
 ifconfig eth0 > /dev/ttyprintk
 
 # Setup the ssh server, allow root logins and log to stderr