Merge remote-tracking branch 'ms/arm-freescale' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Aug 2013 09:14:17 +0000 (11:14 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Aug 2013 09:14:17 +0000 (11:14 +0200)
Conflicts:
make.sh

1  2 
make.sh

diff --cc make.sh
+++ b/make.sh
@@@ -377,8 -377,8 +377,9 @@@ buildipfire() 
    ipfiremake dvb-firmwares
    ipfiremake zd1211-firmware
    ipfiremake rpi-firmware
-   ipfiremake u-boot
 +  ipfiremake bc
+   ipfiremake u-boot
+   ipfiremake u-boot-panda
  
    if [ "${MACHINE_TYPE}" != "arm" ]; then