update Linux kernels, add support for compression choice

Config.in

@@ -98,20 +98,68 @@ config ADK_KERNEL_VERSION_2_6_39_4
 	prompt "2.6.39.4"
 	boolean
 
-config ADK_KERNEL_VERSION_3_0_9
-	prompt "3.0.9"
+config ADK_KERNEL_VERSION_3_0_17
+	prompt "3.0.17"
 	boolean
 
-config ADK_KERNEL_VERSION_3_1_8
-	prompt "3.1.8"
+config ADK_KERNEL_VERSION_3_1_9
+	prompt "3.1.9"
 	boolean
 
-config ADK_KERNEL_VERSION_3_2_0
-	prompt "3.2.0"
+config ADK_KERNEL_VERSION_3_2_1
+	prompt "3.2.1"
 	boolean
 
 endchoice
 
+choice
+prompt "Kernel Compression"
+config ADK_KERNEL_COMP_XZ
+	prompt "use XZ compression"
+	boolean
+	select ADK_KERNEL_RD_XZ
+	select ADK_KERNEL_KERNEL_XZ
+	select ADK_KERNEL_INITRAMFS_COMPRESSION_XZ
+
+config ADK_KERNEL_COMP_LZMA
+	prompt "use LZMA compression"
+	boolean
+	select ADK_KERNEL_RD_LZMA
+	select ADK_KERNEL_KERNEL_LZMA
+	select ADK_KERNEL_INITRAMFS_COMPRESSION_LZMA
+
+config ADK_KERNEL_COMP_LZO
+	prompt "use LZO compression"
+	boolean
+	select ADK_KERNEL_RD_LZO
+	select ADK_KERNEL_KERNEL_LZO
+	select ADK_KERNEL_INITRAMFS_COMPRESSION_LZO
+
+config ADK_KERNEL_COMP_GZIP
+	prompt "use GZIP compression"
+	boolean
+	select ADK_KERNEL_RD_GZIP
+	select ADK_KERNEL_KERNEL_GZIP
+	select ADK_KERNEL_INITRAMFS_COMPRESSION_GZIP
+
+config ADK_KERNEL_COMP_BZIP2
+	prompt "use BZIP2 compression"
+	boolean
+	select ADK_KERNEL_RD_BZIP2
+	select ADK_KERNEL_KERNEL_BZIP2
+	select ADK_KERNEL_INITRAMFS_COMPRESSION_BZIP2
+
+endchoice
+
+config ADK_COMPRESSION_TOOL
+	string
+	default "gzip -n9" if ADK_TARGET_INITRAMFS_COMPRESSION_GZIP
+	default "bzip2" if ADK_TARGET_INITRAMFS_COMPRESSION_BZIP2
+	default "xz" if ADK_TARGET_INITRAMFS_COMPRESSION_XZ
+	default "lzma -9" if ADK_TARGET_INITRAMFS_COMPRESSION_LZMA
+	default "lzop" if ADK_TARGET_INITRAMFS_COMPRESSION_LZO
+	help
+
 source "target/linux/Config.in"
 endmenu
 

mk/image.mk

@@ -105,7 +105,7 @@ ${BIN_DIR}/${INITRAMFS}_list: ${TARGET_DIR}
 
 ${BIN_DIR}/${INITRAMFS}: ${BIN_DIR}/${INITRAMFS}_list
 	sh ${LINUX_DIR}/usr/gen_init_cpio ${BIN_DIR}/${INITRAMFS}_list | \
-		gzip -9 -c >$@
+		${ADK_COMPRESSION_TOOL} -c >$@
 
 ${BUILD_DIR}/root.squashfs: ${TARGET_DIR}
 	${STAGING_HOST_DIR}/bin/mksquashfs ${TARGET_DIR} \
@@ -113,14 +113,33 @@ ${BUILD_DIR}/root.squashfs: ${TARGET_DIR}
 		-nopad -noappend -root-owned $(MAKE_TRACE)
 
 createinitramfs: ${BIN_DIR}/${INITRAMFS}_list
-	${SED} 's/.*CONFIG_(BLK_DEV_INITRD|INITRAMFS_SOURCE).*//' \
+	${SED} 's/.*CONFIG_(BLK_DEV_INITRD|INITRAMFS_SOURCE|INITRAMFS_COMPRESSION).*//' \
 		${LINUX_DIR}/.config
 	( \
 		echo "CONFIG_BLK_DEV_INITRD=y"; \
 		echo 'CONFIG_INITRAMFS_SOURCE="${BIN_DIR}/${INITRAMFS}_list"'; \
-		echo "CONFIG_INITRAMFS_COMPRESSION_GZIP=y"; \
+		echo 'CONFIG_INITRAMFS_COMPRESSION_NONE is not set' >> ${LINUX_DIR}/.config; \
 	) >> ${LINUX_DIR}/.config
-
+ifeq ($(ADK_KERNEL_COMP_XZ),y)
+		echo "CONFIG_RD_XZ=y" >> ${LINUX_DIR}/.config
+		echo "CONFIG_INITRAMFS_COMPRESSION_XZ=y" >> ${LINUX_DIR}/.config
+endif
+ifeq ($(ADK_KERNEL_COMP_LZMA),y)
+		echo "CONFIG_RD_LZMA=y" >> ${LINUX_DIR}/.config
+		echo "CONFIG_INITRAMFS_COMPRESSION_LZMA=y" >> ${LINUX_DIR}/.config
+endif
+ifeq ($(ADK_KERNEL_COMP_LZO),y)
+		echo "CONFIG_RD_LZO=y" >> ${LINUX_DIR}/.config
+		echo "CONFIG_INITRAMFS_COMPRESSION_LZO=y" >> ${LINUX_DIR}/.config
+endif
+ifeq ($(ADK_KERNEL_COMP_GZIP),y)
+		echo "CONFIG_RD_GZIP=y" >> ${LINUX_DIR}/.config
+		echo "CONFIG_INITRAMFS_COMPRESSION_GZIP=y" >> ${LINUX_DIR}/.config
+endif
+ifeq ($(ADK_KERNEL_COMP_BZIP2),y)
+		echo "CONFIG_RD_BZIP2=y" >> ${LINUX_DIR}/.config
+		echo "CONFIG_INITRAMFS_COMPRESSION_BZIP2=y" >> ${LINUX_DIR}/.config
+endif
 	@-rm $(LINUX_DIR)/usr/initramfs_data.cpio* $(MAKE_TRACE)
 	echo N | \
 	$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \

mk/kernel-ver.mk

@@ -3,18 +3,18 @@ KERNEL_VERSION:=	2.6.39.4
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		a17c748c2070168f1e784e9605ca043d
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_0_9),y)
-KERNEL_VERSION:=	3.0.9
+ifeq ($(ADK_KERNEL_VERSION_3_0_17),y)
+KERNEL_VERSION:=	3.0.17
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		71992fa4dfc289a959f9ce266d08d77b
+KERNEL_MD5SUM:=		fcdd6a945445336e4cd28b2d195f1fea
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_1_8),y)
-KERNEL_VERSION:=	3.1.8
+ifeq ($(ADK_KERNEL_VERSION_3_1_9),y)
+KERNEL_VERSION:=	3.1.9
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		69dfba755ab8691a426d8061c94a7ddc
+KERNEL_MD5SUM:=		4e387a49cde20805955c905bc8c311e0
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_2_0),y)
-KERNEL_VERSION:=	3.2
+ifeq ($(ADK_KERNEL_VERSION_3_2_1),y)
+KERNEL_VERSION:=	3.2.1
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		7ceb61f87c097fc17509844b71268935
+KERNEL_MD5SUM:=		090eb3dae0f520f7770f85193e931ad3
 endif

scripts/scan-tools.sh

@@ -112,6 +112,12 @@ if ! which gzip >/dev/null 2>&1; then
 	out=1
 fi
 
+if ! which lzop >/dev/null 2>&1; then
+	echo You must install lzop to continue.
+	echo
+	out=1
+fi
+
 if ! which lzma >/dev/null 2>&1; then
 	echo You must install lzma to continue.
 	echo

target/linux/config/Config.in.kernel

@@ -25,9 +25,21 @@ config ADK_KERNEL_BLK_DEV_INITRD
 config ADK_KERNEL_INITRAMFS_COMPRESSION_NONE
 	boolean
 
+config ADK_KERNEL_INITRAMFS_COMPRESSION_XZ
+	boolean
+
 config ADK_KERNEL_INITRAMFS_COMPRESSION_LZMA
 	boolean
 
+config ADK_KERNEL_INITRAMFS_COMPRESSION_LZO
+	boolean
+
+config ADK_KERNEL_INITRAMFS_COMPRESSION_GZIP
+	boolean
+
+config ADK_KERNEL_INITRAMFS_COMPRESSION_BZIP2
+	boolean
+
 config ADK_KERNEL_RD_GZIP
 	boolean