From 2657e841097b33bc6f50470f852d2e54fb35f5f6 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 6 Jan 2014 20:40:27 +0100 Subject: Multiboot: remove multiboot tables generation. GRUB2-as-payload doesn't use them. Libpayload can live with just coreboot tables if loaded as payload. memtest86+ can use them but is buggy with them. Solaris needs a huge boot archive not supported by coreboot and too big to fit in flash (dozens of megabytes). All-in-all looks like no users are left for this. Change-Id: Id92f73be5a397db80f5b0132ee57c37ee6eeb563 Signed-off-by: Vladimir Serbinenko Reviewed-on: http://review.coreboot.org/4628 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Stefan Reinauer --- src/arch/x86/boot/Makefile.inc | 1 - src/arch/x86/boot/boot.c | 8 ----- src/arch/x86/boot/multiboot.c | 76 ------------------------------------------ src/arch/x86/boot/tables.c | 10 +----- 4 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 src/arch/x86/boot/multiboot.c (limited to 'src/arch') diff --git a/src/arch/x86/boot/Makefile.inc b/src/arch/x86/boot/Makefile.inc index 3e53d79a64..629c644c7c 100644 --- a/src/arch/x86/boot/Makefile.inc +++ b/src/arch/x86/boot/Makefile.inc @@ -2,7 +2,6 @@ romstage-$(CONFIG_EARLY_CBMEM_INIT) += cbmem.c romstage-$(CONFIG_HAVE_ACPI_RESUME) += cbmem.c ramstage-y += boot.c -ramstage-$(CONFIG_MULTIBOOT) += multiboot.c ramstage-y += gdt.c ramstage-y += tables.c ramstage-y += cbmem.c diff --git a/src/arch/x86/boot/boot.c b/src/arch/x86/boot/boot.c index 1b28a4c50c..3ef46a5bf0 100644 --- a/src/arch/x86/boot/boot.c +++ b/src/arch/x86/boot/boot.c @@ -2,7 +2,6 @@ #include #include #include -#include #if CONFIG_RELOCATABLE_RAMSTAGE /* When the ramstage is relocatable the elf loading ensures an elf image cannot @@ -21,9 +20,6 @@ void jmp_to_elf_entry(void *entry, unsigned long unused1, unsigned long unused2) :: "r" (entry) -#if CONFIG_MULTIBOOT - , "b"(mbi), "a" (MB_MAGIC2) -#endif ); } #else @@ -123,11 +119,7 @@ void jmp_to_elf_entry(void *entry, unsigned long buffer, unsigned long size) :: "ri" (lb_start), "ri" (buffer), "ri" (lb_size), "ri" (entry), -#if CONFIG_MULTIBOOT - "ri"(mbi), "ri" (MB_MAGIC2) -#else "ri"(0), "ri" (0) -#endif ); } #endif /* CONFIG_RELOCATABLE_RAMSTAGE */ diff --git a/src/arch/x86/boot/multiboot.c b/src/arch/x86/boot/multiboot.c deleted file mode 100644 index a043e604e8..0000000000 --- a/src/arch/x86/boot/multiboot.c +++ /dev/null @@ -1,76 +0,0 @@ -/* - * support for Multiboot payloads - * - * Copyright (C) 2008 Robert Millan - * - * 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; either version 2 of the License, or - * (at your option) any later version. - * - * 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, see . - * - */ - -#include -#include -#include -#include -#include - -struct multiboot_info *mbi = NULL; - -unsigned long write_multiboot_info(unsigned long rom_table_end) -{ - static struct multiboot_mmap_entry *mb_mem; - struct lb_memory* coreboot_table; - int entries; - int i; - - mbi = (struct multiboot_info *)rom_table_end; - - memset(mbi, 0, sizeof(*mbi)); - rom_table_end += sizeof(*mbi); - - mbi->mmap_addr = (u32) rom_table_end; - mb_mem = (struct multiboot_mmap_entry *)rom_table_end; - - /* copy regions from coreboot tables */ - coreboot_table = get_lb_mem(); - entries = (coreboot_table->size - sizeof(*coreboot_table))/sizeof(coreboot_table->map[0]); - - if (coreboot_table == NULL || entries < 1) { - printk(BIOS_INFO, "%s: Cannot find coreboot table.\n", __func__); - return (unsigned long) mb_mem; - } - - for (i = 0; i < entries; i++) { - uint64_t entry_start = unpack_lb64(coreboot_table->map[i].start); - uint64_t entry_size = unpack_lb64(coreboot_table->map[i].size); - mb_mem->addr = entry_start; - mb_mem->len = entry_size; - switch (coreboot_table->map[i].type) { - case LB_MEM_RAM: - mb_mem->type = MULTIBOOT_MEMORY_AVAILABLE; - break; - default: // anything other than usable RAM - mb_mem->type = MULTIBOOT_MEMORY_RESERVED; - break; - } - mb_mem->size = sizeof(*mb_mem) - sizeof(mb_mem->size); - mb_mem++; - } - - mbi->mmap_length = ((u32) mb_mem) - mbi->mmap_addr; - mbi->flags |= MB_INFO_MEM_MAP; - - printk(BIOS_INFO, "Multiboot Information structure has been written.\n"); - - return (unsigned long)mb_mem; -} diff --git a/src/arch/x86/boot/tables.c b/src/arch/x86/boot/tables.c index 40bf087cc3..e980ed816c 100644 --- a/src/arch/x86/boot/tables.c +++ b/src/arch/x86/boot/tables.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -54,7 +53,7 @@ struct lb_memory *write_tables(void) rom_table_end = 0xf0000; /* Start low addr at 0x500, so we don't run into conflicts with the BDA - * in case our data structures grow beyond 0x400. Only multiboot, GDT + * in case our data structures grow beyond 0x400. Only GDT * and the coreboot table use low_tables. */ low_table_start = 0; @@ -243,13 +242,6 @@ struct lb_memory *write_tables(void) rom_table_start, rom_table_end); } -#if CONFIG_MULTIBOOT - post_code(0x9d); - - /* The Multiboot information structure */ - write_multiboot_info(rom_table_end); -#endif - /* Print CBMEM sections */ cbmem_list(); -- cgit v1.2.3