Merge remote-tracking branch 'ms/arm-freescale' into fifteen

Conflicts:
	make.sh
This commit is contained in:
Michael Tremer
2013-08-28 11:14:17 +02:00
5 changed files with 145 additions and 20 deletions

View File

@@ -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