[coreboot-gerrit] Patch set updated for coreboot: 0a76f55 ChromeOS: Rename chromeos.c in vendorcode

Kyösti Mälkki (kyosti.malkki@gmail.com) gerrit at coreboot.org
Fri May 9 11:51:20 CEST 2014


Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5645

-gerrit

commit 0a76f5543722a6c8bd89875ce52cff2c315a7ec3
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Mon Apr 28 23:25:01 2014 +0300

    ChromeOS: Rename chromeos.c in vendorcode
    
    Rename the file to vboot_handoff.c and compile it conditionally
    with VBOOT_VERIFY_FIRMWARE.
    
    Change-Id: I8b6fd91063b54cb8f5927c6483a398b75e1d262a
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/vendorcode/google/chromeos/Makefile.inc    |   4 +-
 src/vendorcode/google/chromeos/chromeos.c      | 120 -------------------------
 src/vendorcode/google/chromeos/vboot_handoff.c | 115 ++++++++++++++++++++++++
 3 files changed, 117 insertions(+), 122 deletions(-)

diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc
index 5fd595e..cc63e06 100644
--- a/src/vendorcode/google/chromeos/Makefile.inc
+++ b/src/vendorcode/google/chromeos/Makefile.inc
@@ -17,8 +17,6 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-romstage-y += chromeos.c
-ramstage-y += chromeos.c
 romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += vbnv.c
 ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += vbnv.c
 ramstage-y += gnvs.c
@@ -28,6 +26,8 @@ ramstage-$(CONFIG_CHROMEOS_RAMOOPS) += ramoops.c
 smm-y += fmap.c
 
 ifeq ($(CONFIG_VBOOT_VERIFY_FIRMWARE),y)
+romstage-y += vboot_handoff.c
+ramstage-y += vboot_handoff.c
 romstage-y += vboot_loader.c
 rmodules-y += vboot_wrapper.c
 
diff --git a/src/vendorcode/google/chromeos/chromeos.c b/src/vendorcode/google/chromeos/chromeos.c
deleted file mode 100644
index f8dd7dc..0000000
--- a/src/vendorcode/google/chromeos/chromeos.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 The ChromiumOS Authors.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <stddef.h>
-#include "chromeos.h"
-#if CONFIG_VBOOT_VERIFY_FIRMWARE
-#include "vboot_handoff.h"
-#endif
-#include <boot/coreboot_tables.h>
-#include <cbmem.h>
-#include <console/console.h>
-
-#if CONFIG_VBOOT_VERIFY_FIRMWARE
-#include <payload_loader.h>
-
-int vboot_enable_developer(void)
-{
-	struct vboot_handoff *vbho;
-
-	vbho = cbmem_find(CBMEM_ID_VBOOT_HANDOFF);
-
-	if (vbho == NULL) {
-		printk(BIOS_ERR, "%s: Couldn't find vboot_handoff structure!\n",
-		        __func__);
-		return 0;
-	}
-
-	return !!(vbho->init_params.out_flags & VB_INIT_OUT_ENABLE_DEVELOPER);
-}
-
-int vboot_enable_recovery(void)
-{
-	struct vboot_handoff *vbho;
-
-	vbho = cbmem_find(CBMEM_ID_VBOOT_HANDOFF);
-
-	if (vbho == NULL)
-		return 0;
-
-	return !!(vbho->init_params.out_flags & VB_INIT_OUT_ENABLE_RECOVERY);
-}
-
-static void *vboot_get_payload(size_t *len)
-{
-	struct vboot_handoff *vboot_handoff;
-	struct firmware_component *fwc;
-
-	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 (len != NULL)
-		*len = fwc->size;
-
-	printk(BIOS_DEBUG, "Booting 0x%x byte payload at 0x%08x.\n",
-	       fwc->size, fwc->address);
-
-	return (void *)fwc->address;
-}
-
-static int vboot_locate_payload(struct payload *payload)
-{
-	void *buffer;
-	size_t size;
-
-	buffer = vboot_get_payload(&size);
-
-	if (buffer == NULL)
-		return -1;
-
-	payload->backing_store.data = buffer;
-	payload->backing_store.size = size;
-
-	return 0;
-}
-
-const struct payload_loader_ops vboot_payload_loader = {
-	.name = "VBOOT",
-	.locate = vboot_locate_payload,
-};
-
-int vboot_get_handoff_info(void **addr, uint32_t *size)
-{
-	struct vboot_handoff *vboot_handoff;
-
-	vboot_handoff = cbmem_find(CBMEM_ID_VBOOT_HANDOFF);
-
-	if (vboot_handoff == NULL)
-		return -1;
-
-	*addr = vboot_handoff;
-	*size = sizeof(*vboot_handoff);
-	return 0;
-}
-#endif
diff --git a/src/vendorcode/google/chromeos/vboot_handoff.c b/src/vendorcode/google/chromeos/vboot_handoff.c
new file mode 100644
index 0000000..937b2e3
--- /dev/null
+++ b/src/vendorcode/google/chromeos/vboot_handoff.c
@@ -0,0 +1,115 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2011 The ChromiumOS Authors.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stddef.h>
+#include "chromeos.h"
+#include <boot/coreboot_tables.h>
+#include <cbmem.h>
+#include <console/console.h>
+#include <payload_loader.h>
+#include "vboot_handoff.h"
+
+int vboot_enable_developer(void)
+{
+	struct vboot_handoff *vbho;
+
+	vbho = cbmem_find(CBMEM_ID_VBOOT_HANDOFF);
+
+	if (vbho == NULL) {
+		printk(BIOS_ERR, "%s: Couldn't find vboot_handoff structure!\n",
+		        __func__);
+		return 0;
+	}
+
+	return !!(vbho->init_params.out_flags & VB_INIT_OUT_ENABLE_DEVELOPER);
+}
+
+int vboot_enable_recovery(void)
+{
+	struct vboot_handoff *vbho;
+
+	vbho = cbmem_find(CBMEM_ID_VBOOT_HANDOFF);
+
+	if (vbho == NULL)
+		return 0;
+
+	return !!(vbho->init_params.out_flags & VB_INIT_OUT_ENABLE_RECOVERY);
+}
+
+static void *vboot_get_payload(size_t *len)
+{
+	struct vboot_handoff *vboot_handoff;
+	struct firmware_component *fwc;
+
+	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 (len != NULL)
+		*len = fwc->size;
+
+	printk(BIOS_DEBUG, "Booting 0x%x byte payload at 0x%08x.\n",
+	       fwc->size, fwc->address);
+
+	return (void *)fwc->address;
+}
+
+static int vboot_locate_payload(struct payload *payload)
+{
+	void *buffer;
+	size_t size;
+
+	buffer = vboot_get_payload(&size);
+
+	if (buffer == NULL)
+		return -1;
+
+	payload->backing_store.data = buffer;
+	payload->backing_store.size = size;
+
+	return 0;
+}
+
+const struct payload_loader_ops vboot_payload_loader = {
+	.name = "VBOOT",
+	.locate = vboot_locate_payload,
+};
+
+int vboot_get_handoff_info(void **addr, uint32_t *size)
+{
+	struct vboot_handoff *vboot_handoff;
+
+	vboot_handoff = cbmem_find(CBMEM_ID_VBOOT_HANDOFF);
+
+	if (vboot_handoff == NULL)
+		return -1;
+
+	*addr = vboot_handoff;
+	*size = sizeof(*vboot_handoff);
+	return 0;
+}



More information about the coreboot-gerrit mailing list