diff options
| author | Aidan MacDonald <amachronic@protonmail.com> | 2021-05-11 13:28:43 +0100 |
|---|---|---|
| committer | Aidan MacDonald <amachronic@protonmail.com> | 2021-05-12 10:35:20 +0000 |
| commit | 3f26fcf34001197ed267fa1ad549095aae49c88e (patch) | |
| tree | c81ab3298a349d1156e905d467492b603236f74d /tools | |
| parent | cc22df198d0ccb64dfdfe0c2f247f7d86b7fd750 (diff) | |
FiiO M3K: New bootloader
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
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/configure | 21 | ||||
| -rw-r--r-- | tools/root.make | 2 |
2 files changed, 6 insertions, 17 deletions
diff --git a/tools/configure b/tools/configure index f1aa03fd08..9539dc687c 100755 --- a/tools/configure +++ b/tools/configure @@ -1624,7 +1624,8 @@ fi genericbitmaptools="$toolset bmp2rb" # scramble is used by all other targets scramblebitmaptools="$genericbitmaptools scramble" - + # used by X1000 targets + x1000tools="$genericbitmaptools scramble mkspl-x1000 uclpack" # ---- For each target ---- # @@ -4100,15 +4101,13 @@ fi appextra="recorder:gui" plugins="yes" tool="$rootdir/tools/scramble -add=fiiom3k " - boottool="$rootdir/tools/scramble -add=fiiom3k " - spltool="$rootdir/tools/mkspl-x1000 -type=nand -ppb=2 -bpp=2 " + boottool="" # not used output="rockbox.m3k" bootoutput="bootloader.m3k" - sploutput="spl.m3k" sysfontbl="16-Terminus" # toolset is the tools within the tools directory that we build for # this particular target. - toolset="$toolset mkspl-x1000" + toolset="$x1000tools" bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" bmp2rb_native="$rootdir/tools/bmp2rb -f 4" # architecture, manufacturer and model for the target-tree build @@ -4187,9 +4186,6 @@ case $modelname in sansae200) gdbstub=", (E)raser" ;; - fiiom3k) - gdbstub=", (X) SPL loader" - ;; *) ;; esac @@ -4215,15 +4211,6 @@ fi bootloader="1" echo "sansa eraser build selected" ;; - [Xx]) - appsdir='$(ROOTDIR)/bootloader' - apps="bootloader" - extradefines="$extradefines -DBOOTLOADER -DBOOTLOADER_SPL -ffunction-sections -fdata-sections" - bootloader="1" - tool="$spltool" - output="$sploutput" - echo "SPL bootloader build selected" - ;; [Bb]) appsdir='$(ROOTDIR)/bootloader' apps="bootloader" diff --git a/tools/root.make b/tools/root.make index 70f81c0165..22834b3324 100644 --- a/tools/root.make +++ b/tools/root.make @@ -109,6 +109,8 @@ ifneq (,$(findstring bootloader,$(APPSDIR))) include $(ROOTDIR)/firmware/target/hosted/aigo/erosq.make else ifneq (,$(findstring fiio,$(APP_TYPE))) include $(ROOTDIR)/firmware/target/hosted/fiio/fiio.make + else ifneq (,$(findstring ingenic_x1000,$(MANUFACTURER))) + include $(ROOTDIR)/firmware/target/mips/ingenic_x1000/x1000boot.make else include $(APPSDIR)/bootloader.make endif |