Guest User

configure diff

a guest
Aug 6th, 2014
214
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. 131,132c131,132
  2. < prefixtools arm-none-eabi-
  3. < gccchoice="4.7.0"
  4. ---
  5. > prefixtools arm-elf-eabi-
  6. > gccchoice="4.4.4"
  7. 261c261,264
  8. < GCCOPTS="$GCCOPTS -mmmx"
  9. ---
  10. > # -mno-ms-bitfields is a workaround for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52991
  11. > # mingw-gcc >= 4.7 defaults to -mms-bitfields which breaks __attribute__((packed))
  12. > # disable it explicitly for the time being (it doesn't appear to be required for us)
  13. > GCCOPTS="$GCCOPTS -mmmx -mno-ms-bitfields"
  14. 292c295
  15. < LDOPTS="$LDOPTS -ldl"
  16. ---
  17. > LDOPTS="$LDOPTS"
  18. 333c336
  19. < else
  20. ---
  21. > else
  22. 339c342
  23. <
  24. ---
  25. >
  26. 502,508d504
  27. < armcortexm4 () {
  28. < findarmgcc
  29. < GCCOPTS="$CCOPTS -mthumb -march=armv7e-m -mtune=cortex-m4"
  30. < GCCOPTIMIZE="-fomit-frame-pointer" endian="little"
  31. < arch_profile="m"
  32. < }
  33. <
  34. 679a676
  35. > gccchoice="4.6"
  36. 684d680
  37. < gccchoice="4.4.3"
  38. 695d690
  39. < gccchoice="4.4.3"
  40. 703,704c698
  41. < endian=little
  42. < gccchoice="4.4.3"
  43. ---
  44. > endian="little"
  45. 1056c1050
  46. <
  47. ---
  48. >
  49. 1201c1195
  50. < err=
  51. ---
  52. > err=
  53. 1315,1344c1309,1346
  54. < 90) Zen Vision:M 30GB 100) GoGear SA9200 54) Sansa c100
  55. < 91) Zen Vision:M 60GB 101) GoGear HDD1630/ 55) Sansa Clip
  56. < 92) Zen Vision HDD1830 56) Sansa e200v2
  57. < 93) Zen X-Fi2 102) GoGear HDD6330 57) Sansa m200v4
  58. < 94) Zen X-Fi3 58) Sansa Fuze
  59. < ==Meizu== 59) Sansa c200v2
  60. < ==Onda== 110) M6SL 60) Sansa Clipv2
  61. < 120) VX747 111) M6SP 61) Sansa View
  62. < 121) VX767 112) M3 62) Sansa Clip+
  63. < 122) VX747+ 63) Sansa Fuze v2
  64. < 123) VX777 ==Tatung== 64) Sansa Fuze+
  65. < 150) Elio TPJ-1022 65) Sansa Clip Zip
  66. < ==Samsung== 66) Sansa Connect
  67. < 140) YH-820 ==Packard Bell==
  68. < 141) YH-920 160) Vibe 500 ==Logik==
  69. < 142) YH-925 80) DAX 1GB MP3/DAB
  70. < 143) YP-S3 ==MPIO==
  71. < 170) HD200 ==Lyre project==
  72. < ==Application== 171) HD300 130) Lyre proto 1
  73. < 200) SDL 131) Mini2440
  74. < 201) Android ==ROCKCHIP==
  75. < 202) Nokia N8xx 180) rk27xx generic ==HiFiMAN==
  76. < 203) Nokia N900 190) HM-60x
  77. < 204) Pandora ==HiFi E.T.== 191) HM-801
  78. < 205) Samsung YP-R0 210) MA9
  79. < 206) Android MIPS ==Sony==
  80. < 207) Android x86 220) NWZ-E370 series
  81. < 221) NWZ-E360 series
  82. < ==User==
  83. < 222) Nautilus
  84. ---
  85. > 89) Zen X-Fi Style 100) GoGear SA9200 54) Sansa c100
  86. > 90) Zen Vision:M 30GB 101) GoGear HDD1630/ 55) Sansa Clip
  87. > 91) Zen Vision:M 60GB HDD1830 56) Sansa e200v2
  88. > 92) Zen Vision 102) GoGear HDD6330 57) Sansa m200v4
  89. > 93) Zen X-Fi2 58) Sansa Fuze
  90. > 94) Zen X-Fi3 ==Meizu== 59) Sansa c200v2
  91. > 96) Zen X-Fi 110) M6SL 60) Sansa Clipv2
  92. > 97) Zen X-Mozaic 111) M6SP 61) Sansa View
  93. > 98) Zen 112) M3 62) Sansa Clip+
  94. > 63) Sansa Fuze v2
  95. > ==Onda== ==Tatung== 64) Sansa Fuze+
  96. > 120) VX747 150) Elio TPJ-1022 65) Sansa Clip Zip
  97. > 121) VX767 66) Sansa Connect
  98. > 122) VX747+ ==Packard Bell==
  99. > 123) VX777 160) Vibe 500 ==Logik==
  100. > 80) DAX 1GB MP3/DAB
  101. > ==Samsung== ==MPIO==
  102. > 140) YH-820 170) HD200 ==Lyre project==
  103. > 141) YH-920 171) HD300 130) Lyre proto 1
  104. > 142) YH-925 131) Mini2440
  105. > 143) YP-S3
  106. > 144) YP-Z5 ==ROCKCHIP==
  107. > 180) rk27xx generic ==HiFiMAN==
  108. > ==Application== 190) HM-60x
  109. > 200) SDL ==HiFi E.T.== 191) HM-801
  110. > 201) Android 210) MA9
  111. > 202) Nokia N8xx 211) MA9C ==Sony==
  112. > 203) Nokia N900 212) MA8 220) NWZ-E370/E380 series
  113. > 204) Pandora 213) MA8C 221) NWZ-E360 series
  114. > 205) Samsung YP-R0
  115. > 206) Android MIPS
  116. > 207) Android x86
  117. > 208) Samsung YP-R1
  118. >
  119. > ==IHIFI==
  120. > 230) 760
  121. > 231) 960
  122. >
  123. 1412c1414
  124. < archosrom="$pwd/rombox.ucl"
  125. ---
  126. > #archosrom="$pwd/rombox.ucl"
  127. 2039c2041
  128. <
  129. ---
  130. >
  131. 2182c2184,2204
  132. <
  133. ---
  134. >
  135. > 89|creativezenxfistyle)
  136. > target_id=94
  137. > modelname="creativezenxfistyle"
  138. > target="CREATIVE_ZENXFISTYLE"
  139. > memory=64
  140. > bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  141. > bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
  142. > tool="$rootdir/tools/scramble -add=zxfs"
  143. > output="rockbox.creative"
  144. > bootoutput="bootloader-zenxfistyle.creative"
  145. > appextra="gui:recorder:radio"
  146. > plugins="yes"
  147. > swcodec="yes"
  148. > toolset=$scramblebitmaptools
  149. > t_cpu="arm"
  150. > t_manufacturer="imx233"
  151. > t_model="creative-zen"
  152. > arm926ejscc
  153. > ;;
  154. >
  155. 2205c2227
  156. <
  157. ---
  158. >
  159. 2228c2250
  160. <
  161. ---
  162. >
  163. 2283c2305
  164. < plugins=""
  165. ---
  166. > plugins="yes"
  167. 2291a2314,2394
  168. > 95|creativezenv)
  169. > target_id=92
  170. > modelname="creativezenv"
  171. > target="CREATIVE_ZENV"
  172. > memory=32
  173. > bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  174. > bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
  175. > tool="$rootdir/tools/scramble -add=zenv"
  176. > output="rockbox.creative"
  177. > bootoutput="bootloader-zenv.creative"
  178. > appextra="radio:gui:recorder"
  179. > plugins=""
  180. > swcodec="yes"
  181. > toolset=$scramblebitmaptools
  182. > t_cpu="arm"
  183. > t_manufacturer="imx233"
  184. > t_model="creative-zen"
  185. > arm926ejscc
  186. > ;;
  187. >
  188. > 96|creativezenxfi)
  189. > target_id=86
  190. > modelname="creativezenxfi"
  191. > target="CREATIVE_ZENXFI"
  192. > memory=64
  193. > bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  194. > bmp2rb_native="$rootdir/tools/bmp2rb -f 9"
  195. > tool="$rootdir/tools/scramble -add=zxfi"
  196. > output="rockbox.creative"
  197. > bootoutput="bootloader-zenxfi.creative"
  198. > appextra="gui:recorder:radio"
  199. > plugins="yes"
  200. > swcodec="yes"
  201. > toolset=$scramblebitmaptools
  202. > t_cpu="arm"
  203. > t_manufacturer="imx233"
  204. > t_model="creative-zen"
  205. > arm926ejscc
  206. > ;;
  207. >
  208. > 97|creativezenmozaic)
  209. > target_id=87
  210. > modelname="creativezenmozaic"
  211. > target="CREATIVE_ZENMOZAIC"
  212. > memory=32
  213. > bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  214. > bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
  215. > tool="$rootdir/tools/scramble -add=zmoz"
  216. > output="rockbox.creative"
  217. > bootoutput="bootloader-zenmozaic.creative"
  218. > appextra="gui:recorder:radio"
  219. > plugins="yes"
  220. > swcodec="yes"
  221. > toolset=$scramblebitmaptools
  222. > t_cpu="arm"
  223. > t_manufacturer="imx233"
  224. > t_model="creative-zen"
  225. > arm926ejscc
  226. > ;;
  227. >
  228. > 98|creativezen)
  229. > target_id=90
  230. > modelname="creativezen"
  231. > target="CREATIVE_ZEN"
  232. > memory=32
  233. > bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  234. > bmp2rb_native="$rootdir/tools/bmp2rb -f 9"
  235. > tool="$rootdir/tools/scramble -add=zen"
  236. > output="rockbox.creative"
  237. > bootoutput="bootloader-zen.creative"
  238. > appextra="gui:recorder:radio"
  239. > plugins="yes"
  240. > swcodec="yes"
  241. > toolset=$scramblebitmaptools
  242. > t_cpu="arm"
  243. > t_manufacturer="imx233"
  244. > t_model="creative-zen"
  245. > arm926ejscc
  246. > ;;
  247. >
  248. >
  249. 2395,2397c2498,2500
  250. < target_id=42
  251. < modelname="sansac100"
  252. < target="SANSA_C100"
  253. ---
  254. > target_id=42
  255. > modelname="sansac100"
  256. > target="SANSA_C100"
  257. 2552,2553d2654
  258. < echo "Sansa View is not yet supported!"
  259. < exit 1
  260. 2797c2898
  261. <
  262. ---
  263. >
  264. 2819c2920
  265. <
  266. ---
  267. >
  268. 2841c2942
  269. <
  270. ---
  271. >
  272. 2863c2964
  273. <
  274. ---
  275. >
  276. 2885c2986
  277. <
  278. ---
  279. >
  280. 2907c3008
  281. <
  282. ---
  283. >
  284. 2929c3030
  285. <
  286. ---
  287. >
  288. 2951c3052
  289. <
  290. ---
  291. >
  292. 3070c3171,3191
  293. <
  294. ---
  295. >
  296. > 144|samsungypz5)
  297. > target_id=90
  298. > modelname="samsungypz5"
  299. > target="SAMSUNG_YPZ5"
  300. > memory=16
  301. > bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  302. > bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
  303. > tool="$rootdir/tools/scramble -add=ypz5"
  304. > output="rockbox.samsung"
  305. > bootoutput="bootloader-ypz5.samsung"
  306. > appextra="gui:recorder:radio"
  307. > plugins=""
  308. > swcodec="yes"
  309. > toolset=$scramblebitmaptools
  310. > t_cpu="arm"
  311. > t_manufacturer="imx233"
  312. > t_model="samsung-ypz5"
  313. > arm926ejscc
  314. > ;;
  315. >
  316. 3224c3345
  317. < bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
  318. ---
  319. > bmp2rb_native="$rootdir/tools/bmp2rb -f 9"
  320. 3356c3477
  321. < bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
  322. ---
  323. > bmp2rb_native="$rootdir/tools/bmp2rb -f 9"
  324. 3423a3545,3568
  325. > 208|samsungypr1)
  326. > application="yes"
  327. > target_id=93
  328. > modelname="samsungypr1"
  329. > target="SAMSUNG_YPR1"
  330. > memory=32
  331. > uname=`uname`
  332. > # Linux environment and CPU are the same as for R0, use the same gcc options
  333. > ypr0cc
  334. > tool="cp "
  335. > boottool="cp "
  336. > bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  337. > bmp2rb_native="$rootdir/tools/bmp2rb -f 9"
  338. > output="rockbox"
  339. > bootoutput="rockbox"
  340. > appextra="recorder:gui:radio"
  341. > plugins="yes"
  342. > swcodec="yes"
  343. > # architecture, manufacturer and model for the target-tree build
  344. > t_cpu="hosted"
  345. > t_manufacturer="samsungypr"
  346. > t_model="ypr1"
  347. > ;;
  348. >
  349. 3446a3592,3660
  350. > 211|hifietma9c)
  351. > target_id=84
  352. > modelname="hifietma9c"
  353. > target="MA9C"
  354. > memory=16
  355. > arm7ejscc
  356. > tool="$rootdir/tools/scramble -rkw -modelnum=84"
  357. > bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  358. > bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
  359. > output="rockbox.rkw"
  360. > bootoutput="bootloader.rkw"
  361. > appextra="recorder:gui"
  362. > plugins=""
  363. > swcodec="yes"
  364. > # toolset is the tools within the tools directory that we build for
  365. > # this particular target.
  366. > toolset="$genericbitmaptools"
  367. > # architecture, manufacturer and model for the target-tree build
  368. > t_cpu="arm"
  369. > t_manufacturer="rk27xx"
  370. > t_model="ma"
  371. > ;;
  372. >
  373. > 212|hifietma8)
  374. > target_id=85
  375. > modelname="hifietma8"
  376. > target="MA8"
  377. > memory=16
  378. > arm7ejscc
  379. > tool="$rootdir/tools/scramble -rkw -modelnum=85"
  380. > bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  381. > bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
  382. > output="rockbox.rkw"
  383. > bootoutput="bootloader.rkw"
  384. > appextra="recorder:gui"
  385. > plugins=""
  386. > swcodec="yes"
  387. > # toolset is the tools within the tools directory that we build for
  388. > # this particular target.
  389. > toolset="$genericbitmaptools"
  390. > # architecture, manufacturer and model for the target-tree build
  391. > t_cpu="arm"
  392. > t_manufacturer="rk27xx"
  393. > t_model="ma"
  394. > ;;
  395. >
  396. > 213|hifietma8c)
  397. > target_id=91
  398. > modelname="hifietma8c"
  399. > target="MA8C"
  400. > memory=16
  401. > arm7ejscc
  402. > tool="$rootdir/tools/scramble -rkw -modelnum=91"
  403. > bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  404. > bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
  405. > output="rockbox.rkw"
  406. > bootoutput="bootloader.rkw"
  407. > appextra="recorder:gui"
  408. > plugins=""
  409. > swcodec="yes"
  410. > # toolset is the tools within the tools directory that we build for
  411. > # this particular target.
  412. > toolset="$genericbitmaptools"
  413. > # architecture, manufacturer and model for the target-tree build
  414. > t_cpu="arm"
  415. > t_manufacturer="rk27xx"
  416. > t_model="ma"
  417. > ;;
  418. >
  419. 3458c3672
  420. < plugins=""
  421. ---
  422. > plugins="yes"
  423. 3478c3692
  424. < plugins=""
  425. ---
  426. > plugins="yes"
  427. 3486a3701,3722
  428. > 230|ihifi760)
  429. > target_id=92
  430. > modelname="ihifi760"
  431. > target="IHIFI760"
  432. > memory=16
  433. > arm7ejscc
  434. > tool="$rootdir/tools/scramble -rkw -modelnum=92"
  435. > bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
  436. > bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
  437. > output="rockbox.rkw"
  438. > bootoutput="bootloader.rkw"
  439. > appextra="recorder:gui"
  440. > plugins=""
  441. > swcodec="yes"
  442. > # toolset is the tools within the tools directory that we build for
  443. > # this particular target.
  444. > toolset="$genericbitmaptools"
  445. > # architecture, manufacturer and model for the target-tree build
  446. > t_cpu="arm"
  447. > t_manufacturer="rk27xx"
  448. > t_model="ihifi"
  449. > ;;
  450. 3488,3491c3724,3727
  451. < 222|Nautilus)
  452. < target_id=90
  453. < modelname="nautilus"
  454. < target="NAUTILUS"
  455. ---
  456. > 231|ihifi960)
  457. > target_id=93
  458. > modelname="ihifi960"
  459. > target="IHIFI960"
  460. 3492a3729,3730
  461. > arm7ejscc
  462. > tool="$rootdir/tools/scramble -rkw -modelnum=93"
  463. 3495,3498c3733,3735
  464. < tool="$rootdir/tools/scramble -add=stm"
  465. < output="nautilus.fw"
  466. < bootoutput="boot.stm"
  467. < appextra="gui:recorder"
  468. ---
  469. > output="rockbox.rkw"
  470. > bootoutput="bootloader.rkw"
  471. > appextra="recorder:gui"
  472. 3501c3738,3741
  473. < toolset=$scramblebitmaptools
  474. ---
  475. > # toolset is the tools within the tools directory that we build for
  476. > # this particular target.
  477. > toolset="$genericbitmaptools"
  478. > # architecture, manufacturer and model for the target-tree build
  479. 3503,3505c3743,3744
  480. < t_manufacturer="ST"
  481. < t_model="nautilus"
  482. < armcortexm4
  483. ---
  484. > t_manufacturer="rk27xx"
  485. > t_model="ihifi"
  486. 3903c4142
  487. < if [ "$arch" != "none" ]; then
  488. ---
  489. > if [ "$arch" != "none" ]; then
  490. 3923,3927d4161
  491. < if [ -n "$arch_profile" ]; then
  492. < arch_profile="arch_profile_$arch_profile"
  493. < Darch_profile="#define ARCH_PROFILE $arch_profile"
  494. < fi
  495. <
  496. 3948c4182
  497. < fi
  498. ---
  499. > fi
  500. 3981,3983d4214
  501. < #define arch_profile_m 0
  502. < #define ARCH_PROFILE_M 0
  503. <
  504. 3988,3989d4218
  505. < /* Optionally define architecture profile */
  506. < ${Darch_profile}
  507. 4169c4398
  508. < echo "Created Makefile"
  509. ---
  510. > echo "Created Makefile"
  511. \ No newline at end of file
RAW Paste Data