diff options
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 | |||
1624 | genericbitmaptools="$toolset bmp2rb" | 1624 | genericbitmaptools="$toolset bmp2rb" |
1625 | # scramble is used by all other targets | 1625 | # scramble is used by all other targets |
1626 | scramblebitmaptools="$genericbitmaptools scramble" | 1626 | scramblebitmaptools="$genericbitmaptools scramble" |
1627 | 1627 | # used by X1000 targets | |
1628 | x1000tools="$genericbitmaptools scramble mkspl-x1000 uclpack" | ||
1628 | 1629 | ||
1629 | # ---- For each target ---- | 1630 | # ---- For each target ---- |
1630 | # | 1631 | # |
@@ -4100,15 +4101,13 @@ fi | |||
4100 | appextra="recorder:gui" | 4101 | appextra="recorder:gui" |
4101 | plugins="yes" | 4102 | plugins="yes" |
4102 | tool="$rootdir/tools/scramble -add=fiiom3k " | 4103 | tool="$rootdir/tools/scramble -add=fiiom3k " |
4103 | boottool="$rootdir/tools/scramble -add=fiiom3k " | 4104 | boottool="" # not used |
4104 | spltool="$rootdir/tools/mkspl-x1000 -type=nand -ppb=2 -bpp=2 " | ||
4105 | output="rockbox.m3k" | 4105 | output="rockbox.m3k" |
4106 | bootoutput="bootloader.m3k" | 4106 | bootoutput="bootloader.m3k" |
4107 | sploutput="spl.m3k" | ||
4108 | sysfontbl="16-Terminus" | 4107 | sysfontbl="16-Terminus" |
4109 | # toolset is the tools within the tools directory that we build for | 4108 | # toolset is the tools within the tools directory that we build for |
4110 | # this particular target. | 4109 | # this particular target. |
4111 | toolset="$toolset mkspl-x1000" | 4110 | toolset="$x1000tools" |
4112 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" | 4111 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" |
4113 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" | 4112 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" |
4114 | # architecture, manufacturer and model for the target-tree build | 4113 | # architecture, manufacturer and model for the target-tree build |
@@ -4187,9 +4186,6 @@ case $modelname in | |||
4187 | sansae200) | 4186 | sansae200) |
4188 | gdbstub=", (E)raser" | 4187 | gdbstub=", (E)raser" |
4189 | ;; | 4188 | ;; |
4190 | fiiom3k) | ||
4191 | gdbstub=", (X) SPL loader" | ||
4192 | ;; | ||
4193 | *) | 4189 | *) |
4194 | ;; | 4190 | ;; |
4195 | esac | 4191 | esac |
@@ -4215,15 +4211,6 @@ fi | |||
4215 | bootloader="1" | 4211 | bootloader="1" |
4216 | echo "sansa eraser build selected" | 4212 | echo "sansa eraser build selected" |
4217 | ;; | 4213 | ;; |
4218 | [Xx]) | ||
4219 | appsdir='$(ROOTDIR)/bootloader' | ||
4220 | apps="bootloader" | ||
4221 | extradefines="$extradefines -DBOOTLOADER -DBOOTLOADER_SPL -ffunction-sections -fdata-sections" | ||
4222 | bootloader="1" | ||
4223 | tool="$spltool" | ||
4224 | output="$sploutput" | ||
4225 | echo "SPL bootloader build selected" | ||
4226 | ;; | ||
4227 | [Bb]) | 4214 | [Bb]) |
4228 | appsdir='$(ROOTDIR)/bootloader' | 4215 | appsdir='$(ROOTDIR)/bootloader' |
4229 | apps="bootloader" | 4216 | 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))) | |||
109 | include $(ROOTDIR)/firmware/target/hosted/aigo/erosq.make | 109 | include $(ROOTDIR)/firmware/target/hosted/aigo/erosq.make |
110 | else ifneq (,$(findstring fiio,$(APP_TYPE))) | 110 | else ifneq (,$(findstring fiio,$(APP_TYPE))) |
111 | include $(ROOTDIR)/firmware/target/hosted/fiio/fiio.make | 111 | include $(ROOTDIR)/firmware/target/hosted/fiio/fiio.make |
112 | else ifneq (,$(findstring ingenic_x1000,$(MANUFACTURER))) | ||
113 | include $(ROOTDIR)/firmware/target/mips/ingenic_x1000/x1000boot.make | ||
112 | else | 114 | else |
113 | include $(APPSDIR)/bootloader.make | 115 | include $(APPSDIR)/bootloader.make |
114 | endif | 116 | endif |