diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-07 22:22:05 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-07 22:22:05 +0200 |
| commit | a48ecc969f8d2d0fe9167962e9b8b4cca52de10b (patch) | |
| tree | 604e04770713cb314cb6184e26eeb4319dec3d43 /MAKEALL | |
| parent | bec9cab9291bb221714d559a44fe37669a8ca604 (diff) | |
| parent | ceb70b466e75ceb1a621b6163f7e31116bfc8094 (diff) | |
| download | blackbird-obmc-uboot-a48ecc969f8d2d0fe9167962e9b8b4cca52de10b.tar.gz blackbird-obmc-uboot-a48ecc969f8d2d0fe9167962e9b8b4cca52de10b.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
drivers/spi/Makefile
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'MAKEALL')
| -rwxr-xr-x | MAKEALL | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -513,7 +513,8 @@ LIST_ARM9=" \ mx1ads \ mx1fs2 \ netstar \ - nmdk8815 \ + nhk8815 \ + nhk8815_onenand \ omap1510inn \ omap1610h2 \ omap1610inn \ @@ -555,6 +556,8 @@ LIST_ARM11=" \ imx31_phycore \ imx31_phycore_eet \ mx31ads \ + mx31pdk \ + mx31pdk_nand \ qong \ smdk6400 \ " @@ -588,8 +591,10 @@ LIST_at91=" \ cmc_pu2 \ csb637 \ kb9202 \ + meesc \ mp2usb \ m501sk \ + pm9261 \ pm9263 \ " @@ -605,7 +610,9 @@ LIST_pxa=" \ innokom \ lubbock \ pleb2 \ + polaris \ pxa255_idp \ + trizepsiv \ wepep250 \ xaeniax \ xm250 \ |
