Move old vkernel code out of vboot_firmware.

utility/Makefile

Index: utility/Makefile
diff --git a/utility/Makefile b/utility/Makefile
index 9a05aa7c24c34c9d8230d7527a7d5924ef540637..aaf1aae0c5cd0e03ec0994732a1939c537a4232d 100644
--- a/utility/Makefile
+++ b/utility/Makefile
@@ -15,6 +15,8 @@ CFLAGS += -MMD -MF $@.d
 LIBS = $(BUILD)/misclibs/file_keys.o \
 	$(BUILD)/misclibs/signature_digest.o \
 	$(BUILD)/vkernel/kernel_image.o \
+	$(BUILD)/vkernel/kernel_image_fw.o \
+	$(BUILD)/vkernel/load_kernel_fw.o \
 	$(HOSTLIB) \
 	$(FWLIB)
 
@@ -26,7 +28,7 @@ TARGET_NAMES = dumpRSAPublicKey \
 		gbb_utility \
 		kernel_utility \
 		load_kernel_test \
-		load_kernel2_test \
+		load_kernel_test_old \
 		sign_image \
 		signature_digest_utility \
 		vbutil_firmware \
@@ -49,7 +51,7 @@ ${BUILD_ROOT}/gbb_utility: gbb_utility.cc
 ${BUILD_ROOT}/load_kernel_test: load_kernel_test.c $(LIBS)
 	$(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
 
-${BUILD_ROOT}/load_kernel2_test: load_kernel2_test.c $(LIBS)
+${BUILD_ROOT}/load_kernel_test_old: load_kernel_test_old.c $(LIBS)
 	$(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
 
 ${BUILD_ROOT}/kernel_utility: kernel_utility.cc $(LIBS)