Stefan Reinauer (stefan.reinauer@coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1052
-gerrit
commit 7993afd7b1bb29dd3bcbc4ea3f56232ff30998be Author: Stefan Reinauer reinauer@chromium.org Date: Wed May 23 14:20:18 2012 -0700
ChromeOS: Remove remnants of FDT support
Originally, on ChromeBooks, coreboot would provide a modified u-boot device tree (FDT) to u-boot in CBMEM. However, u-boot can now create all the information it needs from the coreboot table and add it to its device tree itself. This means we can drop this (anyways unused) code.
Change-Id: I4ab20bbb8525e7349b18764aa202bbe81958d06a Signed-off-by: Stefan Reinauer reinauer@google.com --- src/vendorcode/google/chromeos/gnvs.c | 42 --------------------------------- src/vendorcode/google/chromeos/gnvs.h | 1 - 2 files changed, 0 insertions(+), 43 deletions(-)
diff --git a/src/vendorcode/google/chromeos/gnvs.c b/src/vendorcode/google/chromeos/gnvs.c index 6b545f4..024dbf8 100644 --- a/src/vendorcode/google/chromeos/gnvs.c +++ b/src/vendorcode/google/chromeos/gnvs.c @@ -34,48 +34,6 @@ void chromeos_init_vboot(chromeos_acpi_t *chromeos) memcpy(vboot_data->mehh, me_hash_saved, sizeof(vboot_data->mehh)); }
-void chromeos_set_vboot_data_ptr(void *blob) -{ - /* This code has to be rewritten to pass the vboot table - * pointer through the coreboot table instead of the - * FDT, since FDT support was rejected upstream. For now - * just make the code available for reference. - */ -#if 0 // CONFIG_ADD_FDT - int node_offset, addr_cell_len; - const u32 *cell; - uintptr_t table_addr = (uintptr_t)vboot_data; - u32 table_addr32; - u64 table_addr64; - void *table_ptr; - - cell = fdt_getprop(blob, 0, "#address-cells", NULL); - if (cell && *cell == 2) { - addr_cell_len = 8; - table_addr64 = cpu_to_fdt64(table_addr); - table_ptr = &table_addr64; - } else { - addr_cell_len = 4; - table_addr32 = cpu_to_fdt32(table_addr); - table_ptr = &table_addr32; - } - - node_offset = fdt_path_offset(blob, "/chromeos-config"); - if (node_offset < 0) { - printk(BIOS_ERR, - "Couldn't find /chromeos-config in the fdt.\n"); - return; - } - - if (fdt_setprop(blob, node_offset, "gnvs-vboot-table", - table_ptr, addr_cell_len) < 0) { - printk(BIOS_ERR, "Couldn't set gnvs-vboot-table.\n"); - } -#else - printk(BIOS_ERR, "Can't set gnvs-vboot-table.\n"); -#endif -} - void chromeos_set_me_hash(u32 *hash, int len) { if ((len*sizeof(u32)) > sizeof(vboot_data->mehh)) diff --git a/src/vendorcode/google/chromeos/gnvs.h b/src/vendorcode/google/chromeos/gnvs.h index 36922ba..6dd740f 100644 --- a/src/vendorcode/google/chromeos/gnvs.h +++ b/src/vendorcode/google/chromeos/gnvs.h @@ -63,7 +63,6 @@ typedef struct {
extern chromeos_acpi_t *vboot_data; void chromeos_init_vboot(chromeos_acpi_t *chromeos); -void chromeos_set_vboot_data_ptr(void *); void chromeos_set_me_hash(u32*, int);
#endif