From 546f966aa570d80d36d79b43636fad0c37eadd8e Mon Sep 17 00:00:00 2001 From: robertmh Date: Thu, 17 Jul 2008 15:05:12 +0000 Subject: [PATCH] 2008-07-17 Robert Millan Partial LinuxBIOS -> Coreboot rename. * conf/i386-linuxbios.rmk: Renamed to ... * conf/i386-coreboot.rmk: ... this. * Makefile.in (RMKFILES): s/i386-linuxbios.rmk/i386-coreboot.rmk/g. * configure.ac: Accept coreboot as input platform (but maintain compatibility with linuxbios). * include/grub/i386/linuxbios: Renamed to ... * include/grub/i386/coreboot: ... this. --- ChangeLog | 12 ++++ DISTLIST | 20 +++--- Makefile.in | 2 +- conf/{i386-linuxbios.mk => i386-coreboot.mk} | 0 .../{i386-linuxbios.rmk => i386-coreboot.rmk} | 0 configure | 6 +- configure.ac | 6 +- include/grub/i386/linuxbios/boot.h | 1 - include/grub/i386/linuxbios/console.h | 25 ------- include/grub/i386/linuxbios/init.h | 28 -------- include/grub/i386/linuxbios/kernel.h | 29 -------- include/grub/i386/linuxbios/loader.h | 1 - include/grub/i386/linuxbios/machine.h | 24 ------- include/grub/i386/linuxbios/memory.h | 68 ------------------- include/grub/i386/linuxbios/serial.h | 1 - include/grub/i386/linuxbios/time.h | 1 - 16 files changed, 33 insertions(+), 191 deletions(-) rename conf/{i386-linuxbios.mk => i386-coreboot.mk} (100%) rename conf/{i386-linuxbios.rmk => i386-coreboot.rmk} (100%) delete mode 100644 include/grub/i386/linuxbios/boot.h delete mode 100644 include/grub/i386/linuxbios/console.h delete mode 100644 include/grub/i386/linuxbios/init.h delete mode 100644 include/grub/i386/linuxbios/kernel.h delete mode 100644 include/grub/i386/linuxbios/loader.h delete mode 100644 include/grub/i386/linuxbios/machine.h delete mode 100644 include/grub/i386/linuxbios/memory.h delete mode 100644 include/grub/i386/linuxbios/serial.h delete mode 100644 include/grub/i386/linuxbios/time.h diff --git a/ChangeLog b/ChangeLog index a7adb66b4..e21504b9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2008-07-17 Robert Millan + + Partial LinuxBIOS -> Coreboot rename. + + * conf/i386-linuxbios.rmk: Renamed to ... + * conf/i386-coreboot.rmk: ... this. + * Makefile.in (RMKFILES): s/i386-linuxbios.rmk/i386-coreboot.rmk/g. + * configure.ac: Accept "coreboot" as input platform (but maintain + compatibility with "linuxbios"). + * include/grub/i386/linuxbios: Renamed to ... + * include/grub/i386/coreboot: ... this. + 2008-07-17 Bean * conf/i386/efi.rmk (pkglib_MODULES): add pci.mod and lspci.mod. diff --git a/DISTLIST b/DISTLIST index d5eb64540..6a7fffcce 100644 --- a/DISTLIST +++ b/DISTLIST @@ -35,10 +35,10 @@ commands/test.c commands/videotest.c conf/common.mk conf/common.rmk +conf/i386-coreboot.mk +conf/i386-coreboot.rmk conf/i386-efi.mk conf/i386-efi.rmk -conf/i386-linuxbios.mk -conf/i386-linuxbios.rmk conf/i386-pc.mk conf/i386-pc.rmk config.guess @@ -124,6 +124,14 @@ include/grub/gpt_partition.h include/grub/gzio.h include/grub/hexdump.h include/grub/hfs.h +include/grub/i386/coreboot/boot.h +include/grub/i386/coreboot/console.h +include/grub/i386/coreboot/init.h +include/grub/i386/coreboot/kernel.h +include/grub/i386/coreboot/loader.h +include/grub/i386/coreboot/memory.h +include/grub/i386/coreboot/serial.h +include/grub/i386/coreboot/time.h include/grub/i386/efi/kernel.h include/grub/i386/efi/loader.h include/grub/i386/efi/time.h @@ -132,14 +140,6 @@ include/grub/i386/ieee1275/machine.h include/grub/i386/ieee1275/memory.h include/grub/i386/ieee1275/serial.h include/grub/i386/io.h -include/grub/i386/linuxbios/boot.h -include/grub/i386/linuxbios/console.h -include/grub/i386/linuxbios/init.h -include/grub/i386/linuxbios/kernel.h -include/grub/i386/linuxbios/loader.h -include/grub/i386/linuxbios/memory.h -include/grub/i386/linuxbios/serial.h -include/grub/i386/linuxbios/time.h include/grub/i386/linux.h include/grub/i386/loader.h include/grub/i386/pc/biosdisk.h diff --git a/Makefile.in b/Makefile.in index 768ebe01d..6f9474c9c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -93,7 +93,7 @@ enable_lzo = @enable_lzo@ ### General variables. RMKFILES = $(addprefix conf/,common.rmk i386-pc.rmk powerpc-ieee1275.rmk \ - sparc64-ieee1275.rmk i386-efi.rmk i386-ieee1275.rmk i386-linuxbios.rmk) + sparc64-ieee1275.rmk i386-efi.rmk i386-ieee1275.rmk i386-coreboot.rmk) MKFILES = $(patsubst %.rmk,%.mk,$(RMKFILES)) PKGLIB = $(pkglib_IMAGES) $(pkglib_MODULES) $(pkglib_PROGRAMS) \ diff --git a/conf/i386-linuxbios.mk b/conf/i386-coreboot.mk similarity index 100% rename from conf/i386-linuxbios.mk rename to conf/i386-coreboot.mk diff --git a/conf/i386-linuxbios.rmk b/conf/i386-coreboot.rmk similarity index 100% rename from conf/i386-linuxbios.rmk rename to conf/i386-coreboot.rmk diff --git a/configure b/configure index 417d899ce..0338d0d1e 100644 --- a/configure +++ b/configure @@ -1955,6 +1955,10 @@ else platform="$with_platform" fi +case "$platform" in + linuxbios) platform=coreboot ;; +esac + if test "x$platform" = "xefi" ; then case "$target_cpu" in i386) ;; @@ -1981,7 +1985,7 @@ case "$target_cpu"-"$platform" in i386-efi) ;; x86_64-efi) ;; i386-pc) ;; - i386-linuxbios) ;; + i386-coreboot) ;; i386-ieee1275) ;; powerpc-ieee1275) ;; sparc64-ieee1275) ;; diff --git a/configure.ac b/configure.ac index 943b9fee4..031974d87 100644 --- a/configure.ac +++ b/configure.ac @@ -69,6 +69,10 @@ else platform="$with_platform" fi +case "$platform" in + linuxbios) platform=coreboot ;; +esac + if test "x$platform" = "xefi" ; then case "$target_cpu" in i386) ;; @@ -91,7 +95,7 @@ case "$target_cpu"-"$platform" in i386-efi) ;; x86_64-efi) ;; i386-pc) ;; - i386-linuxbios) ;; + i386-coreboot) ;; i386-ieee1275) ;; powerpc-ieee1275) ;; sparc64-ieee1275) ;; diff --git a/include/grub/i386/linuxbios/boot.h b/include/grub/i386/linuxbios/boot.h deleted file mode 100644 index 6cd23aa83..000000000 --- a/include/grub/i386/linuxbios/boot.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/grub/i386/linuxbios/console.h b/include/grub/i386/linuxbios/console.h deleted file mode 100644 index f4f481077..000000000 --- a/include/grub/i386/linuxbios/console.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * GRUB -- GRand Unified Bootloader - * Copyright (C) 2008 Free Software Foundation, Inc. - * - * GRUB 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 3 of the License, or - * (at your option) any later version. - * - * GRUB 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 GRUB. If not, see . - */ - -#ifndef _GRUB_CONSOLE_MACHINE_LB_HEADER -#define _GRUB_CONSOLE_MACHINE_LB_HEADER 1 -#include - -void grub_keyboard_controller_init (void); - -#endif /* ! _GRUB_CONSOLE_MACHINE_LB_HEADER */ diff --git a/include/grub/i386/linuxbios/init.h b/include/grub/i386/linuxbios/init.h deleted file mode 100644 index e67007414..000000000 --- a/include/grub/i386/linuxbios/init.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * GRUB -- GRand Unified Bootloader - * Copyright (C) 2007 Free Software Foundation, Inc. - * - * GRUB 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 3 of the License, or - * (at your option) any later version. - * - * GRUB 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 GRUB. If not, see . - */ - -#ifndef GRUB_INIT_I386_LINUXBIOS_HEADER -#define GRUB_INIT_I386_LINUXBIOS_HEADER 1 - -#include -#include - -void EXPORT_FUNC(grub_stop) (void) __attribute__ ((noreturn)); -void EXPORT_FUNC(grub_stop_floppy) (void); - -#endif diff --git a/include/grub/i386/linuxbios/kernel.h b/include/grub/i386/linuxbios/kernel.h deleted file mode 100644 index 480d8727d..000000000 --- a/include/grub/i386/linuxbios/kernel.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * GRUB -- GRand Unified Bootloader - * Copyright (C) 2005,2006,2007,2008 Free Software Foundation, Inc. - * - * GRUB 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 3 of the License, or - * (at your option) any later version. - * - * GRUB 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 GRUB. If not, see . - */ - -#ifndef GRUB_KERNEL_MACHINE_HEADER -#define GRUB_KERNEL_MACHINE_HEADER 1 - -#include - -#define GRUB_MOD_ALIGN 0x1000 - -/* Non-zero value is only needed for some IEEE-1275 platforms. */ -#define GRUB_MOD_GAP 0 - -#endif /* ! GRUB_KERNEL_MACHINE_HEADER */ diff --git a/include/grub/i386/linuxbios/loader.h b/include/grub/i386/linuxbios/loader.h deleted file mode 100644 index d3f36bba5..000000000 --- a/include/grub/i386/linuxbios/loader.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/grub/i386/linuxbios/machine.h b/include/grub/i386/linuxbios/machine.h deleted file mode 100644 index 3f278ede5..000000000 --- a/include/grub/i386/linuxbios/machine.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * GRUB -- GRand Unified Bootloader - * Copyright (C) 2007 Free Software Foundation, Inc. - * - * GRUB 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 3 of the License, or - * (at your option) any later version. - * - * GRUB 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 GRUB. If not, see . - */ - -#ifndef GRUB_MACHINE_MACHINE_HEADER -#define GRUB_MACHINE_MACHINE_HEADER 1 - -#define GRUB_MACHINE_LINUXBIOS 1 - -#endif /* ! GRUB_MACHINE_MACHINE_HEADER */ diff --git a/include/grub/i386/linuxbios/memory.h b/include/grub/i386/linuxbios/memory.h deleted file mode 100644 index 3534adf58..000000000 --- a/include/grub/i386/linuxbios/memory.h +++ /dev/null @@ -1,68 +0,0 @@ -/* memory.h - describe the memory map */ -/* - * GRUB -- GRand Unified Bootloader - * Copyright (C) 2002,2007 Free Software Foundation, Inc. - * - * GRUB 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 3 of the License, or - * (at your option) any later version. - * - * GRUB 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 GRUB. If not, see . - */ - -#ifndef _GRUB_MEMORY_MACHINE_LB_HEADER -#define _GRUB_MEMORY_MACHINE_LB_HEADER 1 - -#include -#include - -#ifndef ASM_FILE -#include -#include -#endif - -#define GRUB_MEMORY_MACHINE_LOWER_USABLE 0x9fc00 /* 640 kiB - 1 kiB */ -#define GRUB_MEMORY_MACHINE_LOWER_SIZE 0xf0000 /* 960 kiB */ - -#define GRUB_MEMORY_MACHINE_UPPER_START 0x100000 /* 1 MiB */ - -#ifndef ASM_FILE - -struct grub_linuxbios_table_header -{ - char signature[4]; - grub_uint32_t size; -}; -typedef struct grub_linuxbios_table_header *grub_linuxbios_table_header_t; - -struct grub_linuxbios_table_item -{ -#define GRUB_LINUXBIOS_MEMBER_UNUSED 0 -#define GRUB_LINUXBIOS_MEMBER_MEMORY 1 - grub_uint32_t tag; - grub_uint32_t size; -}; -typedef struct grub_linuxbios_table_item *grub_linuxbios_table_item_t; - -struct grub_linuxbios_mem_region -{ - grub_uint64_t addr; - grub_uint64_t size; -#define GRUB_LINUXBIOS_MEMORY_AVAILABLE 1 - grub_uint32_t type; -}; -typedef struct grub_linuxbios_mem_region *mem_region_t; - -grub_err_t EXPORT_FUNC(grub_available_iterate) - (int (*hook) (mem_region_t)); - -#endif - -#endif /* ! _GRUB_MEMORY_MACHINE_HEADER */ diff --git a/include/grub/i386/linuxbios/serial.h b/include/grub/i386/linuxbios/serial.h deleted file mode 100644 index 2c527f626..000000000 --- a/include/grub/i386/linuxbios/serial.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/grub/i386/linuxbios/time.h b/include/grub/i386/linuxbios/time.h deleted file mode 100644 index 2298ee8f4..000000000 --- a/include/grub/i386/linuxbios/time.h +++ /dev/null @@ -1 +0,0 @@ -#include