API tools faq
paste
Advertisement
Guest User

configure diff -u

a guest
Aug 6th, 2014
195
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 20.66 KB | None | 0 0
raw download clone embed print report
  1. --- ../tools/configure 2014-08-06 20:49:53.859962076 +0300
  2. +++ ../tools/configure_git 2014-08-06 21:17:05.171502777 +0300
  3. @@ -128,8 +128,8 @@
  4. }
  5.  
  6. findarmgcc() {
  7. - prefixtools arm-none-eabi-
  8. - gccchoice="4.7.0"
  9. + prefixtools arm-elf-eabi-
  10. + gccchoice="4.4.4"
  11. }
  12.  
  13. # scan the $PATH for the given command
  14. @@ -258,7 +258,10 @@
  15. fibers=`check_fiber`
  16. endian="little" # windows is little endian
  17. echo "Enabling MMX support"
  18. - GCCOPTS="$GCCOPTS -mmmx"
  19. + # -mno-ms-bitfields is a workaround for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52991
  20. + # mingw-gcc >= 4.7 defaults to -mms-bitfields which breaks __attribute__((packed))
  21. + # disable it explicitly for the time being (it doesn't appear to be required for us)
  22. + GCCOPTS="$GCCOPTS -mmmx -mno-ms-bitfields"
  23. else
  24. case $uname in
  25. CYGWIN*)
  26. @@ -289,7 +292,7 @@
  27. FreeBSD)
  28. sigaltstack=`check_sigaltstack`
  29. echo "FreeBSD host detected"
  30. - LDOPTS="$LDOPTS -ldl"
  31. + LDOPTS="$LDOPTS"
  32. ;;
  33.  
  34. Darwin)
  35. @@ -330,13 +333,13 @@
  36. echo "don't have SDL (properly) installed. Please correct and"
  37. echo "re-run configure!"
  38. exit 2
  39. - else
  40. + else
  41. # generic sdl-config checker
  42. GCCOPTS="$GCCOPTS `$sdl --cflags`"
  43. LDOPTS="$LDOPTS `$sdl --libs`"
  44. fi
  45. fi
  46. -
  47. +
  48.  
  49. GCCOPTS="$GCCOPTS -I\$(SIMDIR)"
  50. # x86_64 supports MMX by default
  51. @@ -499,13 +502,6 @@
  52. endian="little"
  53. }
  54.  
  55. -armcortexm4 () {
  56. - findarmgcc
  57. - GCCOPTS="$CCOPTS -mthumb -march=armv7e-m -mtune=cortex-m4"
  58. - GCCOPTIMIZE="-fomit-frame-pointer" endian="little"
  59. - arch_profile="m"
  60. -}
  61. -
  62. mipselcc () {
  63. prefixtools mipsel-elf-
  64. # mips is predefined, but we want it for paths. use __mips instead
  65. @@ -677,11 +673,11 @@
  66. LDOPTS="$LDOPTS -Wl,-soname,librockbox.so -shared -ldl -llog"
  67. GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack -shared"
  68. ANDROID_ARCH=$1 # for android.make too
  69. + gccchoice="4.6"
  70. # arch dependant stuff
  71. case $ANDROID_ARCH in
  72. armeabi)
  73. endian="little"
  74. - gccchoice="4.4.3"
  75. gcctarget="arm-linux-androideabi-"
  76. # sigaltstack is not available in pre-android-9, however asm
  77. # threads work fine so far
  78. @@ -692,7 +688,6 @@
  79. ;;
  80. mips)
  81. endian="little"
  82. - gccchoice="4.4.3"
  83. gcctarget="mipsel-linux-android-"
  84. thread_support="HAVE_SIGALTSTACK_THREADS"
  85. GCCOPTS="$GCCOPTS -march=mips32 -mtune=r4600 -mno-mips16 -mno-long-calls -fomit-frame-pointer \
  86. @@ -700,8 +695,7 @@
  87. LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-14/arch-mips"
  88. ;;
  89. x86)
  90. - endian=little
  91. - gccchoice="4.4.3"
  92. + endian="little"
  93. gcctarget="i686-linux-android-"
  94. gccdir=x86-$gccchoice
  95. thread_support="HAVE_SIGALTSTACK_THREADS"
  96. @@ -1053,7 +1047,7 @@
  97. exit 4
  98. fi
  99. fi
  100. -
  101. +
  102. echo "Using $ENCODER for encoding voice clips"
  103.  
  104. # Read custom encoder options from command line
  105. @@ -1198,7 +1192,7 @@
  106. ARG_ARM_THUMB=
  107. ARG_PREFIX="$PREFIX"
  108. ARG_THREAD_SUPPORT=
  109. -err=
  110. +err=
  111. for arg in "$@"; do
  112. case "$arg" in
  113. --ccache) ARG_CCACHE=1;;
  114. @@ -1312,36 +1306,44 @@
  115. 34) M3/M3L 71) M:Robe 100 51) Sansa e200R
  116. 52) Sansa c200
  117. ==Creative== ==Philips== 53) Sansa m200
  118. - 90) Zen Vision:M 30GB 100) GoGear SA9200 54) Sansa c100
  119. - 91) Zen Vision:M 60GB 101) GoGear HDD1630/ 55) Sansa Clip
  120. - 92) Zen Vision HDD1830 56) Sansa e200v2
  121. - 93) Zen X-Fi2 102) GoGear HDD6330 57) Sansa m200v4
  122. - 94) Zen X-Fi3 58) Sansa Fuze
  123. - ==Meizu== 59) Sansa c200v2
  124. - ==Onda== 110) M6SL 60) Sansa Clipv2
  125. - 120) VX747 111) M6SP 61) Sansa View
  126. - 121) VX767 112) M3 62) Sansa Clip+
  127. - 122) VX747+ 63) Sansa Fuze v2
  128. - 123) VX777 ==Tatung== 64) Sansa Fuze+
  129. - 150) Elio TPJ-1022 65) Sansa Clip Zip
  130. - ==Samsung== 66) Sansa Connect
  131. - 140) YH-820 ==Packard Bell==
  132. - 141) YH-920 160) Vibe 500 ==Logik==
  133. - 142) YH-925 80) DAX 1GB MP3/DAB
  134. - 143) YP-S3 ==MPIO==
  135. - 170) HD200 ==Lyre project==
  136. - ==Application== 171) HD300 130) Lyre proto 1
  137. - 200) SDL 131) Mini2440
  138. - 201) Android ==ROCKCHIP==
  139. - 202) Nokia N8xx 180) rk27xx generic ==HiFiMAN==
  140. - 203) Nokia N900 190) HM-60x
  141. - 204) Pandora ==HiFi E.T.== 191) HM-801
  142. - 205) Samsung YP-R0 210) MA9
  143. - 206) Android MIPS ==Sony==
  144. - 207) Android x86 220) NWZ-E370 series
  145. - 221) NWZ-E360 series
  146. - ==User==
  147. - 222) Nautilus
  148. + 89) Zen X-Fi Style 100) GoGear SA9200 54) Sansa c100
  149. + 90) Zen Vision:M 30GB 101) GoGear HDD1630/ 55) Sansa Clip
  150. + 91) Zen Vision:M 60GB HDD1830 56) Sansa e200v2
  151. + 92) Zen Vision 102) GoGear HDD6330 57) Sansa m200v4
  152. + 93) Zen X-Fi2 58) Sansa Fuze
  153. + 94) Zen X-Fi3 ==Meizu== 59) Sansa c200v2
  154. + 96) Zen X-Fi 110) M6SL 60) Sansa Clipv2
  155. + 97) Zen X-Mozaic 111) M6SP 61) Sansa View
  156. + 98) Zen 112) M3 62) Sansa Clip+
  157. + 63) Sansa Fuze v2
  158. + ==Onda== ==Tatung== 64) Sansa Fuze+
  159. + 120) VX747 150) Elio TPJ-1022 65) Sansa Clip Zip
  160. + 121) VX767 66) Sansa Connect
  161. + 122) VX747+ ==Packard Bell==
  162. + 123) VX777 160) Vibe 500 ==Logik==
  163. + 80) DAX 1GB MP3/DAB
  164. + ==Samsung== ==MPIO==
  165. + 140) YH-820 170) HD200 ==Lyre project==
  166. + 141) YH-920 171) HD300 130) Lyre proto 1
  167. + 142) YH-925 131) Mini2440
  168. + 143) YP-S3
  169. + 144) YP-Z5 ==ROCKCHIP==
  170. + 180) rk27xx generic ==HiFiMAN==
  171. + ==Application== 190) HM-60x
  172. + 200) SDL ==HiFi E.T.== 191) HM-801
  173. + 201) Android 210) MA9
  174. + 202) Nokia N8xx 211) MA9C ==Sony==
  175. + 203) Nokia N900 212) MA8 220) NWZ-E370/E380 series
  176. + 204) Pandora 213) MA8C 221) NWZ-E360 series
  177. + 205) Samsung YP-R0
  178. + 206) Android MIPS
  179. + 207) Android x86
  180. + 208) Samsung YP-R1
  181. +
  182. +==IHIFI==
  183. + 230) 760
  184. + 231) 960
  185. +
  186. EOF
  187.  
  188. buildfor=`input`;
  189. @@ -1409,7 +1411,7 @@
  190. tool="$rootdir/tools/scramble"
  191. output="archos.mod"
  192. appextra="player:gui"
  193. - archosrom="$pwd/rombox.ucl"
  194. + #archosrom="$pwd/rombox.ucl"
  195. flash="$pwd/rockbox.ucl"
  196. plugins="yes"
  197. swcodec=""
  198. @@ -2036,7 +2038,7 @@
  199. t_manufacturer="tcc780x"
  200. t_model="cowond2"
  201. ;;
  202. -
  203. +
  204. 34|iaudiom3)
  205. target_id=37
  206. modelname="iaudiom3"
  207. @@ -2179,7 +2181,27 @@
  208. t_manufacturer="tcc77x"
  209. t_model="logikdax"
  210. ;;
  211. -
  212. +
  213. + 89|creativezenxfistyle)
  214. + target_id=94
  215. + modelname="creativezenxfistyle"
  216. + target="CREATIVE_ZENXFISTYLE"
  217. + memory=64
  218. + bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  219. + bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
  220. + tool="$rootdir/tools/scramble -add=zxfs"
  221. + output="rockbox.creative"
  222. + bootoutput="bootloader-zenxfistyle.creative"
  223. + appextra="gui:recorder:radio"
  224. + plugins="yes"
  225. + swcodec="yes"
  226. + toolset=$scramblebitmaptools
  227. + t_cpu="arm"
  228. + t_manufacturer="imx233"
  229. + t_model="creative-zen"
  230. + arm926ejscc
  231. + ;;
  232. +
  233. 90|zenvisionm30gb)
  234. target_id=35
  235. modelname="zenvisionm30gb"
  236. @@ -2202,7 +2224,7 @@
  237. t_manufacturer="tms320dm320"
  238. t_model="creative-zvm"
  239. ;;
  240. -
  241. +
  242. 91|zenvisionm60gb)
  243. target_id=40
  244. modelname="zenvisionm60gb"
  245. @@ -2225,7 +2247,7 @@
  246. t_manufacturer="tms320dm320"
  247. t_model="creative-zvm"
  248. ;;
  249. -
  250. +
  251. 92|zenvision)
  252. target_id=39
  253. modelname="zenvision"
  254. @@ -2280,7 +2302,7 @@
  255. output="rockbox.creative"
  256. bootoutput="bootloader-zenxfi3.creative"
  257. appextra="gui:recorder:radio"
  258. - plugins=""
  259. + plugins="yes"
  260. swcodec="yes"
  261. toolset=$scramblebitmaptools
  262. t_cpu="arm"
  263. @@ -2289,6 +2311,87 @@
  264. arm926ejscc
  265. ;;
  266.  
  267. + 95|creativezenv)
  268. + target_id=92
  269. + modelname="creativezenv"
  270. + target="CREATIVE_ZENV"
  271. + memory=32
  272. + bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  273. + bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
  274. + tool="$rootdir/tools/scramble -add=zenv"
  275. + output="rockbox.creative"
  276. + bootoutput="bootloader-zenv.creative"
  277. + appextra="radio:gui:recorder"
  278. + plugins=""
  279. + swcodec="yes"
  280. + toolset=$scramblebitmaptools
  281. + t_cpu="arm"
  282. + t_manufacturer="imx233"
  283. + t_model="creative-zen"
  284. + arm926ejscc
  285. + ;;
  286. +
  287. + 96|creativezenxfi)
  288. + target_id=86
  289. + modelname="creativezenxfi"
  290. + target="CREATIVE_ZENXFI"
  291. + memory=64
  292. + bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  293. + bmp2rb_native="$rootdir/tools/bmp2rb -f 9"
  294. + tool="$rootdir/tools/scramble -add=zxfi"
  295. + output="rockbox.creative"
  296. + bootoutput="bootloader-zenxfi.creative"
  297. + appextra="gui:recorder:radio"
  298. + plugins="yes"
  299. + swcodec="yes"
  300. + toolset=$scramblebitmaptools
  301. + t_cpu="arm"
  302. + t_manufacturer="imx233"
  303. + t_model="creative-zen"
  304. + arm926ejscc
  305. + ;;
  306. +
  307. + 97|creativezenmozaic)
  308. + target_id=87
  309. + modelname="creativezenmozaic"
  310. + target="CREATIVE_ZENMOZAIC"
  311. + memory=32
  312. + bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  313. + bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
  314. + tool="$rootdir/tools/scramble -add=zmoz"
  315. + output="rockbox.creative"
  316. + bootoutput="bootloader-zenmozaic.creative"
  317. + appextra="gui:recorder:radio"
  318. + plugins="yes"
  319. + swcodec="yes"
  320. + toolset=$scramblebitmaptools
  321. + t_cpu="arm"
  322. + t_manufacturer="imx233"
  323. + t_model="creative-zen"
  324. + arm926ejscc
  325. + ;;
  326. +
  327. + 98|creativezen)
  328. + target_id=90
  329. + modelname="creativezen"
  330. + target="CREATIVE_ZEN"
  331. + memory=32
  332. + bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  333. + bmp2rb_native="$rootdir/tools/bmp2rb -f 9"
  334. + tool="$rootdir/tools/scramble -add=zen"
  335. + output="rockbox.creative"
  336. + bootoutput="bootloader-zen.creative"
  337. + appextra="gui:recorder:radio"
  338. + plugins="yes"
  339. + swcodec="yes"
  340. + toolset=$scramblebitmaptools
  341. + t_cpu="arm"
  342. + t_manufacturer="imx233"
  343. + t_model="creative-zen"
  344. + arm926ejscc
  345. + ;;
  346. +
  347. +
  348. 50|sansae200)
  349. target_id=23
  350. modelname="sansae200"
  351. @@ -2392,9 +2495,9 @@
  352. ;;
  353.  
  354. 54|sansac100)
  355. - target_id=42
  356. - modelname="sansac100"
  357. - target="SANSA_C100"
  358. + target_id=42
  359. + modelname="sansac100"
  360. + target="SANSA_C100"
  361. memory=2
  362. arm946cc
  363. tool="$rootdir/tools/scramble -add=c100"
  364. @@ -2549,8 +2652,6 @@
  365. ;;
  366.  
  367. 61|sansaview)
  368. - echo "Sansa View is not yet supported!"
  369. - exit 1
  370. target_id=63
  371. modelname="sansaview"
  372. target="SANSA_VIEW"
  373. @@ -2794,7 +2895,7 @@
  374. t_manufacturer="s5l8700"
  375. t_model="meizu-m6sl"
  376. ;;
  377. -
  378. +
  379. 111|meizum6sp)
  380. target_id=46
  381. modelname="meizum6sp"
  382. @@ -2816,7 +2917,7 @@
  383. t_manufacturer="s5l8700"
  384. t_model="meizu-m6sp"
  385. ;;
  386. -
  387. +
  388. 112|meizum3)
  389. target_id=47
  390. modelname="meizum3"
  391. @@ -2838,7 +2939,7 @@
  392. t_manufacturer="s5l8700"
  393. t_model="meizu-m3"
  394. ;;
  395. -
  396. +
  397. 120|ondavx747)
  398. target_id=45
  399. modelname="ondavx747"
  400. @@ -2860,7 +2961,7 @@
  401. t_manufacturer="ingenic_jz47xx"
  402. t_model="onda_vx747"
  403. ;;
  404. -
  405. +
  406. 121|ondavx767)
  407. target_id=64
  408. modelname="ondavx767"
  409. @@ -2882,7 +2983,7 @@
  410. t_manufacturer="ingenic_jz47xx"
  411. t_model="onda_vx767"
  412. ;;
  413. -
  414. +
  415. 122|ondavx747p)
  416. target_id=54
  417. modelname="ondavx747p"
  418. @@ -2904,7 +3005,7 @@
  419. t_manufacturer="ingenic_jz47xx"
  420. t_model="onda_vx747"
  421. ;;
  422. -
  423. +
  424. 123|ondavx777)
  425. target_id=61
  426. modelname="ondavx777"
  427. @@ -2926,7 +3027,7 @@
  428. t_manufacturer="ingenic_jz47xx"
  429. t_model="onda_vx747"
  430. ;;
  431. -
  432. +
  433. 130|lyreproto1)
  434. target_id=56
  435. modelname="lyreproto1"
  436. @@ -2948,7 +3049,7 @@
  437. t_manufacturer="at91sam"
  438. t_model="lyre_proto1"
  439. ;;
  440. -
  441. +
  442. 131|mini2440)
  443. target_id=99
  444. modelname="mini2440"
  445. @@ -3067,7 +3168,27 @@
  446. t_manufacturer="s5l8700"
  447. t_model="yps3"
  448. ;;
  449. -
  450. +
  451. + 144|samsungypz5)
  452. + target_id=90
  453. + modelname="samsungypz5"
  454. + target="SAMSUNG_YPZ5"
  455. + memory=16
  456. + bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  457. + bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
  458. + tool="$rootdir/tools/scramble -add=ypz5"
  459. + output="rockbox.samsung"
  460. + bootoutput="bootloader-ypz5.samsung"
  461. + appextra="gui:recorder:radio"
  462. + plugins=""
  463. + swcodec="yes"
  464. + toolset=$scramblebitmaptools
  465. + t_cpu="arm"
  466. + t_manufacturer="imx233"
  467. + t_model="samsung-ypz5"
  468. + arm926ejscc
  469. + ;;
  470. +
  471. 160|vibe500)
  472. target_id=67
  473. modelname="vibe500"
  474. @@ -3221,7 +3342,7 @@
  475. tool="cp "
  476. boottool="cp "
  477. bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  478. - bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
  479. + bmp2rb_native="$rootdir/tools/bmp2rb -f 9"
  480. output="rockbox"
  481. bootoutput="rockbox"
  482. appextra="recorder:gui:radio"
  483. @@ -3353,7 +3474,7 @@
  484. tool="cp "
  485. boottool="cp "
  486. bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  487. - bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
  488. + bmp2rb_native="$rootdir/tools/bmp2rb -f 9"
  489. output="rockbox"
  490. bootoutput="rockbox"
  491. appextra="recorder:gui:radio"
  492. @@ -3421,6 +3542,30 @@
  493. t_model="app"
  494. ;;
  495.  
  496. + 208|samsungypr1)
  497. + application="yes"
  498. + target_id=93
  499. + modelname="samsungypr1"
  500. + target="SAMSUNG_YPR1"
  501. + memory=32
  502. + uname=`uname`
  503. + # Linux environment and CPU are the same as for R0, use the same gcc options
  504. + ypr0cc
  505. + tool="cp "
  506. + boottool="cp "
  507. + bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  508. + bmp2rb_native="$rootdir/tools/bmp2rb -f 9"
  509. + output="rockbox"
  510. + bootoutput="rockbox"
  511. + appextra="recorder:gui:radio"
  512. + plugins="yes"
  513. + swcodec="yes"
  514. + # architecture, manufacturer and model for the target-tree build
  515. + t_cpu="hosted"
  516. + t_manufacturer="samsungypr"
  517. + t_model="ypr1"
  518. + ;;
  519. +
  520. 210|hifietma9)
  521. target_id=83
  522. modelname="hifietma9"
  523. @@ -3444,6 +3589,75 @@
  524. t_model="ma"
  525. ;;
  526.  
  527. + 211|hifietma9c)
  528. + target_id=84
  529. + modelname="hifietma9c"
  530. + target="MA9C"
  531. + memory=16
  532. + arm7ejscc
  533. + tool="$rootdir/tools/scramble -rkw -modelnum=84"
  534. + bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  535. + bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
  536. + output="rockbox.rkw"
  537. + bootoutput="bootloader.rkw"
  538. + appextra="recorder:gui"
  539. + plugins=""
  540. + swcodec="yes"
  541. + # toolset is the tools within the tools directory that we build for
  542. + # this particular target.
  543. + toolset="$genericbitmaptools"
  544. + # architecture, manufacturer and model for the target-tree build
  545. + t_cpu="arm"
  546. + t_manufacturer="rk27xx"
  547. + t_model="ma"
  548. + ;;
  549. +
  550. + 212|hifietma8)
  551. + target_id=85
  552. + modelname="hifietma8"
  553. + target="MA8"
  554. + memory=16
  555. + arm7ejscc
  556. + tool="$rootdir/tools/scramble -rkw -modelnum=85"
  557. + bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  558. + bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
  559. + output="rockbox.rkw"
  560. + bootoutput="bootloader.rkw"
  561. + appextra="recorder:gui"
  562. + plugins=""
  563. + swcodec="yes"
  564. + # toolset is the tools within the tools directory that we build for
  565. + # this particular target.
  566. + toolset="$genericbitmaptools"
  567. + # architecture, manufacturer and model for the target-tree build
  568. + t_cpu="arm"
  569. + t_manufacturer="rk27xx"
  570. + t_model="ma"
  571. + ;;
  572. +
  573. + 213|hifietma8c)
  574. + target_id=91
  575. + modelname="hifietma8c"
  576. + target="MA8C"
  577. + memory=16
  578. + arm7ejscc
  579. + tool="$rootdir/tools/scramble -rkw -modelnum=91"
  580. + bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  581. + bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
  582. + output="rockbox.rkw"
  583. + bootoutput="bootloader.rkw"
  584. + appextra="recorder:gui"
  585. + plugins=""
  586. + swcodec="yes"
  587. + # toolset is the tools within the tools directory that we build for
  588. + # this particular target.
  589. + toolset="$genericbitmaptools"
  590. + # architecture, manufacturer and model for the target-tree build
  591. + t_cpu="arm"
  592. + t_manufacturer="rk27xx"
  593. + t_model="ma"
  594. + ;;
  595. +
  596. 220|sonynwze370)
  597. target_id=88
  598. modelname="sonynwze370"
  599. @@ -3455,7 +3669,7 @@
  600. output="rockbox.sony"
  601. bootoutput="bootloader-nwze370.sony"
  602. appextra="gui:recorder:radio"
  603. - plugins=""
  604. + plugins="yes"
  605. swcodec="yes"
  606. toolset=$scramblebitmaptools
  607. t_cpu="arm"
  608. @@ -3475,7 +3689,7 @@
  609. output="rockbox.sony"
  610. bootoutput="bootloader-nwze360.sony"
  611. appextra="gui:recorder:radio"
  612. - plugins=""
  613. + plugins="yes"
  614. swcodec="yes"
  615. toolset=$scramblebitmaptools
  616. t_cpu="arm"
  617. @@ -3484,25 +3698,50 @@
  618. arm926ejscc
  619. ;;
  620.  
  621. + 230|ihifi760)
  622. + target_id=92
  623. + modelname="ihifi760"
  624. + target="IHIFI760"
  625. + memory=16
  626. + arm7ejscc
  627. + tool="$rootdir/tools/scramble -rkw -modelnum=92"
  628. + bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  629. + bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
  630. + output="rockbox.rkw"
  631. + bootoutput="bootloader.rkw"
  632. + appextra="recorder:gui"
  633. + plugins=""
  634. + swcodec="yes"
  635. + # toolset is the tools within the tools directory that we build for
  636. + # this particular target.
  637. + toolset="$genericbitmaptools"
  638. + # architecture, manufacturer and model for the target-tree build
  639. + t_cpu="arm"
  640. + t_manufacturer="rk27xx"
  641. + t_model="ihifi"
  642. + ;;
  643.  
  644. - 222|Nautilus)
  645. - target_id=90
  646. - modelname="nautilus"
  647. - target="NAUTILUS"
  648. + 231|ihifi960)
  649. + target_id=93
  650. + modelname="ihifi960"
  651. + target="IHIFI960"
  652. memory=16
  653. + arm7ejscc
  654. + tool="$rootdir/tools/scramble -rkw -modelnum=93"
  655. bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  656. bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
  657. - tool="$rootdir/tools/scramble -add=stm"
  658. - output="nautilus.fw"
  659. - bootoutput="boot.stm"
  660. - appextra="gui:recorder"
  661. + output="rockbox.rkw"
  662. + bootoutput="bootloader.rkw"
  663. + appextra="recorder:gui"
  664. plugins=""
  665. swcodec="yes"
  666. - toolset=$scramblebitmaptools
  667. + # toolset is the tools within the tools directory that we build for
  668. + # this particular target.
  669. + toolset="$genericbitmaptools"
  670. + # architecture, manufacturer and model for the target-tree build
  671. t_cpu="arm"
  672. - t_manufacturer="ST"
  673. - t_model="nautilus"
  674. - armcortexm4
  675. + t_manufacturer="rk27xx"
  676. + t_model="ihifi"
  677. ;;
  678.  
  679. *)
  680. @@ -3900,7 +4139,7 @@
  681. arch="none"
  682. echo "Warning: Could not determine target arch"
  683. fi
  684. - if [ "$arch" != "none" ]; then
  685. + if [ "$arch" != "none" ]; then
  686. if [ -n "$arch_version" ]; then
  687. echo "Automatically selected arch: $arch (ver $arch_version)"
  688. else
  689. @@ -3920,11 +4159,6 @@
  690. Darch_version="#define ARCH_VERSION $arch_version"
  691. fi
  692.  
  693. -if [ -n "$arch_profile" ]; then
  694. - arch_profile="arch_profile_$arch_profile"
  695. - Darch_profile="#define ARCH_PROFILE $arch_profile"
  696. -fi
  697. -
  698. if test -n "$ccache"; then
  699. CC="$ccache $CC"
  700. fi
  701. @@ -3945,7 +4179,7 @@
  702. rbdir="/"$ARG_RBDIR
  703. else
  704. rbdir=$ARG_RBDIR
  705. - fi
  706. + fi
  707. echo "Using alternate rockbox dir: ${rbdir}"
  708. fi
  709.  
  710. @@ -3978,15 +4212,10 @@
  711. #define arch_amd64 6
  712. #define ARCH_AMD64 6
  713.  
  714. -#define arch_profile_m 0
  715. -#define ARCH_PROFILE_M 0
  716. -
  717. /* Define target machine architecture */
  718. #define ARCH ${arch}
  719. /* Optionally define architecture version */
  720. ${Darch_version}
  721. -/* Optionally define architecture profile */
  722. -${Darch_profile}
  723.  
  724. /* Define endianess for the target or simulator platform */
  725. #define ${defendian} 1
  726. @@ -4166,4 +4395,4 @@
  727. include \$(TOOLSDIR)/root.make
  728. EOF
  729.  
  730. -echo "Created Makefile"
  731. +echo "Created Makefile"
  732. \ No newline at end of file
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!