2 files changed, 35 insertions, 0 deletions

diff --git a/bootloader/x1000/boot.c b/bootloader/x1000/boot.c
index 60fb864d19..9e22192516 100644
--- a/bootloader/x1000/boot.c
+++ b/bootloader/x1000/boot.c
@@ -29,6 +29,10 @@
 #include "boot-x1000.h"
 #include <ctype.h>
 #include <sys/types.h>
+#if defined(EROS_QN)
+# include "lcd-x1000.c"
+# include "backlight-target.h"
+#endif
 
 void boot_rockbox(void)
 {
@@ -201,6 +205,24 @@ void boot_of_helper(uint32_t addr, uint32_t flash_size, const char* args)
 
     gui_shutdown();
 
+/* The Eros Q needs the LCD initialized in the bootloader */
+#if defined(EROS_QN)
+    /* enable LCD if it's not yet on, but keep the backlight off to avoid a white flash */
+    init_lcd();
+    backlight_hw_off();
+
+    /* TODO: this doesn't work for some reason */
+    //lcd_clear_display();
+    //lcd_update();
+    //lcd_wait_frame();
+
+    /* disable irq and dma */
+    lcd_enable(false);
+
+    /* set up LCD in a config compatible with OF */
+    lcd_tgt_enable_of(1);
+#endif
+
     x1000_dualboot_load_pdma_fw();
     x1000_dualboot_cleanup();
     x1000_dualboot_init_clocktree();
diff --git a/bootloader/x1000/x1000bootloader.h b/bootloader/x1000/x1000bootloader.h
index 1fba9a29a1..81c7f2aaa4 100644
--- a/bootloader/x1000/x1000bootloader.h
+++ b/bootloader/x1000/x1000bootloader.h
@@ -99,6 +99,19 @@ struct uimage_header;
 # define BL_QUIT_NAME       "POWER"
 # define BL_SCREENSHOT_NAME "MENU"
 # define BOOTBACKUP_FILE    "/erosqnative-boot.bin"
+# define OF_PLAYER_NAME     "Aigo Player"
+# define OF_PLAYER_ADDR     0x300000
+# define OF_PLAYER_LENGTH   (6 * 1024 * 1024)
+# define OF_PLAYER_ARGS     OF_RECOVERY_ARGS \
+    " init=/linuxrc ubi.mtd=4 root=ubi0:rootfs ubi.mtd=5 rootfstype=ubifs \
+sn_no=00000000000000000000000000000000 bt_mac=xxxxxxxxxxxx wifi_mac=xxxxxxxxxxxx rw"
+# define OF_PLAYER_BTN      BUTTON_PLAY
+/* Note: OF Recovery boots, but is otherwise untested. */
+//# define OF_RECOVERY_NAME   "Aigo Recovery"
+//# define OF_RECOVERY_ADDR   0x900000
+//# define OF_RECOVERY_LENGTH (7 * 1024 * 1024)
+# define OF_RECOVERY_ARGS \
+    "console=ttyS2,115200n8 mem=32M@0x0 no_console_suspend lpj=5009408 ip=off"
 #else
 # error "Missing keymap!"
 #endif