FiiO M3K: New bootloaderbootloader_fiiom3k_v1

SPL and UCL-compressed bootloader are now packed into one output,
bootloader.m3k, eliminating the separate SPL build phase.

The Rockbox bootloader now has a recovery menu, accessible by
holding VOL+ when booting, that lets you back up, restore, and
update the bootloader from the device.

Change-Id: I642c6e5fb83587a013ab2fbfd1adab439561ced2

1 files changed, 3 insertions, 8 deletions

diff --git a/firmware/target/mips/ingenic_x1000/spl-x1000.h b/firmware/target/mips/ingenic_x1000/spl-x1000.h
index d2255a8d05..062cb40f88 100644
--- a/firmware/target/mips/ingenic_x1000/spl-x1000.h
+++ b/firmware/target/mips/ingenic_x1000/spl-x1000.h
@@ -22,10 +22,7 @@
 #ifndef __SPL_X1000_H__
 #define __SPL_X1000_H__
 
-#include "spl-x1000-defs.h"
-
-#define SPL_ARGUMENTS ((struct x1000_spl_arguments*)SPL_ARGUMENTS_ADDRESS)
-#define SPL_STATUS    ((struct x1000_spl_status*)SPL_STATUS_ADDRESS)
+#include <stdint.h>
 
 struct spl_boot_option {
     uint32_t nand_addr;
@@ -35,15 +32,13 @@ struct spl_boot_option {
     const char* cmdline; /* for Linux */
 };
 
-/* Defined by target, indices are 0 = ROCKBOX, 1 = ORIG_FW, etc... */
+/* Defined by target, order is not important */
 extern const struct spl_boot_option spl_boot_options[];
 
 /* Called on a fatal error */
 extern void spl_error(void) __attribute__((noreturn));
 
-/* When SPL boots with SPL_BOOTOPTION_CHOOSE, this function is invoked
- * to let the target figure out the boot option based on buttons the
- * user is pressing */
+/* Invoked by SPL main routine to determine the boot option */
 extern int spl_get_boot_option(void);
 
 /* Do any setup/initialization needed for the given boot option, this