Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'upstream'

  • Loading branch information...
commit 400a834ca7b8eed08b59d95d4daa77014dc3d887 2 parents 45ba31c + 94f70d5
@fhunleth fhunleth authored
Showing with 6,883 additions and 2,626 deletions.
  1. +69 −0 CHANGES
  2. +2 −0  Config.in
  3. +21 −7 Makefile
  4. +26 −0 board/armadeus/apf9328/linux-3.1.1-0001-fixes_arm_mach-types_for_apf9328.patch
  5. +16 −0 board/armadeus/apf9328/linux-3.1.1-0002-add_missing_config_option_for_apf9328.patch
  6. 0  board/qemu/arm-versatile/{linux-3.1.config → linux-3.2.config}
  7. +1 −1  board/qemu/arm-versatile/readme.txt
  8. +76 −0 board/qemu/mips-malta/linux-3.2.config
  9. +7 −0 board/qemu/mips-malta/readme.txt
  10. 0  board/qemu/mipsel-malta/{linux-3.1.config → linux-3.2.config}
  11. +1 −1  board/qemu/mipsel-malta/readme.txt
  12. 0  board/qemu/sh4-r2d/{linux-3.1.config → linux-3.2.config}
  13. 0  board/qemu/{x86_64/linux-3.1.config → x86/linux-3.2.config}
  14. 0  board/qemu/{x86/linux-3.1.config → x86_64/linux-3.2.config}
  15. +3 −2 boot/Config.in
  16. +10 −1 boot/at91bootstrap/Config.in
  17. +299 −0 boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch
  18. +9 −0 boot/at91bootstrap/at91bootstrap.mk
  19. +1 −1  boot/at91dataflashboot/Config.in
  20. +10 −10 boot/barebox/Config.in
  21. +10 −0 boot/lpc32xxcdl/Config.in
  22. +52 −0 boot/lpc32xxcdl/lpc32xxcdl-2.11-compiler_name.patch
  23. +969 −0 boot/lpc32xxcdl/lpc32xxcdl-2.11-delete_redundant_files.patch
  24. +188 −0 boot/lpc32xxcdl/lpc32xxcdl-2.11-libnosys_gnu.patch
  25. +521 −0 boot/lpc32xxcdl/lpc32xxcdl-2.11-slashes.patch
  26. +70 −0 boot/lpc32xxcdl/lpc32xxcdl.mk
  27. +0 −17 boot/syslinux/syslinux-3.85-makefile.patch
  28. +16 −2 boot/syslinux/syslinux.mk
  29. +7 −13 boot/uboot/Config.in
  30. +181 −0 boot/uboot/uboot-2011.12/uboot-2011.12-change-kernel-address-in-dataflash.patch
  31. +31 −0 configs/armadeus_apf9328_defconfig
  32. +4 −6 configs/at91sam9260dfc_defconfig
  33. +4 −7 configs/at91sam9261ek_defconfig
  34. +5 −8 configs/at91sam9263ek_defconfig
  35. +2 −4 configs/at91sam9g20dfc_defconfig
  36. +39 −0 configs/ea3250_defconfig
  37. +39 −0 configs/fdi3250_defconfig
  38. +39 −0 configs/phy3250_defconfig
  39. +2 −2 configs/qemu_arm_versatile_defconfig
  40. +19 −0 configs/qemu_mips_malta_defconfig
  41. +2 −2 configs/qemu_mipsel_malta_defconfig
  42. +2 −2 configs/qemu_sh4_r2d_defconfig
  43. +1 −1  configs/qemu_sparc_ss10_defconfig
  44. +2 −2 configs/qemu_x86_64_defconfig
  45. +2 −2 configs/qemu_x86_defconfig
  46. +2 −2 docs/buildroot.html
  47. +2 −2 docs/docs.html
  48. +1 −1  docs/git.html
  49. +1 −1  docs/header.html
  50. +14 −10 docs/lists.html
  51. +46 −19 docs/manual/adding-packages-gentargets.txt
  52. +45 −0 docs/manual/customize-toolchain.txt
  53. +2 −0  docs/manual/customize.txt
  54. +1 −0  docs/manual/external-toolchain.txt
  55. +9 −0 docs/news.html
  56. +4 −0 fs/common.mk
  57. +27 −0 fs/skeleton/etc/init.d/rcK
  58. +1 −2  fs/skeleton/etc/inittab
  59. +1 −0  fs/skeleton/etc/securetty
  60. +1 −0  fs/skeleton/run
  61. +8 −0 linux/Config.ext.in
  62. +4 −5 linux/Config.in
  63. +1 −1  linux/linux.mk
  64. +44 −8 package/Config.in
  65. +7 −0 package/Config.in.host
  66. +19 −9 package/Makefile.autotools.in
  67. +16 −1 package/Makefile.in
  68. +7 −15 package/Makefile.package.in
  69. +0 −2  package/atk/atk.mk
  70. +1 −1  package/avahi/S05avahi-setup.sh
  71. +46 −0 package/bash/bash-4.2-011.patch
  72. +151 −0 package/bash/bash-4.2-012.patch
  73. +52 −0 package/bash/bash-4.2-013.patch
  74. +47 −0 package/bash/bash-4.2-014.patch
  75. +81 −0 package/bash/bash-4.2-015.patch
  76. +46 −0 package/bash/bash-4.2-016.patch
  77. +47 −0 package/bash/bash-4.2-017.patch
  78. +74 −0 package/bash/bash-4.2-018.patch
  79. +47 −0 package/bash/bash-4.2-019.patch
  80. +60 −0 package/bash/bash-4.2-020.patch
  81. +5 −1 package/bash/bash.mk
  82. +4 −0 package/beecrypt/Config.in
  83. +0 −12 package/beecrypt/beecrypt-4.1.2_no-cxx-glue.patch
  84. +28 −0 package/beecrypt/beecrypt-cppglue.cxx-cplusplus-only.patch
  85. +31 −0 package/beecrypt/beecrypt-icu-check-cross-compile.patch
  86. +18 −5 package/beecrypt/beecrypt.mk
  87. +1 −1  package/bind/bind.mk
  88. +3 −3 package/binutils/Config.in.host
  89. +2 −0  package/binutils/binutils.mk
  90. +0 −2  package/bison/bison.mk
  91. +0 −1  package/bluez_utils/Config.in
  92. +4 −2 package/bluez_utils/bluez_utils.mk
  93. +79 −0 package/boost/Config.in
  94. +83 −0 package/boost/boost.mk
  95. +11 −0 package/busybox/busybox-1.19.3/busybox-1.19.3-mdev.patch
  96. +29 −0 package/busybox/busybox-1.19.3/busybox-1.19.3-wget.patch
  97. +5 −0 package/busybox/busybox.mk
  98. +2 −1  package/bzip2/bzip2.mk
  99. +36 −0 package/cairo/cairo-1.10.2-directfb.patch
  100. +0 −39 package/cairo/cairo-1.8.10-directfb.patch
  101. +1 −11 package/cairo/cairo.mk
  102. +1 −1  package/ccache/ccache.mk
  103. 0  package/cdrkit/{cdrkit-1.1.10-no-rcmd.patch → cdrkit-1.1.11-no-rcmd.patch}
  104. +8 −5 package/cdrkit/cdrkit.mk
  105. +47 −0 package/connman/Config.in
  106. +22 −0 package/connman/S45connman
  107. +39 −0 package/connman/connman.mk
  108. +0 −51 package/coreutils/coreutils-8.14-hostname-man.patch
  109. +1 −1  package/coreutils/coreutils.mk
  110. +0 −1  package/cramfs/cramfs.mk
  111. +1 −1  package/crosstool-ng/crosstool-ng.mk
  112. +2 −7 package/dbus/Config.in
  113. +4 −3 package/dialog/dialog.mk
  114. +1 −1  package/dmalloc/dmalloc.mk
  115. +23 −0 package/dstat/Config.in
  116. +15 −0 package/dstat/dstat.mk
  117. +3 −0  package/e2fsprogs/Config.in
  118. 0  ...{e2fsprogs-1.41.9-add-missing-dep-of-tst_uuid-o.patch → e2fsprogs-add-missing-dep-of-tst_uuid-o.patch}
  119. +22 −0 package/e2fsprogs/e2fsprogs-fallocate.patch
  120. 0  package/e2fsprogs/{e2fsprogs-1.41.9-sem-init-libs.patch → e2fsprogs-sem-init-libs.patch}
  121. +4 −1 package/e2fsprogs/e2fsprogs.mk
  122. +2 −1  package/ebtables/ebtables.mk
  123. +1 −1  package/ed/ed.mk
  124. +26 −0 package/efl/Config.in
  125. +1 −0  package/efl/efl.mk
  126. +14 −0 package/efl/expedite/Config.in
  127. +11 −0 package/efl/expedite/expedite.mk
  128. +42 −0 package/efl/libecore/Config.in
  129. +77 −0 package/efl/libecore/libecore.mk
  130. +11 −0 package/efl/libedbus/Config.in
  131. +14 −0 package/efl/libedbus/libedbus.mk
  132. +21 −0 package/efl/libedje/Config.in
  133. +24 −0 package/efl/libedje/libedje.mk
  134. +11 −0 package/efl/libeet/Config.in
  135. +15 −0 package/efl/libeet/libeet.mk
  136. +10 −0 package/efl/libefreet/Config.in
  137. +14 −0 package/efl/libefreet/libefreet.mk
  138. +6 −0 package/efl/libeina/Config.in
  139. +15 −0 package/efl/libeina/libeina.mk
  140. +12 −0 package/efl/libelementary/Config.in
  141. +18 −0 package/efl/libelementary/libelementary.mk
  142. +9 −0 package/efl/libembryo/Config.in
  143. +15 −0 package/efl/libembryo/libembryo.mk
  144. +11 −0 package/efl/libethumb/Config.in
  145. +16 −0 package/efl/libethumb/libethumb.mk
  146. +206 −0 package/efl/libevas/Config.in
  147. +216 −0 package/efl/libevas/libevas.mk
  148. +2 −2 package/ethtool/ethtool.mk
  149. +0 −3  package/expat/Makefile.in
  150. +0 −3  package/expat/expat.mk
  151. +10 −0 package/explorercanvas/Config.in
  152. +18 −0 package/explorercanvas/explorercanvas.mk
  153. +14 −0 package/feh/Config.in
  154. +21 −0 package/feh/feh.mk
  155. +2 −2 package/file/file.mk
  156. +21 −0 package/fis/fis-003-list_output.patch
  157. +30 −0 package/fis/fis-004-sorted_list.patch
  158. +2 −0  package/flex/flex.mk
  159. +59 −0 package/flot/Config.in
  160. +23 −0 package/flot/flot.mk
  161. +0 −37 package/fluxbox/fluxbox-1.3.1-iconv.patch
  162. +8 −1 package/fluxbox/fluxbox.mk
  163. +2 −0  package/fluxbox/xsession
  164. +0 −1  package/fontconfig/fontconfig.mk
  165. +3 −1 package/freetype/freetype.mk
  166. +3 −0  package/gawk/gawk.mk
  167. +10 −0 package/giblib/Config.in
  168. +14 −0 package/giblib/giblib.mk
  169. +2 −1  package/grep/grep.mk
  170. +2 −2 package/hdparm/hdparm.mk
  171. +15 −0 package/hostapd/hostapd-0.7.3-libnl3.patch
  172. +1 −0  package/hostapd/hostapd.mk
  173. +7 −7 package/i2c-tools/Config.in
  174. +2 −2 package/i2c-tools/i2c-tools.mk
  175. +1 −0  package/icu/icu.mk
  176. +23 −0 package/igh-ethercat/Config.in
  177. +41 −0 package/igh-ethercat/igh-ethercat.mk
  178. +38 −0 package/imlib2/Config.in
  179. +64 −0 package/imlib2/imlib2.mk
  180. +0 −39 package/iproute2/iproute2-xt-v6.patch
  181. +2 −2 package/iproute2/iproute2.mk
  182. +9 −4 package/ipsec-tools/Config.in
  183. +6 −6 package/ipsec-tools/ipsec-tools.mk
  184. +0 −100 package/ipset/ipset-drop-modules.patch
  185. +2 −1  package/ipset/ipset.mk
  186. +34 −0 package/iptables/iptables-3.2-headers-fix.patch
  187. +1 −2  package/iptables/iptables.mk
  188. +1 −1  package/iw/iw.mk
  189. +0 −5 package/java/Config.in
  190. +0 −9 package/java/classpath/Config.in
  191. +0 −86 package/java/classpath/classpath.mk
  192. +0 −10 package/java/concierge/Config.in
  193. +0 −40 package/java/concierge/concierge.mk
  194. +0 −2  package/java/concierge/files/concierge
  195. +0 −10 package/java/concierge/files/init.xargs
  196. +0 −8 package/java/jamvm/Config.in
  197. +0 −1,473 package/java/jamvm/jamvm-1.5.0.patch.avr32
  198. +0 −93 package/java/jamvm/jamvm.mk
  199. +0 −1  package/java/java.mk
  200. +2 −1  package/jpeg/jpeg.mk
  201. +13 −0 package/jquery-sparkline/Config.in
  202. +18 −0 package/jquery-sparkline/jquery-sparkline.mk
  203. +9 −0 package/jquery-validation/Config.in
  204. +18 −0 package/jquery-validation/jquery-validation.mk
  205. +8 −0 package/jquery/Config.in
  206. +18 −0 package/jquery/jquery.mk
  207. +11 −0 package/jsmin/Config.in
  208. +25 −0 package/jsmin/jsmin.mk
  209. +9 −4 package/kismet/kismet-libnl-30-support.patch
  210. +1 −0  package/kismet/kismet.mk
  211. +7 −0 package/kmod/Config.in
  212. +7 −0 package/kmod/kmod.mk
  213. +17 −17 package/libcap/{libcap-2.20-build-system.patch → libcap-2.22-build-system.patch}
  214. +6 −2 package/libcap/libcap.mk
  215. +6 −4 package/libcgi/libcgi.mk
  216. +22 −0 package/libeXosip2/libeXosip2-fix-non-ipv6-build.patch
  217. +9 −16 package/libeXosip2/libeXosip2.mk
  218. +6 −0 package/libesmtp/Config.in
  219. +13 −0 package/libesmtp/libesmtp.mk
  220. +1 −1  package/libev/libev.mk
  221. +5 −2 package/libffi/libffi.mk
  222. +1 −0  package/libftdi/libftdi.mk
  223. +2 −2 package/libgtk2/libgtk2.mk
  224. +11 −0 package/libical/Config.in
  225. +12 −0 package/libical/libical.mk
  226. +2 −2 package/libidn/libidn.mk
  227. +8 −0 package/libmbus/Config.in
  228. +15 −0 package/libmbus/libmbus.mk
  229. +1 −1  package/libmnl/libmnl.mk
  230. +1 −1  package/libmodbus/libmodbus.mk
  231. +1 −1  package/libnl/libnl.mk
  232. +10 −0 package/liboauth/Config.in
  233. +19 −0 package/liboauth/liboauth.mk
  234. +4 −18 package/libosip2/libosip2.mk
  235. +7 −8 package/libpcap/libpcap.mk
  236. +0 −2  package/libpng/libpng.mk
  237. +3 −6 package/libraw1394/Config.in
  238. +4 −4 package/libraw1394/libraw1394.mk
  239. +9 −0 package/liburcu/Config.in
  240. +13 −0 package/liburcu/liburcu-0.6.7-missing-gnu-source.patch
  241. +7 −0 package/liburcu/liburcu.mk
  242. +1 −0  package/libusb-compat/libusb-compat.mk
  243. +1 −1  package/libusb/libusb.mk
  244. +2 −1  package/libv4l/libv4l.mk
  245. +6 −0 package/libvncserver/Config.in
  246. +50 −0 package/libvncserver/libvncserver.mk
  247. +0 −1  package/libxml-parser-perl/libxml-parser-perl.mk
  248. +7 −7 package/libxslt/libxslt.mk
  249. +1 −1  package/lighttpd/lighttpd.mk
  250. +1 −1  package/links/links.mk
  251. +44 −0 package/linux-firmware/Config.in
  252. +59 −0 package/linux-firmware/linux-firmware.mk
  253. +3 −1 package/lm-sensors/lm-sensors.mk
  254. +30 −0 package/lttng-babeltrace/Config.in
  255. +37 −0 package/lttng-babeltrace/lttng-babeltrace-0.8-no-posix-fallocate-in-uclibc.patch
  256. +15 −0 package/lttng-babeltrace/lttng-babeltrace.mk
  257. +18 −0 package/lttng-libust/Config.in
  258. +50 −0 package/lttng-libust/lttng-libust-1.9.2-dont-build-cxx-tests-when-not-available.patch
  259. +26 −0 package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch
  260. +10 −0 package/lttng-libust/lttng-libust.mk
  261. +18 −0 package/lttng-modules/Config.in
  262. +15 −0 package/lttng-modules/lttng-modules.mk
  263. +22 −0 package/lttng-tools/Config.in
  264. +87 −0 package/lttng-tools/lttng-tools-2.0-pre15-no-sync-file-range-in-uclibc.patch
  265. +20 −0 package/lttng-tools/lttng-tools.mk
  266. +39 −0 package/lua/lua.mk
  267. +0 −1  package/mpc/mpc.mk
  268. +0 −1  package/mpfr/mpfr.mk
  269. +1 −1  package/mtd/mtd.mk
  270. +0 −1  package/multimedia/Config.in
  271. +9 −9 package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch
  272. +6 −1 package/multimedia/ffmpeg/ffmpeg.mk
  273. +2 −2 package/multimedia/gst-dsp/gst-dsp.mk
  274. +2 −2 package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
  275. +139 −0 package/multimedia/gst-plugins-base/gst-plugins-base-0.10.35-tremor.patch
  276. +4 −0 package/multimedia/gst-plugins-base/gst-plugins-base.mk
  277. +0 −84 package/multimedia/libmms/libmms-prevent-unaligned-dereferences.patch
  278. +1 −3 package/multimedia/libmms/libmms.mk
  279. +1 −3 package/multimedia/libogg/libogg.mk
  280. +1 −3 package/multimedia/libvorbis/libvorbis.mk
  281. +1 −1  package/multimedia/mpd/mpd.mk
  282. +7 −2 package/multimedia/mplayer/mplayer.mk
  283. +0 −32 package/multimedia/tremor/tremor-export-all-symbols.patch
  284. +4 −4 package/multimedia/tremor/tremor.mk
  285. +2 −0  package/ncurses/ncurses.mk
  286. +0 −38 package/netperf/netperf-2.4.5-dccp.patch
  287. +0 −51 package/netperf/netperf-2.4.5-netserver.patch
  288. +1 −1  package/netperf/netperf.mk
  289. +17 −0 package/netsnmp/netsnmp-swinst-crash.patch
  290. +1 −1  package/netsnmp/netsnmp.mk
  291. +30 −0 package/network-manager/Config.in
  292. +46 −0 package/network-manager/S45network-manager
  293. +31 −0 package/network-manager/network-manager-execinfo.patch
  294. +50 −0 package/network-manager/network-manager.mk
  295. +1 −1  package/ntp/ntp.mk
  296. +7 −0 package/open2300/Config.in
  297. +29 −0 package/open2300/open2300.mk
  298. +40 −0 package/opencv/opencv-uclibc-optional-long-double-support.patch
  299. +2 −3 package/opencv/opencv.mk
  300. +6 −0 package/openocd/Config.in.host
Sorry, we could not display the entire diff because too many files (525) changed.
View
69 CHANGES
@@ -1,3 +1,72 @@
+2012.02, Not yet released:
+
+ Fixes all over the tree and new features.
+
+ Toolchain: Default to GCC 4.5.x, add binutils 2.22. Java
+ support removed, Powerpc SPE ABI support. GDB ELF support fix,
+ GDB 7.4.
+
+ Gentargets: scp and mercurial support.
+ Autotools: derrive host dependencies from target by default.
+
+ defconfigs: qemu configs for x86-64, mips and sparc.
+
+ uClibc: remove 0.9.30, backport unshare() support, add
+ 0.9.32.1, use same config for ctng.
+
+ Bootloaders: U-Boot: add 2011.12, remove 2010.xx versions,
+ Barebox: add 2012.01, remove 2011.10.
+
+ Buildroot now calls the stop function of scripts in /etc/init.d at
+ shutdown.
+
+ Updated/fixed packages: atk, avahi, barebox, bash, beecrypt,
+ bind, binutils, bison, bluez_utils, busybox, cairo, ccache,
+ cdrkit, coreutils, cramfs, dbus, dbus-glib, dialog, diffutils,
+ dmalloc, dropbear, e2fsprogs, ebtables, ed, ethtool, expat,
+ ffmpeg, file, flex, fluxbox, fontconfig, gawk, grep, gst-dsp,
+ gst-ffmpeg, gst-plugins-base, hdparm, hostapd, htop,
+ i2c-tools, icu, iproute2, ipset, iptables, iw, jpeg, kismet,
+ lame, libcap, libcgi, libeXosip2, libffi, libgpg-error,
+ libgtk2, libidn, libmms, libmnl, libnl, libogg, libosip,
+ libpcap, libpng, libraw1394, libroxml, libv4l, libxcb,
+ libxml-parser-perl, libxslt, lighttpd, links, lm-sensors, lua,
+ m4, module-init-tools, mpc, mpd, mpfr, mplayer, mtd-utils,
+ nano, nbd, ncurses, netperf, netsnmp, ntp, opencv, openssl,
+ openvpn, orc, pciutils, pcre, pkg-config, proftpd, python, qt,
+ ruby, samba, squashfs3, sshfs, sqlite, squid, sudo, syslinux,
+ tcl, tcpdump, ti-utils, tiff, tremor, uboot, uboot-tools,
+ usbmount, vala, valgrind, vsftpd, wpa_supplicant,
+ xapp_{bdftopcf,mkfontdir,mkfontscale,xkbcomp,xcursorgen,xman},
+ xcb-util, xdm, xenomai, xf86-video-sis,
+ xfont_{encodings,font-util},
+ xlib_lib{fontenc,X11,Xau,Xcursor,Xdmcp,Xfixes,Xfont,Xrender},
+ xlib_libxkbfile, xutil_makedepend, yajl
+
+ New packages: boost, connman, expedite, explorercanvas, feh,
+ flot, giblib, igh-ethercat, imlib2, jquery, jquery-sparklines,
+ jquery-validation, jsmin, kmod, libecore, libedbus, libedje,
+ libeet, libeina, libelementary, libesmtp, libethumb, libevas,
+ libical, libmbus, linux-firmware, NetworkManager, open2300,
+ python-distutilscross, python-dpkt, python-netifaces,
+ python-pygame, python-setuptools, rt-tests, sane-backends,
+ sqlcipher, transmission, unionfs, xf86-input-tslib,
+ xinput-calibrator
+
+ Issues resolved (http://bugs.uclibc.org):
+
+ #743: Add Transmission bit torrent option to buildroot
+ #755: Add Boost libraries as a package
+ #2299: Add crypto support to libsoup
+ #2617: Pixman 0.19.2 & Cairo 1.10.0
+ #3403: libgpg-error: bump to version 1.10
+ #3409: libgpg-error: download from gnupg.org
+ #3421: nano: make tiny flag optional
+ #3691: New EFL packages
+ #4664: Cannot patch AT91Bootstrap
+ #4700: setlocalversion not working for combination svn/ubuntu 11.10...
+ #4760: Qt: add host-pkg-config to dependency-list
+
2011.11, Released November 30th, 2011:
Fixes all over the tree.
View
2  Config.in
@@ -371,6 +371,8 @@ source "target/generic/Config.in"
source "package/Config.in"
+source "package/Config.in.host"
+
source "fs/Config.in"
source "boot/Config.in"
View
28 Makefile
@@ -26,6 +26,12 @@
# Set and export the version string
export BR2_VERSION:=2012.02-git
+# Check for minimal make version (note: this check will break at make 10.x)
+MIN_MAKE_VERSION=3.81
+ifneq ($(firstword $(sort $(MAKE_VERSION) $(MIN_MAKE_VERSION))),$(MIN_MAKE_VERSION))
+$(error You have make '$(MAKE_VERSION)' installed. GNU make >= $(MIN_MAKE_VERSION) is required)
+endif
+
# This top-level Makefile can *not* be executed in parallel
.NOTPARALLEL:
@@ -192,6 +198,7 @@ unexport CPP
unexport CFLAGS
unexport CXXFLAGS
unexport GREP_OPTIONS
+unexport CONFIG_SITE
GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess)
@@ -277,8 +284,6 @@ TARGET_DIR:=$(BASE_DIR)/target
TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
TARGET_SKELETON=$(TOPDIR)/fs/skeleton
-BR2_DEPENDS_DIR=$(BUILD_DIR)/buildroot-config
-
ifeq ($(BR2_CCACHE),y)
CCACHE:=$(HOST_DIR)/usr/bin/ccache
CCACHE_CACHE_DIR=$(HOME)/.buildroot-ccache
@@ -298,6 +303,8 @@ include package/Makefile.in
all: world
+include support/dependencies/dependencies.mk
+
# We also need the various per-package makefiles, which also add
# each selected package to TARGETS if that package was selected
# in the .config file.
@@ -359,7 +366,7 @@ HOST_SOURCE += $(addsuffix -source,$(sort $(TARGETS_HOST_DEPS) $(HOST_DEPS)))
$(TARGETS_ALL): __real_tgt_%: $(BASE_TARGETS) %
dirs: $(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
- $(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(STAMP_DIR)
+ $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)
$(BASE_TARGETS): dirs $(O)/toolchainfile.cmake
@@ -368,7 +375,7 @@ $(BUILD_DIR)/buildroot-config/auto.conf: $(CONFIG_DIR)/.config
prepare: $(BUILD_DIR)/buildroot-config/auto.conf
-world: prepare dependencies dirs $(BASE_TARGETS) $(TARGETS_ALL)
+world: prepare dirs dependencies $(BASE_TARGETS) $(TARGETS_ALL)
$(O)/toolchainfile.cmake:
@echo -en "\
@@ -390,7 +397,7 @@ $(O)/toolchainfile.cmake:
$(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \
$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \
$(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
- $(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(STAMP_DIR)
+ $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)
#############################################################
#
@@ -696,8 +703,15 @@ endif
release: OUT=buildroot-$(BR2_VERSION)
+# Create release tarballs. We need to fiddle a bit to add the generated
+# documentation to the git output
release:
- git archive --format=tar --prefix=$(OUT)/ master|gzip -9 >$(OUT).tar.gz
+ git archive --format=tar --prefix=$(OUT)/ master > $(OUT).tar
+ $(MAKE) O=$(OUT) manual-html manual-txt manual-pdf
+ tar rf $(OUT).tar $(OUT)
+ gzip -9 -c < $(OUT).tar > $(OUT).tar.gz
+ bzip2 -9 -c < $(OUT).tar > $(OUT).tar.bz2
+ rm -rf $(OUT) $(OUT).tar
################################################################################
# GENDOC -- generates the make targets needed to build a specific type of
@@ -720,7 +734,7 @@ $(1)-$(3): $$(O)/docs/$(1)/$(1).$(4)
$$(O)/docs/$(1)/$(1).$(4): docs/$(1)/$(1).txt $$($(call UPPERCASE,$(1))_SOURCES)
@echo "Generating $(5) $(1)..."
- $(Q)mkdir -p $$(O)/docs/$(1)/$(2)
+ $(Q)mkdir -p $$(@D)
$(Q)a2x $(6) -f $(2) -d book -L -r $(TOPDIR)/docs/images \
-D $$(@D) $$<
endef
View
26 board/armadeus/apf9328/linux-3.1.1-0001-fixes_arm_mach-types_for_apf9328.patch
@@ -0,0 +1,26 @@
+From 053ba505eb0d40287ac5750daf454af0aed2ce75 Mon Sep 17 00:00:00 2001
+From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
+Date: Tue, 4 Oct 2011 14:19:58 +0200
+Subject: [PATCH 1/2] [ARM] mach-types: Re-add apf9328
+
+
+Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
+---
+ arch/arm/tools/mach-types | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
+index fff68d0..07811a7 100644
+--- a/arch/arm/tools/mach-types
++++ b/arch/arm/tools/mach-types
+@@ -188,6 +188,7 @@ omap_2430sdp MACH_OMAP_2430SDP OMAP_2430SDP 900
+ davinci_evm MACH_DAVINCI_EVM DAVINCI_EVM 901
+ palmz72 MACH_PALMZ72 PALMZ72 904
+ nxdb500 MACH_NXDB500 NXDB500 905
++apf9328 MACH_APF9328 APF9328 906
+ palmt5 MACH_PALMT5 PALMT5 917
+ palmtc MACH_PALMTC PALMTC 918
+ omap_apollon MACH_OMAP_APOLLON OMAP_APOLLON 919
+--
+1.7.3.4
+
View
16 board/armadeus/apf9328/linux-3.1.1-0002-add_missing_config_option_for_apf9328.patch
@@ -0,0 +1,16 @@
+APF9328 needs CONFIG_MTD_CFI_INTELEXT to boot on its NOR FLASH.
+
+Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
+
+Index: linux-3.1.1/arch/arm/mach-imx/Kconfig
+===================================================================
+--- linux-3.1.1.orig/arch/arm/mach-imx/Kconfig 2011-11-16 14:45:55.000000000 +0100
++++ linux-3.1.1/arch/arm/mach-imx/Kconfig 2011-11-16 14:47:20.000000000 +0100
+@@ -84,6 +84,7 @@
+ bool "APF9328"
+ select SOC_IMX1
+ select IMX_HAVE_PLATFORM_IMX_UART
++ select MTD_CFI_INTELEXT
+ help
+ Say Yes here if you are using the Armadeus APF9328 development board
+
View
0  board/qemu/arm-versatile/linux-3.1.config → board/qemu/arm-versatile/linux-3.2.config
File renamed without changes
View
2  board/qemu/arm-versatile/readme.txt
@@ -1,6 +1,6 @@
Run the emulation with:
- qemu-system-arm -M versatilepb -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=scsi -append "root=/dev/sda console=ttyAMA0,115200" -serial stdio
+ qemu-system-arm -M versatilepb -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=scsi -append "root=/dev/sda console=ttyAMA0,115200" -serial stdio -net nic,model=smc91c111 -net user
The login prompt will appear in the terminal that started Qemu. The
graphical window is the framebuffer.
View
76 board/qemu/mips-malta/linux-3.2.config
@@ -0,0 +1,76 @@
+CONFIG_MIPS_MALTA=y
+CONFIG_CPU_MIPS32_R2=y
+CONFIG_MIPS_MT_SMP=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_HZ_100=y
+CONFIG_EXPERIMENTAL=y
+CONFIG_SYSVIPC=y
+CONFIG_LOG_BUF_SHIFT=15
+CONFIG_SYSFS_DEPRECATED_V2=y
+CONFIG_RELAY=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_PID_NS=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_EMBEDDED=y
+# CONFIG_SYSCTL_SYSCALL is not set
+# CONFIG_COMPAT_BRK is not set
+CONFIG_SLAB=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_PCI=y
+CONFIG_PM=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_PNP=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_WIRELESS is not set
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_MISC_DEVICES is not set
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDECD=y
+CONFIG_IDE_GENERIC=y
+CONFIG_BLK_DEV_GENERIC=y
+CONFIG_BLK_DEV_PIIX=y
+CONFIG_NETDEVICES=y
+CONFIG_NET_ETHERNET=y
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=y
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_WLAN is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO_I8042 is not set
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+# CONFIG_HWMON is not set
+# CONFIG_MFD_SUPPORT is not set
+CONFIG_FB=y
+CONFIG_FB_CIRRUS=y
+# CONFIG_VGA_CONSOLE is not set
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+CONFIG_QUOTA=y
+CONFIG_PROC_KCORE=y
+CONFIG_TMPFS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_ROOT_NFS=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
View
7 board/qemu/mips-malta/readme.txt
@@ -0,0 +1,7 @@
+Run the emulation with:
+
+ qemu-system-mips -M malta -kernel output/images/vmlinux -serial stdio -hda output/images/rootfs.ext2 -append "root=/dev/hda"
+
+The login prompt will appear in the terminal that started Qemu. The
+graphical window is the framebuffer. No keyboard support has been
+enabled.
View
0  board/qemu/mipsel-malta/linux-3.1.config → board/qemu/mipsel-malta/linux-3.2.config
File renamed without changes
View
2  board/qemu/mipsel-malta/readme.txt
@@ -1,6 +1,6 @@
Run the emulation with:
- qemu-system-mipsel -M malta -kernel vmlinux -serial stdio -hda rootfs.ext2 -append "root=/dev/hda"
+ qemu-system-mipsel -M malta -kernel output/images/vmlinux -serial stdio -hda output/images/rootfs.ext2 -append "root=/dev/hda"
The login prompt will appear in the terminal that started Qemu. The
graphical window is the framebuffer. No keyboard support has been
View
0  board/qemu/sh4-r2d/linux-3.1.config → board/qemu/sh4-r2d/linux-3.2.config
File renamed without changes
View
0  board/qemu/x86_64/linux-3.1.config → board/qemu/x86/linux-3.2.config
File renamed without changes
View
0  board/qemu/x86/linux-3.1.config → board/qemu/x86_64/linux-3.2.config
File renamed without changes
View
5 boot/Config.in
@@ -1,11 +1,12 @@
menu "Bootloaders"
+source "boot/at91bootstrap/Config.in"
+source "boot/at91dataflashboot/Config.in"
source "boot/barebox/Config.in"
source "boot/grub/Config.in"
+source "boot/lpc32xxcdl/Config.in"
source "boot/syslinux/Config.in"
source "boot/uboot/Config.in"
-source "boot/at91bootstrap/Config.in"
-source "boot/at91dataflashboot/Config.in"
source "boot/xloader/Config.in"
endmenu
View
11 boot/at91bootstrap/Config.in
@@ -1,5 +1,5 @@
config BR2_TARGET_AT91BOOTSTRAP
- depends on BR2_arm
+ depends on BR2_arm926t
bool "AT91 Bootstrap"
help
AT91Bootstrap is a first level bootloader for the Atmel AT91
@@ -10,6 +10,15 @@ config BR2_TARGET_AT91BOOTSTRAP
if BR2_TARGET_AT91BOOTSTRAP
+config BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR
+ string "custom patch dir"
+ help
+ If your board requires custom patches, add the path to the
+ directory containing the patches here. The patches must be
+ named at91bootstrap-<version>-<something>.patch.
+
+ Most users may leave this empty
+
config BR2_TARGET_AT91BOOTSTRAP_BOARD
string "Bootstrap board"
default ""
View
299 boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch
@@ -0,0 +1,299 @@
+Every AT91SAM plaforms were broken between 2010.12 and 2011.03 because
+of the relocation changes.
+
+We have to get JUMP_ADDR consistant with what is used by u-boot
+(CONFIG_SYS_TEXT_BASE).
+
+I didn't know what to do with at91sam9m10g45ek as it doesn't seems to be
+converted yet. But anyway, that means that it is either not working or
+doesn't care so changing it here shouldn't harm.
+
+I also chose to "repartition" the dataflash. u-boot is now living at
+0x4000, letting 16kB for the bootstrap. We also have to increase the
+IMG_SIZE as u-boot as grown larger than the default value.
+As requested on the u-boot ML, we assume that it could be up to 512kB
+big.
+
+It means that now, you have to flash your kernel at 0x0008C000 instead
+of 0x00042000. And so you also have to load it from that adress from
+u-boot.
+
+Then, remember that you could decrease IMG_SIZE to boot faster.
+
+Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
+---
+ board/at91sam9260ek/dataflash/at91sam9260ek.h | 6 +++---
+ board/at91sam9260ek/nandflash/at91sam9260ek.h | 2 +-
+ board/at91sam9261ek/dataflash/at91sam9261ek.h | 6 +++---
+ board/at91sam9261ek/nandflash/at91sam9261ek.h | 2 +-
+ board/at91sam9263ek/dataflash/at91sam9263ek.h | 6 +++---
+ board/at91sam9263ek/nandflash/at91sam9263ek.h | 2 +-
+ board/at91sam9g10ek/dataflash/at91sam9g10ek.h | 6 +++---
+ board/at91sam9g10ek/nandflash/at91sam9g10ek.h | 2 +-
+ board/at91sam9g20ek/dataflash/at91sam9g20ek.h | 6 +++---
+ board/at91sam9g20ek/nandflash/at91sam9g20ek.h | 2 +-
+ board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h | 4 ++--
+ .../at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h | 4 ++--
+ board/at91sam9rlek/dataflash/at91sam9rlek.h | 6 +++---
+ board/at91sam9rlek/nandflash/at91sam9rlek.h | 2 +-
+ board/at91sam9xeek/dataflash/at91sam9xeek.h | 6 +++---
+ board/at91sam9xeek/nandflash/at91sam9xeek.h | 2 +-
+ 16 files changed, 32 insertions(+), 32 deletions(-)
+
+diff --git a/board/at91sam9260ek/dataflash/at91sam9260ek.h b/board/at91sam9260ek/dataflash/at91sam9260ek.h
+index 1834246..5c52bc6 100644
+--- a/board/at91sam9260ek/dataflash/at91sam9260ek.h
++++ b/board/at91sam9260ek/dataflash/at91sam9260ek.h
+@@ -73,11 +73,11 @@
+ /* ******************************************************************* */
+ #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS1_DATAFLASH /* Boot on SPI NCS0 */
+
+-#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
+-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */
++#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */
++#define IMG_SIZE 0x80000 /* Image Size in DataFlash */
+
+ #define MACH_TYPE 0x44B /* AT91SAM9260-EK */
+-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
++#define JUMP_ADDR 0x21F00000 /* Final Jump Address */
+
+ /* ******************************************************************* */
+ /* Application Settings */
+diff --git a/board/at91sam9260ek/nandflash/at91sam9260ek.h b/board/at91sam9260ek/nandflash/at91sam9260ek.h
+index 2cac601..f8fdff2 100644
+--- a/board/at91sam9260ek/nandflash/at91sam9260ek.h
++++ b/board/at91sam9260ek/nandflash/at91sam9260ek.h
+@@ -92,7 +92,7 @@
+ #define IMG_SIZE 0x40000 /* Image Size in NandFlash */
+
+ #define MACH_TYPE 0x44B /* AT91SAM9260-EK */
+-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
++#define JUMP_ADDR 0x21F00000 /* Final Jump Address */
+
+ /* ******************************************************************* */
+ /* Application Settings */
+diff --git a/board/at91sam9261ek/dataflash/at91sam9261ek.h b/board/at91sam9261ek/dataflash/at91sam9261ek.h
+index 8ce30e9..675f80b 100644
+--- a/board/at91sam9261ek/dataflash/at91sam9261ek.h
++++ b/board/at91sam9261ek/dataflash/at91sam9261ek.h
+@@ -96,11 +96,11 @@
+ /* ******************************************************************* */
+ #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */
+
+-#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
+-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */
++#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */
++#define IMG_SIZE 0x80000 /* Image Size in DataFlash */
+
+ #define MACH_TYPE 0x350 /* AT91SAM9261-EK */
+-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
++#define JUMP_ADDR 0x21F00000 /* Final Jump Address */
+
+ /* ******************************************************************* */
+ /* Application Settings */
+diff --git a/board/at91sam9261ek/nandflash/at91sam9261ek.h b/board/at91sam9261ek/nandflash/at91sam9261ek.h
+index badc3ac..e628c97 100644
+--- a/board/at91sam9261ek/nandflash/at91sam9261ek.h
++++ b/board/at91sam9261ek/nandflash/at91sam9261ek.h
+@@ -114,7 +114,7 @@
+ #define IMG_SIZE 0x40000 /* Image Size in NandFlash */
+
+ #define MACH_TYPE 0x350 /* AT91SAM9261-EK */
+-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
++#define JUMP_ADDR 0x21F00000 /* Final Jump Address */
+
+ /* ******************************************************************* */
+ /* Application Settings */
+diff --git a/board/at91sam9263ek/dataflash/at91sam9263ek.h b/board/at91sam9263ek/dataflash/at91sam9263ek.h
+index 5c9da4b..d07b5d1 100644
+--- a/board/at91sam9263ek/dataflash/at91sam9263ek.h
++++ b/board/at91sam9263ek/dataflash/at91sam9263ek.h
+@@ -95,11 +95,11 @@
+ /* ******************************************************************* */
+ #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */
+
+-#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
+-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */
++#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */
++#define IMG_SIZE 0x80000 /* Image Size in DataFlash */
+
+ #define MACH_TYPE 0x4B2 /* AT91SAM9263-EK */
+-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
++#define JUMP_ADDR 0x21F00000 /* Final Jump Address */
+
+ /* ******************************************************************* */
+ /* Application Settings */
+diff --git a/board/at91sam9263ek/nandflash/at91sam9263ek.h b/board/at91sam9263ek/nandflash/at91sam9263ek.h
+index 505afc7..8ab4f46 100644
+--- a/board/at91sam9263ek/nandflash/at91sam9263ek.h
++++ b/board/at91sam9263ek/nandflash/at91sam9263ek.h
+@@ -108,7 +108,7 @@
+ #define IMG_SIZE 0x40000 /* Image Size in NandFlash */
+
+ #define MACH_TYPE 1202 /* AT91SAM9263-EK */
+-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
++#define JUMP_ADDR 0x21F00000 /* Final Jump Address */
+
+ /* ******************************************************************* */
+ /* Application Settings */
+diff --git a/board/at91sam9g10ek/dataflash/at91sam9g10ek.h b/board/at91sam9g10ek/dataflash/at91sam9g10ek.h
+index b2faf44..0882644 100644
+--- a/board/at91sam9g10ek/dataflash/at91sam9g10ek.h
++++ b/board/at91sam9g10ek/dataflash/at91sam9g10ek.h
+@@ -97,11 +97,11 @@
+ /* ******************************************************************* */
+ #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */
+
+-#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
+-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */
++#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */
++#define IMG_SIZE 0x80000 /* Image Size in DataFlash */
+
+ #define MACH_TYPE 0x350 /* AT91SAM9261-EK */
+-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
++#define JUMP_ADDR 0x21F00000 /* Final Jump Address */
+
+ /* ******************************************************************* */
+ /* Application Settings */
+diff --git a/board/at91sam9g10ek/nandflash/at91sam9g10ek.h b/board/at91sam9g10ek/nandflash/at91sam9g10ek.h
+index 66c40a3..6c3ecda 100644
+--- a/board/at91sam9g10ek/nandflash/at91sam9g10ek.h
++++ b/board/at91sam9g10ek/nandflash/at91sam9g10ek.h
+@@ -115,7 +115,7 @@
+ #define IMG_SIZE 0x40000 /* Image Size in NandFlash */
+
+ #define MACH_TYPE 0x350 /* AT91SAM9G10-EK */
+-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
++#define JUMP_ADDR 0x21F00000 /* Final Jump Address */
+
+ /* ******************************************************************* */
+ /* Application Settings */
+diff --git a/board/at91sam9g20ek/dataflash/at91sam9g20ek.h b/board/at91sam9g20ek/dataflash/at91sam9g20ek.h
+index eea0439..44bd578 100644
+--- a/board/at91sam9g20ek/dataflash/at91sam9g20ek.h
++++ b/board/at91sam9g20ek/dataflash/at91sam9g20ek.h
+@@ -74,11 +74,11 @@
+ /* ******************************************************************* */
+ #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS1_DATAFLASH /* Boot on SPI NCS1 */
+
+-#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
+-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */
++#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */
++#define IMG_SIZE 0x80000 /* Image Size in DataFlash */
+
+ #define MACH_TYPE 0x658 /* AT91SAM9G20-EK */
+-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
++#define JUMP_ADDR 0x21F00000 /* Final Jump Address */
+
+ /* ******************************************************************* */
+ /* Application Settings */
+diff --git a/board/at91sam9g20ek/nandflash/at91sam9g20ek.h b/board/at91sam9g20ek/nandflash/at91sam9g20ek.h
+index 31bd499..e797e4d 100644
+--- a/board/at91sam9g20ek/nandflash/at91sam9g20ek.h
++++ b/board/at91sam9g20ek/nandflash/at91sam9g20ek.h
+@@ -93,7 +93,7 @@
+ #define IMG_SIZE 0x40000 /* Image Size in NandFlash */
+
+ #define MACH_TYPE 0x658 /* AT91SAM9G20-EK */
+-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
++#define JUMP_ADDR 0x21F00000 /* Final Jump Address */
+
+ /* ******************************************************************* */
+ /* Application Settings */
+diff --git a/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h b/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h
+index a60fd41..144dd6d 100644
+--- a/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h
++++ b/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h
+@@ -88,8 +88,8 @@
+ /* ******************************************************************* */
+ #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */
+
+-#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
+-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */
++#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */
++#define IMG_SIZE 0x80000 /* Image Size in DataFlash */
+
+ #define MACH_TYPE 0x9CD /* AT91SAM9M10-EKES */
+ #define JUMP_ADDR 0x73F00000 /* Final Jump Address */
+diff --git a/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h b/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h
+index 5c726b5..3152b79 100644
+--- a/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h
++++ b/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h
+@@ -84,8 +84,8 @@
+ /* ******************************************************************* */
+ #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */
+
+-#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
+-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */
++#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */
++#define IMG_SIZE 0x80000 /* Image Size in DataFlash */
+
+ #define MACH_TYPE 0x726 /* AT91SAM9M10G45-EK */
+ #define JUMP_ADDR 0x73F00000 /* Final Jump Address */
+diff --git a/board/at91sam9rlek/dataflash/at91sam9rlek.h b/board/at91sam9rlek/dataflash/at91sam9rlek.h
+index 05c42dc..be277b6 100644
+--- a/board/at91sam9rlek/dataflash/at91sam9rlek.h
++++ b/board/at91sam9rlek/dataflash/at91sam9rlek.h
+@@ -88,11 +88,11 @@
+ /* ******************************************************************* */
+ #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */
+
+-#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
+-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */
++#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */
++#define IMG_SIZE 0x80000 /* Image Size in DataFlash */
+
+ #define MACH_TYPE 1326 /* AT91SAM9RL-EK */
+-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
++#define JUMP_ADDR 0x21F00000 /* Final Jump Address */
+
+ /* ******************************************************************* */
+ /* Application Settings */
+diff --git a/board/at91sam9rlek/nandflash/at91sam9rlek.h b/board/at91sam9rlek/nandflash/at91sam9rlek.h
+index 656b4ba..594db8f 100644
+--- a/board/at91sam9rlek/nandflash/at91sam9rlek.h
++++ b/board/at91sam9rlek/nandflash/at91sam9rlek.h
+@@ -112,7 +112,7 @@
+ #define IMG_SIZE 0x40000 /* Image Size in NandFlash */
+
+ #define MACH_TYPE 1326 /* AT91SAM9RL-EK */
+-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
++#define JUMP_ADDR 0x21F00000 /* Final Jump Address */
+
+ /* ******************************************************************* */
+ /* Application Settings */
+diff --git a/board/at91sam9xeek/dataflash/at91sam9xeek.h b/board/at91sam9xeek/dataflash/at91sam9xeek.h
+index 27d1822..e3172da 100644
+--- a/board/at91sam9xeek/dataflash/at91sam9xeek.h
++++ b/board/at91sam9xeek/dataflash/at91sam9xeek.h
+@@ -73,11 +73,11 @@
+ /* ******************************************************************* */
+ #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS1_DATAFLASH /* Boot on SPI NCS1 */
+
+-#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
+-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */
++#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */
++#define IMG_SIZE 0x80000 /* Image Size in DataFlash */
+
+ #define MACH_TYPE 0x44B /* AT91SAM9XE-EK same id as AT91SAM9260-EK*/
+-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
++#define JUMP_ADDR 0x21F00000 /* Final Jump Address */
+
+ /* ******************************************************************* */
+ /* Application Settings */
+diff --git a/board/at91sam9xeek/nandflash/at91sam9xeek.h b/board/at91sam9xeek/nandflash/at91sam9xeek.h
+index 5dbc63e..9fac7cb 100644
+--- a/board/at91sam9xeek/nandflash/at91sam9xeek.h
++++ b/board/at91sam9xeek/nandflash/at91sam9xeek.h
+@@ -94,7 +94,7 @@
+ #define IMG_SIZE 0x40000 /* Image Size in NandFlash */
+
+ #define MACH_TYPE 0x44B /* AT91SAM9XE-EK same id as AT91SAM9260-EK*/
+-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
++#define JUMP_ADDR 0x21F00000 /* Final Jump Address */
+
+ /* ******************************************************************* */
+ /* Application Settings */
+--
+1.7.5.4
+
View
9 boot/at91bootstrap/at91bootstrap.mk
@@ -21,6 +21,15 @@ define AT91BOOTSTRAP_EXTRACT_CMDS
rmdir $(BUILD_DIR)/Bootstrap-v$(AT91BOOTSTRAP_VERSION)
endef
+ifneq ($(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR)),)
+define AT91BOOTSTRAP_APPLY_CUSTOM_PATCHES
+ support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR) \
+ at91bootstrap-$(AT91BOOTSTRAP_VERSION)-\*.patch
+endef
+
+AT91BOOTSTRAP_POST_PATCH_HOOKS += AT91BOOTSTRAP_APPLY_CUSTOM_PATCHES
+endif
+
define AT91BOOTSTRAP_BUILD_CMDS
$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) -C $(@D)/$(AT91BOOTSTRAP_MAKE_SUBDIR)
endef
View
2  boot/at91dataflashboot/Config.in
@@ -1,3 +1,3 @@
config BR2_TARGET_AT91DATAFLASHBOOT
- depends on BR2_arm
+ depends on BR2_arm926t
bool "AT91 DataFlashBoot"
View
20 boot/barebox/Config.in
@@ -8,19 +8,19 @@ config BR2_TARGET_BAREBOX
if BR2_TARGET_BAREBOX
choice
prompt "version"
- default BR2_TARGET_BAREBOX_2011_11
+ default BR2_TARGET_BAREBOX_2012_02
help
Select the specific Barebox version you want to use
-config BR2_TARGET_BAREBOX_2011_09
+config BR2_TARGET_BAREBOX_2011_12
depends on BR2_DEPRECATED
- bool "2011.09"
+ bool "2011.12"
-config BR2_TARGET_BAREBOX_2011_10
- bool "2011.10"
+config BR2_TARGET_BAREBOX_2012_01
+ bool "2012.01"
-config BR2_TARGET_BAREBOX_2011_11
- bool "2011.11"
+config BR2_TARGET_BAREBOX_2012_02
+ bool "2012.02"
config BR2_TARGET_BAREBOX_CUSTOM_TARBALL
bool "Custom tarball"
@@ -39,9 +39,9 @@ endif
config BR2_TARGET_BAREBOX_VERSION
string
- default "2011.09.0" if BR2_TARGET_BAREBOX_2011_09
- default "2011.10.0" if BR2_TARGET_BAREBOX_2011_10
- default "2011.11.0" if BR2_TARGET_BAREBOX_2011_11
+ default "2011.12.0" if BR2_TARGET_BAREBOX_2011_12
+ default "2012.01.0" if BR2_TARGET_BAREBOX_2012_01
+ default "2012.02.0" if BR2_TARGET_BAREBOX_2012_02
default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
View
10 boot/lpc32xxcdl/Config.in
@@ -0,0 +1,10 @@
+config BR2_TARGET_LPC32XXCDL
+ depends on BR2_arm926t
+ bool "LPC32XX CDL (kickstart and S1L)"
+
+if BR2_TARGET_LPC32XXCDL
+
+config BR2_TARGET_LPC32XXCDL_BOARDNAME
+ string "LPC32xx board name"
+
+endif #BR2_TARGET_LPC32XXCDL
View
52 boot/lpc32xxcdl/lpc32xxcdl-2.11-compiler_name.patch
@@ -0,0 +1,52 @@
+Use CROSS_COMPILE as compiler name and stop using libc
+
+Signed-off-by: Alexandre Belloni <abelloni@adeneo-embedded.com>
+---
+ makerule/lpc32xx/make.lpc32xx.gnu | 22 +++++++++++-----------
+ 1 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/makerule/lpc32xx/make.lpc32xx.gnu b/makerule/lpc32xx/make.lpc32xx.gnu
+index 1014c28..3277d99 100644
+--- a/makerule/lpc32xx/make.lpc32xx.gnu
++++ b/makerule/lpc32xx/make.lpc32xx.gnu
+@@ -27,19 +27,19 @@ CFLAGS += -mno-sched-prolog -fno-hosted -mno-thumb-interwork -ffunction-sectio
+ CFLAGS += -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR)
+ AFLAGS = -mcpu=arm926ej-s
+ AFLAGS += -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR)
+-CC = arm-none-eabi-gcc
+-AS = arm-none-eabi-as
+-AR = arm-none-eabi-ar -r
+-LD = arm-none-eabi-gcc
+-NM = arm-none-eabi-nm
+-OBJDUMP = arm-none-eabi-objdump
+-OBJCOPY = arm-none-eabi-objcopy
+-READELF = arm-none-eabi-readelf
++CC = $(CROSS_COMPILE)gcc
++AS = $(CROSS_COMPILE)as
++AR = $(CROSS_COMPILE)ar -r
++LD = $(CROSS_COMPILE)gcc
++NM = $(CROSS_COMPILE)nm
++OBJDUMP = $(CROSS_COMPILE)objdump
++OBJCOPY = $(CROSS_COMPILE)objcopy
++READELF = $(CROSS_COMPILE)readelf
+ LDFLAGS += -Wl,--gc-sections
+
+ LK = -static
+ LK += -Wl,--start-group $(TARGET_CSP_LIB) $(TARGET_BSP_LIB) $(TARGET_GEN_LIB)
+-LK += -lgcc -lc -lg -lm -lstdc++ -lsupc++
++LK += -nostdlib -lgcc #-lc -lg -lm -lstdc++ -lsupc++
+ LK += -Wl,--end-group
+ MAP = -Xlinker -Map -Xlinker
+ LDESC = -Xlinker -T
+@@ -47,6 +47,6 @@ ENTRY = -e
+ BIN = -bin
+ EXT = .elf
+ LEXT =
+-ELFTOREC =arm-none-eabi-objcopy -O srec --strip-all --verbose
+-ELFTOBIN =arm-none-eabi-objcopy -I elf32-littlearm -O binary --strip-all --verbose
++ELFTOREC = $(OBJCOPY) -O srec --strip-all --verbose
++ELFTOBIN = $(OBJCOPY) -I elf32-littlearm -O binary --strip-all --verbose
+ REC =.srec
+--
+1.7.7.3
+
View
969 boot/lpc32xxcdl/lpc32xxcdl-2.11-delete_redundant_files.patch
@@ -0,0 +1,969 @@
+Remove duplicated files to stop the linker from complaining about duplicate
+symbols
+
+Signed-off-by: Alexandre Belloni <abelloni@adeneo-embedded.com>
+---
+--- a/csps/lpc32xx/bsps/fdi3250/startup/examples/s1l/sysapi_timer.c 2011-10-05 19:10:37.000000000 +0200
++++ /dev/null 2012-01-01 16:39:47.918907000 +0100
+@@ -1,212 +0,0 @@
+-/***********************************************************************
+- * $Id:: sysapi_timer.c 3394 2010-05-06 17:56:27Z usb10132 $
+- *
+- * Project: Time support functions
+- *
+- * Description:
+- * Implements the following functions required for the S1L API
+- * time_init
+- * time_reset
+- * time_start
+- * time_stop
+- * time_get
+- * time_get_rate
+- *
+- ***********************************************************************
+- * Software that is described herein is for illustrative purposes only
+- * which provides customers with programming information regarding the
+- * products. This software is supplied "AS IS" without any warranties.
+- * NXP Semiconductors assumes no responsibility or liability for the
+- * use of the software, conveys no license or title under any patent,
+- * copyright, or mask work right to the product. NXP Semiconductors
+- * reserves the right to make changes in the software without
+- * notification. NXP Semiconductors also make no representation or
+- * warranty that such application will be suitable for the specified
+- * use without further testing or modification.
+- **********************************************************************/
+-
+-#include "s1l_sys_inf.h"
+-#include "lpc32xx_intc_driver.h"
+-#include "lpc32xx_timer_driver.h"
+-
+-static UNS_64 base_rate;
+-static INT_32 tdev = 0;
+-
+-/***********************************************************************
+- *
+- * Function: time_init
+- *
+- * Purpose: Initializes time system
+- *
+- * Processing: Initializes the system timer.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: 0 if the init failed, otherwise non-zero
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-INT_32 time_init(void)
+-{
+- TMR_PSCALE_SETUP_T pscale;
+-
+- /* Open timer driver */
+- if (tdev == 0)
+- {
+- tdev = timer_open((void *) TIMER_CNTR0, 0);
+- if (tdev != 0)
+- {
+- /* Use a prescale count to 100000 */
+- pscale.ps_tick_val = 100000;
+- pscale.ps_us_val = 0; /* Not needed when ps_tick_val != 0 */
+- timer_ioctl(tdev, TMR_SETUP_PSCALE, (INT_32) &pscale);
+-
+- /* Get timer clock rate */
+- base_rate = (UNS_64) timer_ioctl(tdev, TMR_GET_STATUS,
+- TMR_GET_CLOCK);
+- }
+- }
+-
+- return tdev;
+-}
+-
+-/***********************************************************************
+- *
+- * Function: time_reset
+- *
+- * Purpose: Resets system timer
+- *
+- * Processing:
+- * See function.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: Nothing
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-void time_reset(void)
+-{
+- if (tdev != 0)
+- {
+- timer_ioctl(tdev, TMR_RESET, 1);
+- }
+-}
+-
+-/***********************************************************************
+- *
+- * Function: time_start
+- *
+- * Purpose: Starts system timer
+- *
+- * Processing:
+- * See function.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: Nothing
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-void time_start(void)
+-{
+- if (tdev != 0)
+- {
+- timer_ioctl(tdev, TMR_ENABLE, 1);
+- }
+-}
+-
+-/***********************************************************************
+- *
+- * Function: time_stop
+- *
+- * Purpose: Stops system timer
+- *
+- * Processing:
+- * See function.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: Nothing
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-void time_stop(void)
+-{
+- if (tdev != 0)
+- {
+- timer_ioctl(tdev, TMR_ENABLE, 0);
+- }
+-}
+-
+-/***********************************************************************
+- *
+- * Function: time_get
+- *
+- * Purpose: Returns current system time value
+- *
+- * Processing:
+- * See function.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: The number of ticks of the timer counter
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-UNS_64 time_get(void)
+-{
+- TMR_COUNTS_T tcounts;
+- UNS_64 ticks = 0;
+-
+- if (tdev != 0)
+- {
+- timer_ioctl(tdev, TMR_GET_COUNTS, (INT_32) &tcounts);
+-
+- /* Compute number of timer ticks */
+- ticks = (UNS_64) tcounts.count_val * 100000;
+- ticks = ticks + (UNS_64) tcounts.ps_count_val;
+- }
+-
+- return ticks;
+-}
+-
+-/***********************************************************************
+- *
+- * Function: time_get_rate
+- *
+- * Purpose:
+- * Returns base tick rate (ticks per second) of the time counter
+- *
+- * Processing:
+- * See function.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: The timer tick rate (in ticks per second)
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-UNS_64 time_get_rate(void)
+-{
+- return base_rate;
+-}
+-
+--- a/csps/lpc32xx/bsps/fdi3250/startup/examples/s1l/sys_mmu_cmd_group.c 2011-10-05 19:10:37.000000000 +0200
++++ /dev/null 2012-01-01 16:39:47.918907000 +0100
+@@ -1,746 +0,0 @@
+-/***********************************************************************
+- * $Id:: sys_mmu_cmd_group.c 3430 2010-05-07 17:39:08Z usb10132 $
+- *
+- * Project: Command processor for peek, poke, dump, and fill
+- *
+- * Description:
+- * Processes commands from the command prompt
+- *
+- ***********************************************************************
+- * Software that is described herein is for illustrative purposes only
+- * which provides customers with programming information regarding the
+- * products. This software is supplied "AS IS" without any warranties.
+- * NXP Semiconductors assumes no responsibility or liability for the
+- * use of the software, conveys no license or title under any patent,
+- * copyright, or mask work right to the product. NXP Semiconductors
+- * reserves the right to make changes in the software without
+- * notification. NXP Semiconductors also make no representation or
+- * warranty that such application will be suitable for the specified
+- * use without further testing or modification.
+- **********************************************************************/
+-
+-#include "lpc_arm922t_cp15_driver.h"
+-#include "lpc_string.h"
+-#include "startup.h"
+-#include "s1l_cmds.h"
+-#include "s1l_sys_inf.h"
+-
+-/* dcache command */
+-BOOL_32 cmd_dcache(void);
+-static UNS_32 cmd_dcache_plist[] =
+-{
+- (PARSE_TYPE_STR), /* The "dcache" command */
+- (PARSE_TYPE_DEC | PARSE_TYPE_END)
+-};
+-static CMD_ROUTE_T core_dcache_cmd =
+-{
+- (UNS_8 *) "dcache",
+- cmd_dcache,
+- (UNS_8 *) "Enables, disables, or flushes data cache",
+- (UNS_8 *) "dcache [0(disable), 1(enable), 2(flush)]",
+- cmd_dcache_plist,
+- NULL
+-};
+-
+-/* icache command */
+-BOOL_32 cmd_icache(void);
+-static UNS_32 cmd_icache_plist[] =
+-{
+- (PARSE_TYPE_STR), /* The "icache" command */
+- (PARSE_TYPE_DEC | PARSE_TYPE_END)
+-};
+-static CMD_ROUTE_T core_icache_cmd =
+-{
+- (UNS_8 *) "icache",
+- cmd_icache,
+- (UNS_8 *) "Enables or disables instruction cache",
+- (UNS_8 *) "icache [0(disable), 1(enable)]",
+- cmd_icache_plist,
+- NULL
+-};
+-
+-/* inval command */
+-BOOL_32 cmd_inval(void);
+-static UNS_32 cmd_inval_plist[] =
+-{
+- (PARSE_TYPE_STR | PARSE_TYPE_END) /* The "inval" command */
+-};
+-static CMD_ROUTE_T core_inval_cmd =
+-{
+- (UNS_8 *) "inval",
+- cmd_inval,
+- (UNS_8 *) "Flushes data cache and invalidates instruction cache",
+- (UNS_8 *) "inval",
+- cmd_inval_plist,
+- NULL
+-};
+-
+-/* mmuenab command */
+-BOOL_32 cmd_mmuenab(void);
+-static UNS_32 cmd_mmuenab_plist[] =
+-{
+- (PARSE_TYPE_STR), /* The "mmuenab" command */
+- (PARSE_TYPE_DEC | PARSE_TYPE_END)
+-};
+-static CMD_ROUTE_T core_mmuenab_cmd =
+-{
+- (UNS_8 *) "mmuenab",
+- cmd_mmuenab,
+- (UNS_8 *) "Enables or disables the MMU",
+- (UNS_8 *) "mmuenab [0(disable), 1(enable)]",
+- cmd_mmuenab_plist,
+- NULL
+-};
+-
+-/* map command */
+-BOOL_32 cmd_map(void);
+-static UNS_32 cmd_map_plist[] =
+-{
+- (PARSE_TYPE_STR), /* The "map" command */
+- (PARSE_TYPE_HEX),
+- (PARSE_TYPE_HEX),
+- (PARSE_TYPE_DEC),
+- (PARSE_TYPE_DEC | PARSE_TYPE_END),
+-};
+-static CMD_ROUTE_T core_map_cmd =
+-{
+- (UNS_8 *) "map",
+- cmd_map,
+- (UNS_8 *) "Maps a range of physical address sections to virtual addresses",
+- (UNS_8 *) "map [virt hex addr][phy hex addr][sections][0(uncached), 1(cached), 2(unmap)]",
+- cmd_map_plist,
+- NULL
+-};
+-
+-/* mmuinfo command */
+-static BOOL_32 cmd_mmuinfo(void);
+-static UNS_32 cmd_mmuinfo_plist[] =
+-{
+- (PARSE_TYPE_STR | PARSE_TYPE_END) /* The "mmuinfo" command */
+-};
+-static CMD_ROUTE_T core_mmuinfo_cmd =
+-{
+- (UNS_8 *) "mmuinfo",
+- cmd_mmuinfo,
+- (UNS_8 *) "Dumps page table and MMU info",
+- (UNS_8 *) "mmuinfo",
+- cmd_mmuinfo_plist,
+- NULL
+-};
+-
+-/* MMU group */
+-static GROUP_LIST_T mmu_group =
+-{
+- (UNS_8 *) "mmu", /* mmu group */
+- (UNS_8 *) "MMU command group",
+- NULL,
+- NULL
+-};
+-
+-static UNS_8 enabled_msg [] =" enabled";
+-static UNS_8 disabled_msg [] =" disabled";
+-static UNS_8 dcache_msg[] = "Data cache";
+-static UNS_8 icache_msg[] = "Instruction cache";
+-static UNS_8 pagetab_msg[] = "Page table at address: ";
+-static UNS_8 slist_msg[] = "Type Virt Phy fl Size";
+-static UNS_8 mmu_msg [] ="MMU";
+-static UNS_8 cpage_msg[] = "Coarse page:";
+-static UNS_8 fpage_msg[] = "Fine page :";
+-static UNS_8 sect_msg[] = "Section :";
+-static UNS_8 mbytes_msg[] = "M";
+-static UNS_8 map1_err_msg[] =
+- "Error : section addresses must be aligned on a 32-bit boundary";
+-static UNS_8 map2_err_msg[] =
+- "Error : Number of sections exceeds address range of device";
+-static UNS_8 phya_msg[] = "Virtual address ";
+-static UNS_8 mapped_msg[] = " mapped to physical address ";
+-static UNS_8 unmapped_msg[] = " unmapped from physical address ";
+-static UNS_8 cached_msg[] = " (cached)";
+-static UNS_8 inval_msg[] = " invalidated";
+-static UNS_8 caches_msg [] ="Caches";
+-static UNS_8 flushed_msg[] = " flushed";
+-
+-/***********************************************************************
+- *
+- * Function: show_section
+- *
+- * Purpose: Display section information
+- *
+- * Processing:
+- * See function.
+- *
+- * Parameters:
+- * mmu_reg : MMU settings for this section
+- * virt_addr : Starting virtual address for this section
+- * segs : Number of 1M segments for this section
+- *
+- * Outputs: None
+- *
+- * Returns: Nothing
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-static void show_section(UNS_32 mmu_reg,
+- UNS_32 virt_addr,
+- UNS_32 segs)
+-{
+- UNS_8 straddr [16];
+- UNS_32 mmu_phy;
+-
+- if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) !=
+- ARM922T_L1D_TYPE_FAULT)
+- {
+- if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) ==
+- ARM922T_L1D_TYPE_CPAGE)
+- {
+- term_dat_out(cpage_msg);
+- }
+- else if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) ==
+- ARM922T_L1D_TYPE_FPAGE)
+- {
+- term_dat_out(fpage_msg);
+- }
+- else
+- {
+- term_dat_out(sect_msg);
+- }
+-
+- /* Compute virtual address */
+- str_makehex(straddr, virt_addr, 8);
+- term_dat_out(straddr);
+- term_dat_out((UNS_8 *) " ");
+-
+- /* Compute mapped physical address */
+- if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) ==
+- ARM922T_L1D_TYPE_SECTION)
+- {
+- mmu_phy = mmu_reg & 0xFFF00000;
+- }
+- else
+- {
+- /* Don't compute addresses for non-sections */
+- mmu_phy = 0;
+- }
+- str_makehex(straddr, mmu_phy, 8);
+- term_dat_out(straddr);
+- term_dat_out((UNS_8 *) " ");
+-
+- /* MMU flags */
+- if ((mmu_reg & ARM922T_L1D_BUFFERABLE) != 0)
+- {
+- term_dat_out((UNS_8 *) "b");
+- }
+- else
+- {
+- term_dat_out((UNS_8 *) " ");
+- }
+- if ((mmu_reg & ARM922T_L1D_CACHEABLE) != 0)
+- {
+- term_dat_out((UNS_8 *) "c");
+- }
+- else
+- {
+- term_dat_out((UNS_8 *) " ");
+- }
+- term_dat_out((UNS_8 *) " ");
+-
+- /* Displays used megabytes */
+- str_makedec(straddr, segs);
+- term_dat_out(straddr);
+- term_dat_out_crlf(mbytes_msg);
+- }
+-}
+-
+-/***********************************************************************
+- *
+- * Function: mmu_dumpinfo
+- *
+- * Purpose: Display MMU info
+- *
+- * Processing:
+- * Display the MMU information, including enable status, cache
+- * status, and page table.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: TRUE if the command was processed, otherwise FALSE
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-static BOOL_32 mmu_dumpinfo(void)
+-{
+- UNS_32 segsz, last_mmu_reg, mmu_vrt, mmu_reg, mmu_vrtsav = 0, *pt;
+- UNS_32 mlast_mmu_reg, mmmu_reg;
+- int idx;
+- UNS_8 hexaddr [16];
+-
+- term_dat_out(mmu_msg);
+- if (cp15_mmu_enabled() == FALSE)
+- {
+- term_dat_out_crlf(disabled_msg);
+- }
+- else
+- {
+- term_dat_out_crlf(enabled_msg);
+-
+- /* Get MMU control register word */
+- mmu_reg = cp15_get_mmu_control_reg();
+-
+- /* Instruction cache status */
+- term_dat_out(icache_msg);
+- if ((mmu_reg & ARM922T_MMU_CONTROL_I) == 0)
+- {
+- term_dat_out_crlf(disabled_msg);
+- }
+- else
+- {
+- term_dat_out_crlf(enabled_msg);
+- }
+-
+- /* Data cache status */
+- term_dat_out(dcache_msg);
+- if ((mmu_reg & ARM922T_MMU_CONTROL_C) == 0)
+- {
+- term_dat_out_crlf(disabled_msg);
+- }
+- else
+- {
+- term_dat_out_crlf(enabled_msg);
+- }
+-
+- term_dat_out(pagetab_msg);
+- mmu_reg = (UNS_32) cp15_get_ttb();
+- str_makehex(hexaddr, mmu_reg, 8);
+- term_dat_out_crlf(hexaddr);
+- term_dat_out_crlf(slist_msg);
+-
+- /* Process MMU table - assume that the physical and
+- virtual locations of table are the same */
+- pt = (UNS_32 *) mmu_reg;
+- mmu_vrt = 0x0;
+- segsz = 0xFFFFFFFF;
+- last_mmu_reg = mlast_mmu_reg = 0xFFFFFFFF;
+- for (idx = 0; idx < 4096; idx++)
+- {
+- mmu_reg = *pt;
+- mmmu_reg = (mmu_reg & (ARM922T_L1D_TYPE_PG_SN_MASK |
+- ARM922T_L1D_BUFFERABLE | ARM922T_L1D_CACHEABLE));
+- segsz = segsz + 1;
+-
+- if ((last_mmu_reg != 0xFFFFFFFF) &&
+- (mlast_mmu_reg != mmmu_reg))
+- {
+- show_section(last_mmu_reg, mmu_vrtsav, segsz);
+- segsz = 0;
+- }
+-
+- if (mlast_mmu_reg != mmmu_reg)
+- {
+- mmu_vrtsav = mmu_vrt;
+- last_mmu_reg = mmu_reg;
+- mlast_mmu_reg = mmmu_reg;
+- }
+-
+- pt++;
+- mmu_vrt += 0x00100000;
+- }
+- }
+-
+- return TRUE;
+-}
+-
+-/***********************************************************************
+- *
+- * Function: mmu_dumpmap
+- *
+- * Purpose: Map a virtual address range to a physical range
+- *
+- * Processing:
+- * From the input addresses and number of sections, generate the
+- * appropriate entries in the page table.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: TRUE if the command was processed, otherwise FALSE
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-static BOOL_32 mmu_dumpmap(UNS_32 vrt,
+- UNS_32 phy,
+- UNS_32 sections,
+- UNS_32 cache)
+-{
+- BOOL_32 processed = FALSE;
+- UNS_32 mmu_phy, mmu_vrt, tmp1 = 0, tmp2, *pt;
+- UNS_8 hexaddr [16];
+-
+- /* Verify address boundaries are sectional */
+- mmu_vrt = vrt & ~ARM922T_L2D_SN_BASE_MASK;
+- mmu_phy = phy & ~ARM922T_L2D_SN_BASE_MASK;
+- if ((mmu_vrt != 0) || (mmu_phy != 0))
+- {
+- term_dat_out_crlf(map1_err_msg);
+- }
+- else
+- {
+- /* Verify that address range and section count will not
+- exceed address range of device */
+- tmp1 = vrt >> 20;
+- tmp1 = (tmp1 + sections) - 1;
+- tmp2 = phy >> 20;
+- tmp2 = (tmp2 + sections) - 1;
+- if ((tmp1 < 4096) && (tmp2 < 4096))
+- {
+- /* Good address range and good section count */
+- processed = TRUE;
+- }
+- else
+- {
+- term_dat_out_crlf(map2_err_msg);
+- }
+- }
+-
+- /* Generate static part of MMU word */
+- if (cache == 0)
+- {
+- /* Section mapped with cache disabled */
+- tmp1 = ARM922T_L1D_TYPE_SECTION;
+- }
+- else if (cache == 1)
+- {
+- /* Section mapped with cache enabled */
+- tmp1 = (ARM922T_L1D_BUFFERABLE | ARM922T_L1D_CACHEABLE |
+- ARM922T_L1D_TYPE_SECTION);
+- }
+- else if (cache == 2)
+- {
+- /* Section unmapped */
+- tmp1 = ARM922T_L1D_TYPE_FAULT;
+- }
+- tmp1 |= ARM922T_L1D_AP_ALL;
+-
+- /* Offset into page table for virtual address */
+- tmp2 = (vrt >> 20);
+- pt = cp15_get_ttb() + tmp2;
+-
+- /* Loop until all sections are complete */
+- while ((sections > 0) && (processed == TRUE))
+- {
+- /* Add in physical address */
+- tmp2 = tmp1 | (phy & ARM922T_L2D_SN_BASE_MASK);
+-
+- /* Save new section descriptor for virtual address */
+- *pt = tmp2;
+-
+- /* Output message shown the map */
+- term_dat_out(phya_msg);
+- str_makehex(hexaddr, phy, 8);
+- term_dat_out(hexaddr);
+- if (cache == 2)
+- {
+- term_dat_out(unmapped_msg);
+- }
+- else
+- {
+- term_dat_out(mapped_msg);
+- }
+- str_makehex(hexaddr, vrt, 8);
+- term_dat_out(hexaddr);
+- if (cache == 1)
+- {
+- term_dat_out(cached_msg);
+- }
+- term_dat_out_crlf((UNS_8 *) "");
+-
+- /* Next section and page table entry*/
+- phy += 0x00100000;
+- vrt += 0x00100000;
+- pt++;
+- sections--;
+- }
+-
+- return processed;
+-}
+-
+-/***********************************************************************
+- *
+- * Function: cmd_mmuinfo
+- *
+- * Purpose: Display MMU information
+- *
+- * Processing:
+- * See function.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: TRUE if the command was processed, otherwise FALSE
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-static BOOL_32 cmd_mmuinfo(void)
+-{
+- mmu_dumpinfo();
+-
+- return TRUE;
+-}
+-
+-/***********************************************************************
+- *
+- * Function: cmd_map
+- *
+- * Purpose: Map a physical address region to a virtual region
+- *
+- * Processing:
+- * See function.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: TRUE if the command was processed, otherwise FALSE
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-BOOL_32 cmd_map(void)
+-{
+- UNS_32 phy, virt, sects, ce = 0;
+-
+- /* Get arguments */
+- virt = cmd_get_field_val(1);
+- phy = cmd_get_field_val(2);
+- sects = cmd_get_field_val(3);
+- ce = cmd_get_field_val(4);
+-
+- if (ce <= 2)
+- {
+- mmu_dumpmap(virt, phy, sects, ce);
+- }
+-
+- return TRUE;
+-}
+-
+-/***********************************************************************
+- *
+- * Function: cmd_inval
+- *
+- * Purpose: MMU cache flush and invalidate
+- *
+- * Processing:
+- * See function.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: TRUE if the command was processed, otherwise FALSE
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-BOOL_32 cmd_inval(void)
+-{
+- dcache_flush();
+- icache_inval();
+- term_dat_out(caches_msg);
+- term_dat_out(inval_msg);
+-
+- return TRUE;
+-}
+-
+-/***********************************************************************
+- *
+- * Function: cmd_dcache
+- *
+- * Purpose: MMU data cache enable and disable
+- *
+- * Processing:
+- * If the value passed in the parser is 1, enable the data cache,
+- * otherwise disable the data cache.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: TRUE if the command was processed, otherwise FALSE
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-BOOL_32 cmd_dcache(void)
+-{
+- UNS_32 cenable;
+- UNS_8 *ppar;
+-
+- /* Get argument */
+- cenable = cmd_get_field_val(1);
+-
+- switch (cenable)
+- {
+- case 0:
+- dcache_flush();
+- cp15_set_dcache(0);
+- ppar = disabled_msg;
+- break;
+-
+- case 1:
+- cp15_invalidate_cache();
+- cp15_set_dcache(1);
+- ppar = enabled_msg;
+- break;
+-
+- case 2:
+- default:
+- dcache_flush();
+- ppar = flushed_msg;
+- break;
+- }
+-
+- term_dat_out(dcache_msg);
+- term_dat_out_crlf(ppar);
+-
+- return TRUE;
+-}
+-
+-/***********************************************************************
+- *
+- * Function: cmd_icache
+- *
+- * Purpose: MMU instruction cache enable and disable
+- *
+- * Processing:
+- * If the value passed in the parser is 1, enable the instruction
+- * cache, otherwise disable the instruction cache.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: TRUE if the command was processed, otherwise FALSE
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-BOOL_32 cmd_icache(void)
+-{
+- UNS_32 cenable;
+- UNS_8 *ppar;
+-
+- /* Get argument */
+- cenable = cmd_get_field_val(1);
+-
+- if (cenable == 1)
+- {
+- dcache_flush();
+- cp15_invalidate_cache();
+- cp15_set_icache(1);
+- ppar = enabled_msg;
+- }
+- else
+- {
+- cp15_set_icache(0);
+- ppar = disabled_msg;
+- }
+-
+- term_dat_out(icache_msg);
+- term_dat_out_crlf(ppar);
+-
+- return TRUE;
+-}
+-
+-
+-/***********************************************************************
+- *
+- * Function: cmd_mmuenab
+- *
+- * Purpose: Enable or disable MMU
+- *
+- * Processing:
+- * See function.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: TRUE if the command was processed, otherwise FALSE
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-BOOL_32 cmd_mmuenab(void)
+-{
+- UNS_8 *ppar;
+- UNS_32 cenable;
+-
+- term_dat_out_crlf((UNS_8 *) "Warning: Changing MMU status on "
+- " cached and buffered code can cause system crashes.");
+-
+- /* Get argument */
+- cenable = cmd_get_field_val(1);
+-
+- if (cenable == 1)
+- {
+- if ((cp15_get_mmu_control_reg() & ARM922T_MMU_CONTROL_C) != 0)
+- {
+- cp15_invalidate_cache();
+- }
+-
+- cp15_set_mmu(1);
+- ppar = enabled_msg;
+- }
+- else
+- {
+- cp15_dcache_flush();
+- cp15_write_buffer_flush();
+- cp15_invalidate_cache();
+- cp15_set_mmu(0);
+- ppar = disabled_msg;
+- }
+-
+- term_dat_out(mmu_msg);
+- term_dat_out_crlf(ppar);
+-
+- return TRUE;
+-}
+-
+-/***********************************************************************
+- *
+- * Function: mmu_cmd_group_init
+- *
+- * Purpose: Initialize MMU command group
+- *
+- * Processing:
+- * See function.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: Nothin
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-void mmu_cmd_group_init(void)
+-{
+- /* Add MMU group */
+- cmd_add_group(&mmu_group);
+-
+- /* Add commands to the MMU group */
+- cmd_add_new_command(&mmu_group, &core_dcache_cmd);
+- cmd_add_new_command(&mmu_group, &core_icache_cmd);
+- cmd_add_new_command(&mmu_group, &core_inval_cmd);
+- cmd_add_new_command(&mmu_group, &core_mmuenab_cmd);
+- cmd_add_new_command(&mmu_group, &core_map_cmd);
+- cmd_add_new_command(&mmu_group, &core_mmuinfo_cmd);
+-}
View
188 boot/lpc32xxcdl/lpc32xxcdl-2.11-libnosys_gnu.patch
@@ -0,0 +1,188 @@
+Fix compilation and eabi issues
+
+Since we are not linking with libc anymore, we need to define our own memset,
+strlen and memcpy. Also, as we are using a *libc compiler, we need to "handle"
+exceptions (mostly division by 0) by defining raise() and
+__aeabi_unwind_cpp_pr0.
+
+Signed-off-by: Alexandre Belloni <abelloni@adeneo-embedded.com>
+---
+ csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c | 41 +++++++++++++++++++++++
+ csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c | 41 +++++++++++++++++++++++
+ csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c | 41 +++++++++++++++++++++++
+ 3 files changed, 123 insertions(+), 0 deletions(-)
+
+diff --git a/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c b/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c
+index 385b0ab..f1f0a0a 100644
+--- a/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c
++++ b/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c
+@@ -25,6 +25,7 @@
+ #include <errno.h>
+ #include <sys/times.h>
+ #include <sys/stat.h>
++#include <sys/types.h>
+
+ /* errno definition */
+ #undef errno
+@@ -125,4 +126,44 @@ int _write(int file, char *ptr, int len){
+ return 0;
+ }
+
++void * memset(void * s,int c,size_t count)
++{
++ char *xs = (char *) s;
++
++ while (count--)
++ *xs++ = c;
++
++ return s;
++}
++
++
++size_t strlen(const char * s)
++{
++ const char *sc;
++
++ for (sc = s; *sc != '\0'; ++sc)
++ /* nothing */;
++ return sc - s;
++}
++
++void * memcpy(void * dest,const void *src,size_t count)
++{
++ char *tmp = (char *) dest, *s = (char *) src;
++
++ while (count--)
++ *tmp++ = *s++;
++
++ return dest;
++}
++
++
++/* Dummy functions to avoid linker complaints */
++void __aeabi_unwind_cpp_pr0(void)
++{
++};
++
++void raise(void)
++{
++};
++
+ #endif /*__GNUC__*/
+diff --git a/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c b/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c
+index 385b0ab..f1f0a0a 100644
+--- a/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c
++++ b/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c
+@@ -25,6 +25,7 @@
+ #include <errno.h>
+ #include <sys/times.h>
+ #include <sys/stat.h>
++#include <sys/types.h>
+
+ /* errno definition */
+ #undef errno
+@@ -125,4 +126,44 @@ int _write(int file, char *ptr, int len){
+ return 0;
+ }
+
++void * memset(void * s,int c,size_t count)
++{
++ char *xs = (char *) s;
++
++ while (count--)
++ *xs++ = c;
++
++ return s;
++}
++
++
++size_t strlen(const char * s)
++{
++ const char *sc;
++
++ for (sc = s; *sc != '\0'; ++sc)
++ /* nothing */;
++ return sc - s;
++}
++
++void * memcpy(void * dest,const void *src,size_t count)
++{
++ char *tmp = (char *) dest, *s = (char *) src;
++
++ while (count--)
++ *tmp++ = *s++;
++
++ return dest;
++}
++
++
++/* Dummy functions to avoid linker complaints */
++void __aeabi_unwind_cpp_pr0(void)
++{
++};
++
++void raise(void)
++{
++};
++
+ #endif /*__GNUC__*/
+diff --git a/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c b/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c
+index cfdb674..6b50c60 100644
+--- a/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c
++++ b/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c
+@@ -25,6 +25,7 @@
+ #include <errno.h>
+ #include <sys/times.h>
+ #include <sys/stat.h>
++#include <sys/types.h>
+
+ /* errno definition */
+ #undef errno
+@@ -125,4 +126,44 @@ int _write(int file, char *ptr, int len){
+ return 0;
+ }
+
++void * memset(void * s,int c,size_t count)
++{
++ char *xs = (char *) s;
++
++ while (count--)
++ *xs++ = c;
++
++ return s;
++}
++
++
++size_t strlen(const char * s)
++{
++ const char *sc;
++
++ for (sc = s; *sc != '\0'; ++sc)
++ /* nothing */;
++ return sc - s;
++}
++
++void * memcpy(void * dest,const void *src,size_t count)
++{
++ char *tmp = (char *) dest, *s = (char *) src;
++
++ while (count--)
++ *tmp++ = *s++;
++
++ return dest;
++}
++
++
++/* Dummy functions to avoid linker complaints */
++void __aeabi_unwind_cpp_pr0(void)
++{
++};
++
++void raise(void)
++{