Browse Source

we need kernel compression support for defconfigs

Waldemar Brodkorb 8 years ago
parent
commit
01535884db
4 changed files with 137 additions and 132 deletions
  1. 1 0
      Config.in
  2. 1 1
      mk/kernel-build.mk
  3. 135 0
      target/linux/config/Config.in.compression
  4. 0 131
      target/linux/config/Config.in.kernel

+ 1 - 0
Config.in

@@ -48,6 +48,7 @@ endmenu
 
 source "target/config/Config.in.kernelversion"
 source "target/config/Config.in.kernelcfg"
+source "target/linux/config/Config.in.compression"
 
 menu "Kernel configuration"
 	visible if ADK_TARGET_OS_LINUX && ADK_TARGET_KERNEL_CUSTOMISING && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH && !ADK_TARGET_KERNEL_USE_DEFCONFIG

+ 1 - 1
mk/kernel-build.mk

@@ -41,11 +41,11 @@ $(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PK
 $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig
 	$(START_TRACE) "target/$(ADK_TARGET_ARCH)-kernel-configure.. "
 	-for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done
+	echo "-${KERNEL_RELEASE}" >${LINUX_DIR}/localversion
 ifeq ($(ADK_TARGET_KERNEL_USE_DEFCONFIG),y)
 	${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} $(ADK_TARGET_KERNEL_DEFCONFIG) $(MAKE_TRACE)
 else
 	$(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/mini.config
-	echo "-${KERNEL_RELEASE}" >${LINUX_DIR}/localversion
 	${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} KCONFIG_ALLCONFIG=mini.config allnoconfig $(MAKE_TRACE)
 endif
 	touch -c $(LINUX_DIR)/.config

+ 135 - 0
target/linux/config/Config.in.compression

@@ -0,0 +1,135 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+config ADK_KERNEL_INITRAMFS_COMPRESSION_NONE
+	bool
+
+config ADK_KERNEL_INITRAMFS_COMPRESSION_XZ
+	bool
+	select ADK_HOST_NEED_XZ
+
+config ADK_KERNEL_INITRAMFS_COMPRESSION_LZ4
+	bool
+	select ADK_HOST_NEED_LZ4
+
+config ADK_KERNEL_INITRAMFS_COMPRESSION_LZMA
+	bool
+	select ADK_HOST_NEED_LZMA
+
+config ADK_KERNEL_INITRAMFS_COMPRESSION_LZO
+	bool
+	select ADK_HOST_NEED_LZOP
+
+config ADK_KERNEL_INITRAMFS_COMPRESSION_BZIP2
+	bool
+	select ADK_HOST_NEED_BZIP2
+
+config ADK_KERNEL_INITRAMFS_COMPRESSION_GZIP
+	bool
+
+config ADK_KERNEL_RD_GZIP
+	bool
+
+config ADK_KERNEL_KERNEL_GZIP
+	bool
+
+config ADK_KERNEL_RD_BZIP2
+	bool
+
+config ADK_KERNEL_KERNEL_BZIP2
+	bool
+
+config ADK_KERNEL_RD_LZ4
+	bool
+
+config ADK_KERNEL_KERNEL_LZ4
+	bool
+
+config ADK_KERNEL_RD_LZMA
+	bool
+
+config ADK_KERNEL_KERNEL_LZMA
+	bool
+
+config ADK_KERNEL_RD_LZO
+	bool
+
+config ADK_KERNEL_KERNEL_LZO
+	bool
+
+config ADK_KERNEL_RD_XZ
+	bool
+
+config ADK_KERNEL_KERNEL_XZ
+	bool
+
+config ADK_KERNEL_KERNEL_COMPRESS_NONE
+	bool
+
+config ADK_KERNEL_INITRAMFS_SOURCE
+	string
+	default ""
+
+choice
+prompt "Kernel compression"
+default ADK_KERNEL_COMP_GZIP if ADK_TARGET_BOARD_BCM28XX
+default ADK_KERNEL_COMP_XZ if ADK_TARGET_KERNEL_WITH_COMPRESSION
+default ADK_KERNEL_COMPRESS_NONE
+
+config ADK_KERNEL_COMP_XZ
+	bool "use XZ compression"
+	select ADK_KERNEL_RD_XZ
+	select ADK_KERNEL_KERNEL_XZ
+	select ADK_KERNEL_INITRAMFS_COMPRESSION_XZ
+	depends on ADK_TARGET_KERNEL_WITH_COMPRESSION \
+		|| ADK_TARGET_GENERIC
+
+config ADK_KERNEL_COMP_LZ4
+	bool "use LZ4 compression"
+	select ADK_KERNEL_RD_LZ4
+	select ADK_KERNEL_KERNEL_LZ4
+	select ADK_KERNEL_INITRAMFS_COMPRESSION_LZ4
+	depends on ADK_TARGET_ARCH_X86 || ADK_TARGET_ARCH_ARM
+	depends on ADK_TARGET_KERNEL_WITH_COMPRESSION \
+		|| ADK_TARGET_GENERIC
+
+config ADK_KERNEL_COMP_LZMA
+	bool "use LZMA compression"
+	select ADK_KERNEL_RD_LZMA
+	select ADK_KERNEL_KERNEL_LZMA
+	select ADK_KERNEL_INITRAMFS_COMPRESSION_LZMA
+	depends on ADK_TARGET_KERNEL_WITH_COMPRESSION \
+		|| ADK_TARGET_GENERIC
+
+config ADK_KERNEL_COMP_LZO
+	bool "use LZO compression"
+	select ADK_KERNEL_RD_LZO
+	select ADK_KERNEL_KERNEL_LZO
+	select ADK_KERNEL_INITRAMFS_COMPRESSION_LZO
+	depends on ADK_TARGET_KERNEL_WITH_COMPRESSION \
+		|| ADK_TARGET_GENERIC
+
+config ADK_KERNEL_COMP_BZIP2
+	bool "use BZIP2 compression"
+	select ADK_KERNEL_RD_BZIP2
+	select ADK_KERNEL_KERNEL_BZIP2
+	select ADK_KERNEL_INITRAMFS_COMPRESSION_BZIP2
+	depends on ADK_TARGET_KERNEL_WITH_COMPRESSION \
+		|| ADK_TARGET_GENERIC
+
+config ADK_KERNEL_COMP_GZIP
+	bool "use GZIP compression"
+	select ADK_KERNEL_RD_GZIP
+	select ADK_KERNEL_KERNEL_GZIP
+	select ADK_KERNEL_INITRAMFS_COMPRESSION_GZIP
+	depends on ADK_TARGET_KERNEL_WITH_COMPRESSION \
+		|| ADK_TARGET_GENERIC
+
+config ADK_KERNEL_COMPRESS_NONE
+	bool "use no compression"
+	select ADK_KERNEL_KERNEL_COMPRESS_NONE
+	select ADK_KERNEL_INITRAMFS_COMPRESSION_NONE
+
+endchoice
+
+

+ 0 - 131
target/linux/config/Config.in.kernel

@@ -17,75 +17,6 @@ config ADK_KERNEL_BLK_DEV_INITRD
 config ADK_KERNEL_BLK_DEV_RAM
 	bool
 
-config ADK_KERNEL_INITRAMFS_COMPRESSION_NONE
-	bool
-
-config ADK_KERNEL_INITRAMFS_COMPRESSION_XZ
-	bool
-	select ADK_HOST_NEED_XZ
-
-config ADK_KERNEL_INITRAMFS_COMPRESSION_LZ4
-	bool
-	select ADK_HOST_NEED_LZ4
-
-config ADK_KERNEL_INITRAMFS_COMPRESSION_LZMA
-	bool
-	select ADK_HOST_NEED_LZMA
-
-config ADK_KERNEL_INITRAMFS_COMPRESSION_LZO
-	bool
-	select ADK_HOST_NEED_LZOP
-
-config ADK_KERNEL_INITRAMFS_COMPRESSION_BZIP2
-	bool
-	select ADK_HOST_NEED_BZIP2
-
-config ADK_KERNEL_INITRAMFS_COMPRESSION_GZIP
-	bool
-
-config ADK_KERNEL_RD_GZIP
-	bool
-
-config ADK_KERNEL_KERNEL_GZIP
-	bool
-
-config ADK_KERNEL_RD_BZIP2
-	bool
-
-config ADK_KERNEL_KERNEL_BZIP2
-	bool
-
-config ADK_KERNEL_RD_LZ4
-	bool
-
-config ADK_KERNEL_KERNEL_LZ4
-	bool
-
-config ADK_KERNEL_RD_LZMA
-	bool
-
-config ADK_KERNEL_KERNEL_LZMA
-	bool
-
-config ADK_KERNEL_RD_LZO
-	bool
-
-config ADK_KERNEL_KERNEL_LZO
-	bool
-
-config ADK_KERNEL_RD_XZ
-	bool
-
-config ADK_KERNEL_KERNEL_XZ
-	bool
-
-config ADK_KERNEL_KERNEL_COMPRESS_NONE
-	bool
-
-config ADK_KERNEL_INITRAMFS_SOURCE
-	string
-	default ""
-
 config ADK_KERNEL_NETWORK_FILESYSTEMS
 	bool
 
@@ -125,68 +56,6 @@ config ADK_KERNEL_CPU_LITTLE_ENDIAN
 	bool
 	default y if ADK_TARGET_LITTLE_ENDIAN
 
-choice
-prompt "Kernel compression"
-default ADK_KERNEL_COMP_GZIP if ADK_TARGET_BOARD_BCM28XX
-default ADK_KERNEL_COMP_XZ if ADK_TARGET_KERNEL_WITH_COMPRESSION
-default ADK_KERNEL_COMPRESS_NONE
-
-config ADK_KERNEL_COMP_XZ
-	bool "use XZ compression"
-	select ADK_KERNEL_RD_XZ
-	select ADK_KERNEL_KERNEL_XZ
-	select ADK_KERNEL_INITRAMFS_COMPRESSION_XZ
-	depends on ADK_TARGET_KERNEL_WITH_COMPRESSION \
-		|| ADK_TARGET_GENERIC
-
-config ADK_KERNEL_COMP_LZ4
-	bool "use LZ4 compression"
-	select ADK_KERNEL_RD_LZ4
-	select ADK_KERNEL_KERNEL_LZ4
-	select ADK_KERNEL_INITRAMFS_COMPRESSION_LZ4
-	depends on ADK_TARGET_ARCH_X86 || ADK_TARGET_ARCH_ARM
-	depends on ADK_TARGET_KERNEL_WITH_COMPRESSION \
-		|| ADK_TARGET_GENERIC
-
-config ADK_KERNEL_COMP_LZMA
-	bool "use LZMA compression"
-	select ADK_KERNEL_RD_LZMA
-	select ADK_KERNEL_KERNEL_LZMA
-	select ADK_KERNEL_INITRAMFS_COMPRESSION_LZMA
-	depends on ADK_TARGET_KERNEL_WITH_COMPRESSION \
-		|| ADK_TARGET_GENERIC
-
-config ADK_KERNEL_COMP_LZO
-	bool "use LZO compression"
-	select ADK_KERNEL_RD_LZO
-	select ADK_KERNEL_KERNEL_LZO
-	select ADK_KERNEL_INITRAMFS_COMPRESSION_LZO
-	depends on ADK_TARGET_KERNEL_WITH_COMPRESSION \
-		|| ADK_TARGET_GENERIC
-
-config ADK_KERNEL_COMP_BZIP2
-	bool "use BZIP2 compression"
-	select ADK_KERNEL_RD_BZIP2
-	select ADK_KERNEL_KERNEL_BZIP2
-	select ADK_KERNEL_INITRAMFS_COMPRESSION_BZIP2
-	depends on ADK_TARGET_KERNEL_WITH_COMPRESSION \
-		|| ADK_TARGET_GENERIC
-
-config ADK_KERNEL_COMP_GZIP
-	bool "use GZIP compression"
-	select ADK_KERNEL_RD_GZIP
-	select ADK_KERNEL_KERNEL_GZIP
-	select ADK_KERNEL_INITRAMFS_COMPRESSION_GZIP
-	depends on ADK_TARGET_KERNEL_WITH_COMPRESSION \
-		|| ADK_TARGET_GENERIC
-
-config ADK_KERNEL_COMPRESS_NONE
-	bool "use no compression"
-	select ADK_KERNEL_KERNEL_COMPRESS_NONE
-	select ADK_KERNEL_INITRAMFS_COMPRESSION_NONE
-
-endchoice
-
 menu "Kernel options"
 
 config ADK_KERNEL_DEVTMPFS