Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4629
-gerrit
commit c22102325eeef847d23909a8b9764103d536d857
Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
Date: Thu Dec 26 02:02:00 2013 -0500
cubieboard: Keep AHB clock within specs
The CPU was clocked at 384MHz in the bootblock, but the AHB bus has a
maximum rated frequency of 250MHz. Its clock needs to be divided to
keep it within spec. Overclocking the AHB bus hung the CPU when
memory was accessed.
Change-Id: I7cb9cdd1f126b3d5b0446fc68af79b54946bc2d3
Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
---
src/mainboard/cubietech/cubieboard/bootblock.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/mainboard/cubietech/cubieboard/bootblock.c b/src/mainboard/cubietech/cubieboard/bootblock.c
index 90dfd0d..8899160 100644
--- a/src/mainboard/cubietech/cubieboard/bootblock.c
+++ b/src/mainboard/cubietech/cubieboard/bootblock.c
@@ -15,7 +15,7 @@
#define CPU_AHB_APB0_DEFAULT \
CPU_CLK_SRC_OSC24M \
| APB0_DIV_1 \
- | AHB_DIV_1 \
+ | AHB_DIV_2 \
| AXI_DIV_1
#define GPH_STATUS_LEDS (1 << 20) | (1 << 21)
@@ -33,7 +33,9 @@ static void cubieboard_set_sys_clock(void)
/* Switch CPU clock to main oscillator */
write32(CPU_AHB_APB0_DEFAULT, &ccm->cpu_ahb_apb0_cfg);
- /* Configure the PLL1. The value is the same one used by u-boot */
+ /* Configure the PLL1. The value is the same one used by u-boot
+ * P = 1, N = 16, K = 1, M = 1 --> Output = 384 MHz
+ */
write32(0xa1005000, &ccm->pll1_cfg);
/* FIXME: Delay to wait for PLL to lock */
Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4575
-gerrit
commit a34cc32d7af7539186b0215fddc6cb137edf5906
Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
Date: Thu Dec 26 22:53:52 2013 -0500
lib/hexdump: Take const void * and size_t as arguments
Representing a memory location as an unsigned long is specific to
32-bit architectures. It also doesn't make sense to represent a length
assumed to be positive as a signed integer. With this change, it is no
longer necessary to cast a pointer to unsigned long when passing it to
hexdump.
Change-Id: I641777d940ceac6f37c363051f1e9c1b3ec3ed95
Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
---
src/include/lib.h | 3 ++-
src/lib/hexdump.c | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/include/lib.h b/src/include/lib.h
index 5fc390a..6e9c505 100644
--- a/src/include/lib.h
+++ b/src/include/lib.h
@@ -22,6 +22,7 @@
#ifndef __LIB_H__
#define __LIB_H__
#include <stdint.h>
+#include <types.h>
#ifndef __PRE_RAM__ /* Conflicts with inline function in arch/io.h */
/* Defined in src/lib/clog2.c */
@@ -57,6 +58,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx);
void post_cache_as_ram(void);
/* Defined in src/lib/hexdump.c */
-void hexdump(unsigned long memory, int length);
+void hexdump(const void *memory, size_t length);
#endif /* __LIB_H__ */
diff --git a/src/lib/hexdump.c b/src/lib/hexdump.c
index d24ae77..82b0a3b 100644
--- a/src/lib/hexdump.c
+++ b/src/lib/hexdump.c
@@ -28,7 +28,7 @@ static int isprint(int c)
return (c >= 32 && c <= 126);
}
-void hexdump(unsigned long memory, int length)
+void hexdump(const void* memory, size_t length)
{
int i;
uint8_t *m;
@@ -48,7 +48,7 @@ void hexdump(unsigned long memory, int length)
}
if (all_zero < 2) {
- printk(BIOS_DEBUG, "%08lx:", memory + i);
+ printk(BIOS_DEBUG, "%p:", memory + i);
for (j = 0; j < 16; j++)
printk(BIOS_DEBUG, " %02x", m[i+j]);
printk(BIOS_DEBUG, " ");
Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4628
-gerrit
commit 7b394098324f1d2b9f6988ac76fffed32423ae1f
Author: Vladimir Serbinenko <phcoder(a)gmail.com>
Date: Mon Jan 6 20:40:27 2014 +0100
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(a)gmail.com>
---
src/Kconfig | 5 --
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 +--
src/include/cpu/x86/multiboot.h | 184 ----------------------------------------
6 files changed, 1 insertion(+), 283 deletions(-)
diff --git a/src/Kconfig b/src/Kconfig
index 88df9ae..d427e15 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 3e53d79..629c644 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 1b28a4c..3ef46a5 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 a043e60..0000000
--- 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 eea9bf1..b420a7c 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>
@@ -58,7 +57,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;
@@ -247,13 +246,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 7bc25a9..0000000
--- 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
Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4628
-gerrit
commit f42039c360a2f75d58791594664aba0fbafe441a
Author: Vladimir Serbinenko <phcoder(a)gmail.com>
Date: Mon Jan 6 20:40:27 2014 +0100
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(a)gmail.com>
---
payloads/libpayload/Config.in | 3 +-
src/Kconfig | 5 --
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 +--
src/include/cpu/x86/multiboot.h | 184 ----------------------------------------
7 files changed, 3 insertions(+), 284 deletions(-)
diff --git a/payloads/libpayload/Config.in b/payloads/libpayload/Config.in
index ae90285..c54475d 100644
--- a/payloads/libpayload/Config.in
+++ b/payloads/libpayload/Config.in
@@ -340,8 +340,9 @@ config USB_EHCI
Select this option if you want to use USB 2.0
config USB_XHCI
- bool "Support for USB xHCI controllers"
+ bool
depends on USB
+ default n
help
Select this option if you want to use USB 3.0
NOTE: This option is not (fully) implemented yet
diff --git a/src/Kconfig b/src/Kconfig
index 88df9ae..d427e15 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 3e53d79..629c644 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 1b28a4c..3ef46a5 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 a043e60..0000000
--- 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 eea9bf1..b420a7c 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>
@@ -58,7 +57,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;
@@ -247,13 +246,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 7bc25a9..0000000
--- 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
Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4627
-gerrit
commit 983d6bb65fe49b32cbd514d8df0a0142ddf1715a
Author: Vladimir Serbinenko <phcoder(a)gmail.com>
Date: Mon Jan 6 20:02:48 2014 +0100
Kconfig: Don't tell that multiboot tables are for GRUB2
GRUB2-as-payload hasn't used multiboot tables on coreboot for quite some time
due to bugs slipping into multiboot info generated by coreboot and often it's
disabled altogether, so GRUB2-as-payload uses only cbtables.
Apparently libpayload still uses it, so don't remove them altogether.
Change-Id: Ife203ab86038c1d73dd553d5df2d4d306672a359
Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com>
---
src/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Kconfig b/src/Kconfig
index 88df9ae..1ae17e4 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -470,7 +470,7 @@ config MAX_PIRQ_LINKS
menu "System tables"
config MULTIBOOT
- bool "Generate Multiboot tables (for GRUB2)"
+ bool "Generate Multiboot tables"
default y
depends on ARCH_X86