diff options
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/configure | 92 | ||||
-rw-r--r-- | tools/root.make | 6 |
2 files changed, 76 insertions, 22 deletions
diff --git a/tools/configure b/tools/configure index f6fc50d905..4b2b1ce829 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -888,7 +888,6 @@ mipsellinuxcc () { | |||
888 | SHARED_LDFLAG="-shared" | 888 | SHARED_LDFLAG="-shared" |
889 | SHARED_CFLAGS='-fPIC -fvisibility=hidden' | 889 | SHARED_CFLAGS='-fPIC -fvisibility=hidden' |
890 | endian="little" | 890 | endian="little" |
891 | app_type="rocker" | ||
892 | thread_support="HAVE_SIGALTSTACK_THREADS" | 891 | thread_support="HAVE_SIGALTSTACK_THREADS" |
893 | 892 | ||
894 | # Include path | 893 | # Include path |
@@ -1244,7 +1243,7 @@ voiceconfig () { | |||
1244 | exit 4 | 1243 | exit 4 |
1245 | fi | 1244 | fi |
1246 | fi | 1245 | fi |
1247 | 1246 | ||
1248 | echo "Using $ENCODER for encoding voice clips" | 1247 | echo "Using $ENCODER for encoding voice clips" |
1249 | 1248 | ||
1250 | # Read custom encoder options from command line | 1249 | # Read custom encoder options from command line |
@@ -1392,7 +1391,7 @@ ARG_ARM_THUMB= | |||
1392 | ARG_PREFIX="$PREFIX" | 1391 | ARG_PREFIX="$PREFIX" |
1393 | ARG_THREAD_SUPPORT= | 1392 | ARG_THREAD_SUPPORT= |
1394 | ARG_32BIT= | 1393 | ARG_32BIT= |
1395 | err= | 1394 | err= |
1396 | for arg in "$@"; do | 1395 | for arg in "$@"; do |
1397 | case "$arg" in | 1396 | case "$arg" in |
1398 | --ccache) ARG_CCACHE=1;; | 1397 | --ccache) ARG_CCACHE=1;; |
@@ -1565,6 +1564,8 @@ cat <<EOF | |||
1565 | 229) NWZ-S750 series | 1564 | 229) NWZ-S750 series |
1566 | ==xDuoo== ==AgpTek== | 1565 | ==xDuoo== ==AgpTek== |
1567 | 241) X3 240) Rocker | 1566 | 241) X3 240) Rocker |
1567 | 242) X3II | ||
1568 | 243) X20 | ||
1568 | 1569 | ||
1569 | EOF | 1570 | EOF |
1570 | 1571 | ||
@@ -2260,7 +2261,7 @@ fi | |||
2260 | t_manufacturer="tcc780x" | 2261 | t_manufacturer="tcc780x" |
2261 | t_model="cowond2" | 2262 | t_model="cowond2" |
2262 | ;; | 2263 | ;; |
2263 | 2264 | ||
2264 | 34|iaudiom3) | 2265 | 34|iaudiom3) |
2265 | target_id=37 | 2266 | target_id=37 |
2266 | modelname="iaudiom3" | 2267 | modelname="iaudiom3" |
@@ -2403,7 +2404,7 @@ fi | |||
2403 | t_manufacturer="tcc77x" | 2404 | t_manufacturer="tcc77x" |
2404 | t_model="logikdax" | 2405 | t_model="logikdax" |
2405 | ;; | 2406 | ;; |
2406 | 2407 | ||
2407 | 89|creativezenxfistyle) | 2408 | 89|creativezenxfistyle) |
2408 | target_id=94 | 2409 | target_id=94 |
2409 | modelname="creativezenxfistyle" | 2410 | modelname="creativezenxfistyle" |
@@ -2446,7 +2447,7 @@ fi | |||
2446 | t_manufacturer="tms320dm320" | 2447 | t_manufacturer="tms320dm320" |
2447 | t_model="creative-zvm" | 2448 | t_model="creative-zvm" |
2448 | ;; | 2449 | ;; |
2449 | 2450 | ||
2450 | 91|zenvisionm60gb) | 2451 | 91|zenvisionm60gb) |
2451 | target_id=40 | 2452 | target_id=40 |
2452 | modelname="zenvisionm60gb" | 2453 | modelname="zenvisionm60gb" |
@@ -2469,7 +2470,7 @@ fi | |||
2469 | t_manufacturer="tms320dm320" | 2470 | t_manufacturer="tms320dm320" |
2470 | t_model="creative-zvm" | 2471 | t_model="creative-zvm" |
2471 | ;; | 2472 | ;; |
2472 | 2473 | ||
2473 | 92|zenvision) | 2474 | 92|zenvision) |
2474 | target_id=39 | 2475 | target_id=39 |
2475 | modelname="zenvision" | 2476 | modelname="zenvision" |
@@ -2717,9 +2718,9 @@ fi | |||
2717 | ;; | 2718 | ;; |
2718 | 2719 | ||
2719 | 54|sansac100) | 2720 | 54|sansac100) |
2720 | target_id=42 | 2721 | target_id=42 |
2721 | modelname="sansac100" | 2722 | modelname="sansac100" |
2722 | target="SANSA_C100" | 2723 | target="SANSA_C100" |
2723 | memory=2 | 2724 | memory=2 |
2724 | arm946cc | 2725 | arm946cc |
2725 | tool="$rootdir/tools/scramble -add=c100" | 2726 | tool="$rootdir/tools/scramble -add=c100" |
@@ -3117,7 +3118,7 @@ fi | |||
3117 | t_manufacturer="s5l8700" | 3118 | t_manufacturer="s5l8700" |
3118 | t_model="meizu-m6sl" | 3119 | t_model="meizu-m6sl" |
3119 | ;; | 3120 | ;; |
3120 | 3121 | ||
3121 | 111|meizum6sp) | 3122 | 111|meizum6sp) |
3122 | target_id=46 | 3123 | target_id=46 |
3123 | modelname="meizum6sp" | 3124 | modelname="meizum6sp" |
@@ -3139,7 +3140,7 @@ fi | |||
3139 | t_manufacturer="s5l8700" | 3140 | t_manufacturer="s5l8700" |
3140 | t_model="meizu-m6sp" | 3141 | t_model="meizu-m6sp" |
3141 | ;; | 3142 | ;; |
3142 | 3143 | ||
3143 | 112|meizum3) | 3144 | 112|meizum3) |
3144 | target_id=47 | 3145 | target_id=47 |
3145 | modelname="meizum3" | 3146 | modelname="meizum3" |
@@ -3161,7 +3162,7 @@ fi | |||
3161 | t_manufacturer="s5l8700" | 3162 | t_manufacturer="s5l8700" |
3162 | t_model="meizu-m3" | 3163 | t_model="meizu-m3" |
3163 | ;; | 3164 | ;; |
3164 | 3165 | ||
3165 | 120|ondavx747) | 3166 | 120|ondavx747) |
3166 | target_id=45 | 3167 | target_id=45 |
3167 | modelname="ondavx747" | 3168 | modelname="ondavx747" |
@@ -3183,7 +3184,7 @@ fi | |||
3183 | t_manufacturer="ingenic_jz47xx" | 3184 | t_manufacturer="ingenic_jz47xx" |
3184 | t_model="onda_vx747" | 3185 | t_model="onda_vx747" |
3185 | ;; | 3186 | ;; |
3186 | 3187 | ||
3187 | 121|ondavx767) | 3188 | 121|ondavx767) |
3188 | target_id=64 | 3189 | target_id=64 |
3189 | modelname="ondavx767" | 3190 | modelname="ondavx767" |
@@ -3205,7 +3206,7 @@ fi | |||
3205 | t_manufacturer="ingenic_jz47xx" | 3206 | t_manufacturer="ingenic_jz47xx" |
3206 | t_model="onda_vx767" | 3207 | t_model="onda_vx767" |
3207 | ;; | 3208 | ;; |
3208 | 3209 | ||
3209 | 122|ondavx747p) | 3210 | 122|ondavx747p) |
3210 | target_id=54 | 3211 | target_id=54 |
3211 | modelname="ondavx747p" | 3212 | modelname="ondavx747p" |
@@ -3227,7 +3228,7 @@ fi | |||
3227 | t_manufacturer="ingenic_jz47xx" | 3228 | t_manufacturer="ingenic_jz47xx" |
3228 | t_model="onda_vx747" | 3229 | t_model="onda_vx747" |
3229 | ;; | 3230 | ;; |
3230 | 3231 | ||
3231 | 123|ondavx777) | 3232 | 123|ondavx777) |
3232 | target_id=61 | 3233 | target_id=61 |
3233 | modelname="ondavx777" | 3234 | modelname="ondavx777" |
@@ -3249,7 +3250,7 @@ fi | |||
3249 | t_manufacturer="ingenic_jz47xx" | 3250 | t_manufacturer="ingenic_jz47xx" |
3250 | t_model="onda_vx747" | 3251 | t_model="onda_vx747" |
3251 | ;; | 3252 | ;; |
3252 | 3253 | ||
3253 | 130|lyreproto1) | 3254 | 130|lyreproto1) |
3254 | target_id=56 | 3255 | target_id=56 |
3255 | modelname="lyreproto1" | 3256 | modelname="lyreproto1" |
@@ -3271,7 +3272,7 @@ fi | |||
3271 | t_manufacturer="at91sam" | 3272 | t_manufacturer="at91sam" |
3272 | t_model="lyre_proto1" | 3273 | t_model="lyre_proto1" |
3273 | ;; | 3274 | ;; |
3274 | 3275 | ||
3275 | 131|mini2440) | 3276 | 131|mini2440) |
3276 | target_id=99 | 3277 | target_id=99 |
3277 | modelname="mini2440" | 3278 | modelname="mini2440" |
@@ -3390,7 +3391,7 @@ fi | |||
3390 | t_manufacturer="s5l8700" | 3391 | t_manufacturer="s5l8700" |
3391 | t_model="yps3" | 3392 | t_model="yps3" |
3392 | ;; | 3393 | ;; |
3393 | 3394 | ||
3394 | 144|samsungypz5) | 3395 | 144|samsungypz5) |
3395 | target_id=90 | 3396 | target_id=90 |
3396 | modelname="samsungypz5" | 3397 | modelname="samsungypz5" |
@@ -4226,10 +4227,11 @@ fi | |||
4226 | 4227 | ||
4227 | 240|agptekrocker) | 4228 | 240|agptekrocker) |
4228 | application="yes" | 4229 | application="yes" |
4230 | app_type="rocker" | ||
4229 | target_id=97 | 4231 | target_id=97 |
4230 | modelname="agptekrocker" | 4232 | modelname="agptekrocker" |
4231 | target="AGPTEK_ROCKER" | 4233 | target="AGPTEK_ROCKER" |
4232 | memory=6 | 4234 | memory=8 |
4233 | tool="cp " | 4235 | tool="cp " |
4234 | boottool="cp " | 4236 | boottool="cp " |
4235 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" | 4237 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" |
@@ -4268,6 +4270,52 @@ fi | |||
4268 | t_model="xduoo_x3" | 4270 | t_model="xduoo_x3" |
4269 | ;; | 4271 | ;; |
4270 | 4272 | ||
4273 | 242|xduoox3ii) | ||
4274 | target_id=110 | ||
4275 | application=yes | ||
4276 | app_type="xduoo" | ||
4277 | modelname="xduoox3ii" | ||
4278 | target="XDUOO_X3II" | ||
4279 | memory=8 | ||
4280 | mipsellinuxcc | ||
4281 | tool="cp " | ||
4282 | boottool="cp " | ||
4283 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" | ||
4284 | bmp2rb_native="$rootdir/tools/bmp2rb -f 10" | ||
4285 | output="rockbox.x3ii" | ||
4286 | bootoutput="bootloader.x3ii" | ||
4287 | appextra="recorder:gui:hosted" | ||
4288 | plugins="yes" | ||
4289 | swcodec="yes" | ||
4290 | # architecture, manufacturer and model for the target-tree build | ||
4291 | t_cpu="hosted" | ||
4292 | t_manufacturer="xduoo" | ||
4293 | t_model="xduoo_x3ii" | ||
4294 | ;; | ||
4295 | |||
4296 | 243|xduoox20) | ||
4297 | target_id=111 | ||
4298 | application=yes | ||
4299 | app_type="xduoo" | ||
4300 | modelname="xduoox20" | ||
4301 | target="XDUOO_X20" | ||
4302 | memory=8 | ||
4303 | mipsellinuxcc | ||
4304 | tool="cp " | ||
4305 | boottool="cp " | ||
4306 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" | ||
4307 | bmp2rb_native="$rootdir/tools/bmp2rb -f 10" | ||
4308 | output="rockbox.x20" | ||
4309 | bootoutput="bootloader.x20" | ||
4310 | appextra="recorder:gui:hosted" | ||
4311 | plugins="yes" | ||
4312 | swcodec="yes" | ||
4313 | # architecture, manufacturer and model for the target-tree build | ||
4314 | t_cpu="hosted" | ||
4315 | t_manufacturer="xduoo" | ||
4316 | t_model="xduoo_x20" | ||
4317 | ;; | ||
4318 | |||
4271 | 250|ihifi770c) | 4319 | 250|ihifi770c) |
4272 | target_id=107 | 4320 | target_id=107 |
4273 | modelname="ihifi770c" | 4321 | modelname="ihifi770c" |
@@ -4749,7 +4797,7 @@ if [ -z "$arch" ]; then | |||
4749 | arch="none" | 4797 | arch="none" |
4750 | echo "Warning: Could not determine target arch" | 4798 | echo "Warning: Could not determine target arch" |
4751 | fi | 4799 | fi |
4752 | if [ "$arch" != "none" ]; then | 4800 | if [ "$arch" != "none" ]; then |
4753 | if [ -n "$arch_version" ]; then | 4801 | if [ -n "$arch_version" ]; then |
4754 | echo "Automatically selected arch: $arch (ver $arch_version)" | 4802 | echo "Automatically selected arch: $arch (ver $arch_version)" |
4755 | else | 4803 | else |
@@ -4789,7 +4837,7 @@ if [ "$ARG_RBDIR" != "" ]; then | |||
4789 | rbdir="/"$ARG_RBDIR | 4837 | rbdir="/"$ARG_RBDIR |
4790 | else | 4838 | else |
4791 | rbdir=$ARG_RBDIR | 4839 | rbdir=$ARG_RBDIR |
4792 | fi | 4840 | fi |
4793 | echo "Using alternate rockbox dir: ${rbdir}" | 4841 | echo "Using alternate rockbox dir: ${rbdir}" |
4794 | fi | 4842 | fi |
4795 | 4843 | ||
diff --git a/tools/root.make b/tools/root.make index 72039335da..412dbbc97b 100644 --- a/tools/root.make +++ b/tools/root.make | |||
@@ -105,6 +105,8 @@ ifneq (,$(findstring bootloader,$(APPSDIR))) | |||
105 | include $(ROOTDIR)/firmware/target/hosted/sonynwz/sonynwz.make | 105 | include $(ROOTDIR)/firmware/target/hosted/sonynwz/sonynwz.make |
106 | else ifneq (,$(findstring rocker,$(APP_TYPE))) | 106 | else ifneq (,$(findstring rocker,$(APP_TYPE))) |
107 | include $(ROOTDIR)/firmware/target/hosted/agptek/rocker.make | 107 | include $(ROOTDIR)/firmware/target/hosted/agptek/rocker.make |
108 | else ifneq (,$(findstring xduoo,$(APP_TYPE))) | ||
109 | include $(ROOTDIR)/firmware/target/hosted/xduoo/xduoo.make | ||
108 | else | 110 | else |
109 | include $(APPSDIR)/bootloader.make | 111 | include $(APPSDIR)/bootloader.make |
110 | endif | 112 | endif |
@@ -149,6 +151,10 @@ else # core | |||
149 | include $(ROOTDIR)/firmware/target/hosted/agptek/rocker.make | 151 | include $(ROOTDIR)/firmware/target/hosted/agptek/rocker.make |
150 | endif | 152 | endif |
151 | 153 | ||
154 | ifneq (,$(findstring xduoo,$(APP_TYPE))) | ||
155 | include $(ROOTDIR)/firmware/target/hosted/xduoo/xduoo.make | ||
156 | endif | ||
157 | |||
152 | ifneq (,$(findstring android_ndk, $(APP_TYPE))) | 158 | ifneq (,$(findstring android_ndk, $(APP_TYPE))) |
153 | include $(ROOTDIR)/firmware/target/hosted/ibasso/android_ndk.make | 159 | include $(ROOTDIR)/firmware/target/hosted/ibasso/android_ndk.make |
154 | else | 160 | else |