Fuloong support.

* configure.ac: Rename yeeloong platform to loongson. All users updated.
	* grub-core/Makefile.core.def (fwstart_fuloong): New image.
	* grub-core/boot/mips/loongson/fuloong.S: New file.
	* grub-core/boot/mips/loongson/fwstart.S: Wait for CS5536 to come up.
	Explicitly init CS5536.
	[FULOONG]: Don't use serial until CS5536 is available.
	Set GPIO based on dumps.
	(serial_hw_init) [FULOONG]: Handle CS5536 parts.
	[FULOONG]: Handle GPIO and memory controller differences.
	Parse machine type in $a2.
	* grub-core/boot/mips/startup_raw.S: Determine and save the
	architecture.
	* grub-core/bus/cs5536.c (gpiodump): Move to fwstart.S.
	(grub_cs5536_init_geode): Remove gpio part. Conditionalise DIVIL
	init on architecture type.
	* grub-core/kern/mips/loongson/init.c (grub_machine_init): Init
	SIS315E. Don't init at_keyboard on fuloong.
	(grub_halt): Support Fuloong.
	* grub-core/kern/mips/startup.S [LOONGSON]: Save $s7.
	* grub-core/loader/mips/linux.c (LOONGSON_MACHTYPE): Removed.
	(loongson_machtypes): New array.
	(grub_cmd_linux) [GRUB_MACHINE_MIPS_LOONGSON]: Pass the right machine
	type.
	* grub-core/term/ns8250.c (serial_get_divisor): New parameter port and
	config. All users updated. Handle CS5536 serial.
	* grub-core/term/serial.c (grub_serial_register): Conditionalise
	default port on machine type. Register serial as inactive.
	* grub-core/video/sis315pro.c: New file.
	* include/grub/cs5536.h (GRUB_CS5536_MSR_MAILBOX_CONFIG_ENABLED): New
	definition.
	(GRUB_CS5536_MSR_MAILBOX_CONFIG): Likewise.
	(GRUB_CS5536_MSR_DIVIL_LEG_IO_UART1_COM1): Likewise.
	(GRUB_CS5536_MSR_DIVIL_LEG_IO_UART2_COM3): Likewise.
	(GRUB_CS5536_MSR_DIVIL_UART1_CONF): Likewise.
	(GRUB_CS5536_MSR_DIVIL_UART2_CONF): Likewise.
	* include/grub/mips/loongson.h (GRUB_CPU_LOONGSON_SHUTDOWN_GPIO): Rename
	to ...
	(GRUB_CPU_YEELOONG_SHUTDOWN_GPIO): ... this.
	* include/grub/mips/loongson/kernel.h (GRUB_ARCH_MACHINE_YEELOONG): New
	definition.
	(GRUB_ARCH_MACHINE_FULOONG): Likewise.
	(grub_arch_machine): New extern var.
	* include/grub/mips/loongson/serial.h
	(GRUB_MACHINE_SERIAL_DIVISOR_115200): Renamed to ...
	(GRUB_MACHINE_SERIAL_PORT0_DIVISOR_115200): ... this.
	(GRUB_MACHINE_SERIAL_PORT): Renamed to ...
	(GRUB_MACHINE_SERIAL_PORT0): ... this.
	(GRUB_MACHINE_SERIAL_PORT2_DIVISOR_115200): New definition.
	(GRUB_MACHINE_SERIAL_PORT1): Likewise.
	(GRUB_MACHINE_SERIAL_PORT2): Likewise.
	(GRUB_MACHINE_SERIAL_PORTS): Include ports 1 and 2.
	* include/grub/term.h (grub_term_register_input_inactive): New inline
	function.
	(grub_term_register_output_inactive): Likewise.
	* include/grub/video.h (grub_video_driver_id): New value
	GRUB_VIDEO_DRIVER_SIS315PRO.
	* util/grub-mkimage.c (image_target_desc): Rename name to dirname.
	New field "names". All users updated.
	New field value IMAGE_FULOONG_FLASH.
	(generate_image): USe separate fwstart hashes for yeeloong and fuloong.

ChangeLog

@@ -1,3 +1,68 @@
+2011-05-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Fuloong support.
+
+	* configure.ac: Rename yeeloong platform to loongson. All users updated.
+	* grub-core/Makefile.core.def (fwstart_fuloong): New image.
+	* grub-core/boot/mips/loongson/fuloong.S: New file.
+	* grub-core/boot/mips/loongson/fwstart.S: Wait for CS5536 to come up.
+	Explicitly init CS5536.
+	[FULOONG]: Don't use serial until CS5536 is available.
+	Set GPIO based on dumps.
+	(serial_hw_init) [FULOONG]: Handle CS5536 parts.
+	[FULOONG]: Handle GPIO and memory controller differences.
+	Parse machine type in $a2.
+	* grub-core/boot/mips/startup_raw.S: Determine and save the
+	architecture.
+	* grub-core/bus/cs5536.c (gpiodump): Move to fwstart.S.
+	(grub_cs5536_init_geode): Remove gpio part. Conditionalise DIVIL
+	init on architecture type.
+	* grub-core/kern/mips/loongson/init.c (grub_machine_init): Init
+	SIS315E. Don't init at_keyboard on fuloong.
+	(grub_halt): Support Fuloong.
+	* grub-core/kern/mips/startup.S [LOONGSON]: Save $s7.
+	* grub-core/loader/mips/linux.c (LOONGSON_MACHTYPE): Removed.
+	(loongson_machtypes): New array.
+	(grub_cmd_linux) [GRUB_MACHINE_MIPS_LOONGSON]: Pass the right machine
+	type.
+	* grub-core/term/ns8250.c (serial_get_divisor): New parameter port and
+	config. All users updated. Handle CS5536 serial.
+	* grub-core/term/serial.c (grub_serial_register): Conditionalise
+	default port on machine type. Register serial as inactive.
+	* grub-core/video/sis315pro.c: New file.
+	* include/grub/cs5536.h (GRUB_CS5536_MSR_MAILBOX_CONFIG_ENABLED): New
+	definition.
+	(GRUB_CS5536_MSR_MAILBOX_CONFIG): Likewise.
+	(GRUB_CS5536_MSR_DIVIL_LEG_IO_UART1_COM1): Likewise.
+	(GRUB_CS5536_MSR_DIVIL_LEG_IO_UART2_COM3): Likewise.
+	(GRUB_CS5536_MSR_DIVIL_UART1_CONF): Likewise.
+	(GRUB_CS5536_MSR_DIVIL_UART2_CONF): Likewise.
+	* include/grub/mips/loongson.h (GRUB_CPU_LOONGSON_SHUTDOWN_GPIO): Rename
+	to ...
+	(GRUB_CPU_YEELOONG_SHUTDOWN_GPIO): ... this.
+	* include/grub/mips/loongson/kernel.h (GRUB_ARCH_MACHINE_YEELOONG): New
+	definition.
+	(GRUB_ARCH_MACHINE_FULOONG): Likewise.
+	(grub_arch_machine): New extern var.
+	* include/grub/mips/loongson/serial.h
+	(GRUB_MACHINE_SERIAL_DIVISOR_115200): Renamed to ...
+	(GRUB_MACHINE_SERIAL_PORT0_DIVISOR_115200): ... this.
+	(GRUB_MACHINE_SERIAL_PORT): Renamed to ...
+	(GRUB_MACHINE_SERIAL_PORT0): ... this.
+	(GRUB_MACHINE_SERIAL_PORT2_DIVISOR_115200): New definition.
+	(GRUB_MACHINE_SERIAL_PORT1): Likewise.
+	(GRUB_MACHINE_SERIAL_PORT2): Likewise.
+	(GRUB_MACHINE_SERIAL_PORTS): Include ports 1 and 2.
+	* include/grub/term.h (grub_term_register_input_inactive): New inline
+	function.
+	(grub_term_register_output_inactive): Likewise.
+	* include/grub/video.h (grub_video_driver_id): New value
+	GRUB_VIDEO_DRIVER_SIS315PRO.
+	* util/grub-mkimage.c (image_target_desc): Rename name to dirname.
+	New field "names". All users updated.
+	New field value IMAGE_FULOONG_FLASH.
+	(generate_image): USe separate fwstart hashes for yeeloong and fuloong.
+
 2011-05-14  Jordan Uggla  <jordan.uggla@gmail.com>
 
 	* docs/grub.texi (Invoking grub-install): Fix additional outdated claims

conf/Makefile.common

@@ -25,7 +25,7 @@ endif
 if COND_i386_ieee1275
   CFLAGS_PLATFORM += -mrtd -mregparm=3
 endif
-if COND_mips_yeeloong
+if COND_mips_loongson
   CFLAGS_PLATFORM += -mexplicit-relocs
   CPPFLAGS_PLATFORM = -DUSE_ASCII_FAILBACK
   CCASFLAGS_PLATFORM = -march=mips3

configure.ac

@@ -96,7 +96,7 @@ if test "x$with_platform" = x; then
     powerpc-*) platform=ieee1275 ;;
     powerpc64-*) platform=ieee1275 ;;
     sparc64-*) platform=ieee1275 ;;
-    mips-*) platform=yeeloong ;;
+    mips-*) platform=loongson ;;
     *) AC_MSG_ERROR([unsupported CPU: "$target_cpu"]) ;;
   esac
 else
@@ -123,7 +123,9 @@ case "$target_cpu"-"$platform" in
   powerpc-ieee1275) ;;
   sparc64-ieee1275) ;;
   mips-qemu-mips) ;;
-  mips-yeeloong) ;;
+  mips-yeeloong) platform=loongson ;;
+  mips-fuloong) platform=loongson ;;
+  mips-loongson) ;;
   *-emu) ;;
   *) AC_MSG_ERROR([platform "$platform" is not supported for target CPU "$target_cpu"]) ;;
 esac
@@ -156,7 +158,7 @@ case "$platform" in
   qemu)		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_QEMU=1" ;;
   pc)		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_PCBIOS=1" ;;
   emu)		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_EMU=1" ;;
-  yeeloong)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+  loongson)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS_LOONGSON=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
   qemu-mips)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
 esac
 case "$target_cpu" in
@@ -219,8 +221,8 @@ for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
   done
 done
 
-if test "x$FONT_SOURCE" = x && ( test "x$platform" = xqemu || test "x$platform" = xyeeloong ); then
+if test "x$FONT_SOURCE" = x && ( test "x$platform" = xqemu || test "x$platform" = xloongson ); then
-   AC_MSG_ERROR([qemu and yeeloong ports need unifont])
+   AC_MSG_ERROR([qemu and loongson ports need unifont])
 fi
 
 AC_SUBST([FONT_SOURCE])
@@ -398,7 +400,7 @@ if test "x$grub_cv_cc_fno_dwarf2_cfi_asm" = xyes; then
   TARGET_CFLAGS="$TARGET_CFLAGS -fno-dwarf2-cfi-asm"
 fi
 
-if test "${target_cpu}-${platform}" = mips-yeeloong; then
+if test "${target_cpu}-${platform}" = mips-loongson; then
   AC_CACHE_CHECK([whether -march=loongson2f works], [grub_cv_cc_march_loongson2f], [
     SAVE_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -march=loongson2f"
@@ -950,7 +952,7 @@ AM_CONDITIONAL([COND_i386_ieee1275], [test x$target_cpu = xi386 -a x$platform =
 AM_CONDITIONAL([COND_i386_coreboot], [test x$target_cpu = xi386 -a x$platform = xcoreboot])
 AM_CONDITIONAL([COND_i386_multiboot], [test x$target_cpu = xi386 -a x$platform = xmultiboot])
 AM_CONDITIONAL([COND_x86_64_efi], [test x$target_cpu = xx86_64 -a x$platform = xefi])
-AM_CONDITIONAL([COND_mips_yeeloong], [test x$target_cpu = xmips -a x$platform = xyeeloong])
+AM_CONDITIONAL([COND_mips_loongson], [test x$target_cpu = xmips -a x$platform = xloongson])
 AM_CONDITIONAL([COND_mips_qemu_mips], [test x$target_cpu = xmips -a x$platform = xqemu_mips])
 AM_CONDITIONAL([COND_sparc64_ieee1275], [test x$target_cpu = xsparc64 -a x$platform = xieee1275])
 AM_CONDITIONAL([COND_powerpc_ieee1275], [test x$target_cpu = xpowerpc -a x$platform = xieee1275])

gentpl.py

@@ -6,7 +6,7 @@
 
 GRUB_PLATFORMS = [ "emu", "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot",
                    "i386_multiboot", "i386_ieee1275", "x86_64_efi",
-                   "mips_yeeloong", "sparc64_ieee1275",
+                   "mips_loongson", "sparc64_ieee1275",
                    "powerpc_ieee1275" ]
 
 GROUPS = {}
@@ -17,7 +17,7 @@ GROUPS["common"]   = GRUB_PLATFORMS[:]
 GROUPS["i386"]     = [ "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot", "i386_multiboot", "i386_ieee1275" ]
 GROUPS["x86_64"]   = [ "x86_64_efi" ]
 GROUPS["x86"]      = GROUPS["i386"] + GROUPS["x86_64"]
-GROUPS["mips"]     = [ "mips_yeeloong" ]
+GROUPS["mips"]     = [ "mips_loongson" ]
 GROUPS["sparc64"]  = [ "sparc64_ieee1275" ]
 GROUPS["powerpc"]  = [ "powerpc_ieee1275" ]
 
@@ -29,17 +29,17 @@ GROUPS["ieee1275"]   = [ "i386_ieee1275", "sparc64_ieee1275", "powerpc_ieee1275"
 GROUPS["noemu"]   = GRUB_PLATFORMS[:]; GROUPS["noemu"].remove("emu")
 
 # Groups based on hardware features
-GROUPS["cmos"] = GROUPS["x86"][:] + ["mips_yeeloong"]; GROUPS["cmos"].remove("i386_efi"); GROUPS["cmos"].remove("x86_64_efi")
+GROUPS["cmos"] = GROUPS["x86"][:] + ["mips_loongson"]; GROUPS["cmos"].remove("i386_efi"); GROUPS["cmos"].remove("x86_64_efi")
 GROUPS["pci"]      = GROUPS["x86"] + GROUPS["mips"]
 GROUPS["usb"]      = GROUPS["pci"]
 
 # If gfxterm is main output console integrate it into kernel
-GROUPS["videoinkernel"] = ["mips_yeeloong"]
+GROUPS["videoinkernel"] = ["mips_loongson"]
 GROUPS["videomodules"]   = GRUB_PLATFORMS[:];
 for i in GROUPS["videoinkernel"]: GROUPS["videomodules"].remove(i)
 
 # Similar for terminfo
-GROUPS["terminfoinkernel"] = ["mips_yeeloong"] + GROUPS["ieee1275"];
+GROUPS["terminfoinkernel"] = ["mips_loongson"] + GROUPS["ieee1275"];
 GROUPS["terminfomodule"]   = GRUB_PLATFORMS[:];
 for i in GROUPS["terminfoinkernel"]: GROUPS["terminfomodule"].remove(i)
 
@@ -238,7 +238,7 @@ def foreach_enabled_platform(closure):
 #    noemu = bus/usb/usbhub.c;
 #    enable = emu;
 #    enable = i386;
-#    enable = mips_yeeloong;
+#    enable = mips_loongson;
 #    emu_condition = COND_GRUB_EMU_USB;
 #  };
 #

grub-core/Makefile.am

@@ -125,7 +125,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
 endif
 
-if COND_mips_yeeloong
+if COND_mips_loongson
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/keyboard_layouts.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/cache.h

grub-core/Makefile.core.def

@@ -32,11 +32,11 @@ kernel = {
   i386_coreboot_ldflags    = '-Wl,-Ttext=0x8200';
   i386_multiboot_ldflags   = '-Wl,-Ttext=0x8200';
   i386_ieee1275_ldflags    = '-Wl,-Ttext=0x10000';
-  mips_yeeloong_ldflags    = '-Wl,-Ttext,0x80200000';
+  mips_loongson_ldflags    = '-Wl,-Ttext,0x80200000';
   powerpc_ieee1275_ldflags = '-Wl,-Ttext,0x200000';
   sparc64_ieee1275_ldflags = '-Wl,-Ttext,0x4400';
 
-  mips_yeeloong_cppflags = '-DUSE_ASCII_FAILBACK';
+  mips_loongson_cppflags = '-DUSE_ASCII_FAILBACK';
   i386_qemu_cppflags     = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)';
   emu_cflags = '$(CFLAGS_GNULIB)';
   emu_cppflags = '$(CPPFLAGS_GNULIB)';
@@ -48,7 +48,7 @@ kernel = {
   i386_ieee1275_startup = kern/i386/ieee1275/startup.S;
   i386_coreboot_startup = kern/i386/coreboot/startup.S;
   i386_multiboot_startup = kern/i386/coreboot/startup.S;
-  mips_yeeloong_startup = kern/mips/startup.S;
+  mips_loongson_startup = kern/mips/startup.S;
   sparc64_ieee1275_startup = kern/sparc64/ieee1275/crt0.S;
   powerpc_ieee1275_startup = kern/powerpc/ieee1275/startup.S;
 
@@ -81,7 +81,7 @@ kernel = {
   i386_qemu = kern/generic/rtc_get_time_ms.c;
   i386_coreboot = kern/generic/rtc_get_time_ms.c;
   i386_multiboot = kern/generic/rtc_get_time_ms.c;
-  mips_yeeloong = kern/generic/rtc_get_time_ms.c;
+  mips_loongson = kern/generic/rtc_get_time_ms.c;
 
   ieee1275 = disk/ieee1275/ofdisk.c;
   ieee1275 = kern/ieee1275/cmain.c;
@@ -136,19 +136,20 @@ kernel = {
 
   i386_ieee1275 = kern/ieee1275/init.c;
 
-  mips_yeeloong = term/ns8250.c;
+  mips_loongson = term/ns8250.c;
-  mips_yeeloong = bus/bonito.c;
+  mips_loongson = bus/bonito.c;
-  mips_yeeloong = bus/cs5536.c;
+  mips_loongson = bus/cs5536.c;
-  mips_yeeloong = bus/pci.c;
+  mips_loongson = bus/pci.c;
-  mips_yeeloong = kern/mips/cache.S;
+  mips_loongson = kern/mips/cache.S;
-  mips_yeeloong = kern/mips/dl.c;
+  mips_loongson = kern/mips/dl.c;
-  mips_yeeloong = kern/mips/init.c;
+  mips_loongson = kern/mips/init.c;
-  mips_yeeloong = kern/mips/yeeloong/init.c;
+  mips_loongson = kern/mips/loongson/init.c;
-  mips_yeeloong = term/at_keyboard.c;
+  mips_loongson = term/at_keyboard.c;
-  mips_yeeloong = term/serial.c;
+  mips_loongson = term/serial.c;
-  mips_yeeloong = video/sm712.c;
+  mips_loongson = video/sm712.c;
+  mips_loongson = video/sis315pro.c;
   extra_dist = video/sm712_init.c;
-  mips_yeeloong = commands/keylayouts.c;
+  mips_loongson = commands/keylayouts.c;
 
   powerpc_ieee1275 = kern/ieee1275/init.c;
   powerpc_ieee1275 = kern/powerpc/cache.S;
@@ -322,10 +323,18 @@ image = {
 
 image = {
   name = fwstart;
-  mips_yeeloong = boot/mips/yeeloong/fwstart.S;
+  mips_loongson = boot/mips/loongson/fwstart.S;
   objcopyflags = '-O binary';
   ldflags = '-static-libgcc -lgcc -Wl,-N,-S,-Ttext,0xbfc00000,-Bstatic';
-  enable = mips_yeeloong;
+  enable = mips_loongson;
+};
+
+image = {
+  name = fwstart_fuloong;
+  mips_loongson = boot/mips/loongson/fuloong.S;
+  objcopyflags = '-O binary';
+  ldflags = '-static-libgcc -lgcc -Wl,-N,-S,-Ttext,0xbfc00000,-Bstatic';
+  enable = mips_loongson;
 };
 
 module = {
@@ -349,8 +358,8 @@ module = {
 
 module = {
   name = lsspd;
-  mips_yeeloong = commands/mips/yeeloong/lsspd.c;
+  mips_loongson = commands/mips/loongson/lsspd.c;
-  enable = mips_yeeloong;
+  enable = mips_loongson;
 };
 
 module = {
@@ -1228,10 +1237,10 @@ module = {
 
   x86_efi = mmap/efi/mmap.c;
 
-  mips_yeeloong = mmap/mips/yeeloong/uppermem.c;
+  mips_loongson = mmap/mips/loongson/uppermem.c;
 
   enable = x86;
-  enable = mips_yeeloong;
+  enable = mips_loongson;
 };
 
 module = {

grub-core/boot/mips/loongson/fuloong.S

@@ -0,0 +1,2 @@
+#define FULOONG 1
+#include "fwstart.S"

grub-core/boot/mips/loongson/fwstart.S

@@ -16,15 +16,24 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <grub/mips/yeeloong/serial.h>
+#include <grub/mips/loongson/serial.h>
-#include <grub/mips/yeeloong/pci.h>
+#include <grub/mips/loongson/pci.h>
 #include <grub/mips/loongson.h>
 #include <grub/pci.h>
 #include <grub/machine/serial.h>
+#include <grub/machine/kernel.h>
 #include <grub/ns8250.h>
 #include <grub/cs5536.h>
 #include <grub/smbus.h>
 
+#ifdef FULOONG
+#define GRUB_MACHINE_SERIAL_PORT GRUB_MACHINE_SERIAL_PORT2
+#define GRUB_MACHINE_SERIAL_DIVISOR_115200 GRUB_MACHINE_SERIAL_PORT2_DIVISOR_115200
+#else
+#define GRUB_MACHINE_SERIAL_PORT GRUB_MACHINE_SERIAL_PORT0
+#define GRUB_MACHINE_SERIAL_DIVISOR_115200 GRUB_MACHINE_SERIAL_PORT0_DIVISOR_115200
+#endif
+
 	.set noreorder
 	.set noat
 	.set nomacro
@@ -34,34 +43,46 @@
 start:
 _start:
 __start:	
+	/* Put serial init as soon as possible.  But on Fuloong serial is past
+	   Geode, so on Fuloong we need Geode first.
+	*/
+#ifndef FULOONG
 	bal serial_hw_init
 	 nop
+#endif
+
 	/* Find CS5536 controller.  */
 	/* $t4 chooses device in priority encoding.  */
 	/* Resulting value is kept in GRUB_MACHINE_PCI_CONF_CTRL_REG.
 	   This way we don't need to sacrifice a register for it.  */
+retry_cs5536:	
 	/* We have only one bus (0). Function is 0.  */
 	lui $t0, %hi(GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR)
 	lui $t1, %hi(GRUB_MACHINE_PCI_CONFSPACE)
 	lui $t3, %hi(GRUB_CS5536_PCIID)
 	addiu $t3, $t3, %lo(GRUB_CS5536_PCIID)
 	ori $t4, $zero, 1
-	lui $a0, %hi(no_cs5536)
 1:
 	andi $t4, $t4, ((1 << GRUB_PCI_NUM_DEVICES) - 1)
-	beql  $t4, $zero, fatal
+	/* In case of failure try again. CS5536 may be slow to come up.  */
-	 addiu $a0, $a0, %lo(no_cs5536)
+	beql  $t4, $zero, retry_cs5536
+	 nop
 	sw   $t4, %lo(GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR) ($t0)
 	lw   $t2, (%lo(GRUB_MACHINE_PCI_CONFSPACE) + GRUB_PCI_REG_PCI_ID) ($t1)
 	bnel  $t2, $t3, 1b
 	 sll $t4, $t4, 1
 
+#ifndef FULOONG
 	bal message
 	 addiu $a0, $a0, %lo(cs5536_found)
 	bal printhex
 	 move $a0, $t4
+#endif
 
-	/* Initialise SMBus controller.  */
+	lui $t0, %hi(GRUB_MACHINE_PCI_CONFSPACE)
+	li  $t1, GRUB_CS5536_MSR_MAILBOX_CONFIG_ENABLED
+	sw  $t1, (%lo(GRUB_MACHINE_PCI_CONFSPACE) + GRUB_CS5536_MSR_MAILBOX_CONFIG) ($t0)
+	
 	/* Set GPIO LBAR.  */
 	lui $a0, %hi(GRUB_CS5536_MSR_GPIO_BAR)
 	addiu $a0, $a0, %lo(GRUB_CS5536_MSR_GPIO_BAR)
@@ -71,6 +92,15 @@ __start:
 	 ori $a2, $zero, ((GRUB_CS5536_LBAR_MASK_MASK \
 	                  | GRUB_CS5536_LBAR_ENABLE) >> 32)
 
+	bal gpio_init
+	 nop
+
+#ifdef FULOONG
+	bal serial_hw_init
+	 nop
+#endif
+
+	/* Initialise SMBus controller.  */
 	/* Set SMBUS LBAR.  */
 	lui $a0, %hi(GRUB_CS5536_MSR_SMB_BAR)
 	addiu $a0, $a0, %lo(GRUB_CS5536_MSR_SMB_BAR)
@@ -84,14 +114,6 @@ __start:
 	bal message
 	  addiu $a0, $a0, %lo(smbus_enabled)
 
-	/* Enable SMBus controller pins.  */
-	lui $t0, %hi(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_GPIO)
-	ori $t1, $zero, GRUB_GPIO_SMBUS_PINS
-	sw  $t1, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_GPIO + GRUB_GPIO_REG_OUT_EN) ($t0)
-	sw  $t1, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_GPIO + GRUB_GPIO_REG_OUT_AUX1) ($t0)
-	sw  $t1, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_GPIO + GRUB_GPIO_REG_IN_EN) ($t0)
-	sw  $t1, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_GPIO + GRUB_GPIO_REG_IN_AUX1) ($t0)
-
 	lui $t0, %hi(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_SMBUS)
 
 	/* Disable SMB.  */
@@ -108,7 +130,7 @@ __start:
 	sb $t1, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL3) ($t0)
 	sb $t1, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL2) ($t0)
 
-	/* Yeeloong has only one memory slot.  */
+	/* Yeeloong and Fuloong have only one memory slot.  */
 	/* Output first byte on serial for debugging.  */
 	ori $a1, $zero, GRUB_SMB_RAM_START_ADDR
 	bal read_spd
@@ -207,10 +229,54 @@ other_exception:
 	b fatal
 	 addiu $a0, $a0, %lo(unhandled_exception)
 
+gpio_init:
+	lui $t0, %hi(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_GPIO)
+	addiu  $t0, $t0, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_GPIO)
+	lui $t1, %hi (gpio_dump)
+	addiu $t1, $t1, %lo (gpio_dump)
+
+1:	
+	lw $t2, 0($t1)
+	sw $t2, 0($t0)
+	addiu $t0, $t0, 4
+	addiu $t1, $t1, 4
+	lui $t2, %hi (gpio_dump_end)
+	addiu $t2, $t2, %lo (gpio_dump_end)
+	bne $t1, $t2, 1b
+	 nop
+	jr $ra
+	 nop
+
 	/* Same as similarly named C function but in asm since
 	   we need it early.  */
-	/* In: none. Out: none. Clobbered: $t0, $t1, $a0.  */
+	/* In: none. Out: none. Clobbered: $t0, $t1, $t2, $a0, $a1, $a2.  */
 serial_hw_init:
+	move $t2, $ra
+#ifdef FULOONG
+	lui $a0, %hi(GRUB_CS5536_MSR_DIVIL_LEG_IO)
+	addiu $a0, $a0, %lo(GRUB_CS5536_MSR_DIVIL_LEG_IO)
+	lui $a1, %hi (GRUB_CS5536_MSR_DIVIL_LEG_IO_UART2_COM3    \
+		     | GRUB_CS5536_MSR_DIVIL_LEG_IO_F_REMAP	    \
+		     | GRUB_CS5536_MSR_DIVIL_LEG_IO_MODE_X86    \
+	             | GRUB_CS5536_MSR_DIVIL_LEG_IO_UART1_COM1)
+	ori $a1, $a1, (GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE0 \
+		       | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE1)
+	bal wrmsr
+	 move $a2, $zero
+
+	lui $a0, %hi(GRUB_CS5536_MSR_DIVIL_UART1_CONF)
+	addiu $a0, $a0, %lo(GRUB_CS5536_MSR_DIVIL_UART1_CONF)
+	li $a1, 2
+	bal wrmsr
+	 move $a2, $zero
+
+	lui $a0, %hi(GRUB_CS5536_MSR_DIVIL_UART2_CONF)
+	addiu $a0, $a0, %lo(GRUB_CS5536_MSR_DIVIL_UART2_CONF)
+	li $a1, 2
+	bal wrmsr
+	 move $a2, $zero
+#endif
+	
 	lui $t0, %hi (GRUB_MACHINE_SERIAL_PORT)
 
 	/* Turn off the interrupt.  */
@@ -240,6 +306,7 @@ serial_hw_init:
 	/* Let message return to original caller.  */
 	lui  $a0, %hi(notification_string)
 	addiu $a0, $a0, %lo(notification_string)
+	move $ra, $t2
 
 	/* Print message on serial console.  */
 	/* In: $a0 = asciiz message. Out: none. Clobbered: $t0, $t1, $a0.  */
@@ -380,7 +447,6 @@ read_spd_fail:
 	 ori $v0, $v0, 0x100
 
 notification_string:	.asciz "GRUB "
-no_cs5536:	.asciz "No CS5536 found.\n\r"
 cs5536_found:	.asciz "CS5536 at "
 sm_failed: .asciz "SM transaction failed.\n\r"
 unhandled_tlb_refill:	.asciz "Unhandled TLB refill.\n\r"
@@ -405,14 +471,22 @@ regdump:
 	.quad 0x0100020200010101 /* 4 */
 	.quad 0x0a04030603050203 /* 6 */
 	.quad 0x0f0e040000010a0b /* 7 */
+#ifdef FULOONG
+	.quad 0x0000000100000001 /* 8 */
+#else
 	.quad 0x0000010200000102 /* 8 */
+#endif
 	.quad 0x0000060c00000000 /* 9 */
 	.quad 0x2323233f3f1f0200 /* a */
 	.quad 0x5f7f232323232323 /* b */
 	.quad 0x002a3c0615000000 /* c */
 	.quad 0x002a002a002a002a /* d */
 	.quad 0x002a002a002a002a /* e */
+#ifdef FULOONG
+	.quad 0x00b40020005b0004 /* f */
+#else
 	.quad 0x00b40020006d0004 /* f */
+#endif
 	.quad 0x070007ff00000087 /* 10 */
 	.quad 0x000000000016101f /* 11 */
 	.quad 0x001c000000000000 /* 12 */
@@ -427,6 +501,45 @@ regdump:
 	.quad 0 /* 1b */
 	.quad 0 /* 1c */
 
+/* Dump of GPIO connections. FIXME: Remove useless and macroify.  */
+gpio_dump:
+#ifdef FULOONG
+	.long 0xffff0000, 0x2eefd110, 0xffff0000, 0xffff0000
+	.long 0x2eefd110, 0xffff0000, 0x1000efff, 0xefff1000
+	.long 0x3df3c20c, 0xffff0000, 0xffff0000, 0xffff0000
+	.long 0x7df3820c, 0x3df3c20c, 0xffff0000, 0x00000000
+	.long 0xffff0000, 0xffff0000, 0x3de3c21c, 0x3d83c27c
+	.long 0x00000000, 0x00000000, 0x00000000, 0x00000000
+	.long 0x00000000, 0x00000000, 0x00000000, 0x00000000
+	.long 0x00000000, 0x00000000, 0x00000000, 0x00000000
+	.long 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000
+	.long 0xffff0000, 0xffff0000, 0x0000ffff, 0xffff0000
+	.long 0xefff1000, 0xffff0000, 0xffff0000, 0xffff0000
+	.long 0xefff1000, 0xefff1000, 0xffff0000, 0x00000000
+	.long 0xffff0000, 0xffff0000, 0xefff1000, 0xefff1000
+	.long 0x00000000, 0x00000000, 0x00000000, 0x00000000
+	.long 0x00000000, 0x00000000, 0x00000000, 0x00000000
+	.long 0x00000000, 0x00000000, 0x00000000, 0x00000000
+#else
+	.long 0xffff0000, 0x2ffdd002, 0xffff0000, 0xffff0000
+	.long 0x2fffd000, 0xffff0000, 0x1000efff, 0xefff1000
+	.long 0x3ffbc004, 0xffff0000, 0xffff0000, 0xffff0000
+	.long 0x3ffbc004, 0x3ffbc004, 0xffff0000, 0x00000000
+	.long 0xffff0000, 0xffff0000, 0x3ffbc004, 0x3f9bc064
+	.long 0x00000000, 0x00000000, 0x00000000, 0x00000000
+	.long 0x00000000, 0x00000000, 0x00000000, 0x00000000
+	.long 0x00000000, 0x00000000, 0x00000000, 0x00000000
+	.long 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000
+	.long 0xffff0000, 0xffff0000, 0x0000ffff, 0xffff0000
+	.long 0xefff1000, 0xffff0000, 0xffff0000, 0xffff0000
+	.long 0xefff1000, 0xefff1000, 0xffff0000, 0x00000000
+	.long 0xffff0000, 0xffff0000, 0xefff1000, 0xffff0000
+	.long 0x00000000, 0x00000000, 0x00000000, 0x00000000
+	.long 0x00000000, 0x00000000, 0x00000000, 0x00000000
+	.long 0x00000000, 0x50000000, 0x00000000, 0x00000000
+#endif
+gpio_dump_end:	
+
 	.p2align
 
 write_dumpreg:	
@@ -627,6 +740,10 @@ continue:
 	lui $t0, %hi(cached_continue - 0x20000000)
 	addiu $t0, $t0, %lo(cached_continue - 0x20000000)
 	jr $t0
-	 addiu $a2, $zero, -1
+#ifdef FULOONG
+	 addiu $a2, $zero, -(1 + GRUB_ARCH_MACHINE_FULOONG)
+#else
+	 addiu $a2, $zero, -(1 + GRUB_ARCH_MACHINE_YEELOONG)
+#endif
 
-cached_continue:
+cached_continue:

grub-core/boot/mips/startup_raw.S

@@ -20,6 +20,7 @@
 #include <grub/symbol.h>
 #include <grub/offsets.h>
 #include <grub/machine/memory.h>
+#include <grub/machine/kernel.h>
 #include <grub/offsets.h>
 
 #define BASE_ADDR 8
@@ -49,15 +50,17 @@ codestart:
 
 	/* Parse arguments. Has to be done before relocation.
 	So need to do it in asm.  */
-#ifdef GRUB_MACHINE_MIPS_YEELOONG
+#ifdef GRUB_MACHINE_MIPS_LOONGSON
 	move $s2, $zero
 	move $s3, $zero
 	move $s4, $zero
 	move $s5, $zero
+	move $s7, $zero
 
 	/* $a2 has the environment.  */
-	addiu $t0, $a2, 1
+	addiu $t0, $zero, -0x10
-	beq $t0, $zero, argdone
+	and $t1, $a2, $t0
+	beq $t0, $t1, argfw
 	 nop
 	move $t0, $a2	
 argcont:	
@@ -72,11 +75,19 @@ argcont:
 	 nop		  ;\
 	b 2f;\
 	 move reg, $v0;	 \
-1:	
+1:
+#define DO_CHECKT1(str, val)				 \
+	move $t6, $t1					;\
+	addiu $t7, $s0, (str - base);\
+	bal do_check				       ;\
+	 li $t2, val
+
 	DO_PARSE (busclockstr, $s2)
 	DO_PARSE (cpuclockstr, $s3)
 	DO_PARSE (memsizestr, $s4)
 	DO_PARSE (highmemsizestr, $s5)
+	DO_CHECKT1 (pmon_yeeloong_verstr, GRUB_ARCH_MACHINE_YEELOONG)
+	DO_CHECKT1 (pmon_fuloong_verstr, GRUB_ARCH_MACHINE_FULOONG)
 2:	
 	b argcont
 	 addiu $t0, $t0, 4	 
@@ -120,8 +131,47 @@ busclockstr:	.asciiz "busclock="
 cpuclockstr:	.asciiz "cpuclock="
 memsizestr:	.asciiz "memsize="
 highmemsizestr:	.asciiz "highmemsize="
+machtype_yeeloong_str1:	.asciiz "machtype=8.9"
+machtype_yeeloong_str2:	.asciiz "machtype=lemote-yeeloong-"
+machtype_fuloong_str:	.asciiz "machtype=lemote-fuloong-"
+pmon_yeeloong_str:	.asciiz "PMON_VER=LM8"
+pmon_fuloong_str:	.asciiz "PMON_VER=LM6"
+pmon_yeeloong_verstr:	.asciiz "Version=LM8"
+pmon_fuloong_verstr:	.asciiz "Version=LM6"
 	.p2align 2
+
 argdone:
+	beq $a0, $zero, cmdlinedone
+	 nop
+#define DO_CHECKA1(str, val)				 \
+	lw $t6, 0($a1)					;\
+	addiu $t7, $s0, (str - base);\
+	bal do_check				       ;\
+	 li $t2, val
+	DO_CHECKA1 (machtype_yeeloong_str1, GRUB_ARCH_MACHINE_YEELOONG)
+	DO_CHECKA1 (machtype_yeeloong_str2, GRUB_ARCH_MACHINE_YEELOONG)
+	DO_CHECKA1 (pmon_yeeloong_str, GRUB_ARCH_MACHINE_YEELOONG)
+	DO_CHECKA1 (machtype_fuloong_str, GRUB_ARCH_MACHINE_FULOONG)
+	DO_CHECKA1 (pmon_fuloong_str, GRUB_ARCH_MACHINE_FULOONG)
+	addiu $a0, $a0, -1
+	b argdone
+  	 addiu $a1, $a1, 4
+do_check:
+	lb $t4, 0($t7)
+	beq $t4, $zero, 1f
+	 lb $t3, 0($t6)
+	bne $t3, $t4, 2f
+	 addiu $t6, $t6, 1
+	b do_check
+	 addiu $t7, $t7, 1
+1:
+	move $s7, $t2
+2:
+	jr $ra
+	 nop
+argfw:
+	not $s7, $a2
+cmdlinedone:	
 #endif
 	/* Copy the decompressor. */
 	lui $t1, %hi(base)

grub-core/bus/cs5536.c

@@ -21,6 +21,7 @@
 #include <grub/pci.h>
 #include <grub/time.h>
 #include <grub/ata.h>
+#include <grub/machine/kernel.h>
 
 #include <grub/dl.h>
 
@@ -217,26 +218,6 @@ grub_cs5536_read_spd (grub_port_t smbbase, grub_uint8_t dev,
   return GRUB_ERR_NONE;
 }
 
-/* Dump of GPIO connections. FIXME: Remove useless and macroify.  */
-static grub_uint32_t gpiodump[] = {
-  0xffff0000, 0x2ffdd002, 0xffff0000, 0xffff0000,
-  0x2fffd000, 0xffff0000, 0x1000efff, 0xefff1000,
-  0x3ffbc004, 0xffff0000, 0xffff0000, 0xffff0000,
-  0x3ffbc004, 0x3ffbc004, 0xffff0000, 0x00000000,
-  0xffff0000, 0xffff0000, 0x3ffbc004, 0x3f9bc064,
-  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000,
-  0xffff0000, 0xffff0000, 0x0000ffff, 0xffff0000,
-  0xefff1000, 0xffff0000, 0xffff0000, 0xffff0000,
-  0xefff1000, 0xefff1000, 0xffff0000, 0x00000000,
-  0xffff0000, 0xffff0000, 0xefff1000, 0xffff0000,
-  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  0x00000000, 0x50000000, 0x00000000, 0x00000000,
-};
-
 static inline void
 set_io_space (grub_pci_device_t dev, int num, grub_uint16_t start,
 	      grub_uint16_t len)
@@ -277,17 +258,6 @@ set_p2d (grub_pci_device_t dev, int num, int dest, grub_uint32_t start)
 void
 grub_cs5536_init_geode (grub_pci_device_t dev)
 {
-  int i;
-
-  /* Make sure GPIO is where we expect it to be.  */
-  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GPIO_BAR,
-			 GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_GPIO);
-
-  /* Setup GPIO.  */
-  for (i = 0; i < (int) ARRAY_SIZE (gpiodump); i++)
-    ((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_IO_BASE 
-				 + GRUB_CS5536_LBAR_GPIO)) [i] = gpiodump[i];
-
   /* Enable more BARs.  */
   grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IRQ_MAP_BAR,
 			 GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_IRQ_MAP);
@@ -299,11 +269,25 @@ grub_cs5536_init_geode (grub_pci_device_t dev)
 			 GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_PM);
 
   /* Setup DIVIL.  */
-  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_LEG_IO,
+  switch (grub_arch_machine)
-			 GRUB_CS5536_MSR_DIVIL_LEG_IO_MODE_X86
+    {
-			 | GRUB_CS5536_MSR_DIVIL_LEG_IO_F_REMAP
+    case GRUB_ARCH_MACHINE_YEELOONG:
-			 | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE0
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_LEG_IO,
-			 | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE1);
+			     GRUB_CS5536_MSR_DIVIL_LEG_IO_MODE_X86
+			     | GRUB_CS5536_MSR_DIVIL_LEG_IO_F_REMAP
+			     | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE0
+			     | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE1);
+      break;
+    case GRUB_ARCH_MACHINE_FULOONG:
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_LEG_IO,
+			     GRUB_CS5536_MSR_DIVIL_LEG_IO_UART2_COM3
+			     | GRUB_CS5536_MSR_DIVIL_LEG_IO_UART1_COM1
+			     | GRUB_CS5536_MSR_DIVIL_LEG_IO_MODE_X86
+			     | GRUB_CS5536_MSR_DIVIL_LEG_IO_F_REMAP
+			     | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE0
+			     | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE1);
+      break;
+    }
   grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_PRIMARY_MASK,
 			 (~GRUB_CS5536_DIVIL_LPC_INTERRUPTS) & 0xffff);
   grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_LPC_MASK,

grub-core/bus/pci.c

@@ -47,7 +47,7 @@ grub_dma_free (struct grub_pci_dma_chunk *ch)
 }
 /* #endif */
 
-#ifdef GRUB_MACHINE_MIPS_YEELOONG
+#ifdef GRUB_MACHINE_MIPS_LOONGSON
 volatile void *
 grub_dma_get_virt (struct grub_pci_dma_chunk *ch)
 {
@@ -110,13 +110,13 @@ grub_pci_iterate (grub_pci_iteratefunc_t hook)
 		    continue;
 		}
 
-#ifdef GRUB_MACHINE_MIPS_YEELOONG
+#ifdef GRUB_MACHINE_MIPS_LOONGSON
 	      /* Skip ghosts.  */
-	      if (id == GRUB_YEELOONG_OHCI_PCIID
+	      if (id == GRUB_LOONGSON_OHCI_PCIID
-		  && dev.function == GRUB_YEELOONG_OHCI_GHOST_FUNCTION)
+		  && dev.function == GRUB_LOONGSON_OHCI_GHOST_FUNCTION)
 		continue;
-	      if (id == GRUB_YEELOONG_EHCI_PCIID
+	      if (id == GRUB_LOONGSON_EHCI_PCIID
-		  && dev.function == GRUB_YEELOONG_EHCI_GHOST_FUNCTION)
+		  && dev.function == GRUB_LOONGSON_EHCI_GHOST_FUNCTION)
 		continue;
 #endif
 

grub-core/kern/main.c

@@ -53,8 +53,8 @@ grub_module_iterate (int (*hook) (struct grub_module_header *header))
     }
 }
 
-/* This is actualy platform-independant but used only on yeeloong and sparc.  */
+/* This is actualy platform-independant but used only on loongson and sparc.  */
-#if defined (GRUB_MACHINE_MIPS_YEELOONG) || defined (GRUB_MACHINE_SPARC64)
+#if defined (GRUB_MACHINE_MIPS_LOONGSON) || defined (GRUB_MACHINE_SPARC64)
 grub_addr_t
 grub_modules_get_end (void)
 {

grub-core/kern/mips/loongson/init.c

@@ -33,6 +33,7 @@
 #include <grub/machine/ec.h>
 
 extern void grub_video_sm712_init (void);
+extern void grub_video_sis315pro_init (void);
 extern void grub_video_init (void);
 extern void grub_bitmap_init (void);
 extern void grub_font_init (void);
@@ -79,7 +80,7 @@ init_pci (void)
     /* FIXME: autoscan for BARs and devices.  */
     switch (pciid)
       {
-      case GRUB_YEELOONG_OHCI_PCIID:
+      case GRUB_LOONGSON_OHCI_PCIID:
 	addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
 	grub_pci_write (addr, 0x5025000);
 	addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
@@ -91,7 +92,7 @@ init_pci (void)
 	addr = grub_pci_make_address (dev, GRUB_PCI_REG_STATUS);
 	grub_pci_write_word (addr, 0x0200 | GRUB_PCI_STATUS_CAPABILITIES);
 	break;
-      case GRUB_YEELOONG_EHCI_PCIID:
+      case GRUB_LOONGSON_EHCI_PCIID:
 	addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
 	grub_pci_write (addr, 0x5026000);
 	addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
@@ -163,7 +164,7 @@ grub_machine_init (void)
       if (err)
 	grub_fatal ("Couldn't init SMBus: %s\n", grub_errmsg);
 
-      /* Yeeloong has only one memory slot.  */
+      /* Yeeloong and Fuloong have only one memory slot.  */
       err = grub_cs5536_read_spd (smbbase, GRUB_SMB_RAM_START_ADDR, &spd);
       if (err)
 	grub_fatal ("Couldn't read SPD: %s\n", grub_errmsg);
@@ -202,12 +203,14 @@ grub_machine_init (void)
      relies on a working heap.  */
   grub_video_init ();
   grub_video_sm712_init ();
+  grub_video_sis315pro_init ();
   grub_bitmap_init ();
   grub_font_init ();
   grub_gfxterm_init ();
 
   grub_keylayouts_init ();
-  grub_at_keyboard_init ();
+  if (grub_arch_machine == GRUB_ARCH_MACHINE_YEELOONG)
+    grub_at_keyboard_init ();
 
   grub_terminfo_init ();
   grub_serial_init ();
@@ -223,10 +226,28 @@ grub_machine_fini (void)
 void
 grub_halt (void)
 {
-  grub_outb (grub_inb (GRUB_CPU_LOONGSON_GPIOCFG)
+  switch (grub_arch_machine)
-	     & ~GRUB_CPU_LOONGSON_SHUTDOWN_GPIO, GRUB_CPU_LOONGSON_GPIOCFG);
+    {
-
+    case GRUB_ARCH_MACHINE_FULOONG:
-  grub_millisleep (1500);
+      {
+	grub_pci_device_t dev;
+	grub_port_t p;
+	if (grub_cs5536_find (&dev))
+	  {
+	    p = (grub_cs5536_read_msr (dev, GRUB_CS5536_MSR_GPIO_BAR)
+		 & GRUB_CS5536_LBAR_ADDR_MASK) + GRUB_MACHINE_PCI_IO_BASE;
+	    grub_outl ((1 << 13), p + 4);
+	    grub_outl ((1 << 29), p);
+	    grub_millisleep (5000);
+	  }
+      }
+      break;
+    case GRUB_ARCH_MACHINE_YEELOONG:
+      grub_outb (grub_inb (GRUB_CPU_LOONGSON_GPIOCFG)
+		 & ~GRUB_CPU_YEELOONG_SHUTDOWN_GPIO, GRUB_CPU_LOONGSON_GPIOCFG);
+      grub_millisleep (1500);
+      break;
+    }
 
   grub_printf ("Shutdown failed\n");
   grub_refresh ();

grub-core/kern/mips/startup.S

@@ -20,6 +20,7 @@
 #include <grub/symbol.h>
 #include <grub/offsets.h>
 #include <grub/machine/memory.h>
+#include <grub/machine/kernel.h>
 #include <grub/offsets.h>
 
 #define BASE_ADDR 8	
@@ -35,7 +36,7 @@ start:
 	bal cont
 	 nop
 
-	. = _start + GRUB_KERNEL_MIPS_YEELOONG_TOTAL_MODULE_SIZE
+	. = _start + GRUB_KERNEL_MIPS_LOONGSON_TOTAL_MODULE_SIZE
 total_module_size:
 	.long 0
 
@@ -50,7 +51,7 @@ VARIABLE(grub_prefix)
 	 */
 
 	. = _start + GRUB_KERNEL_MACHINE_PREFIX_END
-#ifdef GRUB_MACHINE_MIPS_YEELOONG
+#ifdef GRUB_MACHINE_MIPS_LOONGSON
 VARIABLE (grub_arch_busclock)
 	.long 0
 VARIABLE (grub_arch_cpuclock)
@@ -59,18 +60,21 @@ VARIABLE (grub_arch_memsize)
 	.long 0
 VARIABLE (grub_arch_highmemsize)
 	.long 0
+VARIABLE (grub_arch_machine)
+	.long GRUB_ARCH_MACHINE_FULOONG
 #endif
 cont:
 	/* Save our base.  */
 	move $s0, $ra
 
-#ifdef GRUB_MACHINE_MIPS_YEELOONG
+#ifdef GRUB_MACHINE_MIPS_LOONGSON
 	lui $t1, %hi(grub_arch_busclock)
 	addiu $t1, %lo(grub_arch_busclock)
 	sw $s2, 0($t1)
 	sw $s3, 4($t1)
 	sw $s4, 8($t1)
 	sw $s5, 12($t1)
+	sw $s7, 16($t1)
 #endif
 
 	/* Move the modules out of BSS.  */

grub-core/loader/mips/linux.c

@@ -34,12 +34,14 @@ GRUB_MOD_LICENSE ("GPLv3+");
 #include <grub/pci.h>
 #include <grub/machine/time.h>
 
-#ifdef GRUB_MACHINE_MIPS_YEELOONG
+#ifdef GRUB_MACHINE_MIPS_LOONGSON
-/* This can be detected on runtime from PMON, but:
+#include <grub/machine/kernel.h>
-     a) it wouldn't work when GRUB is the firmware
+
-   and
+const char loongson_machtypes[][60] =
-     b) for now we only support Yeeloong anyway.  */
+  {
-#define LOONGSON_MACHTYPE "machtype=lemote-yeeloong-2f-8.9inches"
+    [GRUB_ARCH_MACHINE_YEELOONG] = "machtype=lemote-yeeloong-2f-8.9inches",
+    [GRUB_ARCH_MACHINE_FULOONG]  = "machtype=lemote-fuloong-2f-unknown"
+  };
 #endif
 
 static grub_dl_t my_mod;
@@ -224,7 +226,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 
   /* For arguments.  */
   linux_argc = argc;
-#ifdef LOONGSON_MACHTYPE
+#ifdef GRUB_MACHINE_MIPS_LOONGSON
   linux_argc++;
 #endif
   /* Main arguments.  */
@@ -239,8 +241,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   /* Normal arguments.  */
   for (i = 1; i < argc; i++)
     size += ALIGN_UP (grub_strlen (argv[i]) + 1, 4);
-#ifdef LOONGSON_MACHTYPE
+#ifdef GRUB_MACHINE_MIPS_LOONGSON
-  size += ALIGN_UP (sizeof (LOONGSON_MACHTYPE), 4);
+  size += ALIGN_UP (sizeof (loongson_machtypes[0]), 4);
 #endif
 
   /* rd arguments.  */
@@ -279,14 +281,20 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   linux_argv++;
   linux_args += ALIGN_UP (sizeof ("a0"), 4);
 
-#ifdef LOONGSON_MACHTYPE
+#ifdef GRUB_MACHINE_MIPS_LOONGSON
-  /* In Loongson platform, it is the responsibility of the bootloader/firmware
+  {
-     to supply the OS kernel with machine type information.  */
+    unsigned mtype = grub_arch_machine;
-  grub_memcpy (linux_args, LOONGSON_MACHTYPE, sizeof (LOONGSON_MACHTYPE));
+    if (mtype >= ARRAY_SIZE (loongson_machtypes))
-  *linux_argv = (grub_uint8_t *) linux_args - (grub_uint8_t *) playground
+      mtype = 0;
-    + target_addr;
+    /* In Loongson platform, it is the responsibility of the bootloader/firmware
-  linux_argv++;
+       to supply the OS kernel with machine type information.  */
-  linux_args += ALIGN_UP (sizeof (LOONGSON_MACHTYPE), 4);
+    grub_memcpy (linux_args, loongson_machtypes[mtype],
+		 sizeof (loongson_machtypes[mtype]));
+    *linux_argv = (grub_uint8_t *) linux_args - (grub_uint8_t *) playground
+      + target_addr;
+    linux_argv++;
+    linux_args += ALIGN_UP (sizeof (loongson_machtypes[mtype]), 4);
+  }
 #endif
 
   for (i = 1; i < argc; i++)

grub-core/term/at_keyboard.c

@@ -259,7 +259,7 @@ grub_keyboard_controller_write (grub_uint8_t c)
   grub_outb (c, KEYBOARD_REG_DATA);
 }
 
-#if !defined (GRUB_MACHINE_MIPS_YEELOONG) && !defined (GRUB_MACHINE_QEMU)
+#if !defined (GRUB_MACHINE_MIPS_LOONGSON) && !defined (GRUB_MACHINE_QEMU)
 
 static grub_uint8_t
 grub_keyboard_controller_read (void)
@@ -332,7 +332,7 @@ set_scancodes (void)
       return;
     }
 
-#if !(defined (GRUB_MACHINE_MIPS_YEELOONG) || defined (GRUB_MACHINE_QEMU))
+#if !(defined (GRUB_MACHINE_MIPS_LOONGSON) || defined (GRUB_MACHINE_QEMU))
   current_set = 1;
   return;
 #endif
@@ -569,7 +569,7 @@ grub_keyboard_controller_init (struct grub_term_input *term __attribute__ ((unus
       keyboard_controller_wait_until_ready ();
       grub_inb (KEYBOARD_REG_DATA);
     }
-#if defined (GRUB_MACHINE_MIPS_YEELOONG) || defined (GRUB_MACHINE_QEMU)
+#if defined (GRUB_MACHINE_MIPS_LOONGSON) || defined (GRUB_MACHINE_QEMU)
   grub_keyboard_controller_orig = 0;
   grub_keyboard_orig_set = 2;
 #else

grub-core/term/ns8250.c

@@ -37,7 +37,8 @@ static const grub_port_t serial_hw_io_addr[] = GRUB_MACHINE_SERIAL_PORTS;
 
 /* Convert speed to divisor.  */
 static unsigned short
-serial_get_divisor (unsigned int speed)
+serial_get_divisor (const struct grub_serial_port *port,
+		    const struct grub_serial_config *config)
 {
   unsigned int i;
 
@@ -63,13 +64,16 @@ serial_get_divisor (unsigned int speed)
 
   /* Set the baud rate.  */
   for (i = 0; i < ARRAY_SIZE (divisor_tab); i++)
-    if (divisor_tab[i].speed == speed)
+    if (divisor_tab[i].speed == config->speed)
-  /* UART in Yeeloong runs twice the usual rate.  */
+      {
-#ifdef GRUB_MACHINE_MIPS_YEELOONG
+	/* internal Loongson UART runs twice the usual rate.  */
-      return 2 * divisor_tab[i].div;
+#ifdef GRUB_MACHINE_MIPS_LOONGSON
-#else
+	if (port->port == 0xbff003f8)
-      return divisor_tab[i].div;
+	  return 2 * divisor_tab[i].div;
+	else
 #endif
+	  return divisor_tab[i].div;
+      }
   return 0;
 }
 
@@ -93,7 +97,7 @@ do_real_config (struct grub_serial_port *port)
 
   port->broken = 0;
 
-  divisor = serial_get_divisor (port->config.speed);
+  divisor = serial_get_divisor (port, &port->config);
 
   /* Turn off the interrupt.  */
   grub_outb (0, port->port + UART_IER);
@@ -111,8 +115,8 @@ do_real_config (struct grub_serial_port *port)
 	     | stop_bits[port->config.stop_bits]);
   grub_outb (status, port->port + UART_LCR);
 
-  /* In Yeeloong serial port has only 3 wires.  */
+  /* On Loongson machines serial port has only 3 wires.  */
-#ifndef GRUB_MACHINE_MIPS_YEELOONG
+#ifndef GRUB_MACHINE_MIPS_LOONGSON
   /* Enable the FIFO.  */
   grub_outb (UART_ENABLE_FIFO_TRIGGER1, port->port + UART_FCR);
 
@@ -188,7 +192,7 @@ serial_hw_configure (struct grub_serial_port *port,
 {
   unsigned short divisor;
 
-  divisor = serial_get_divisor (config->speed);
+  divisor = serial_get_divisor (port, config);
   if (divisor == 0)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad speed");
 

grub-core/term/serial.c

@@ -26,6 +26,9 @@
 #include <grub/extcmd.h>
 #include <grub/i18n.h>
 #include <grub/list.h>
+#ifdef GRUB_MACHINE_MIPS_LOONGSON
+#include <grub/machine/kernel.h>
+#endif
 
 GRUB_MOD_LICENSE ("GPLv3+");
 
@@ -297,18 +300,23 @@ grub_serial_register (struct grub_serial_port *port)
   port->term_in = in;
   port->term_out = out;
   grub_terminfo_output_register (out, "vt100");
-#ifdef GRUB_MACHINE_MIPS_YEELOONG
+#ifdef GRUB_MACHINE_MIPS_LOONGSON
-  if (grub_strcmp (port->name, "com0") == 0)
+  if (grub_strcmp (port->name, 
+		   (grub_arch_machine == GRUB_ARCH_MACHINE_YEELOONG)
+		   ? "com0" : "com2") == 0)
     {
       grub_term_register_input_active ("serial_*", in);
       grub_term_register_output_active ("serial_*", out);
     }
   else
-#endif
     {
-      grub_term_register_input ("serial_*", in);
+      grub_term_register_input_inactive ("serial_*", in);
-      grub_term_register_output ("serial_*", out);
+      grub_term_register_output_inactive ("serial_*", out);
     }
+#else
+  grub_term_register_input ("serial_*", in);
+  grub_term_register_output ("serial_*", out);
+#endif
 
   return GRUB_ERR_NONE;
 }

grub-core/video/sis315pro.c

@@ -0,0 +1,246 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2005,2006,2007,2008,2009,2010  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 <http://www.gnu.org/licenses/>.
+ */
+
+#define grub_video_render_target grub_video_fbrender_target
+
+#include <grub/err.h>
+#include <grub/types.h>
+#include <grub/dl.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/video.h>
+#include <grub/video_fb.h>
+#include <grub/pci.h>
+#include <grub/vga.h>
+
+#define GRUB_SIS315PRO_PCIID 0x03251039
+#define GRUB_SIS315PRO_TOTAL_MEMORY_SPACE  0x800000
+
+static struct
+{
+  struct grub_video_mode_info mode_info;
+  struct grub_video_render_target *render_target;
+
+  grub_uint8_t *ptr;
+  int mapped;
+  grub_uint32_t base;
+  grub_pci_device_t dev;
+} framebuffer;
+
+#ifndef TEST
+static grub_err_t
+grub_video_sis315pro_video_init (void)
+{
+  /* Reset frame buffer.  */
+  grub_memset (&framebuffer, 0, sizeof(framebuffer));
+
+  return grub_video_fb_init ();
+}
+
+static grub_err_t
+grub_video_sis315pro_video_fini (void)
+{
+  if (framebuffer.mapped)
+    grub_pci_device_unmap_range (framebuffer.dev, framebuffer.ptr,
+				 GRUB_SIS315PRO_TOTAL_MEMORY_SPACE);
+
+  return grub_video_fb_fini ();
+}
+#endif
+
+static grub_err_t
+grub_video_sis315pro_setup (unsigned int width, unsigned int height,
+			    unsigned int mode_type,
+			    unsigned int mode_mask __attribute__ ((unused)))
+{
+  int depth;
+  grub_err_t err;
+  int found = 0;
+
+#ifndef TEST
+  auto int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev, grub_pci_id_t pciid __attribute__ ((unused)));
+  int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev, grub_pci_id_t pciid __attribute__ ((unused)))
+    {
+      grub_pci_address_t addr;
+      grub_uint32_t class;
+
+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
+      class = grub_pci_read (addr);
+
+      if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA
+	  || pciid != GRUB_SIS315PRO_PCIID)
+	return 0;
+      
+      found = 1;
+
+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
+      framebuffer.base = grub_pci_read (addr);
+      framebuffer.dev = dev;
+
+      return 1;
+    }
+
+  /* Decode depth from mode_type.  If it is zero, then autodetect.  */
+  depth = (mode_type & GRUB_VIDEO_MODE_TYPE_DEPTH_MASK)
+          >> GRUB_VIDEO_MODE_TYPE_DEPTH_POS;
+
+  if ((width != 640 && width != 0) || (height != 400 && height != 0)
+      || (depth != 8 && depth != 0))
+    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+		       "Only 640x400x8 is supported");
+
+  grub_pci_iterate (find_card);
+  if (!found)
+    return grub_error (GRUB_ERR_IO, "Couldn't find graphics card");
+#endif
+  /* Fill mode info details.  */
+  framebuffer.mode_info.width = 640;
+  framebuffer.mode_info.height = 400;
+  framebuffer.mode_info.mode_type = GRUB_VIDEO_MODE_TYPE_INDEX_COLOR;
+  framebuffer.mode_info.bpp = 8;
+  framebuffer.mode_info.bytes_per_pixel = 1;
+  framebuffer.mode_info.pitch = 640 * 1;
+  framebuffer.mode_info.number_of_colors = 256;
+  framebuffer.mode_info.red_mask_size = 0;
+  framebuffer.mode_info.red_field_pos = 0;
+  framebuffer.mode_info.green_mask_size = 0;
+  framebuffer.mode_info.green_field_pos = 0;
+  framebuffer.mode_info.blue_mask_size = 0;
+  framebuffer.mode_info.blue_field_pos = 0;
+  framebuffer.mode_info.reserved_mask_size = 0;
+  framebuffer.mode_info.reserved_field_pos = 0;
+#ifndef TEST
+  framebuffer.mode_info.blit_format
+    = grub_video_get_blit_format (&framebuffer.mode_info);
+#endif
+
+  /* We can safely discard volatile attribute.  */
+#ifndef TEST
+  framebuffer.ptr
+    = (void *) grub_pci_device_map_range (framebuffer.dev,
+					  framebuffer.base,
+					  GRUB_SIS315PRO_TOTAL_MEMORY_SPACE);
+#endif
+  framebuffer.mapped = 1;
+
+#ifndef TEST
+  /* Prevent garbage from appearing on the screen.  */
+  grub_memset (framebuffer.ptr, 0, 
+	       framebuffer.mode_info.height * framebuffer.mode_info.pitch);
+#endif
+
+#ifndef TEST
+  err = grub_video_fb_create_render_target_from_pointer (&framebuffer
+							 .render_target,
+							 &framebuffer.mode_info,
+							 framebuffer.ptr);
+
+  if (err)
+    return err;
+
+  err = grub_video_fb_set_active_render_target (framebuffer.render_target);
+  
+  if (err)
+    return err;
+
+  /* Copy default palette to initialize emulated palette.  */
+  err = grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS,
+				   grub_video_fbstd_colors);
+#endif
+  return err;
+}
+
+#ifndef TEST
+
+static grub_err_t
+grub_video_sis315pro_swap_buffers (void)
+{
+  /* TODO: Implement buffer swapping.  */
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_video_sis315pro_set_active_render_target (struct grub_video_render_target *target)
+{
+  if (target == GRUB_VIDEO_RENDER_TARGET_DISPLAY)
+      target = framebuffer.render_target;
+
+  return grub_video_fb_set_active_render_target (target);
+}
+
+static grub_err_t
+grub_video_sis315pro_get_info_and_fini (struct grub_video_mode_info *mode_info,
+					void **framebuf)
+{
+  grub_memcpy (mode_info, &(framebuffer.mode_info), sizeof (*mode_info));
+  *framebuf = (char *) framebuffer.ptr;
+
+  grub_video_fb_fini ();
+
+  return GRUB_ERR_NONE;
+}
+
+static struct grub_video_adapter grub_video_sis315pro_adapter =
+  {
+    .name = "SIS315PRO Video Driver",
+    .id = GRUB_VIDEO_DRIVER_SIS315PRO,
+
+    .prio = GRUB_VIDEO_ADAPTER_PRIO_NATIVE,
+
+    .init = grub_video_sis315pro_video_init,
+    .fini = grub_video_sis315pro_video_fini,
+    .setup = grub_video_sis315pro_setup,
+    .get_info = grub_video_fb_get_info,
+    .get_info_and_fini = grub_video_sis315pro_get_info_and_fini,
+    .set_palette = grub_video_fb_set_palette,
+    .get_palette = grub_video_fb_get_palette,
+    .set_viewport = grub_video_fb_set_viewport,
+    .get_viewport = grub_video_fb_get_viewport,
+    .map_color = grub_video_fb_map_color,
+    .map_rgb = grub_video_fb_map_rgb,
+    .map_rgba = grub_video_fb_map_rgba,
+    .unmap_color = grub_video_fb_unmap_color,
+    .fill_rect = grub_video_fb_fill_rect,
+    .blit_bitmap = grub_video_fb_blit_bitmap,
+    .blit_render_target = grub_video_fb_blit_render_target,
+    .scroll = grub_video_fb_scroll,
+    .swap_buffers = grub_video_sis315pro_swap_buffers,
+    .create_render_target = grub_video_fb_create_render_target,
+    .delete_render_target = grub_video_fb_delete_render_target,
+    .set_active_render_target = grub_video_sis315pro_set_active_render_target,
+    .get_active_render_target = grub_video_fb_get_active_render_target,
+
+    .next = 0
+  };
+
+GRUB_MOD_INIT(video_sis315pro)
+{
+  grub_video_register (&grub_video_sis315pro_adapter);
+}
+
+GRUB_MOD_FINI(video_sis315pro)
+{
+  grub_video_unregister (&grub_video_sis315pro_adapter);
+}
+#else
+int
+main ()
+{
+  grub_video_sis315pro_setup (640, 400, 0, 0);
+}
+#endif

include/grub/cs5536.h

@@ -26,9 +26,11 @@
 #endif
 
 #define GRUB_CS5536_PCIID 0x208f1022
-#define GRUB_CS5536_MSR_MAILBOX_ADDR  0xf4
+#define GRUB_CS5536_MSR_MAILBOX_CONFIG_ENABLED        0x1
-#define GRUB_CS5536_MSR_MAILBOX_DATA0 0xf8
+#define GRUB_CS5536_MSR_MAILBOX_CONFIG 0xf0
-#define GRUB_CS5536_MSR_MAILBOX_DATA1 0xfc
+#define GRUB_CS5536_MSR_MAILBOX_ADDR   0xf4
+#define GRUB_CS5536_MSR_MAILBOX_DATA0  0xf8
+#define GRUB_CS5536_MSR_MAILBOX_DATA1  0xfc
 #define GRUB_CS5536_MSR_IRQ_MAP_BAR 0x80000008
 #define GRUB_CS5536_MSR_SMB_BAR 0x8000000b
 
@@ -73,11 +75,15 @@
 #define GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE1 0x00000002
 #define GRUB_CS5536_MSR_DIVIL_LEG_IO_MODE_X86    0x10000000
 #define GRUB_CS5536_MSR_DIVIL_LEG_IO_F_REMAP     0x04000000
+#define GRUB_CS5536_MSR_DIVIL_LEG_IO_UART1_COM1  0x00070000
+#define GRUB_CS5536_MSR_DIVIL_LEG_IO_UART2_COM3  0x00500000
 #define GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_PRIMARY_MASK 0x80000024
 #define GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_LPC_MASK 0x80000025
 #define GRUB_CS5536_DIVIL_LPC_INTERRUPTS 0x1002
 #define GRUB_CS5536_MSR_DIVIL_LPC_SERIAL_IRQ_CONTROL 0x8000004e
 #define GRUB_CS5536_MSR_DIVIL_LPC_SERIAL_IRQ_CONTROL_ENABLE 0x80
+#define GRUB_CS5536_MSR_DIVIL_UART1_CONF 0x8000003a
+#define GRUB_CS5536_MSR_DIVIL_UART2_CONF 0x8000003e
 
 #define GRUB_CS5536_MSR_USB_OHCI_BASE 0x40000008
 #define GRUB_CS5536_MSR_USB_EHCI_BASE 0x40000009

include/grub/mips/loongson.h

@@ -85,6 +85,6 @@
 #define GRUB_CPU_LOONGSON_PCI_HIT1_SEL_HI   0xbfe00154
 
 #define GRUB_CPU_LOONGSON_GPIOCFG  0xbfe00120
-#define GRUB_CPU_LOONGSON_SHUTDOWN_GPIO 1
+#define GRUB_CPU_YEELOONG_SHUTDOWN_GPIO 1
 
 #endif

include/grub/mips/loongson/kernel.h

@@ -21,11 +21,16 @@
 
 #include <grub/symbol.h>
 
+#define GRUB_ARCH_MACHINE_YEELOONG 0
+#define GRUB_ARCH_MACHINE_FULOONG 1
+
 #ifndef ASM_FILE
 
 void EXPORT_FUNC (grub_reboot) (void) __attribute__ ((noreturn));
 void EXPORT_FUNC (grub_halt) (void) __attribute__ ((noreturn));
 
+extern grub_uint32_t EXPORT_VAR (grub_arch_machine);
+
 #endif
 
 #endif /* ! GRUB_KERNEL_MACHINE_HEADER */

include/grub/mips/loongson/pci.h

@@ -24,10 +24,10 @@
 #include <grub/cpu/io.h>
 #endif
 
-#define GRUB_YEELOONG_OHCI_PCIID 0x00351033
+#define GRUB_LOONGSON_OHCI_PCIID 0x00351033
-#define GRUB_YEELOONG_EHCI_PCIID 0x00e01033
+#define GRUB_LOONGSON_EHCI_PCIID 0x00e01033
-#define GRUB_YEELOONG_OHCI_GHOST_FUNCTION 4
+#define GRUB_LOONGSON_OHCI_GHOST_FUNCTION 4
-#define GRUB_YEELOONG_EHCI_GHOST_FUNCTION 5
+#define GRUB_LOONGSON_EHCI_GHOST_FUNCTION 5
 
 #define GRUB_PCI_NUM_BUS        1
 #define GRUB_PCI_NUM_DEVICES    16

include/grub/mips/loongson/serial.h

@@ -19,11 +19,14 @@
 #ifndef GRUB_MACHINE_SERIAL_HEADER
 #define GRUB_MACHINE_SERIAL_HEADER	1
 
-#define GRUB_MACHINE_SERIAL_DIVISOR_115200 2
+#define GRUB_MACHINE_SERIAL_PORT0_DIVISOR_115200 2
-#define GRUB_MACHINE_SERIAL_PORT  0xbff003f8
+#define GRUB_MACHINE_SERIAL_PORT2_DIVISOR_115200 1
+#define GRUB_MACHINE_SERIAL_PORT0  0xbff003f8
+#define GRUB_MACHINE_SERIAL_PORT1  0xbfd003f8
+#define GRUB_MACHINE_SERIAL_PORT2  0xbfd002f8
 
 #ifndef ASM_FILE
-#define GRUB_MACHINE_SERIAL_PORTS { GRUB_MACHINE_SERIAL_PORT }
+#define GRUB_MACHINE_SERIAL_PORTS { GRUB_MACHINE_SERIAL_PORT0, GRUB_MACHINE_SERIAL_PORT1, GRUB_MACHINE_SERIAL_PORT2 }
 #else
 #endif
 

include/grub/offsets.h

@@ -100,16 +100,16 @@
 #define GRUB_KERNEL_POWERPC_IEEE1275_LINK_ALIGN 4
 #define GRUB_KERNEL_POWERPC_IEEE1275_LINK_ADDR 0x200000
 
-#define GRUB_KERNEL_MIPS_YEELOONG_LINK_ADDR         0x80200000
+#define GRUB_KERNEL_MIPS_LOONGSON_LINK_ADDR         0x80200000
 
-#define GRUB_KERNEL_MIPS_YEELOONG_LINK_ALIGN  32
+#define GRUB_KERNEL_MIPS_LOONGSON_LINK_ALIGN  32
 
-#define GRUB_KERNEL_MIPS_YEELOONG_COMPRESSED_SIZE          0x8
+#define GRUB_KERNEL_MIPS_LOONGSON_COMPRESSED_SIZE          0x8
-#define GRUB_KERNEL_MIPS_YEELOONG_UNCOMPRESSED_SIZE        0xc
+#define GRUB_KERNEL_MIPS_LOONGSON_UNCOMPRESSED_SIZE        0xc
 
-#define GRUB_KERNEL_MIPS_YEELOONG_TOTAL_MODULE_SIZE	0x08
+#define GRUB_KERNEL_MIPS_LOONGSON_TOTAL_MODULE_SIZE	0x08
-#define GRUB_KERNEL_MIPS_YEELOONG_PREFIX	        0x0c
+#define GRUB_KERNEL_MIPS_LOONGSON_PREFIX	        0x0c
-#define GRUB_KERNEL_MIPS_YEELOONG_PREFIX_END	        0x54
+#define GRUB_KERNEL_MIPS_LOONGSON_PREFIX_END	        0x54
 
 /* The offset of GRUB_PREFIX.  */
 #define GRUB_KERNEL_I386_EFI_PREFIX		0x8
@@ -144,7 +144,7 @@
 
 #define GRUB_KERNEL_POWERPC_IEEE1275_MOD_ALIGN 0x1000
 
-#define GRUB_KERNEL_MIPS_YEELOONG_MOD_ALIGN 0x1
+#define GRUB_KERNEL_MIPS_LOONGSON_MOD_ALIGN 0x1
 
 /* Minimal gap between _end and the start of the modules.  It's a hack
    for PowerMac to prevent "CLAIM failed" error.  The real fix is to

include/grub/serial.h

@@ -102,7 +102,7 @@ grub_serial_config_defaults (struct grub_serial_port *port)
 {
   struct grub_serial_config config =
     {
-#ifdef GRUB_MACHINE_MIPS_YEELOONG
+#ifdef GRUB_MACHINE_MIPS_LOONGSON
       .speed = 115200,
 #else
       .speed = 9600,

include/grub/term.h

@@ -248,6 +248,14 @@ grub_term_register_input (const char *name __attribute__ ((unused)),
     }
 }
 
+static inline void
+grub_term_register_input_inactive (const char *name __attribute__ ((unused)),
+				   grub_term_input_t term)
+{
+  grub_list_push (GRUB_AS_LIST_P (&grub_term_inputs_disabled),
+		  GRUB_AS_LIST (term));
+}
+
 static inline void
 grub_term_register_input_active (const char *name __attribute__ ((unused)),
 				 grub_term_input_t term)
@@ -272,6 +280,14 @@ grub_term_register_output (const char *name __attribute__ ((unused)),
     }
 }
 
+static inline void
+grub_term_register_output_inactive (const char *name __attribute__ ((unused)),
+				    grub_term_output_t term)
+{
+  grub_list_push (GRUB_AS_LIST_P (&grub_term_outputs_disabled),
+		  GRUB_AS_LIST (term));
+}
+
 static inline void
 grub_term_register_output_active (const char *name __attribute__ ((unused)),
 				  grub_term_output_t term)

include/grub/video.h

@@ -211,7 +211,8 @@ typedef enum grub_video_driver_id
     GRUB_VIDEO_DRIVER_VGA,
     GRUB_VIDEO_DRIVER_CIRRUS,
     GRUB_VIDEO_DRIVER_BOCHS,
-    GRUB_VIDEO_DRIVER_SDL
+    GRUB_VIDEO_DRIVER_SDL,
+    GRUB_VIDEO_DRIVER_SIS315PRO,
   } grub_video_driver_id_t;
 
 typedef enum grub_video_adapter_prio

util/grub-install.in

@@ -554,13 +554,13 @@ fi
 
 case "${target_cpu}-${platform}" in
     sparc64-ieee1275) mkimage_target=sparc64-ieee1275-raw ;;
-    mips-yeeloong) mkimage_target=mipsel-yeeloong-elf ;;
+    mips-loongson) mkimage_target=mipsel-loongson-elf ;;
     *) mkimage_target="${target_cpu}-${platform}" ;;
 esac
 
 case "${target_cpu}-${platform}" in
     i386-efi | x86_64-efi) imgext=efi ;;
-    mips-yeeloong | i386-coreboot | i386-multiboot | i386-ieee1275 \
+    mips-loongson | i386-coreboot | i386-multiboot | i386-ieee1275 \
 	| powerpc-ieee1275) imgext=elf ;;
     *) imgext=img ;;
 esac
@@ -569,7 +569,7 @@ esac
 "$grub_mkimage" ${config_opt} -d "${pkglibdir}" -O ${mkimage_target} --output="${grubdir}/core.${imgext}" --prefix="${prefix_drive}${relative_grubdir}" $modules || exit 1
 
 # Backward-compatibility kludges
-if [ "${target_cpu}-${platform}" = "mips-yeeloong" ]; then
+if [ "${target_cpu}-${platform}" = "mips-loongson" ]; then
     cp "${grubdir}/core.${imgext}" "${bootdir}"/grub.elf
 elif [ "${target_cpu}-${platform}" = "i386-ieee1275" ] || [ "${target_cpu}-${platform}" = "powerpc-ieee1275" ]; then
     cp "${grubdir}/core.${imgext}" "${grubdir}/grub"

util/grub-mkimage.c

@@ -58,14 +58,15 @@ typedef enum {
 
 struct image_target_desc
 {
-  const char *name;
+  const char *dirname;
+  const char *names[6];
   grub_size_t voidp_sizeof;
   int bigendian;
   enum {
     IMAGE_I386_PC, IMAGE_EFI, IMAGE_COREBOOT,
     IMAGE_SPARC64_AOUT, IMAGE_SPARC64_RAW, IMAGE_I386_IEEE1275,
-    IMAGE_YEELOONG_ELF, IMAGE_QEMU, IMAGE_PPC, IMAGE_YEELOONG_FLASH,
+    IMAGE_LOONGSON_ELF, IMAGE_QEMU, IMAGE_PPC, IMAGE_YEELOONG_FLASH,
-    IMAGE_I386_PC_PXE
+    IMAGE_FULOONG_FLASH, IMAGE_I386_PC_PXE
   } id;
   enum
     {
@@ -92,7 +93,8 @@ struct image_target_desc
 struct image_target_desc image_targets[] =
   {
     {
-      .name = "i386-coreboot",
+      .dirname = "i386-coreboot",
+      .names = { "i386-coreboot", NULL },
       .voidp_sizeof = 4,
       .bigendian = 0,
       .id = IMAGE_COREBOOT,
@@ -114,7 +116,8 @@ struct image_target_desc image_targets[] =
       .mod_align = GRUB_KERNEL_I386_COREBOOT_MOD_ALIGN
     },
     {
-      .name = "i386-multiboot",
+      .dirname = "i386-multiboot",
+      .names = { "i386-multiboot", NULL},
       .voidp_sizeof = 4,
       .bigendian = 0,
       .id = IMAGE_COREBOOT,
@@ -136,7 +139,8 @@ struct image_target_desc image_targets[] =
       .mod_align = GRUB_KERNEL_I386_COREBOOT_MOD_ALIGN
     },
     {
-      .name = "i386-pc",
+      .dirname = "i386-pc",
+      .names = { "i386-pc", NULL },
       .voidp_sizeof = 4,
       .bigendian = 0,
       .id = IMAGE_I386_PC, 
@@ -154,7 +158,8 @@ struct image_target_desc image_targets[] =
       .link_addr = GRUB_KERNEL_I386_PC_LINK_ADDR
     },
     {
-      .name = "i386-pc-pxe",
+      .dirname = "i386-pc",
+      .names = { "i386-pc-pxe", NULL },
       .voidp_sizeof = 4,
       .bigendian = 0,
       .id = IMAGE_I386_PC_PXE, 
@@ -172,7 +177,8 @@ struct image_target_desc image_targets[] =
       .link_addr = GRUB_KERNEL_I386_PC_LINK_ADDR
     },
     {
-      .name = "i386-efi",
+      .dirname = "i386-efi",
+      .names = { "i386-efi", NULL },
       .voidp_sizeof = 4,
       .bigendian = 0,
       .id = IMAGE_EFI,
@@ -194,7 +200,8 @@ struct image_target_desc image_targets[] =
       .install_bsd_part = TARGET_NO_FIELD,
     },
     {
-      .name = "i386-ieee1275",
+      .dirname = "i386-ieee1275",
+      .names = { "i386-ieee1275", NULL },
       .voidp_sizeof = 4,
       .bigendian = 0,
       .id = IMAGE_I386_IEEE1275, 
@@ -216,7 +223,8 @@ struct image_target_desc image_targets[] =
       .link_align = 4,
     },
     {
-      .name = "i386-qemu",
+      .dirname = "i386-qemu",
+      .names = { "i386-qemu", NULL },
       .voidp_sizeof = 4,
       .bigendian = 0,
       .id = IMAGE_QEMU, 
@@ -234,7 +242,8 @@ struct image_target_desc image_targets[] =
       .link_addr = GRUB_KERNEL_I386_QEMU_LINK_ADDR
     },
     {
-      .name = "x86_64-efi",
+      .dirname = "x86_64-efi",
+      .names = { "x86_64-efi", NULL },
       .voidp_sizeof = 8,
       .bigendian = 0, 
       .id = IMAGE_EFI, 
@@ -256,49 +265,75 @@ struct image_target_desc image_targets[] =
       .install_bsd_part = TARGET_NO_FIELD,
     },
     {
-      .name = "mipsel-yeeloong-flash",
+      .dirname = "mips-loongson",
+      .names = { "mipsel-yeeloong-flash", NULL },
       .voidp_sizeof = 4,
       .bigendian = 0,
       .id = IMAGE_YEELOONG_FLASH, 
       .flags = PLATFORM_FLAGS_DECOMPRESSORS,
-      .prefix = GRUB_KERNEL_MIPS_YEELOONG_PREFIX,
+      .prefix = GRUB_KERNEL_MIPS_LOONGSON_PREFIX,
-      .prefix_end = GRUB_KERNEL_MIPS_YEELOONG_PREFIX_END,
+      .prefix_end = GRUB_KERNEL_MIPS_LOONGSON_PREFIX_END,
       .raw_size = 0,
-      .total_module_size = GRUB_KERNEL_MIPS_YEELOONG_TOTAL_MODULE_SIZE,
+      .total_module_size = GRUB_KERNEL_MIPS_LOONGSON_TOTAL_MODULE_SIZE,
       .compressed_size = TARGET_NO_FIELD,
       .kernel_image_size = TARGET_NO_FIELD,
       .section_align = 1,
       .vaddr_offset = 0,
       .install_dos_part = TARGET_NO_FIELD,
       .install_bsd_part = TARGET_NO_FIELD,
-      .link_addr = GRUB_KERNEL_MIPS_YEELOONG_LINK_ADDR,
+      .link_addr = GRUB_KERNEL_MIPS_LOONGSON_LINK_ADDR,
       .elf_target = EM_MIPS,
-      .link_align = GRUB_KERNEL_MIPS_YEELOONG_LINK_ALIGN,
+      .link_align = GRUB_KERNEL_MIPS_LOONGSON_LINK_ALIGN,
       .default_compression = COMPRESSION_NONE
     },
     {
-      .name = "mipsel-yeeloong-elf",
+      .dirname = "mips-loongson",
+      .names = { "mipsel-fuloong-flash", NULL },
       .voidp_sizeof = 4,
       .bigendian = 0,
-      .id = IMAGE_YEELOONG_ELF, 
+      .id = IMAGE_FULOONG_FLASH, 
       .flags = PLATFORM_FLAGS_DECOMPRESSORS,
-      .prefix = GRUB_KERNEL_MIPS_YEELOONG_PREFIX,
+      .prefix = GRUB_KERNEL_MIPS_LOONGSON_PREFIX,
-      .prefix_end = GRUB_KERNEL_MIPS_YEELOONG_PREFIX_END,
+      .prefix_end = GRUB_KERNEL_MIPS_LOONGSON_PREFIX_END,
       .raw_size = 0,
-      .total_module_size = GRUB_KERNEL_MIPS_YEELOONG_TOTAL_MODULE_SIZE,
+      .total_module_size = GRUB_KERNEL_MIPS_LOONGSON_TOTAL_MODULE_SIZE,
       .compressed_size = TARGET_NO_FIELD,
       .kernel_image_size = TARGET_NO_FIELD,
       .section_align = 1,
       .vaddr_offset = 0,
       .install_dos_part = TARGET_NO_FIELD,
       .install_bsd_part = TARGET_NO_FIELD,
-      .link_addr = GRUB_KERNEL_MIPS_YEELOONG_LINK_ADDR,
+      .link_addr = GRUB_KERNEL_MIPS_LOONGSON_LINK_ADDR,
       .elf_target = EM_MIPS,
-      .link_align = GRUB_KERNEL_MIPS_YEELOONG_LINK_ALIGN,
+      .link_align = GRUB_KERNEL_MIPS_LOONGSON_LINK_ALIGN,
       .default_compression = COMPRESSION_NONE
     },
     {
-      .name = "powerpc-ieee1275",
+      .dirname = "mips-loongson",
+      .names = { "mipsel-loongson-elf", "mipsel-yeeloong-elf",
+		 "mipsel-fuloong-elf", NULL },
+      .voidp_sizeof = 4,
+      .bigendian = 0,
+      .id = IMAGE_LOONGSON_ELF, 
+      .flags = PLATFORM_FLAGS_DECOMPRESSORS,
+      .prefix = GRUB_KERNEL_MIPS_LOONGSON_PREFIX,
+      .prefix_end = GRUB_KERNEL_MIPS_LOONGSON_PREFIX_END,
+      .raw_size = 0,
+      .total_module_size = GRUB_KERNEL_MIPS_LOONGSON_TOTAL_MODULE_SIZE,
+      .compressed_size = TARGET_NO_FIELD,
+      .kernel_image_size = TARGET_NO_FIELD,
+      .section_align = 1,
+      .vaddr_offset = 0,
+      .install_dos_part = TARGET_NO_FIELD,
+      .install_bsd_part = TARGET_NO_FIELD,
+      .link_addr = GRUB_KERNEL_MIPS_LOONGSON_LINK_ADDR,
+      .elf_target = EM_MIPS,
+      .link_align = GRUB_KERNEL_MIPS_LOONGSON_LINK_ALIGN,
+      .default_compression = COMPRESSION_NONE
+    },
+    {
+      .dirname = "powerpc-ieee1275",
+      .names = { "powerpc-ieee1275", NULL },
       .voidp_sizeof = 4,
       .bigendian = 1,
       .id = IMAGE_PPC, 
@@ -320,7 +355,8 @@ struct image_target_desc image_targets[] =
       .link_align = 4
     },
     {
-      .name = "sparc64-ieee1275-raw",
+      .dirname = "sparc64-ieee1275",
+      .names = { "sparc64-ieee1275-raw", NULL },
       .voidp_sizeof = 8,
       .bigendian = 1, 
       .id = IMAGE_SPARC64_RAW,
@@ -338,7 +374,8 @@ struct image_target_desc image_targets[] =
       .link_addr = GRUB_KERNEL_SPARC64_IEEE1275_LINK_ADDR
     },
     {
-      .name = "sparc64-ieee1275-aout",
+      .dirname = "sparc64-ieee1275",
+      .names = { "sparc64-ieee1275-aout", NULL },
       .voidp_sizeof = 8,
       .bigendian = 1,
       .id = IMAGE_SPARC64_AOUT,
@@ -800,10 +837,10 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       decompress_size = grub_util_get_image_size (decompress_path);
       decompress_img = grub_util_read_image (decompress_path);
 
-      *((grub_uint32_t *) (decompress_img + GRUB_KERNEL_MIPS_YEELOONG_COMPRESSED_SIZE))
+      *((grub_uint32_t *) (decompress_img + GRUB_KERNEL_MIPS_LOONGSON_COMPRESSED_SIZE))
 	= grub_host_to_target32 (core_size);
 
-      *((grub_uint32_t *) (decompress_img + GRUB_KERNEL_MIPS_YEELOONG_UNCOMPRESSED_SIZE))
+      *((grub_uint32_t *) (decompress_img + GRUB_KERNEL_MIPS_LOONGSON_UNCOMPRESSED_SIZE))
 	= grub_host_to_target32 (kernel_size + total_module_size);
 
       full_size = core_size + decompress_size;
@@ -1163,6 +1200,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       }
       break;
     case IMAGE_YEELOONG_FLASH:
+    case IMAGE_FULOONG_FLASH:
     {
       char *rom_img;
       size_t rom_size;
@@ -1170,22 +1208,40 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       size_t boot_size;
       grub_uint8_t context[GRUB_MD_SHA512->contextsize];
       /* fwstart.img is the only part which can't be tested by using *-elf
-	 target. Check it against the checksum. This checksum is obtained with
+	 target. Check it against the checksum. */
-	 sha512sum utility after compiling on Gnewsense.
+      const grub_uint8_t yeeloong_fwstart_good_hash[512 / 8] = 
-      */
+	{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      const grub_uint8_t fwstart_good_hash[] = 
+	  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	{ 
+	  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	  0x44, 0xce, 0xbc, 0xe7, 0xc2, 0x5e, 0xff, 0x65,
+	  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	  0xc5, 0xda, 0x29, 0x5a, 0xb9, 0x08, 0x89, 0x42,
+	  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	  0x83, 0x3f, 0x2b, 0x2e, 0x06, 0xe1, 0x6f, 0x79,
+	  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	  0x9b, 0x78, 0x6d, 0xe5, 0xd3, 0x64, 0x98, 0x35,
+	  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	  0xc8, 0x58, 0xac, 0xb8, 0x08, 0x6d, 0x21, 0x51,
+	  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-	  0xcf, 0xe0, 0x76, 0x48, 0x81, 0x6c, 0xed, 0x65,
+      /* None yet. */
-	  0x4a, 0x50, 0xb4, 0x06, 0x38, 0x0b, 0x26, 0x74,
+      const grub_uint8_t fuloong_fwstart_good_hash[512 / 8] = 
-	  0x43, 0xbf, 0xc5, 0x2e, 0x07, 0xa6, 0xb8, 0x0e,
+	{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	};
-      
+      const grub_uint8_t *fwstart_good_hash;
-      boot_path = grub_util_get_path (dir, "fwstart.img");
+            
+      if (image_target->id == IMAGE_FULOONG_FLASH)
+	{
+	  fwstart_good_hash = fuloong_fwstart_good_hash;
+	  boot_path = grub_util_get_path (dir, "fwstart_fuloong.img");
+	}
+      else
+	{
+	  fwstart_good_hash = yeeloong_fwstart_good_hash;
+	  boot_path = grub_util_get_path (dir, "fwstart.img");
+	}
+
       boot_size = grub_util_get_image_size (boot_path);
       boot_img = grub_util_read_image (boot_path);
 
@@ -1217,7 +1273,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       core_size = rom_size;
     }
     break;
-    case IMAGE_YEELOONG_ELF:
+    case IMAGE_LOONGSON_ELF:
     case IMAGE_PPC:
     case IMAGE_COREBOOT:
     case IMAGE_I386_IEEE1275:
@@ -1230,7 +1286,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 	int header_size, footer_size = 0;
 	int phnum = 1;
 	
-	if (image_target->id != IMAGE_YEELOONG_ELF)
+	if (image_target->id != IMAGE_LOONGSON_ELF)
 	  phnum += 2;
 
 	if (note)
@@ -1265,7 +1321,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
 	/* No section headers.  */
 	ehdr->e_shoff = grub_host_to_target32 (0);
-	if (image_target->id == IMAGE_YEELOONG_ELF)
+	if (image_target->id == IMAGE_LOONGSON_ELF)
 	  ehdr->e_shentsize = grub_host_to_target16 (0);
 	else
 	  ehdr->e_shentsize = grub_host_to_target16 (sizeof (Elf32_Shdr));
@@ -1278,7 +1334,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 	phdr->p_offset = grub_host_to_target32 (header_size);
 	phdr->p_flags = grub_host_to_target32 (PF_R | PF_W | PF_X);
 
-	if (image_target->id == IMAGE_YEELOONG_ELF)
+	if (image_target->id == IMAGE_LOONGSON_ELF)
 	  target_addr = ALIGN_UP (image_target->link_addr
 				  + kernel_size + total_module_size, 32);
 	else
@@ -1287,12 +1343,12 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 	phdr->p_vaddr = grub_host_to_target32 (target_addr);
 	phdr->p_paddr = grub_host_to_target32 (target_addr);
 	phdr->p_align = grub_host_to_target32 (align > image_target->link_align ? align : image_target->link_align);
-	if (image_target->id == IMAGE_YEELOONG_ELF)
+	if (image_target->id == IMAGE_LOONGSON_ELF)
 	  ehdr->e_flags = grub_host_to_target32 (0x1000 | EF_MIPS_NOREORDER 
 						 | EF_MIPS_PIC | EF_MIPS_CPIC);
 	else
 	  ehdr->e_flags = 0;
-	if (image_target->id == IMAGE_YEELOONG_ELF)
+	if (image_target->id == IMAGE_LOONGSON_ELF)
 	  {
 	    phdr->p_filesz = grub_host_to_target32 (core_size);
 	    phdr->p_memsz = grub_host_to_target32 (core_size);
@@ -1407,12 +1463,12 @@ usage (int status)
       char *ptr;
       unsigned i;
       for (i = 0; i < ARRAY_SIZE (image_targets); i++)
-	format_len += strlen (image_targets[i].name) + 2;
+	format_len += strlen (image_targets[i].names[0]) + 2;
       ptr = formats = xmalloc (format_len);
       for (i = 0; i < ARRAY_SIZE (image_targets); i++)
 	{
-	  strcpy (ptr, image_targets[i].name);
+	  strcpy (ptr, image_targets[i].names[0]);
-	  ptr += strlen (image_targets[i].name);
+	  ptr += strlen (image_targets[i].names[0]);
 	  *ptr++ = ',';
 	  *ptr++ = ' ';
 	}
@@ -1482,10 +1538,12 @@ main (int argc, char *argv[])
 
 	  case 'O':
 	    {
-	      unsigned i;
+	      unsigned i, j;
 	      for (i = 0; i < ARRAY_SIZE (image_targets); i++)
-		if (strcmp (optarg, image_targets[i].name) == 0)
+		for (j = 0; image_targets[i].names[j]
-		  image_target = &image_targets[i];
+		       && j < ARRAY_SIZE (image_targets[i].names); j++)
+		  if (strcmp (optarg, image_targets[i].names[j]) == 0)
+		    image_target = &image_targets[i];
 	      if (!image_target)
 		{
 		  printf ("unknown target format %s\n", optarg);
@@ -1580,29 +1638,11 @@ main (int argc, char *argv[])
 
   if (!dir)
     {
-      const char *last;
+      dir = xmalloc (sizeof (GRUB_PKGLIBROOTDIR)
-      last = strchr (image_target->name, '-');
+		     + grub_strlen (image_target->dirname) + 1);
-      if (last)
-	last = strchr (last + 1, '-');
-      if (!last)
-	last = image_target->name + strlen (image_target->name);
-      dir = xmalloc (sizeof (GRUB_PKGLIBROOTDIR) + (last - image_target->name)
-		     + 1);
       memcpy (dir, GRUB_PKGLIBROOTDIR, sizeof (GRUB_PKGLIBROOTDIR) - 1);
       *(dir + sizeof (GRUB_PKGLIBROOTDIR) - 1) = '/';
-      if (strncmp (image_target->name, "mipsel-yeeloong",
+      strcpy (dir + sizeof (GRUB_PKGLIBROOTDIR), image_target->dirname);
-		   last - image_target->name) == 0)
-	{
-	  memcpy (dir + sizeof (GRUB_PKGLIBROOTDIR), "mips-yeeloong",
-		  sizeof ("mips-yeeloong"));	  
-	}
-      else
-	{
-	  memcpy (dir + sizeof (GRUB_PKGLIBROOTDIR), image_target->name,
-		  last - image_target->name);
-	  *(dir + sizeof (GRUB_PKGLIBROOTDIR) + (last - image_target->name))
-	    = 0;
-	}
     }
 
   generate_image (dir, prefix ? : DEFAULT_DIRECTORY, fp,