reverting changes that were not merged from other branches

Makefile

@@ -11,7 +11,6 @@ log_dir		:= $(build)/log
 
 BOARD		?= qemu-coreboot
 CONFIG		:= $(pwd)/boards/$(BOARD).config
-BOARDMAKE	:= $(pwd)/boards/$(BOARD).mk
 
 ifneq "y" "$(shell [ -r '$(CONFIG)' ] && echo y)"
 $(error $(CONFIG): board configuration does not exist)
@@ -19,10 +18,6 @@ endif
 
 include $(CONFIG)
 
-ifneq "y" "$(shell [ ! -r '$(BOARDMAKE)' ] && echo y)"
-include $(BOARDMAKE)
-endif
-
 # Unless otherwise specified, we are building for heads
 CONFIG_HEADS	?= y
 

boards/qemu-coreboot.mk

@@ -1,5 +0,0 @@
-run: coreboot.intermediate
-run: $(build)/$(BOARD)/coreboot.rom
-	qemu-system-x86_64 \
-		--machine q35 \
-		--bios $< \

boards/qemu-linuxboot.mk

@@ -1,15 +0,0 @@
-# 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=$(build)/$(BOARD)/linuxboot.rom
-	stty sane
-

boards/x230.config

@@ -15,7 +15,6 @@ CONFIG_POPT=y
 CONFIG_QRENCODE=y
 CONFIG_TPMTOTP=y
 CONFIG_DROPBEAR=y
-CONFIG_TPM=y
 
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=y

config/busybox.config

@@ -470,9 +470,9 @@ CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y
 # CONFIG_BOOTCHARTD is not set
 # CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
 # CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
-# CONFIG_HALT is not set
-# CONFIG_POWEROFF is not set
-# CONFIG_REBOOT is not set
+CONFIG_HALT=y
+CONFIG_POWEROFF=y
+CONFIG_REBOOT=y
 # CONFIG_FEATURE_CALL_TELINIT is not set
 CONFIG_TELINIT_PATH=""
 # CONFIG_INIT is not set

initrd/etc/motd.coreboot

@@ -1,6 +0,0 @@
-  _   _                _          __   ____               _                 _   
- | | | | ___  __ _  __| |___     / /  / ___|___  _ __ ___| |__   ___   ___ | |_ 
- | |_| |/ _ \/ _` |/ _` / __|   / /  | |   / _ \| '__/ _ \ '_ \ / _ \ / _ \| __|
- |  _  |  __/ (_| | (_| \__ \  / /   | |__| (_) | | |  __/ |_) | (_) | (_) | |_ 
- |_| |_|\___|\__,_|\__,_|___/ /_/     \____\___/|_|  \___|_.__/ \___/ \___/ \__|
-                                                                               

initrd/etc/motd.nerf

@@ -1,6 +0,0 @@
-  _   _                _          __  _   _ _____ ____  _____ 
- | | | | ___  __ _  __| |___     / / | \ | | ____|  _ \|  ___|
- | |_| |/ _ \/ _` |/ _` / __|   / /  |  \| |  _| | |_) | |_   
- |  _  |  __/ (_| | (_| \__ \  / /   | |\  | |___|  _ <|  _|  
- |_| |_|\___|\__,_|\__,_|___/ /_/    |_| \_|_____|_| \_\_|    
-

initrd/init

@@ -58,25 +58,6 @@ hwclock -l -s
 . /etc/functions
 . /etc/config
 
-# Configure linuxboot environment
-if [ ! -z "$CONFIG_LINUXBOOT" ]; then
-	mount /sys/firmware/efi/efivars
-
-	# Setup the pty psudeo filesystem
-	mkdir /dev/pts
-	mount /dev/pts 2>/dev/ttyprintk
-
-	if [ ! -r /dev/ptmx ]; then
-		ln -s /dev/pts/ptmx /dev/ptmx
-	fi
-fi
-
-# Setup recovery serial shell
-if [ ! -z "$CONFIG_BOOT_RECOVERY_SERIAL" ]; then
-	stty -F "$CONFIG_BOOT_RECOVERY_SERIAL" 115200
-	/bin/sh < "$CONFIG_BOOT_RECOVERY_SERIAL" > "$CONFIG_BOOT_RECOVERY_SERIAL" 2>&1 &
-fi
-
 # Add our boot devices into the /etc/fstab, if they are defined
 # in the configuration file.
 if [ ! -z "$CONFIG_BOOT_DEV" ]; then