x1000: remove the last vestiges of boot option support

There should be no need for any compatibility hacks since this
value was mostly used internally between the SPL and bootloader.
clk_init() was the only user in the main Rockbox binary which
accessed it, but when loaded by the Rockbox bootloader that code
will not be reached since BOOT_FLAG_CLK_INIT is already set.

Change-Id: Idd68b9834172e652b47432bfb1e00c923ea35407

1 files changed, 0 insertions, 24 deletions

diff --git a/firmware/target/mips/ingenic_x1000/boot-x1000.h b/firmware/target/mips/ingenic_x1000/boot-x1000.h
index fa918a3ead..1b7a0db1e9 100644
--- a/firmware/target/mips/ingenic_x1000/boot-x1000.h
+++ b/firmware/target/mips/ingenic_x1000/boot-x1000.h
@@ -28,16 +28,6 @@
 #include <stddef.h>
 
 enum {
-    BOOT_OPTION_ROCKBOX = 0,
-    BOOT_OPTION_OFW_PLAYER,
-    BOOT_OPTION_OFW_RECOVERY,
-};
-
-enum {
-    /* 3 bits to store the boot option selected by the SPL */
-    BOOT_OPTION_MASK  = 0x7,
-    BOOT_OPTION_SHIFT = 0,
-
     /* Set after running clk_init() and setting up system clocks */
     BOOT_FLAG_CLK_INIT = (1 << 31),
 
@@ -88,18 +78,4 @@ static inline void clr_boot_flag(uint32_t bit)
     cpm_scratch_set(REG_CPM_SCRATCH & ~bit);
 }
 
-static inline void set_boot_option(int opt)
-{
-    uint32_t r = REG_CPM_SCRATCH;
-    r &= ~(BOOT_OPTION_MASK << BOOT_OPTION_SHIFT);
-    r |= (opt & BOOT_OPTION_MASK) << BOOT_OPTION_SHIFT;
-    cpm_scratch_set(r);
-}
-
-static inline int get_boot_option(void)
-{
-    uint32_t r = REG_CPM_SCRATCH;
-    return (r >> BOOT_OPTION_SHIFT) & BOOT_OPTION_MASK;
-}
-
 #endif /* __BOOT_X1000_H__ */