[coreboot-gerrit] New patch to review for coreboot: 82263df vboot: Remove vboot_get_payload()

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10095

-gerrit

commit 82263dfc277e0355b17871c2bb4b17e61eb32ea6
Author: Aaron Durbin <adurbin at chromium.org>
Date:   Fri May 1 16:48:54 2015 -0500

    vboot: Remove vboot_get_payload()
    
    It's not used at all.
    
    Change-Id: I97bf02a9277f6ca348443c6886f77b4dfc70da78
    Signed-off-by: Aaron Durbin <adurbin at chromium.org>
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
---
 src/vendorcode/google/chromeos/chromeos.h     |  2 --
 src/vendorcode/google/chromeos/vboot_common.c | 35 ---------------------------
 2 files changed, 37 deletions(-)

diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h
index 3e427b9..57ab640 100644
--- a/src/vendorcode/google/chromeos/chromeos.h
+++ b/src/vendorcode/google/chromeos/chromeos.h
@@ -65,10 +65,8 @@ struct romstage_handoff;
 #if CONFIG_VBOOT_VERIFY_FIRMWARE
 /* Returns 0 on success < 0 on error. */
 int vboot_get_handoff_info(void **addr, uint32_t *size);
-void *vboot_get_payload(int *len);
 #else /* CONFIG_VBOOT_VERIFY_FIRMWARE */
 static inline void vboot_verify_firmware(struct romstage_handoff *h) {}
-static inline void *vboot_get_payload(int *len) { return NULL; }
 static inline int vboot_get_handoff_info(void **addr, uint32_t *size)
 {
 	return -1;
diff --git a/src/vendorcode/google/chromeos/vboot_common.c b/src/vendorcode/google/chromeos/vboot_common.c
index 68aa314..d3a939c 100644
--- a/src/vendorcode/google/chromeos/vboot_common.c
+++ b/src/vendorcode/google/chromeos/vboot_common.c
@@ -94,41 +94,6 @@ struct vboot_components *vboot_locate_components(struct vboot_region *region)
 	return vbc;
 }
 
-void *vboot_get_payload(int *len)
-{
-	struct vboot_handoff *vboot_handoff;
-	struct firmware_component *fwc;
-
-	if (IS_ENABLED(CONFIG_MULTIPLE_CBFS_INSTANCES))
-		return NULL; /* Let CBFS figure it out. */
-
-	vboot_handoff = cbmem_find(CBMEM_ID_VBOOT_HANDOFF);
-
-	if (vboot_handoff == NULL)
-		return NULL;
-
-	if (CONFIG_VBOOT_BOOT_LOADER_INDEX >= MAX_PARSED_FW_COMPONENTS) {
-		printk(BIOS_ERR, "Invalid boot loader index: %d\n",
-		       CONFIG_VBOOT_BOOT_LOADER_INDEX);
-		return NULL;
-	}
-
-	fwc = &vboot_handoff->components[CONFIG_VBOOT_BOOT_LOADER_INDEX];
-
-	/* If payload size is zero fall back to cbfs path. */
-	if (fwc->size == 0)
-		return NULL;
-
-	if (len != NULL)
-		*len = fwc->size;
-
-	printk(BIOS_DEBUG, "Booting 0x%x byte verified payload at 0x%08x.\n",
-	       fwc->size, fwc->address);
-
-	/* This will leak a mapping. */
-	return vboot_get_region(fwc->address, fwc->size, NULL);
-}
-
 void vboot_reboot(void)
 {
 	if (IS_ENABLED(CONFIG_CONSOLE_CBMEM_DUMP_TO_UART))