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 <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/4628
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

6 files changed, 1 insertions, 283 deletions

diff --git a/src/Kconfig b/src/Kconfig
index bed6c7f8ee..0af108f180 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -469,11 +469,6 @@ config MAX_PIRQ_LINKS
 
 menu "System tables"
 
-config MULTIBOOT
-	bool "Generate Multiboot tables (for GRUB2)"
-	default y
-	depends on ARCH_X86
-
 config GENERATE_ACPI_TABLES
 	prompt "Generate ACPI tables" if HAVE_ACPI_TABLES
 	bool
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 <arch/stages.h>
 #include <ip_checksum.h>
 #include <string.h>
-#include <cpu/x86/multiboot.h>
 
 #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 <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <cpu/x86/multiboot.h>
-#include <string.h>
-#include <device/resource.h>
-#include <console/console.h>
-#include <boot/coreboot_tables.h>
-
-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 <arch/smp/mpspec.h>
 #include <arch/acpi.h>
 #include <string.h>
-#include <cpu/x86/multiboot.h>
 #include <cbmem.h>
 #include <lib.h>
 #include <smbios.h>
@@ -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();
 
diff --git a/src/include/cpu/x86/multiboot.h b/src/include/cpu/x86/multiboot.h
deleted file mode 100644
index 7bc25a9eee..0000000000
--- a/src/include/cpu/x86/multiboot.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2003 Free Software Foundation, Inc.
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/*
- * multiboot.h - multiboot header file.
- */
-
-#ifndef MULTIBOOT_H
-#define MULTIBOOT_H
-
-#include <stdint.h>
-
-/* How many bytes from the start of the file we search for the header.  */
-#define MB_SEARCH                 8192
-
-/* The magic field should contain this.  */
-#define MB_MAGIC                  0x1BADB002
-
-/* This should be in %eax.  */
-#define MB_MAGIC2                 0x2BADB002
-
-/* The bits in the required part of flags field we don't support.  */
-#define MB_UNSUPPORTED            0x0000fffc
-
-/* Alignment of multiboot modules.  */
-#define MB_MOD_ALIGN              0x00001000
-
-/*
- * Flags set in the 'flags' member of the multiboot header.
- */
-
-/* Align all boot modules on i386 page (4KB) boundaries.  */
-#define MB_PAGE_ALIGN		0x00000001
-
-/* Must pass memory information to OS.  */
-#define MB_MEMORY_INFO		0x00000002
-
-/* Must pass video information to OS.  */
-#define MB_VIDEO_MODE		0x00000004
-
-/* This flag indicates the use of the address fields in the header.  */
-#define MB_AOUT_KLUDGE		0x00010000
-
-/*
- *  Flags to be set in the 'flags' member of the multiboot info structure.
- */
-
-/* is there basic lower/upper memory information? */
-#define MB_INFO_MEMORY		0x00000001
-/* is there a boot device set? */
-#define MB_INFO_BOOTDEV		0x00000002
-/* is the command-line defined? */
-#define MB_INFO_CMDLINE		0x00000004
-/* are there modules to do something with? */
-#define MB_INFO_MODS		0x00000008
-
-/* These next two are mutually exclusive */
-
-/* is there a symbol table loaded? */
-#define MB_INFO_AOUT_SYMS		0x00000010
-/* is there an ELF section header table? */
-#define MB_INFO_ELF_SHDR		0x00000020
-
-/* is there a full memory map? */
-#define MB_INFO_MEM_MAP		0x00000040
-
-/* Is there drive info?  */
-#define MB_INFO_DRIVE_INFO		0x00000080
-
-/* Is there a config table?  */
-#define MB_INFO_CONFIG_TABLE	0x00000100
-
-/* Is there a boot loader name?  */
-#define MB_INFO_BOOT_LOADER_NAME	0x00000200
-
-/* Is there a APM table?  */
-#define MB_INFO_APM_TABLE		0x00000400
-
-/* Is there video information?  */
-#define MB_INFO_VIDEO_INFO		0x00000800
-
-struct multiboot_header {
-	/* Must be MB_MAGIC - see above.  */
-	uint32_t magic;
-
-	/* Feature flags.  */
-	uint32_t flags;
-
-	/* The above fields plus this one must equal 0 mod 2^32. */
-	uint32_t checksum;
-
-	/* These are only valid if MB_AOUT_KLUDGE is set.  */
-	uint32_t header_addr;
-	uint32_t load_addr;
-	uint32_t load_end_addr;
-	uint32_t bss_end_addr;
-	uint32_t entry_addr;
-
-	/* These are only valid if MB_VIDEO_MODE is set.  */
-	uint32_t mode_type;
-	uint32_t width;
-	uint32_t height;
-	uint32_t depth;
-};
-
-struct multiboot_info {
-	/* Multiboot info version number */
-	uint32_t flags;
-
-	/* Available memory from BIOS */
-	uint32_t mem_lower;
-	uint32_t mem_upper;
-
-	/* "root" partition */
-	uint32_t boot_device;
-
-	/* Kernel command line */
-	uint32_t cmdline;
-
-	/* Boot-Module list */
-	uint32_t mods_count;
-	uint32_t mods_addr;
-
-	uint32_t syms[4];
-
-	/* Memory Mapping buffer */
-	uint32_t mmap_length;
-	uint32_t mmap_addr;
-
-	/* Drive Info buffer */
-	uint32_t drives_length;
-	uint32_t drives_addr;
-
-	/* ROM configuration table */
-	uint32_t config_table;
-
-	/* Boot Loader Name */
-	uint32_t boot_loader_name;
-
-	/* APM table */
-	uint32_t apm_table;
-
-	/* Video */
-	uint32_t vbe_control_info;
-	uint32_t vbe_mode_info;
-	uint16_t vbe_mode;
-	uint16_t vbe_interface_seg;
-	uint16_t vbe_interface_off;
-	uint16_t vbe_interface_len;
-};
-
-#define MULTIBOOT_MEMORY_AVAILABLE              1
-#define MULTIBOOT_MEMORY_RESERVED               2
-
-struct multiboot_mmap_entry {
-	uint32_t size;
-	uint64_t addr;
-	uint64_t len;
-	uint32_t type;
-} __attribute__ ((packed));
-
-extern struct multiboot_info *mbi;
-
-unsigned long  write_multiboot_info(unsigned long rom_table_end);
-
-#endif