From: Vladimir 'phcoder' Serbinenko Date: Sat, 16 Jan 2010 16:27:35 +0000 (+0100) Subject: merge multiboot into multiboot2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=165a055fb8dade22aaa6235b09a75066786dedec;p=thirdparty%2Fgrub.git merge multiboot into multiboot2 --- 165a055fb8dade22aaa6235b09a75066786dedec diff --cc ChangeLog index 0db49b5c2,b8923bce2..3dc778ea4 --- a/ChangeLog +++ b/ChangeLog @@@ -1,15 -1,35 +1,47 @@@ + 2010-01-15 Vladimir Serbinenko + + * doc/kernel.c (cmain): Handle EGA text video information. + * doc/multiboot.h (MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT): New const. + + 2010-01-14 Robert Millan + + * COPYING: Replace with GPLv3 text. + * doc/boot.S: Update to GPL version 3 or later. + * doc/kernel.c: Likewise. + + 2010-01-12 Vladimir Serbinenko + 2010-01-12 Robert Millan + + Video mode amendment by Vladimir Serbinenko. See NEWS file for + details. + + * NEWS: Document video mode amendment. + * doc/multiboot.texi: Video mode ammendment. + * doc/multiboot.h (MULTIBOOT_INFO_VIDEO_INFO): Remove macro. + (MULTIBOOT_INFO_VBE_INFO, MULTIBOOT_INFO_FRAMEBUFFER_INFO): New macros. + (multiboot_uint8_t): New type. + (struct multiboot_color): New structure. + (struct multiboot_info): Add new video mode fields. + (MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED) + (MULTIBOOT_FRAMEBUFFER_TYPE_RGB): New macros. + + * doc/boot.S (MULTIBOOT_HEADER_FLAGS): Add `MULTIBOOT_VIDEO_MODE'. + (multiboot_header): Include video mode information. + * doc/kernel.c (cmain): Draw a blue diagonal line when video mode + information is provided. + +2010-01-07 Robert Millan + + Kick out Multiboot 2 draft as a branch. Initially it is + identical to Multiboot 1, except for the magic numbers. + + * doc/multiboot.h: Rename to ... + * doc/multiboot2.h: ... this. Update all users. + (MULTIBOOT_HEADER_MAGIC): Replace with ... + (MULTIBOOT2_HEADER_MAGIC): ... this. Update all users. + (MULTIBOOT_BOOTLOADER_MAGIC): Replace with ... + (MULTIBOOT2_BOOTLOADER_MAGIC): ... this. Update all users. + 2010-01-07 Robert Millan * doc/multiboot.h (MULTIBOOT_UNSUPPORTED): Remove macro (moved to diff --cc doc/boot.S index f7562d83b,849c055cd..80a4381fa --- a/doc/boot.S +++ b/doc/boot.S @@@ -1,22 -1,22 +1,22 @@@ /* boot.S - bootstrap the kernel */ - /* Copyright (C) 1999, 2001 Free Software Foundation, Inc. - - 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ + /* Copyright (C) 1999, 2001, 2010 Free Software Foundation, Inc. */ + /* + * 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 3 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 . + */ #define ASM_FILE 1 -#include +#include /* C symbol format. HAVE_ASM_USCORE is defined by configure. */ #ifdef HAVE_ASM_USCORE diff --cc doc/kernel.c index 1107ce69a,09ecb2c70..57881b6ea --- a/doc/kernel.c +++ b/doc/kernel.c @@@ -1,21 -1,21 +1,21 @@@ /* kernel.c - the C part of the kernel */ - /* Copyright (C) 1999 Free Software Foundation, Inc. - - 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ + /* Copyright (C) 1999, 2010 Free Software Foundation, Inc. */ + /* + * 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 3 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 /* Macros. */