Merge branch 'arm-port' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into...

Conflicts:
	lfs/linux

diff --cc config/kernel/kernel.config.armv5tel-ipfire
Simple merge

diff --cc lfs/linux
index 1f9916e0d741cd0712b68a586771e8acb429e0d3,63ffeb8460c1ce476f498b0d57cbda2309061667..a81aabcd18d59738895be6a1c53dd033f5722177
--- 1/lfs/linux
--- 2/lfs/linux
+++ b/lfs/linux
@@@ -193,11 -187,10 +193,11 @@@ ifeq "$(XEN)" "1
        cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" vmlinuz
        cd $(DIR_APP) && cp -v arch/i386/boot/vmlinuz /boot/vmlinuz-$(VER)-$(VERSUFIX)
  else
- ifeq "$(MACHINE)" "arm"
 -      cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
+ ifeq "$(MACHINE_TYPE)" "arm"
 -      cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
 +      cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" uImage
 +      cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
  else
 +      cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
        cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
  endif
  endif

diff --cc make.sh
index 49cff99b329034d57c43d4cd705ecde2ac4a73d4,3d1381313fe6f2ea39d2cb33332e84899e83cf00..477cd93ca5092560583c3063d7cf8a2c2a6af942
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -376,12 -376,8 +376,12 @@@ buildipfire() 
    ipfiremake linux-firmware
    ipfiremake zd1211-firmware
  
-   if [ "${MACHINE}" == "arm" ]; then
++  if [ "${MACHINE_TYPE}" == "arm" ]; then
 +      ipfiremake u-boot
 +  fi
 +
    # The xen and PAE kernels are only available for x86
-   if [ "${MACHINE}" != "arm" ]; then
+   if [ "${MACHINE_TYPE}" != "arm" ]; then
      ipfiremake linux                  XEN=1
      ipfiremake kqemu                  XEN=1
      ipfiremake v4l-dvb                        XEN=1