Fix qemu-r4k

diff --git a/conf/mips-qemu-r4k.rmk b/conf/mips-qemu-r4k.rmk
index 3ff36c47270bd7a11dea6c6f57ef389a69442fd8..ec14d9336e36fb378a03070a31f7514b6c5c31f4 100644 (file)
--- a/conf/mips-qemu-r4k.rmk
+++ b/conf/mips-qemu-r4k.rmk
@@ -1,4 +1,6 @@
 # -*- makefile -*-
 LINK_BASE = 0x80010000
 target_machine=qemu-r4k
+COMMON_CFLAGS += -march=mips3
+COMMON_ASFLAGS += -march=mips3
 include $(srcdir)/conf/mips.mk

diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index 95ec2652280e79f4971a795b3a6b2cbedd203d69..68c426e1b9cd5438ed573fac29f7a4b664892040 100644 (file)
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -11,8 +11,62 @@ pci_mod_SOURCES = bus/pci.c bus/bonito.c
 pci_mod_CFLAGS = $(COMMON_CFLAGS)
 pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For ata.mod.
+pkglib_MODULES += ata.mod
+ata_mod_SOURCES = disk/ata.c
+ata_mod_CFLAGS = $(COMMON_CFLAGS)
+ata_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 # For pci.mod.
 pkglib_MODULES += sm712.mod
 sm712_mod_SOURCES = video/sm712.c 
 sm712_mod_CFLAGS = $(COMMON_CFLAGS)
 sm712_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For lspci.mod
+pkglib_MODULES += lspci.mod
+lspci_mod_SOURCES = commands/lspci.c
+lspci_mod_CFLAGS = $(COMMON_CFLAGS)
+lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For ohci.mod
+pkglib_MODULES += ohci.mod
+ohci_mod_SOURCES = bus/usb/ohci.c
+ohci_mod_CFLAGS = $(COMMON_CFLAGS)
+ohci_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usb.mod
+pkglib_MODULES += usb.mod
+usb_mod_SOURCES = bus/usb/usb.c bus/usb/usbtrans.c bus/usb/usbhub.c
+usb_mod_CFLAGS = $(COMMON_CFLAGS)
+usb_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usbtest.mod
+pkglib_MODULES += usbtest.mod
+usbtest_mod_SOURCES = commands/usbtest.c
+usbtest_mod_CFLAGS = $(COMMON_CFLAGS)
+usbtest_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usbms.mod
+pkglib_MODULES += usbms.mod
+usbms_mod_SOURCES = disk/usbms.c
+usbms_mod_CFLAGS = $(COMMON_CFLAGS)
+usbms_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usb_keyboard.mod
+pkglib_MODULES += usb_keyboard.mod
+usb_keyboard_mod_SOURCES = term/usb_keyboard.c
+usb_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
+usb_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For at_keyboard.mod.
+pkglib_MODULES += at_keyboard.mod
+at_keyboard_mod_SOURCES = term/at_keyboard.c
+at_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
+at_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For ata_pthru.mod.
+pkglib_MODULES += ata_pthru.mod
+ata_pthru_mod_SOURCES = disk/ata_pthru.c
+ata_pthru_mod_CFLAGS = $(COMMON_CFLAGS)
+ata_pthru_mod_LDFLAGS = $(COMMON_LDFLAGS)

diff --git a/conf/mips.rmk b/conf/mips.rmk
index fd51cfb0081dd5892909bdfed03efb49db11c387..8c99d9813ddefb102caf304827afe91ec2d82630 100644 (file)
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -137,48 +137,6 @@ serial_mod_SOURCES = term/serial.c
 serial_mod_CFLAGS = $(COMMON_CFLAGS)
 serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For ata.mod.
-pkglib_MODULES += ata.mod
-ata_mod_SOURCES = disk/ata.c
-ata_mod_CFLAGS = $(COMMON_CFLAGS)
-ata_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lspci.mod
-pkglib_MODULES += lspci.mod
-lspci_mod_SOURCES = commands/lspci.c
-lspci_mod_CFLAGS = $(COMMON_CFLAGS)
-lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ohci.mod
-pkglib_MODULES += ohci.mod
-ohci_mod_SOURCES = bus/usb/ohci.c
-ohci_mod_CFLAGS = $(COMMON_CFLAGS)
-ohci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usb.mod
-pkglib_MODULES += usb.mod
-usb_mod_SOURCES = bus/usb/usb.c bus/usb/usbtrans.c bus/usb/usbhub.c
-usb_mod_CFLAGS = $(COMMON_CFLAGS)
-usb_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usbtest.mod
-pkglib_MODULES += usbtest.mod
-usbtest_mod_SOURCES = commands/usbtest.c
-usbtest_mod_CFLAGS = $(COMMON_CFLAGS)
-usbtest_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usbms.mod
-pkglib_MODULES += usbms.mod
-usbms_mod_SOURCES = disk/usbms.c
-usbms_mod_CFLAGS = $(COMMON_CFLAGS)
-usbms_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usb_keyboard.mod
-pkglib_MODULES += usb_keyboard.mod
-usb_keyboard_mod_SOURCES = term/usb_keyboard.c
-usb_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
-usb_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For relocator.mod.
 pkglib_MODULES += relocator.mod
 relocator_mod_SOURCES = lib/$(target_cpu)/relocator.c lib/$(target_cpu)/relocator_asm.S
@@ -192,16 +150,4 @@ linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For at_keyboard.mod.
-pkglib_MODULES += at_keyboard.mod
-at_keyboard_mod_SOURCES = term/at_keyboard.c
-at_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
-at_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ata_pthru.mod.
-pkglib_MODULES += ata_pthru.mod
-ata_pthru_mod_SOURCES = disk/ata_pthru.c
-ata_pthru_mod_CFLAGS = $(COMMON_CFLAGS)
-ata_pthru_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 include $(srcdir)/conf/common.mk

diff --git a/configure.ac b/configure.ac
index 88ef06970a01f5f82c57d97a594b8e15f161c265..62ad58a5d96515796cb44f7cd8241c3577427549 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -135,6 +135,7 @@ case "$platform" in
   pc)          machine_CFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
   emu)         machine_CFLAGS="-DGRUB_MACHINE_EMU=1" ;;
   yeeloong)    machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+  qemu-r4k)    machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
 esac
 CFLAGS="$CFLAGS $machine_CFLAGS"
 TARGET_CFLAGS="$TARGET_CFLAGS $machine_CFLAGS"

diff --git a/include/grub/mips/qemu-r4k/boot.h b/include/grub/mips/qemu-r4k/boot.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/kern/mips/qemu-r4k/init.c b/kern/mips/qemu-r4k/init.c
index 8dfda57c273b5b86c3d2f60c1fa49200341f04d1..866c7a82aaec9a2ee297eb67e9af6c52e6d28852 100644 (file)
--- a/kern/mips/qemu-r4k/init.c
+++ b/kern/mips/qemu-r4k/init.c
@@ -50,21 +50,6 @@ grub_reboot (void)
   while (1);
 }
 
-void
-grub_machine_set_prefix (void)
-{
-  grub_env_set ("prefix", grub_prefix);
-}
-
-extern char _start[];
-extern char _end[];
-
-grub_addr_t
-grub_arch_modules_addr (void)
-{
-  return ALIGN_UP((grub_addr_t) _end + GRUB_MOD_GAP, GRUB_MOD_ALIGN);
-}
-
 grub_err_t 
 grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, 
                                                         grub_uint64_t,