[x86] change default kernel to 2.6.32.8, remove block2mtd patch until it is fixed

[openwrt.git] / target / linux / orion / image / Makefile

diff --git a/target/linux/orion/image/Makefile b/target/linux/orion/image/Makefile
index 0650870..81cd670 100644 (file)
--- a/target/linux/orion/image/Makefile
+++ b/target/linux/orion/image/Makefile
@@ -1,9 +1,10 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
+
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
@@ -26,10 +27,73 @@ define Image/BuildKernel
        -C none -a 0x00008000 -e 0x00008000 -n 'Linux-$(LINUX_VERSION)' \
        -d $(KDIR)/wnr854t-zImage $(KDIR)/wnr854t-uImage
        cp $(KDIR)/wnr854t-uImage $(BIN_DIR)/openwrt-wnr854t-uImage
+# DT2: mach id 1514 (0x5EA)
+       echo -en "\x05\x1c\xa0\xe3\xea\x10\x81\xe3" > $(KDIR)/dt2-zImage
+       cat $(LINUX_DIR)/arch/arm/boot/zImage >> $(KDIR)/dt2-zImage
+       $(STAGING_DIR_HOST)/bin/mkimage -A arm -O linux -T kernel \
+       -C none -a 0x00008000 -e 0x00008000 -n 'Linux-$(LINUX_VERSION)' \
+       -d $(KDIR)/dt2-zImage $(KDIR)/dt2-uImage
+       cp $(KDIR)/dt2-uImage $(BIN_DIR)/openwrt-dt2-uImage
+endef
+
+define Image/Build/Netgear
+       mkdir $(KDIR)/netgear_image
+       cp $(KDIR)/wnr854t-uImage $(KDIR)/netgear_image/uImage
+       $(STAGING_DIR_HOST)/bin/mkfs.jffs2 -m none -p -l -q -e 128KiB -o $(KDIR)/wnr854t-uImage.jffs2 -d $(KDIR)/netgear_image
+       rm -rf $(KDIR)/netgear_image
+       ( \
+               dd if=$(KDIR)/wnr854t-uImage.jffs2 bs=1024k conv=sync; \
+               dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
+       ) > $(BIN_DIR)/openwrt-$(2)-$(1).img
+       $(STAGING_DIR_HOST)/bin/add_header $(3) $(BIN_DIR)/openwrt-$(2)-$(1).img $(BIN_DIR)/openwrt-$(2)-$(1)-webupgrade.img
+endef
+
+define Image/Build/Linksys
+# WRT350N v2 images
+# sysupgrade image
+       ( \
+               dd if="${KDIR}/$2-uImage" bs=$5 conv=sync; \
+               dd if="${KDIR}/root.$1" bs=64k conv=sync; \
+       ) > "${BIN_DIR}/openwrt-$2-$1.img"
+# recovery image and webupgrade image for stock firmware
+       rm -rf "${TMP_DIR}/$2_webupgrade"
+       mkdir "${TMP_DIR}/$2_webupgrade"
+# create parameter file
+       echo ":kernel $5 ${BIN_DIR}/openwrt-$2-uImage" >"${TMP_DIR}/$2_webupgrade/$2.par"
+       echo ":rootfs 0 ${KDIR}/root.$1" >>"${TMP_DIR}/$2_webupgrade/$2.par"
+       [ ! -f "$(STAGING_DIR_HOST)/share/wrt350nv2-builder/u-boot.bin" ] || ( \
+               echo ":u-boot 0 $(STAGING_DIR_HOST)/share/wrt350nv2-builder/u-boot.bin" >>"${TMP_DIR}/$2_webupgrade/$2.par"; )
+       echo "#version 0x2020" >>"${TMP_DIR}/$2_webupgrade/$2.par"
+# create bin file for recovery and webupgrade image
+       ( cd "${TMP_DIR}/$2_webupgrade"; \
+               "${STAGING_DIR_HOST}/bin/$2-builder" \
+                       -v -b "${TMP_DIR}/$2_webupgrade/$2.par"; \
+       )
+# copy bin file as recovery image
+       $(CP) "${TMP_DIR}/$2_webupgrade/wrt350n.bin" "$(BIN_DIR)/openwrt-$2-$1-recovery.bin"
+# create webupgrade image for stock firmware update mechanism
+       zip "${TMP_DIR}/$2_webupgrade/wrt350n.zip" "${TMP_DIR}/$2_webupgrade/wrt350n.bin"
+       "${STAGING_DIR_HOST}/bin/$2-builder" -v -z "${TMP_DIR}/$2_webupgrade/wrt350n.zip" "${BIN_DIR}/openwrt-$2-$1-webupgrade.img"
+       rm -rf "${TMP_DIR}/$2_webupgrade"
+endef
+
+define Image/Build/Freecom
+       $(INSTALL_DIR) $(TARGET_DIR)/boot
+       # TODO: Add special CMDLINE shim for webupgrade image here
+       $(CP) $(KDIR)/dt2-uImage $(TARGET_DIR)/boot/uImage
+       rm -rf $(TARGET_DIR)/{var,jffs,rom}
+       $(INSTALL_DIR) $(TARGET_DIR)/var
+       $(TAR) cfj $(BIN_DIR)/openwrt-$(2)-$(1).img --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ .
+       $(STAGING_DIR_HOST)/bin/encode_crc $(BIN_DIR)/openwrt-$(2)-$(1).img $(BIN_DIR)/openwrt-$(2)-$(1)-webupgrade.img $(3)
 endef
 
 define Image/Build
        $(call Image/Build/$(1),$(1))
+       $(call Image/Build/Netgear,$(1),wnr854t,NG_WNR854T,$(1))
+       $(call Image/Build/Freecom,$(1),dt2,DT,$(1))
+# Leave WRT350Nv2 at last position due to webimage dependency for zip
+# 5th parameter is kernel mtd size, e.g. 0x00100000 = 1048576 or 0x001A0000 = 1703936
+       $(call Image/Build/Linksys,$(1),wrt350nv2,WNR350Nv2,$(1),1048576)
 endef
 
 define Image/Build/squashfs
@@ -41,3 +105,8 @@ define Image/Build/squashfs
 endef
 
 $(eval $(call BuildImage))
+
+# Dependency for WRT350N v2 webupgrade image
+$(eval $(call RequireCommand,zip, \
+       Please install zip. \
+))