commit b3e251696962a9d1581c6975914eb6c33a61f641
author Jeremy Compostella <jeremy.compostella@intel.com> Thu Aug 14 14:52:46 2014 +0200
committer Patrick Tjin <pattjin@google.com> Mon Aug 18 21:46:12 2014 -0700
tree f88c65b4d132c230eb52109efb0cd18c55d8df20
parent 23dfe463711d038d9fe42642e36a2ffb3c20de3b

Revert "[REVERT ME] Disable bootstub compilation"

Bug: 16928801
BZ: 216961

This reverts commit 23dfe463711d038d9fe42642e36a2ffb3c20de3b.

Change-Id: Idfb57f902d28edd816e17a33323fea946745df0a
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>

2ndbootloader

diff --git a/2ndbootloader b/2ndbootloader
deleted file mode 100644
index 132b0d3..0000000
--- a/2ndbootloader
+++ /dev/null
Binary files differ

Android.mk

diff --git a/Android.mk b/Android.mk
index 889079d..e90bb6c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,22 +1,7 @@
 LOCAL_PATH := $(call my-dir)
-
-# HACK: Revert back to moorefield after bootstub compilation is fixed
+    
 ifeq ($(TARGET_BOARD_PLATFORM),moorefield)
 
-# 2ndbootloader - temporary prebuilt
-include $(CLEAR_VARS)
-LOCAL_MODULE := 2ndbootloader
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)
-LOCAL_SRC_FILES := 2ndbootloader
-include $(BUILD_PREBUILT)
-
-endif #($(TARGET_BOARD_PLATFORM),moorefield)
-# END HACK
-
-ifeq ($(TARGET_BOARD_PLATFORM),moorefield_disabled)
-
 include $(CLEAR_VARS)
 
 # First compile bootstub.bin