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

Conflicts:
	lfs/linux

diff --combined config/kernel/kernel.config.armv5tel-ipfire
index beabdaf85fb58d0835d7802b42a8eb24f635c939,fc29fd7cf8dea480b8cbe99c73ee49dd12d304db..beabdaf85fb58d0835d7802b42a8eb24f635c939
--- 1/config/kernel/kernel.config.arm-ipfire
--- 2/config/kernel/kernel.config.armv5tel-ipfire
+++ b/config/kernel/kernel.config.armv5tel-ipfire
@@@ -1,11 -1,10 +1,11 @@@
  #
  # Automatically generated make config: don't edit
 -# Linux kernel version: 2.6.32.45-ipfire
 -# Sat Sep  3 10:18:38 2011
 +# Linux kernel version: 2.6.32.45
 +# Sat Sep 17 13:58:02 2011
  #
  CONFIG_ARM=y
  CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 +CONFIG_GENERIC_GPIO=y
  CONFIG_GENERIC_TIME=y
  CONFIG_GENERIC_CLOCKEVENTS=y
  CONFIG_GENERIC_HARDIRQS=y
@@@ -104,6 -103,7 +104,6 @@@ CONFIG_HAVE_OPROFILE=
  # CONFIG_KPROBES is not set
  CONFIG_HAVE_KPROBES=y
  CONFIG_HAVE_KRETPROBES=y
 -CONFIG_HAVE_CLK=y
  
  #
  # GCOV-based kernel profiling
@@@ -145,7 -145,7 +145,7 @@@ CONFIG_MMU=
  # CONFIG_ARCH_AAEC2000 is not set
  # CONFIG_ARCH_INTEGRATOR is not set
  # CONFIG_ARCH_REALVIEW is not set
 -CONFIG_ARCH_VERSATILE=y
 +# CONFIG_ARCH_VERSATILE is not set
  # CONFIG_ARCH_AT91 is not set
  # CONFIG_ARCH_CLPS711X is not set
  # CONFIG_ARCH_GEMINI is not set
@@@ -164,7 -164,7 +164,7 @@@
  # CONFIG_ARCH_IXP2000 is not set
  # CONFIG_ARCH_IXP4XX is not set
  # CONFIG_ARCH_L7200 is not set
 -# CONFIG_ARCH_KIRKWOOD is not set
 +CONFIG_ARCH_KIRKWOOD=y
  # CONFIG_ARCH_LOKI is not set
  # CONFIG_ARCH_MV78XX0 is not set
  # CONFIG_ARCH_ORION5X is not set
@@@ -188,30 -188,22 +188,30 @@@
  # CONFIG_ARCH_BCMRING is not set
  
  #
 -# Versatile platform type
 +# Marvell Kirkwood Implementations
  #
 -CONFIG_ARCH_VERSATILE_PB=y
 -CONFIG_MACH_VERSATILE_AB=y
 +CONFIG_MACH_DB88F6281_BP=y
 +CONFIG_MACH_RD88F6192_NAS=y
 +CONFIG_MACH_RD88F6281=y
 +CONFIG_MACH_MV88F6281GTW_GE=y
 +CONFIG_MACH_SHEEVAPLUG=y
 +CONFIG_MACH_DREAMPLUG=y
 +CONFIG_MACH_TS219=y
 +CONFIG_MACH_OPENRD_BASE=y
 +CONFIG_PLAT_ORION=y
  
  #
  # Processor Type
  #
  CONFIG_CPU_32=y
 -CONFIG_CPU_ARM926T=y
 +CONFIG_CPU_FEROCEON=y
 +CONFIG_CPU_FEROCEON_OLD_ID=y
  CONFIG_CPU_32v5=y
 -CONFIG_CPU_ABRT_EV5TJ=y
 +CONFIG_CPU_ABRT_EV5T=y
  CONFIG_CPU_PABRT_LEGACY=y
  CONFIG_CPU_CACHE_VIVT=y
 -CONFIG_CPU_COPY_V4WB=y
 -CONFIG_CPU_TLB_V4WBI=y
 +CONFIG_CPU_COPY_FEROCEON=y
 +CONFIG_CPU_TLB_FEROCEON=y
  CONFIG_CPU_CP15=y
  CONFIG_CPU_CP15_MMU=y
  
@@@ -221,14 -213,18 +221,14 @@@
  CONFIG_ARM_THUMB=y
  # CONFIG_CPU_ICACHE_DISABLE is not set
  # CONFIG_CPU_DCACHE_DISABLE is not set
 -# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
 -# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
 +CONFIG_OUTER_CACHE=y
 +CONFIG_CACHE_FEROCEON_L2=y
 +# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
  CONFIG_ARM_L1_CACHE_SHIFT=5
 -CONFIG_ARM_VIC=y
 -CONFIG_ARM_VIC_NR=2
 -CONFIG_ICST307=y
 -CONFIG_COMMON_CLKDEV=y
  
  #
  # Bus support
  #
 -CONFIG_ARM_AMBA=y
  CONFIG_PCI=y
  CONFIG_PCI_SYSCALL=y
  # CONFIG_ARCH_SUPPORTS_MSI is not set
@@@ -275,6 -271,7 +275,6 @@@ CONFIG_HZ=10
  # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
  # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
  CONFIG_HIGHMEM=y
 -# CONFIG_HIGHPTE is not set
  CONFIG_SELECT_MEMORY_MODEL=y
  CONFIG_FLATMEM_MANUAL=y
  # CONFIG_DISCONTIGMEM_MANUAL is not set
@@@ -291,6 -288,7 +291,6 @@@ CONFIG_HAVE_MLOCK=
  CONFIG_HAVE_MLOCKED_PAGE_BIT=y
  CONFIG_KSM=y
  CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 -# CONFIG_LEDS is not set
  CONFIG_ALIGNMENT_TRAP=y
  # CONFIG_UACCESS_WITH_MEMCPY is not set
  
@@@ -958,6 -956,7 +958,6 @@@ CONFIG_BLK_DEV=
  CONFIG_BLK_DEV_LOOP=y
  CONFIG_BLK_DEV_CRYPTOLOOP=m
  CONFIG_BLK_DEV_NBD=m
 -CONFIG_BLK_DEV_OSD=m
  CONFIG_BLK_DEV_SX8=m
  # CONFIG_BLK_DEV_UB is not set
  CONFIG_BLK_DEV_RAM=y
@@@ -966,8 -965,6 +966,8 @@@ CONFIG_BLK_DEV_RAM_SIZE=1638
  # CONFIG_BLK_DEV_XIP is not set
  # CONFIG_CDROM_PKTCDVD is not set
  CONFIG_ATA_OVER_ETH=m
 +CONFIG_MG_DISK=m
 +CONFIG_MG_DISK_RES=0
  CONFIG_MISC_DEVICES=y
  # CONFIG_PHANTOM is not set
  # CONFIG_SGI_IOC4 is not set
@@@ -1115,6 -1112,9 +1115,6 @@@ CONFIG_SCSI_DH_HP_SW=
  CONFIG_SCSI_DH_EMC=m
  CONFIG_SCSI_DH_ALUA=m
  # CONFIG_SCSI_OSD_INITIATOR is not set
 -CONFIG_SCSI_OSD_ULD=m
 -CONFIG_SCSI_OSD_DPRINT_SENSE=1
 -# CONFIG_SCSI_OSD_DEBUG is not set
  CONFIG_ATA=m
  # CONFIG_ATA_NONSTANDARD is not set
  CONFIG_ATA_VERBOSE_ERROR=y
@@@ -1263,7 -1263,6 +1263,7 @@@ CONFIG_STE10XP=
  CONFIG_LSI_ET1011C_PHY=m
  # CONFIG_FIXED_PHY is not set
  CONFIG_MDIO_BITBANG=m
 +CONFIG_MDIO_GPIO=m
  CONFIG_NET_ETHERNET=y
  CONFIG_MII=m
  # CONFIG_AX88796 is not set
@@@ -1304,6 -1303,9 +1304,6 @@@ CONFIG_PCNET32=
  CONFIG_AMD8111_ETH=m
  CONFIG_ADAPTEC_STARFIRE=m
  # CONFIG_B44 is not set
 -CONFIG_B44_PCI_AUTOSELECT=y
 -CONFIG_B44_PCICORE_AUTOSELECT=y
 -CONFIG_B44_PCI=y
  CONFIG_FORCEDETH=m
  # CONFIG_FORCEDETH_NAPI is not set
  CONFIG_E100=m
@@@ -1353,7 -1355,6 +1353,7 @@@ CONFIG_VIA_VELOCITY=
  CONFIG_TIGON3=m
  CONFIG_BNX2=m
  CONFIG_CNIC=m
 +CONFIG_MV643XX_ETH=m
  CONFIG_QLA3XXX=m
  CONFIG_ATL1=m
  CONFIG_ATL1E=m
@@@ -1522,6 -1523,7 +1522,6 @@@ CONFIG_ATM_FORE200E_USE_TASKLET=
  CONFIG_ATM_FORE200E_TX_RETRY=16
  CONFIG_ATM_FORE200E_DEBUG=0
  # CONFIG_ATM_HE is not set
 -CONFIG_ATM_HE_USE_SUNI=y
  CONFIG_ATM_SOLOS=m
  CONFIG_IEEE802154_DRIVERS=m
  CONFIG_IEEE802154_FAKEHARD=m
@@@ -1706,8 -1708,6 +1706,8 @@@ CONFIG_KEYBOARD_ADP5588=
  CONFIG_KEYBOARD_ATKBD=y
  CONFIG_QT2160=m
  CONFIG_KEYBOARD_LKKBD=m
 +CONFIG_KEYBOARD_GPIO=m
 +CONFIG_KEYBOARD_MATRIX=m
  CONFIG_KEYBOARD_LM8323=m
  CONFIG_KEYBOARD_MAX7359=m
  CONFIG_KEYBOARD_NEWTON=m
@@@ -1728,7 -1728,6 +1728,7 @@@ CONFIG_INPUT_YEALINK=
  CONFIG_INPUT_CM109=m
  # CONFIG_INPUT_UINPUT is not set
  CONFIG_INPUT_PCF50633_PMU=m
 +CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
  CONFIG_INPUT_WM831X_ON=m
  
  #
@@@ -1737,6 -1736,7 +1737,6 @@@
  CONFIG_SERIO=y
  CONFIG_SERIO_SERPORT=y
  # CONFIG_SERIO_PARKBD is not set
 -# CONFIG_SERIO_AMBAKMI is not set
  # CONFIG_SERIO_PCIPS2 is not set
  CONFIG_SERIO_LIBPS2=y
  # CONFIG_SERIO_RAW is not set
@@@ -1772,6 -1772,7 +1772,6 @@@ CONFIG_SERIAL_8250_RSA=
  #
  # Non-8250 serial port support
  #
 -# CONFIG_SERIAL_AMBA_PL011 is not set
  CONFIG_SERIAL_CORE=y
  CONFIG_SERIAL_CORE_CONSOLE=y
  # CONFIG_SERIAL_JSM is not set
@@@ -1837,10 -1838,10 +1837,10 @@@ CONFIG_I2C_VIAPRO=
  #
  # I2C system bus drivers (mostly embedded / system-on-chip)
  #
 -# CONFIG_I2C_DESIGNWARE is not set
 +CONFIG_I2C_GPIO=m
 +CONFIG_I2C_MV64XXX=m
  CONFIG_I2C_OCORES=m
  CONFIG_I2C_SIMTEC=m
 -# CONFIG_I2C_VERSATILE is not set
  
  #
  # External I2C/SMBus adapter drivers
@@@ -1877,36 -1878,8 +1877,36 @@@ CONFIG_SENSORS_TSL2550=
  #
  CONFIG_PPS=m
  # CONFIG_PPS_DEBUG is not set
 -CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 -# CONFIG_GPIOLIB is not set
 +CONFIG_ARCH_REQUIRE_GPIOLIB=y
 +CONFIG_GPIOLIB=y
 +# CONFIG_DEBUG_GPIO is not set
 +# CONFIG_GPIO_SYSFS is not set
 +
 +#
 +# Memory mapped GPIO expanders:
 +#
 +
 +#
 +# I2C GPIO expanders:
 +#
 +CONFIG_GPIO_MAX732X=m
 +CONFIG_GPIO_PCA953X=m
 +CONFIG_GPIO_PCF857X=m
 +CONFIG_GPIO_WM831X=m
 +
 +#
 +# PCI GPIO expanders:
 +#
 +# CONFIG_GPIO_BT8XX is not set
 +# CONFIG_GPIO_LANGWELL is not set
 +
 +#
 +# SPI GPIO expanders:
 +#
 +
 +#
 +# AC97 GPIO expanders:
 +#
  CONFIG_W1=m
  CONFIG_W1_CON=y
  
@@@ -1916,7 -1889,7 +1916,7 @@@
  CONFIG_W1_MASTER_MATROX=m
  CONFIG_W1_MASTER_DS2490=m
  CONFIG_W1_MASTER_DS2482=m
 -# CONFIG_W1_MASTER_DS1WM is not set
 +CONFIG_W1_MASTER_GPIO=m
  
  #
  # 1-wire Slaves
@@@ -1988,7 -1961,6 +1988,7 @@@ CONFIG_SENSORS_MAX6650=
  CONFIG_SENSORS_PC87360=m
  CONFIG_SENSORS_PC87427=m
  CONFIG_SENSORS_PCF8591=m
 +CONFIG_SENSORS_SHT15=m
  CONFIG_SENSORS_SIS5595=m
  CONFIG_SENSORS_DME1737=m
  CONFIG_SENSORS_SMSC47M1=m
@@@ -2021,7 -1993,6 +2021,7 @@@ CONFIG_WATCHDOG=
  CONFIG_SOFT_WATCHDOG=m
  CONFIG_WM831X_WATCHDOG=m
  CONFIG_WM8350_WATCHDOG=m
 +CONFIG_ORION_WATCHDOG=m
  CONFIG_ALIM7101_WDT=m
  
  #
@@@ -2057,13 -2028,10 +2057,13 @@@ CONFIG_SSB_DRIVER_PCICORE=
  #
  CONFIG_MFD_CORE=m
  CONFIG_MFD_SM501=m
 +# CONFIG_MFD_SM501_GPIO is not set
 +# CONFIG_MFD_ASIC3 is not set
 +# CONFIG_HTC_EGPIO is not set
  CONFIG_HTC_PASIC3=m
 +CONFIG_TPS65010=m
  # CONFIG_MFD_TMIO is not set
 -# CONFIG_MFD_T7L66XB is not set
 -# CONFIG_MFD_TC6387XB is not set
 +# CONFIG_MFD_TC6393XB is not set
  CONFIG_MFD_WM8400=m
  CONFIG_MFD_WM831X=m
  CONFIG_MFD_WM8350=m
@@@ -2274,6 -2242,8 +2274,6 @@@ CONFIG_DAB=
  #
  CONFIG_VGA_ARB=y
  CONFIG_DRM=m
 -CONFIG_DRM_KMS_HELPER=m
 -CONFIG_DRM_TTM=m
  CONFIG_DRM_TDFX=m
  CONFIG_DRM_R128=m
  # CONFIG_DRM_RADEON is not set
@@@ -2308,6 -2278,7 +2308,6 @@@ CONFIG_FB_TILEBLITTING=
  CONFIG_FB_CIRRUS=m
  CONFIG_FB_PM2=m
  CONFIG_FB_PM2_FIFO_DISCONNECT=y
 -# CONFIG_FB_ARMCLCD is not set
  CONFIG_FB_CYBER2000=m
  CONFIG_FB_ASILIANT=y
  # CONFIG_FB_IMSTT is not set
@@@ -2340,6 -2311,8 +2340,6 @@@ CONFIG_FB_ATY_GX=
  CONFIG_FB_ATY_BACKLIGHT=y
  CONFIG_FB_S3=m
  # CONFIG_FB_SAVAGE is not set
 -CONFIG_FB_SAVAGE_I2C=y
 -CONFIG_FB_SAVAGE_ACCEL=y
  CONFIG_FB_SIS=m
  CONFIG_FB_SIS_300=y
  CONFIG_FB_SIS_315=y
@@@ -2382,7 -2355,6 +2382,7 @@@ CONFIG_DISPLAY_SUPPORT=
  #
  # Console display driver support
  #
 +# CONFIG_VGA_CONSOLE is not set
  CONFIG_DUMMY_CONSOLE=y
  CONFIG_FRAMEBUFFER_CONSOLE=y
  # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
@@@ -2492,6 -2464,7 +2492,6 @@@ CONFIG_SND_PCI=
  # CONFIG_SND_VX222 is not set
  # CONFIG_SND_YMFPCI is not set
  CONFIG_SND_ARM=y
 -# CONFIG_SND_ARMAACI is not set
  CONFIG_SND_USB=y
  # CONFIG_SND_USB_AUDIO is not set
  # CONFIG_SND_USB_CAIAQ is not set
@@@ -2726,7 -2699,6 +2726,7 @@@ CONFIG_USB_XUSBATM=
  # OTG and related infrastructure
  #
  CONFIG_USB_OTG_UTILS=y
 +CONFIG_USB_GPIO_VBUS=m
  CONFIG_NOP_USB_XCEIV=m
  CONFIG_UWB=m
  CONFIG_UWB_HWA=m
@@@ -2749,6 -2721,7 +2749,6 @@@ CONFIG_MMC_TEST=
  #
  # MMC/SD/SDIO Host Controller Drivers
  #
 -# CONFIG_MMC_ARMMMCI is not set
  CONFIG_MMC_SDHCI=m
  CONFIG_MMC_SDHCI_PCI=m
  CONFIG_MMC_RICOH_MMC=m
@@@ -2756,7 -2729,6 +2756,7 @@@ CONFIG_MMC_SDHCI_PLTFM=
  # CONFIG_MMC_AT91 is not set
  # CONFIG_MMC_ATMELMCI is not set
  CONFIG_MMC_TIFM_SD=m
 +CONFIG_MMC_MVSDIO=m
  CONFIG_MMC_SDRICOH_CS=m
  CONFIG_MMC_CB710=m
  CONFIG_MMC_VIA_SDMMC=m
@@@ -2781,8 -2753,6 +2781,8 @@@ CONFIG_LEDS_CLASS=
  # LED drivers
  #
  CONFIG_LEDS_PCA9532=m
 +CONFIG_LEDS_GPIO=m
 +CONFIG_LEDS_GPIO_PLATFORM=y
  CONFIG_LEDS_LP3944=m
  CONFIG_LEDS_PCA955X=m
  CONFIG_LEDS_WM831X_STATUS=m
@@@ -2796,7 -2766,6 +2796,7 @@@ CONFIG_LEDS_TRIGGERS=
  CONFIG_LEDS_TRIGGER_TIMER=m
  CONFIG_LEDS_TRIGGER_HEARTBEAT=m
  CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 +CONFIG_LEDS_TRIGGER_GPIO=m
  CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
  
  #
@@@ -2862,21 -2831,13 +2862,21 @@@ CONFIG_RTC_DRV_AB3100=
  #
  # on-CPU RTC drivers
  #
 -# CONFIG_RTC_DRV_PL030 is not set
 -# CONFIG_RTC_DRV_PL031 is not set
 +CONFIG_RTC_DRV_MV=m
  CONFIG_DMADEVICES=y
  
  #
  # DMA Devices
  #
 +CONFIG_MV_XOR=y
 +CONFIG_DMA_ENGINE=y
 +
 +#
 +# DMA Clients
 +#
 +CONFIG_NET_DMA=y
 +CONFIG_ASYNC_TX_DMA=y
 +CONFIG_DMATEST=m
  # CONFIG_AUXDISPLAY is not set
  CONFIG_UIO=m
  CONFIG_UIO_CIF=m
@@@ -2929,6 -2890,7 +2929,6 @@@ CONFIG_ET131X=
  CONFIG_IDE_PHISON=m
  # CONFIG_PLAN9AUTH is not set
  # CONFIG_LINE6_USB is not set
 -# CONFIG_DRM_RADEON_KMS is not set
  # CONFIG_USB_SERIAL_QUATECH2 is not set
  # CONFIG_USB_SERIAL_QUATECH_USB2 is not set
  # CONFIG_VT6655 is not set
@@@ -3080,6 -3042,7 +3080,6 @@@ CONFIG_JFFS2_CMODE_PRIORITY=
  # CONFIG_ROMFS_FS is not set
  # CONFIG_SYSV_FS is not set
  # CONFIG_UFS_FS is not set
 -# CONFIG_EXOFS_FS is not set
  CONFIG_NETWORK_FILESYSTEMS=y
  CONFIG_NFS_FS=m
  CONFIG_NFS_V3=y
@@@ -3366,7 -3329,6 +3366,7 @@@ CONFIG_CRYPTO_LZO=
  #
  CONFIG_CRYPTO_ANSI_CPRNG=m
  CONFIG_CRYPTO_HW=y
 +CONFIG_CRYPTO_DEV_MV_CESA=m
  CONFIG_CRYPTO_DEV_HIFN_795X=m
  CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
  # CONFIG_BINARY_PRINTF is not set

diff --combined lfs/linux
index 1f9916e0d741cd0712b68a586771e8acb429e0d3,63ffeb8460c1ce476f498b0d57cbda2309061667..a81aabcd18d59738895be6a1c53dd033f5722177
--- 1/lfs/linux
--- 2/lfs/linux
+++ b/lfs/linux
@@@ -63,7 -63,7 +63,7 @@@ els
        TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)
  endif
  
- ifeq "$(MACHINE)" "arm"
+ ifeq "$(MACHINE_TYPE)" "arm"
        HEADERS_ARCH=arm
  else
        HEADERS_ARCH=x86
@@@ -165,12 -165,6 +165,12 @@@ endi
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_ipg-fix-driver-name.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch
  
 +ifeq "$(MACHINE)" "arm"
 +      # Add dreamplug support on ARM
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.45-arm_kirkwood_dreamplug.patch
 +endif
 +
 +
  ifeq "$(HEADERS)" "1"
        # Install the header files
        cd $(DIR_APP) && make ARCH=$(HEADERS_ARCH) INSTALL_HDR_PATH=dest headers_install
@@@ -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
@@@ -242,7 -235,7 +242,7 @@@ endi
        rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
        rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
  
- ifneq "$(MACHINE)" "arm"
+ ifneq "$(MACHINE_TYPE)" "arm"
        # Disable geode_aes modul
        mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko \
             /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko.off

diff --combined make.sh
index 49cff99b329034d57c43d4cd705ecde2ac4a73d4,3d1381313fe6f2ea39d2cb33332e84899e83cf00..477cd93ca5092560583c3063d7cf8a2c2a6af942
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -255,7 -255,7 +255,7 @@@ buildtoolchain() 
      lfsmake1 make     PASS=1
      lfsmake1 binutils PASS=1
      lfsmake1 gcc              PASS=1
-     if [ "${MACHINE}" = "arm" ]; then
+     if [ "${MACHINE_TYPE}" = "arm" ]; then
          lfsmake1 linux TOOLS=1 HEADERS=1
      else
          lfsmake1 linux-libc-header
@@@ -294,7 -294,7 +294,7 @@@ buildbase() 
      LOGFILE="$BASEDIR/log/_build.base.log"
      export LOGFILE
      lfsmake2 stage2
-     if [ "${MACHINE}" = "arm" ]; then
+     if [ "${MACHINE_TYPE}" = "arm" ]; then
          lfsmake2 linux HEADERS=1
      else
          lfsmake2 linux-libc-header
@@@ -354,7 -354,7 +354,7 @@@
      lfsmake2 vim
  
      # ARM cannot use grub.
-     if [ "${MACHINE}" != "arm" ]; then
+     if [ "${MACHINE_TYPE}" != "arm" ]; then
        lfsmake2 grub
      fi
  }
@@@ -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
@@@ -418,7 -414,7 +418,7 @@@
    ipfiremake linux
    ipfiremake v4l-dvb
  
-   if [ "${MACHINE}" != "arm" ]; then
+   if [ "${MACHINE_TYPE}" != "arm" ]; then
      # Virtualization helpers are only available for x86.
      ipfiremake kqemu
      ipfiremake kvm-kmod
@@@ -435,15 -431,12 +435,12 @@@
  #  ipfiremake r8169
  #  ipfiremake r8168
  #  ipfiremake r8101
-   ipfiremake e1000
-   ipfiremake e1000e
-   ipfiremake igb
+   #ipfiremake e1000
+   #ipfiremake e1000e
+   #ipfiremake igb
    ipfiremake pkg-config
    ipfiremake linux-atm
    ipfiremake cpio
- 
-   installmake strip
- 
    ipfiremake dracut
    ipfiremake expat
    ipfiremake gdbm
@@@ -485,7 -478,7 +482,7 @@@
    ipfiremake arping
    ipfiremake beep
    ipfiremake bind
-   ipfiremake cdrtools
+   ipfiremake dvdrtools
    ipfiremake dnsmasq
    ipfiremake dosfstools
    ipfiremake reiserfsprogs
@@@ -673,7 -666,7 +670,7 @@@
    ipfiremake wpa_supplicant
    ipfiremake hostapd
    ipfiremake urlgrabber
-   if [ "${MACHINE:0:3}" != "arm" ]; then
+   if [ "${MACHINE_TYPE}" != "arm" ]; then
      ipfiremake syslinux
    fi
    ipfiremake tftpd
@@@ -700,7 -693,7 +697,7 @@@
    ipfiremake perl-DBD-mysql
    ipfiremake cacti
    ipfiremake icecc
-   if [ "${MACHINE:0:3}" != "arm" ]; then
+   if [ "${MACHINE_TYPE}" != "arm" ]; then
      ipfiremake openvmtools
    fi
    ipfiremake nagiosql
@@@ -758,7 -751,7 +755,7 @@@ buildinstaller() 
    # Run installer scripts one by one
    LOGFILE="$BASEDIR/log/_build.installer.log"
    export LOGFILE
-   if [ "${MACHINE:0:3}" != "arm" ]; then
+   if [ "${MACHINE_TYPE}" != "arm" ]; then
      ipfiremake as86
      ipfiremake mbr
      ipfiremake memtest
@@@ -795,11 -788,13 +792,13 @@@ buildpackages() 
    $0 git log
  
    # Create images for install
-       ipfiremake cdrom ED=$IPFVER
+   ipfiremake cdrom ED=$IPFVER
  
    # Check if there is a loop device for building in virtual environments
-   if [ $BUILD_IMAGES == 1 ] &&  ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
-       ipfiremake usb-stick ED=$IPFVER
+   if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
+       if [ "${MACHINE_TYPE}" != "arm" ]; then
+               ipfiremake usb-stick ED=$IPFVER
+       fi
        ipfiremake flash-images ED=$IPFVER
    fi