* Makefile.util.def (grub-mkrescue): Enable on loongson.

	* util/grub-mkrescue.in: Handle loongson.

diff --git a/ChangeLog b/ChangeLog
index 40c63a2d854bfd52dadf334c35db6c6a83e0bbfa..6ea130dee8aa3f515fd912137e154e147f67237f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * Makefile.util.def (grub-mkrescue): Enable on loongson.
+       * util/grub-mkrescue.in: Handle loongson.
+
 2012-06-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/getroot.c (convert_system_partition_to_system_disk) [__APPLE__]:

diff --git a/Makefile.util.def b/Makefile.util.def
index 79430e60aad5d7a07229e2ebffce6271de1ffe62..b80187c81ba17d4dc7ce5d714ccc3c8efa22d8ea 100644 (file)
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -456,6 +456,7 @@ script = {
   name = grub-mkrescue;
   x86 = util/grub-mkrescue.in;
   mips_qemu_mips = util/grub-mkrescue.in;
+  mips_loongson = util/grub-mkrescue.in;
   ia64_efi = util/grub-mkrescue.in;
   powerpc_ieee1275 = util/powerpc/ieee1275/grub-mkrescue.in;
   enable = i386_pc;
@@ -465,6 +466,7 @@ script = {
   enable = i386_multiboot;
   enable = i386_coreboot;
   enable = mips_qemu_mips;
+  enable = mips_loongson;
   enable = ia64_efi;
   enable = powerpc_ieee1275;
 };

diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 2ba5f08253648592de2f92866c69ef761d710e52..f71099ee053274aef655021d949a382b4b0f07a8 100644 (file)
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -41,6 +41,7 @@ multiboot_dir="${libdir}/@PACKAGE@/i386-multiboot"
 coreboot_dir="${libdir}/@PACKAGE@/i386-coreboot"
 qemu_dir="${libdir}/@PACKAGE@/i386-qemu"
 mipsel_qemu_dir="${libdir}/@PACKAGE@/mipsel-qemu_mips"
+loongson_dir="${libdir}/@PACKAGE@/mipsel-loongson"
 mips_qemu_dir="${libdir}/@PACKAGE@/mips-qemu_mips"
 pc_dir="${libdir}/@PACKAGE@/i386-pc"
 efi32_dir="${libdir}/@PACKAGE@/i386-efi"
@@ -253,6 +254,9 @@ if [ "${override_dir}" = "" ] ; then
     if test -e "${mipsel_qemu_dir}" ; then
         process_input_dir "${mipsel_qemu_dir}" mipsel-qemu_mips
     fi
+    if test -e "${loongson_dir}" ; then
+        process_input_dir "${loongson_dir}" mipsel-loongson
+    fi
 else
     . "${override_dir}"/modinfo.sh
     process_input_dir "${override_dir}" ${grub_modinfo_target_cpu}-${grub_modinfo_platform}
@@ -265,6 +269,7 @@ else
     qemu_dir=
     mipsel_qemu_dir=
     mips_qemu_dir=
+    loongson_dir=
     case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
         i386-multiboot) multiboot_dir="${override_dir}" ;;
         i386-coreboot) coreboot_dir="${override_dir}" ;;
@@ -274,6 +279,7 @@ else
        x86_64-efi) efi64_dir="${override_dir}" ;;
        ia64-efi) ia64_dir="${override_dir}" ;;
        mipsel-qemu_mips) mipsel_qemu_dir="${override_dir}" ;;
+       mipsel-loongson) loongson_dir="${override_dir}" ;;
        mips-qemu_mips) mips_qemu_dir="${override_dir}" ;;
     esac
 fi
@@ -333,6 +339,21 @@ make_image "${mipsel_qemu_dir}" mipsel-qemu_mips-elf "${iso9660_dir}/boot/mipsel
 if [ -e "${iso9660_dir}/boot/mipsel-qemu_mips.elf" ] && [ -d "${rom_directory}" ]; then
     cp "${iso9660_dir}/boot/mipsel-qemu_mips.elf" "${rom_directory}/mipsel-qemu_mips.elf"
 fi
+
+make_image "${loongson_dir}" mipsel-loongson-elf "${iso9660_dir}/boot/mipsel-loongson.elf" "pata -C xz"
+if [ -e "${iso9660_dir}/boot/mipsel-loongson.elf" ] && [ -d "${rom_directory}" ]; then
+    cp "${iso9660_dir}/boot/mipsel-loongson.elf" "${rom_directory}/mipsel-loongson.elf"
+fi
+make_image "${loongson_dir}" mipsel-yeeloong-flash "${iso9660_dir}/boot/mipsel-yeeloong.bin" "pata -C xz"
+if [ -e "${iso9660_dir}/boot/mipsel-yeeloong.bin" ] && [ -d "${rom_directory}" ]; then
+    cp "${iso9660_dir}/boot/mipsel-yeeloong.bin" "${rom_directory}/mipsel-yeeloong.bin"
+fi
+
+make_image "${loongson_dir}" mipsel-fuloong2f-flash "${iso9660_dir}/boot/mipsel-fuloong2f.bin" "pata -C xz"
+if [ -e "${iso9660_dir}/boot/mipsel-fulong.bin" ] && [ -d "${rom_directory}" ]; then
+    cp "${iso9660_dir}/boot/mipsel-fulong.bin" "${rom_directory}/mipsel-fulong.bin"
+fi
+
 make_image "${mips_qemu_dir}" mips-qemu_mips-elf "${iso9660_dir}/boot/mips-qemu_mips.elf" "pata"
 if [ -e "${iso9660_dir}/boot/mips-qemu_mips.elf" ] && [ -d "${rom_directory}" ]; then
     cp "${iso9660_dir}/boot/mips-qemu_mips.elf" "${rom_directory}/mips-qemu_mips.elf"