build only one image for all

diff --git a/make/bootloader.mk b/make/bootloader.mk
index 267d6ef5520a4d1feeee874cc66613fb5c56afbf..f59b4944e936af682b0480be32163956c6c7e8b8 100755 (executable)
--- a/make/bootloader.mk
+++ b/make/bootloader.mk
@@ -5,7 +5,5 @@ $(D)/coolstream-u-boot: | $(TARGETPREFIX)
        cd $(BUILD_TMP)/u-boot-2009.03-CST && \
                $(MAKE) coolstream_hdx_config && \
                $(MAKE)
-       cp -f $(BUILD_TMP)/u-boot-2009.03-CST/u-boot.bin $(BUILD_TMP)/hd1-mtd0-u-boot-$(DATE).img
-       cp -f $(BUILD_TMP)/u-boot-2009.03-CST/u-boot.bin $(BUILD_TMP)/neo-mtd0-u-boot-$(DATE).img
-       cp -f $(BUILD_TMP)/u-boot-2009.03-CST/u-boot.bin $(BUILD_TMP)/zee-mtd0-u-boot-$(DATE).img
+       cp -f $(BUILD_TMP)/u-boot-2009.03-CST/u-boot.bin $(BUILD_TMP)/u-boot-$(DATE).img
        touch $@

diff --git a/make/flashimage.mk b/make/flashimage.mk
index 03a1949f853c6e80f86fd4fcf49fadb381b9b41c..ac24ee561504b419a100a5821ef844d0997da949 100755 (executable)
--- a/make/flashimage.mk
+++ b/make/flashimage.mk
@@ -6,25 +6,19 @@ flash: $(D)/flashcp
        cd $(BUILD_TMP)/rootfs && \
        cp -f $(BUILD_TMP)/rootfs/etc/init.d/update.sh $(BUILD_TMP)/update.sh && \
        rm -f $(BUILD_TMP)/rootfs/etc/init.d/update.sh && \
-       tar -cf $(BUILD_TMP)/hd1-mtd2-systemfs-$(DATE).tar * .??*
-       cp -f $(BUILD_TMP)/hd1-mtd2-systemfs-$(DATE).tar $(BUILD_TMP)/neo-mtd3-systemfs-$(DATE).tar
-       cp -f $(BUILD_TMP)/hd1-mtd2-systemfs-$(DATE).tar $(BUILD_TMP)/zee-mtd3-systemfs-$(DATE).tar
+       tar -cf $(BUILD_TMP)/system-$(DATE).tar * .??*
        echo "/dev/console c 0777 0 0 5 1 0 0 0" > $(BUILD_TMP)/devtable
        echo "/dev/null c 0777 0 0 1 3 0 0 0" >> $(BUILD_TMP)/devtable
-       $(HOSTPREFIX)/bin/mkfs.jffs2 -U -p -r $(BUILD_TMP)/rootfs -D $(BUILD_TMP)/devtable -e 128KiB -o $(BUILD_TMP)/hd1-mtd2-systemfs-$(DATE).img
-       cp -f $(BUILD_TMP)/hd1-mtd2-systemfs-$(DATE).img $(BUILD_TMP)/neo-mtd3-systemfs-$(DATE).img
-       cp -f $(BUILD_TMP)/hd1-mtd2-systemfs-$(DATE).img $(BUILD_TMP)/zee-mtd3-systemfs-$(DATE).img
+       $(HOSTPREFIX)/bin/mkfs.jffs2 -U -p -r $(BUILD_TMP)/rootfs -D $(BUILD_TMP)/devtable -e 128KiB -o $(BUILD_TMP)/system-$(DATE).img
        rm -f $(BUILD_TMP)/devtable
        cp -f $(BUILD_TMP)/update.sh $(BUILD_TMP)/rootfs/etc/init.d/update.sh
        rm -f $(BUILD_TMP)/update.sh
 
 flash-full:
        cd $(BUILD_TMP)/rootfs && \
-       cp -f $(BUILD_TMP)/hd1-mtd1-kernel-compressed-??.??.????.img $(BUILD_TMP)/rootfs/var/update/uImage
+       cp -f $(BUILD_TMP)/kernel-compressed-??.??.????.img $(BUILD_TMP)/rootfs/var/update/uImage
        echo "/dev/console c 0777 0 0 5 1 0 0 0" > $(BUILD_TMP)/devtable
        echo "/dev/null c 0777 0 0 1 3 0 0 0" >> $(BUILD_TMP)/devtable
-       $(HOSTPREFIX)/bin/mkfs.jffs2 -U -p -r $(BUILD_TMP)/rootfs -D $(BUILD_TMP)/devtable -e 128KiB -o $(BUILD_TMP)/hd1-full-$(DATE).img
-       cp -f $(BUILD_TMP)/hd1-full-$(DATE).img $(BUILD_TMP)/neo-full-$(DATE).img
-       cp -f $(BUILD_TMP)/hd1-full-$(DATE).img $(BUILD_TMP)/zee-full-$(DATE).img
+       $(HOSTPREFIX)/bin/mkfs.jffs2 -U -p -r $(BUILD_TMP)/rootfs -D $(BUILD_TMP)/devtable -e 128KiB -o $(BUILD_TMP)/full-$(DATE).img
        rm -f $(BUILD_TMP)/devtable
        rm -f $(BUILD_TMP)/rootfs/var/update/uImage

diff --git a/make/kernel.mk b/make/kernel.mk
index d4c941cb4217f3061b8aa0fdbba9c53582b1af88..822f79a9ccc29ea46b33b2c09ec994b5d9f9aff3 100755 (executable)
--- a/make/kernel.mk
+++ b/make/kernel.mk
@@ -9,12 +9,8 @@ $(D)/coolstream-kernel-2.6.26.8-cnxt: $(D)/coolstream-u-boot | $(TARGETPREFIX)
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.26.8-cnxt-modules zImage && \
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.26.8-cnxt-modules modules && \
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.26.8-cnxt-modules modules_install
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream HDx Kernel" -d $(IMAGE) $(BUILD_TMP)/hd1-mtd1-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream HDx Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/hd1-mtd1-kernel-compressed-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream NEO Kernel" -d $(IMAGE) $(BUILD_TMP)/neo-mtd2-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream NEO Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/neo-mtd2-kernel-compressed-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream ZEE Kernel" -d $(IMAGE) $(BUILD_TMP)/zee-mtd2-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream ZEE Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/zee-mtd2-kernel-compressed-$(DATE).img
+               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream Kernel" -d $(IMAGE) $(BUILD_TMP)/kernel-$(DATE).img && \
+               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/kernel-compressed-$(DATE).img
        touch $@
 
 $(D)/coolstream-kernel-2.6.34.13-cnxt: $(D)/coolstream-u-boot | $(TARGETPREFIX)
@@ -26,12 +22,8 @@ $(D)/coolstream-kernel-2.6.34.13-cnxt: $(D)/coolstream-u-boot | $(TARGETPREFIX)
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.34.13-cnxt-modules zImage && \
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.34.13-cnxt-modules modules && \
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.34.13-cnxt-modules modules_install
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream HDx Kernel" -d $(IMAGE) $(BUILD_TMP)/hd1-mtd1-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream HDx Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/hd1-mtd1-kernel-compressed-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream NEO Kernel" -d $(IMAGE) $(BUILD_TMP)/neo-mtd2-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream NEO Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/neo-mtd2-kernel-compressed-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream ZEE Kernel" -d $(IMAGE) $(BUILD_TMP)/zee-mtd2-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream ZEE Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/zee-mtd2-kernel-compressed-$(DATE).img
+               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream Kernel" -d $(IMAGE) $(BUILD_TMP)/kernel-$(DATE).img && \
+               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/kernel-compressed-$(DATE).img
        touch $@
 
 $(D)/coolstream-kernel-2.6.35.14-cnxt: $(D)/coolstream-u-boot | $(TARGETPREFIX)
@@ -43,12 +35,8 @@ $(D)/coolstream-kernel-2.6.35.14-cnxt: $(D)/coolstream-u-boot | $(TARGETPREFIX)
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.35.14-cnxt-modules zImage && \
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.35.14-cnxt-modules modules && \
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.35.14-cnxt-modules modules_install
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream HDx Kernel" -d $(IMAGE) $(BUILD_TMP)/hd1-mtd1-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream HDx Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/hd1-mtd1-kernel-compressed-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream NEO Kernel" -d $(IMAGE) $(BUILD_TMP)/neo-mtd2-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream NEO Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/neo-mtd2-kernel-compressed-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream ZEE Kernel" -d $(IMAGE) $(BUILD_TMP)/zee-mtd2-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream ZEE Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/zee-mtd2-kernel-compressed-$(DATE).img
+               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream Kernel" -d $(IMAGE) $(BUILD_TMP)/kernel-$(DATE).img && \
+               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/kernel-compressed-$(DATE).img
        touch $@
 
 $(D)/coolstream-kernel-2.6.39.4-cnxt: $(D)/coolstream-u-boot | $(TARGETPREFIX)
@@ -60,12 +48,8 @@ $(D)/coolstream-kernel-2.6.39.4-cnxt: $(D)/coolstream-u-boot | $(TARGETPREFIX)
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.39.4-cnxt-modules zImage && \
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.39.4-cnxt-modules modules && \
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.39.4-cnxt-modules modules_install
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream HDx Kernel" -d $(IMAGE) $(BUILD_TMP)/hd1-mtd1-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream HDx Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/hd1-mtd1-kernel-compressed-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream NEO Kernel" -d $(IMAGE) $(BUILD_TMP)/neo-mtd2-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream NEO Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/neo-mtd2-kernel-compressed-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream ZEE Kernel" -d $(IMAGE) $(BUILD_TMP)/zee-mtd2-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream ZEE Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/zee-mtd2-kernel-compressed-$(DATE).img
+               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream Kernel" -d $(IMAGE) $(BUILD_TMP)/kernel-$(DATE).img && \
+               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/kernel-compressed-$(DATE).img
        touch $@
 
 $(D)/coolstream-kernel-2.6.26.8-cnxt-new: $(D)/coolstream-u-boot | $(TARGETPREFIX)
@@ -77,12 +61,8 @@ $(D)/coolstream-kernel-2.6.26.8-cnxt-new: $(D)/coolstream-u-boot | $(TARGETPREFI
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.26.8-cnxt-modules zImage && \
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.26.8-cnxt-modules modules && \
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.26.8-cnxt-modules modules_install
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream HDx Kernel" -d $(IMAGE) $(BUILD_TMP)/hd1-mtd1-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream HDx Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/hd1-mtd1-kernel-compressed-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream NEO Kernel" -d $(IMAGE) $(BUILD_TMP)/neo-mtd2-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream NEO Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/neo-mtd2-kernel-compressed-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream ZEE Kernel" -d $(IMAGE) $(BUILD_TMP)/zee-mtd2-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream ZEE Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/zee-mtd2-kernel-compressed-$(DATE).img && \
+               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream Kernel" -d $(IMAGE) $(BUILD_TMP)/kernel-$(DATE).img && \
+               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/kernel-compressed-$(DATE).img && \
        cp -f $(BUILD_TMP)/linux-2.6.26.8-cnxt-modules/lib/modules/2.6.26.8-nevis/kernel/drivers/hid/usbhid/usbhid.ko $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis/usbhid.ko
        cp -f $(BUILD_TMP)/linux-2.6.26.8-cnxt-modules/lib/modules/2.6.26.8-nevis/kernel/drivers/hid/hid.ko $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis/hid.ko
        cp -f $(BUILD_TMP)/linux-2.6.26.8-cnxt-modules/lib/modules/2.6.26.8-nevis/kernel/drivers/mtd/devices/block2mtd.ko $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis/block2mtd.ko
@@ -105,12 +85,8 @@ $(D)/coolstream-kernel-2.6.34.13-cnxt-new: $(D)/coolstream-u-boot | $(TARGETPREF
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.34.13-cnxt-modules zImage && \
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.34.13-cnxt-modules modules && \
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.34.13-cnxt-modules modules_install
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream HDx Kernel" -d $(IMAGE) $(BUILD_TMP)/hd1-mtd1-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream HDx Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/hd1-mtd1-kernel-compressed-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream NEO Kernel" -d $(IMAGE) $(BUILD_TMP)/neo-mtd2-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream NEO Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/neo-mtd2-kernel-compressed-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream ZEE Kernel" -d $(IMAGE) $(BUILD_TMP)/zee-mtd2-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream ZEE Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/zee-mtd2-kernel-compressed-$(DATE).img && \
+               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream Kernel" -d $(IMAGE) $(BUILD_TMP)/kernel-$(DATE).img && \
+               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/kernel-compressed-$(DATE).img && \
        cp -f $(BUILD_TMP)/linux-2.6.34.13-cnxt-modules/lib/modules/2.6.34.13-nevis/kernel/drivers/hid/usbhid/usbhid.ko $(TARGETPREFIX)/lib/modules/2.6.34.13-nevis/usbhid.ko
        cp -f $(BUILD_TMP)/linux-2.6.34.13-cnxt-modules/lib/modules/2.6.34.13-nevis/kernel/drivers/hid/hid.ko $(TARGETPREFIX)/lib/modules/2.6.34.13-nevis/hid.ko
        cp -f $(BUILD_TMP)/linux-2.6.34.13-cnxt-modules/lib/modules/2.6.34.13-nevis/kernel/drivers/mtd/devices/block2mtd.ko $(TARGETPREFIX)/lib/modules/2.6.34.13-nevis/block2mtd.ko
@@ -137,12 +113,8 @@ $(D)/coolstream-kernel-2.6.35.14-cnxt-new: $(D)/coolstream-u-boot | $(TARGETPREF
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.35.14-cnxt-modules zImage && \
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.35.14-cnxt-modules modules && \
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.35.14-cnxt-modules modules_install
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream HDx Kernel" -d $(IMAGE) $(BUILD_TMP)/hd1-mtd1-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream HDx Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/hd1-mtd1-kernel-compressed-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream NEO Kernel" -d $(IMAGE) $(BUILD_TMP)/neo-mtd2-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream NEO Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/neo-mtd2-kernel-compressed-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream ZEE Kernel" -d $(IMAGE) $(BUILD_TMP)/zee-mtd2-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream ZEE Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/zee-mtd2-kernel-compressed-$(DATE).img && \
+               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream Kernel" -d $(IMAGE) $(BUILD_TMP)/kernel-$(DATE).img && \
+               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/kernel-compressed-$(DATE).img && \
        cp -f $(BUILD_TMP)/linux-2.6.35.14-cnxt-modules/lib/modules/2.6.35.14-nevis+/kernel/drivers/hid/usbhid/usbhid.ko $(TARGETPREFIX)/lib/modules/2.6.35.14-nevis/usbhid.ko
        cp -f $(BUILD_TMP)/linux-2.6.35.14-cnxt-modules/lib/modules/2.6.35.14-nevis+/kernel/drivers/hid/hid.ko $(TARGETPREFIX)/lib/modules/2.6.35.14-nevis/hid.ko
        cp -f $(BUILD_TMP)/linux-2.6.35.14-cnxt-modules/lib/modules/2.6.35.14-nevis+/kernel/drivers/mtd/devices/block2mtd.ko $(TARGETPREFIX)/lib/modules/2.6.35.14-nevis/block2mtd.ko
@@ -169,12 +141,8 @@ $(D)/coolstream-kernel-2.6.39.4-cnxt-new: $(D)/coolstream-u-boot | $(TARGETPREFI
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.39.4-cnxt-modules zImage && \
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.39.4-cnxt-modules modules && \
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.39.4-cnxt-modules modules_install
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream HDx Kernel" -d $(IMAGE) $(BUILD_TMP)/hd1-mtd1-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream HDx Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/hd1-mtd1-kernel-compressed-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream NEO Kernel" -d $(IMAGE) $(BUILD_TMP)/neo-mtd2-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream NEO Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/neo-mtd2-kernel-compressed-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream ZEE Kernel" -d $(IMAGE) $(BUILD_TMP)/zee-mtd2-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream ZEE Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/zee-mtd2-kernel-compressed-$(DATE).img && \
+               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream Kernel" -d $(IMAGE) $(BUILD_TMP)/kernel-$(DATE).img && \
+               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "Coolstream Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/kernel-compressed-$(DATE).img && \
        cp -f $(BUILD_TMP)/linux-2.6.39.4-cnxt-modules/lib/modules/2.6.39.4-nevis/kernel/drivers/hid/usbhid/usbhid.ko $(TARGETPREFIX)/lib/modules/2.6.39.4-nevis/usbhid.ko
        cp -f $(BUILD_TMP)/linux-2.6.39.4-cnxt-modules/lib/modules/2.6.39.4-nevis/kernel/drivers/hid/hid.ko $(TARGETPREFIX)/lib/modules/2.6.39.4-nevis/hid.ko
        cp -f $(BUILD_TMP)/linux-2.6.39.4-cnxt-modules/lib/modules/2.6.39.4-nevis/kernel/drivers/mtd/devices/block2mtd.ko $(TARGETPREFIX)/lib/modules/2.6.39.4-nevis/block2mtd.ko
@@ -205,12 +173,8 @@ $(D)/coolstream-kernel-2.6.26.8-cnxt-uvc-new: $(D)/coolstream-u-boot | $(TARGETP
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.26.8-cnxt-modules zImage && \
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.26.8-cnxt-modules modules && \
                $(MAKE) ARCH=arm CROSS_COMPILE=arm-cx2450x-linux-gnueabi- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-2.6.26.8-cnxt-modules modules_install
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream HDx Kernel" -d $(IMAGE) $(BUILD_TMP)/hd1-mtd1-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream HDx Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/hd1-mtd1-kernel-compressed-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream NEO Kernel" -d $(IMAGE) $(BUILD_TMP)/neo-mtd2-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream NEO Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/neo-mtd2-kernel-compressed-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream ZEE Kernel" -d $(IMAGE) $(BUILD_TMP)/zee-mtd2-kernel-$(DATE).img && \
-               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream ZEE Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/zee-mtd2-kernel-compressed-$(DATE).img && \
+               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream Kernel" -d $(IMAGE) $(BUILD_TMP)/kernel-$(DATE).img && \
+               $(MKIMAGE) -A arm -O linux -T kernel -C none -a 0x17048000 -e 0x17048000 -n "Coolstream Kernel (compressed)" -d $(ZIMAGE) $(BUILD_TMP)/kernel-compressed-$(DATE).img && \
        cp -f $(BUILD_TMP)/linux-2.6.26.8-cnxt-modules/lib/modules/2.6.26.8-nevis/kernel/drivers/hid/usbhid/usbhid.ko $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis/usbhid.ko
        cp -f $(BUILD_TMP)/linux-2.6.26.8-cnxt-modules/lib/modules/2.6.26.8-nevis/kernel/drivers/hid/hid.ko $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis/hid.ko
        cp -f $(BUILD_TMP)/linux-2.6.26.8-cnxt-modules/lib/modules/2.6.26.8-nevis/kernel/drivers/media/video/uvc/uvcvideo.ko $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis/uvcvideo.ko