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

Conflicts:
	make.sh

diff --combined make.sh
index 8b468217353ae597358130498cbaabf3622fdce3,557835ca9fa3a1156f718e85b9c5d79dc8eb60ef..7ad42b09579f433be38f23222c9052c567cbc244
--- 1/make.sh
--- 2/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
  
@@@ -397,29 -397,29 +398,29 @@@
  
      # x86-pae (Native and new XEN) kernel build
      ipfiremake linux                  KCFG="-pae"
 -    ipfiremake kvm-kmod                       KCFG="-pae"
 -    ipfiremake v4l-dvb                        KCFG="-pae"
 -    ipfiremake mISDN                  KCFG="-pae"
 +#    ipfiremake kvm-kmod                      KCFG="-pae"
 +#    ipfiremake v4l-dvb                       KCFG="-pae"
 +#    ipfiremake mISDN                 KCFG="-pae"
      ipfiremake cryptodev              KCFG="-pae"
 -    ipfiremake compat-drivers         KCFG="-pae"
 -    ipfiremake r8169                  KCFG="-pae"
 -    ipfiremake r8168                  KCFG="-pae"
 -    ipfiremake r8101                  KCFG="-pae"
 -    ipfiremake e1000e                 KCFG="-pae"
 -    ipfiremake igb                    KCFG="-pae"
 +#    ipfiremake compat-drivers                KCFG="-pae"
 +#    ipfiremake r8169                 KCFG="-pae"
 +#    ipfiremake r8168                 KCFG="-pae"
 +#    ipfiremake r8101                 KCFG="-pae"
 +#    ipfiremake e1000e                        KCFG="-pae"
 +#    ipfiremake igb                   KCFG="-pae"
  
      # x86 kernel build
      ipfiremake linux                  KCFG=""
 -    ipfiremake kvm-kmod                       KCFG=""
 -    ipfiremake v4l-dvb                        KCFG=""
 -    ipfiremake mISDN                  KCFG=""
 +#    ipfiremake kvm-kmod                      KCFG=""
 +#    ipfiremake v4l-dvb                       KCFG=""
 +#    ipfiremake mISDN                 KCFG=""
      ipfiremake cryptodev              KCFG=""
 -    ipfiremake compat-drivers         KCFG=""
 -    ipfiremake r8169                  KCFG=""
 -    ipfiremake r8168                  KCFG=""
 -    ipfiremake r8101                  KCFG=""
 -    ipfiremake e1000e                 KCFG=""
 -    ipfiremake igb                    KCFG=""
 +#    ipfiremake compat-drivers                KCFG=""
 +#    ipfiremake r8169                 KCFG=""
 +#    ipfiremake r8168                 KCFG=""
 +#    ipfiremake r8101                 KCFG=""
 +#    ipfiremake e1000e                        KCFG=""
 +#    ipfiremake igb                   KCFG=""
  
    else
      # arm-rpi (Raspberry Pi) kernel build
@@@ -530,7 -530,6 +531,7 @@@
    ipfiremake URI
    ipfiremake HTML-Tagset
    ipfiremake HTML-Parser
 +  ipfiremake HTML-Template
    ipfiremake Compress-Zlib
    ipfiremake Digest
    ipfiremake Digest-SHA1
@@@ -679,6 -678,7 +680,6 @@@
    ipfiremake mpc
    ipfiremake git
    ipfiremake squidclamav
 -  ipfiremake bc
    ipfiremake vnstat
    ipfiremake vnstati
    ipfiremake iw
@@@ -753,7 -753,6 +754,7 @@@
    ipfiremake acpid
    ipfiremake fping
    ipfiremake telnet
 +  ipfiremake xinetd
    ipfiremake libgpg-error
    ipfiremake libassuan
    ipfiremake gpgme