From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 17 Sep 2011 22:33:41 +0000 (+0000)
Subject: Merge branch 'arm-port' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into... 
X-Git-Tag: v2.9-core54~13^2~70^2
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=38becfffb894e9daa239daab7162886892c4e8b4

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

Conflicts:
	lfs/linux
---

38becfffb894e9daa239daab7162886892c4e8b4
diff --cc lfs/linux
index 1f9916e0d7,63ffeb8460..a81aabcd18
--- a/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 49cff99b32,3d1381313f..477cd93ca5
--- a/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