fix compilation on coreboot

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 8676aaea33ac3e04a72b69eda1a86203997f7cf1..6b3d32847198f33c86fe5e8981a06218f67126a4 100644 (file)
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -32,10 +32,10 @@ kernel_img_SOURCES = kern/i386/coreboot/startup.S \
        term/i386/pc/vga_text.c term/i386/vga_common.c \
        symlist.c
 kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-       env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
+       env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h \
        partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
        machine/boot.h machine/console.h machine/init.h \
-       machine/memory.h machine/loader.h list.h handler.h command.h i18n.h
+       machine/memory.h list.h handler.h command.h i18n.h mm_private.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR),-Bstatic
@@ -76,10 +76,10 @@ kernel_img_SOURCES = kern/i386/qemu/startup.S \
        term/i386/pc/vga_text.c term/i386/vga_common.c \
        symlist.c
 kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-       env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
+       env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h \
        partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
        machine/boot.h machine/console.h machine/init.h \
-       machine/memory.h machine/loader.h list.h handler.h command.h i18n.h
+       machine/memory.h list.h handler.h command.h i18n.h mm_private.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS) -DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS) -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR)

diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index f3281a1bc32b203ae4402047f20048ceb3b2157e..673349858c18b3672bb750968f8e91cf1d767a15 100644 (file)
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -49,9 +49,9 @@ kernel_img_SOURCES = kern/i386/efi/startup.S kern/main.c kern/device.c \
        kern/generic/rtc_get_time_ms.c \
        kern/generic/millisleep.c
 kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-       env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
+       env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h \
        partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-       efi/efi.h efi/time.h efi/disk.h i386/pit.h list.h handler.h command.h i18n.h
+       efi/efi.h efi/time.h efi/disk.h i386/pit.h list.h handler.h command.h i18n.h mm_private.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS)

diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 5c3a5aaf65901b7ce82178513624514f6b01f524..b9e1927966675d239f5ca666de14345beaaecbb5 100644 (file)
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -30,10 +30,10 @@ kernel_img_SOURCES = kern/i386/ieee1275/startup.S \
        disk/ieee1275/ofdisk.c \
        symlist.c
 kernel_img_HEADERS = cache.h device.h disk.h dl.h elf.h elfload.h \
-       env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
+       env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h \
        partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-       ieee1275/ieee1275.h machine/kernel.h machine/loader.h machine/memory.h \
-       list.h handler.h command.h i18n.h
+       ieee1275/ieee1275.h machine/kernel.h machine/memory.h \
+       list.h handler.h command.h i18n.h mm_private.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x10000,-Bstatic

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 36ca7695087fe5af57998dbc6be916e0516e5b3a..6f7b4f26c317affa7afe30ad92500c70ac8c76c2 100644 (file)
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -60,7 +60,7 @@ kernel_img_SOURCES = kern/i386/pc/startup.S \
        term/i386/pc/console.c term/i386/vga_common.c \
        symlist.c
 kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-       env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
+       env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h \
        partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
        machine/biosdisk.h machine/boot.h machine/console.h machine/init.h \
        machine/memory.h machine/loader.h machine/vga.h machine/vbe.h \

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 854ad50b70e97a2564bb68b24ee97d553ff0809f..fd6230771c8c6f808a72ec29dbe8028f965f9c6a 100644 (file)
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -15,9 +15,9 @@ DEFSYMFILES += kernel_syms.lst
 
 kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
        env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h reader.h \
-       symbol.h term.h time.h types.h powerpc/libgcc.h loader.h partition.h \
+       symbol.h term.h time.h types.h powerpc/libgcc.h partition.h \
        msdos_partition.h ieee1275/ieee1275.h machine/kernel.h handler.h list.h \
-       command.h i18n.h
+       command.h i18n.h mm_private.h
 
 symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
        /bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)

diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 4ba0986199bc9172a1390a05981b042a659cb5ee..a056ddc6723c7d9c34f8fc234cdb7cd379f4874c 100644 (file)
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -27,11 +27,11 @@ MOSTLYCLEANFILES += symlist.c kernel_syms.lst
 DEFSYMFILES += kernel_syms.lst
 
 kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-       env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
+       env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h \
        partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
        list.h handler.h command.h i18n.h \
        sparc64/libgcc.h ieee1275/ieee1275.h machine/kernel.h \
-       sparc64/ieee1275/ieee1275.h
+       sparc64/ieee1275/ieee1275.h mm_private.h
 kernel_img_SOURCES = kern/sparc64/ieee1275/crt0.S kern/ieee1275/cmain.c        \
        kern/ieee1275/ieee1275.c kern/main.c kern/device.c              \
        kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c          \

diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index 4f6ace0572583148cc3c5c0d176b2e489a83d236..19220610dda9d0b073faace99189aa41dead0b88 100644 (file)
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -51,7 +51,7 @@ kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
        env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
        partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
        efi/efi.h efi/time.h efi/disk.h machine/loader.h i386/pit.h list.h \
-       handler.h command.h i18n.h
+       handler.h command.h i18n.h mm_private.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS)

diff --git a/include/grub/i386/coreboot/loader.h b/include/grub/i386/coreboot/loader.h
deleted file mode 100644 (file)
index d3f36bb..0000000
--- a/include/grub/i386/coreboot/loader.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <grub/cpu/loader.h>

diff --git a/include/grub/i386/qemu/loader.h b/include/grub/i386/qemu/loader.h
deleted file mode 100644 (file)
index d3f36bb..0000000
--- a/include/grub/i386/qemu/loader.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <grub/cpu/loader.h>

diff --git a/kern/i386/coreboot/init.c b/kern/i386/coreboot/init.c
index 550a2a60ad3e32bac097d35e4aff8848187ca636..7d8b1270bb6958b3d9ec1135d9a2481abc40f860 100644 (file)
--- a/kern/i386/coreboot/init.c
+++ b/kern/i386/coreboot/init.c
@@ -41,9 +41,6 @@
 extern char _start[];
 extern char _end[];
 
-grub_addr_t grub_os_area_addr;
-grub_size_t grub_os_area_size;
-
 grub_uint32_t
 grub_get_rtc (void)
 {
@@ -105,20 +102,7 @@ grub_machine_init (void)
          }
       }
 
-    if (addr == GRUB_MEMORY_MACHINE_UPPER_START
-       || (addr >= GRUB_MEMORY_MACHINE_LOWER_SIZE
-           && addr <= GRUB_MEMORY_MACHINE_UPPER_START
-           && (addr + size > GRUB_MEMORY_MACHINE_UPPER_START)))
-      {
-       grub_size_t quarter = size >> 2;
-
-       grub_os_area_addr = addr;
-       grub_os_area_size = size - quarter;
-       grub_mm_init_region ((void *) (grub_os_area_addr + grub_os_area_size),
-                            quarter);
-      }
-    else
-      grub_mm_init_region ((void *) (grub_addr_t) addr, (grub_size_t) size);
+    grub_mm_init_region ((void *) (grub_addr_t) addr, (grub_size_t) size);
 
     return 0;
   }

diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index b6298d0bb43285bcfd9c50ed370de496c3fd695a..ec6a5bb3b03f5a5b3d8edd261037d3b4fe88679b 100644 (file)
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -18,7 +18,6 @@
 
 #include <grub/loader.h>
 #include <grub/machine/memory.h>
-#include <grub/machine/loader.h>
 #include <grub/normal.h>
 #include <grub/file.h>
 #include <grub/disk.h>

diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c
index 2f9cc73c9692b8d18f28bf271d9d8da645f2376d..be11fe20b3b630042b175d363d8a99a2be6ec37e 100644 (file)
--- a/loader/i386/multiboot.c
+++ b/loader/i386/multiboot.c
@@ -31,7 +31,6 @@
 #define UNSUPPORTED_FLAGS                      0x0000fff0
 
 #include <grub/loader.h>
-#include <grub/machine/loader.h>
 #include <grub/multiboot.h>
 #include <grub/machine/init.h>
 #include <grub/machine/memory.h>