diff --git a/include/grub/mips/kernel.h b/include/grub/mips/kernel.h
index 8b68f7b6b..ee759f10b 100644
--- a/include/grub/mips/kernel.h
+++ b/include/grub/mips/kernel.h
@@ -41,21 +41,8 @@
 #define GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE GRUB_KERNEL_CPU_TOTAL_MODULE_SIZE
 #define GRUB_KERNEL_MACHINE_COMPRESSED_SIZE GRUB_KERNEL_CPU_COMPRESSED_SIZE
 
-#define GRUB_PLATFORM_IMAGE_FORMATS     "raw, elf"
-#define GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT     "raw"
-
-#define GRUB_PLATFORM_IMAGE_DEFAULT GRUB_PLATFORM_IMAGE_RAW
-
 #ifndef ASM_FILE
 
-typedef enum {
-  GRUB_PLATFORM_IMAGE_RAW,
-  GRUB_PLATFORM_IMAGE_ELF
-}
-  grub_platform_image_format_t;
-#define GRUB_PLATFORM_IMAGE_RAW GRUB_PLATFORM_IMAGE_RAW
-#define GRUB_PLATFORM_IMAGE_ELF GRUB_PLATFORM_IMAGE_ELF
-
 /* The prefix which points to the directory where GRUB modules and its
    configuration file are located.  */
 extern char grub_prefix[];
diff --git a/include/grub/mips/qemu-mips/kernel.h b/include/grub/mips/qemu-mips/kernel.h
index dbf74c1b2..cc6169d5f 100644
--- a/include/grub/mips/qemu-mips/kernel.h
+++ b/include/grub/mips/qemu-mips/kernel.h
@@ -31,6 +31,21 @@ void EXPORT_FUNC (grub_halt) (void);
    configuration file are located.  */
 extern char grub_prefix[];
 
+#define GRUB_PLATFORM_IMAGE_FORMATS     "raw, elf"
+#define GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT     "raw"
+
+#define GRUB_PLATFORM_IMAGE_DEFAULT GRUB_PLATFORM_IMAGE_RAW
+
+#ifndef ASM_FILE
+
+typedef enum {
+  GRUB_PLATFORM_IMAGE_RAW,
+  GRUB_PLATFORM_IMAGE_ELF
+}
+  grub_platform_image_format_t;
+#define GRUB_PLATFORM_IMAGE_RAW GRUB_PLATFORM_IMAGE_RAW
+#define GRUB_PLATFORM_IMAGE_ELF GRUB_PLATFORM_IMAGE_ELF
+
 #endif
 
 #endif /* ! GRUB_KERNEL_MACHINE_HEADER */
diff --git a/include/grub/mips/yeeloong/kernel.h b/include/grub/mips/yeeloong/kernel.h
index 230455dbf..05fe0eb55 100644
--- a/include/grub/mips/yeeloong/kernel.h
+++ b/include/grub/mips/yeeloong/kernel.h
@@ -27,6 +27,19 @@
 void EXPORT_FUNC (grub_reboot) (void);
 void EXPORT_FUNC (grub_halt) (void);
 
+#define GRUB_PLATFORM_IMAGE_FORMATS     "yeeloong_flash, elf"
+#define GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT     "yeeloong_flash"
+
+#define GRUB_PLATFORM_IMAGE_DEFAULT GRUB_PLATFORM_IMAGE_YEELOONG_FLASH
+
+typedef enum {
+  GRUB_PLATFORM_IMAGE_YEELOONG_FLASH,
+  GRUB_PLATFORM_IMAGE_ELF
+}
+  grub_platform_image_format_t;
+#define GRUB_PLATFORM_IMAGE_YEELOONG_FLASH GRUB_PLATFORM_IMAGE_YEELOONG_FLASH
+#define GRUB_PLATFORM_IMAGE_ELF GRUB_PLATFORM_IMAGE_ELF
+
 #endif
 
 #endif /* ! GRUB_KERNEL_MACHINE_HEADER */
diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index 7babbef6a..67bd64a1b 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -569,6 +569,11 @@ main (int argc, char *argv[])
 
 #ifdef GRUB_PLATFORM_IMAGE_DEFAULT
 	  case 'O':
+#ifdef GRUB_PLATFORM_IMAGE_YEELOONG_FLASH
+	    if (strcmp (optarg, "yeeloong_flash") == 0)
+	      format = GRUB_PLATFORM_IMAGE_YEELOONG_FLASH;
+	    else 
+#endif
 #ifdef GRUB_PLATFORM_IMAGE_RAW
 	    if (strcmp (optarg, "raw") == 0)
 	      format = GRUB_PLATFORM_IMAGE_RAW;