From: Felix Fietkau Date: Tue, 19 Jul 2016 15:01:28 +0000 (+0200) Subject: config: remove options for including kernel/dtb in rootfs X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=673004f9bc127a54935ffb4ca05bfb788fba345c;p=openwrt%2Fstaging%2Fnbd.git config: remove options for including kernel/dtb in rootfs These options were a big design flaw to begin with Signed-off-by: Felix Fietkau --- diff --git a/config/Config-images.in b/config/Config-images.in index f81931e47f..c990b87605 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -271,45 +271,4 @@ menu "Target Images" it will be mounted by PARTUUID which makes the kernel find the appropriate disk automatically. - - menuconfig TARGET_ROOTFS_INCLUDE_KERNEL - bool "Include kernel in root filesystem" - depends on TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS - default n - help - Include the kernel image in the rootfs. Typically, the image is placed - below /boot. - - config TARGET_ROOTFS_INCLUDE_UIMAGE - bool "include uImage" if TARGET_ROOTFS_INCLUDE_KERNEL - default y - help - This option might not apply to all targets. Make sure - to check target/linux//image/Makefile to - see if this option will have any effect. - - config TARGET_ROOTFS_INCLUDE_ZIMAGE - bool "include zImage" if TARGET_ROOTFS_INCLUDE_KERNEL - default y - help - This option might not apply to all targets. Make sure - to check target/linux//image/Makefile to - see if this option will have any effect. - - config TARGET_ROOTFS_INCLUDE_FIT - bool "include FIT" if TARGET_ROOTFS_INCLUDE_KERNEL - default y - help - This option might not apply to all targets. Make sure - to check target/linux//image/Makefile to - see if this option will have any effect. - - config TARGET_ROOTFS_INCLUDE_DTB - bool "Include DTB in root filesystem" - depends on USES_DEVICETREE && (TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS) - default n - help - Include the device tree blob file(s) in the rootfs. Typically the DTBs - are placed below /boot. - endmenu