vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2009-12-24 Robert Millan <rmh.grub@aybabtu.com>

Browse source 
* docs/boot.S (ASM): Rename to ...
	(ASM_FILE): ... this.
	* docs/multiboot.h: Check for `ASM_FILE' instead of `ASM'.
	
	* docs/multiboot.h (EXT_C, STACK_SIZE): Moved from here ...
	* docs/boot.S (EXT_C, STACK_SIZE): ... to here.
This commit is contained in:
Robert Millan 2009-12-24 14:00:50 +01:00
parent 1a2144be6d
commit ca3c56e765
3 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2009-12-24 Robert Millan <rmh.grub@aybabtu.com>
* docs/boot.S (ASM): Rename to ...
(ASM_FILE): ... this.
* docs/multiboot.h: Check for `ASM_FILE' instead of `ASM'.
* docs/multiboot.h (EXT_C, STACK_SIZE): Moved from here ...
* docs/boot.S (EXT_C, STACK_SIZE): ... to here.
2009-12-13 Vladimir Serbinenko <phcoder@gmail.com> 2009-12-13 Vladimir Serbinenko <phcoder@gmail.com>
* docs/fdl.texi: Remove. It's not used. * docs/fdl.texi: Remove. It's not used.

12
docs/boot.S
View file

@ -15,9 +15,19 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#define ASM 1 #define ASM_FILE 1
#include <multiboot.h> #include <multiboot.h>
/* C symbol format. HAVE_ASM_USCORE is defined by configure. */
#ifdef HAVE_ASM_USCORE
# define EXT_C(sym) _ ## sym
#else
# define EXT_C(sym) sym
#endif
/* The size of our stack (16KB). */
#define STACK_SIZE 0x4000
.text .text
.globl start, _start .globl start, _start

14
docs/multiboot.h
View file

@ -30,17 +30,7 @@
/* The magic number passed by a Multiboot-compliant boot loader. */ /* The magic number passed by a Multiboot-compliant boot loader. */
#define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002 #define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002
/* The size of our stack (16KB). */ #ifndef ASM_FILE
#define STACK_SIZE 0x4000
/* C symbol format. HAVE_ASM_USCORE is defined by configure. */
#ifdef HAVE_ASM_USCORE
# define EXT_C(sym) _ ## sym
#else
# define EXT_C(sym) sym
#endif
#ifndef ASM
/* Do not include here in boot.S. */ /* Do not include here in boot.S. */
/* Types. */ /* Types. */
@ -116,4 +106,4 @@ typedef struct memory_map
unsigned long type; unsigned long type;
} memory_map_t; } memory_map_t;
#endif /* ! ASM */ #endif /* ! ASM_FILE */