- remove initramfs related config settings and configure them back if needed

diff --git a/target/linux/Makefile.in b/target/linux/Makefile.in
index ba571b56a88177aa5e16d6a099490562fe478e1a..25f98a3780e38437776fc4e05d8ad5e5bf67b941 100644 (file)
--- a/target/linux/Makefile.in
+++ b/target/linux/Makefile.in
@@ -152,19 +152,20 @@ ifeq ($(BR2_INET_IPV6),y)
 else
        echo "# CONFIG_IPV6 is not set" >> $(LINUX26_DIR)/.config
 endif
-ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
        $(SED) '/CONFIG_INITRAMFS_SOURCE/d' $(LINUX26_DIR)/.config
+       $(SED) '/INITRAMFS_ROOT_.ID/d' $(LINUX26_DIR)/.config
+ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
        echo "CONFIG_INITRAMFS_SOURCE=\"$(INITRAMFS_TARGET)\"" >> \
                $(LINUX26_DIR)/.config
-       $(SED) '/INITRAMFS_ROOT_.ID/d' $(LINUX26_DIR)/.config
        echo "CONFIG_INITRAMFS_ROOT_UID=0" >> $(LINUX26_DIR)/.config
        echo "CONFIG_INITRAMFS_ROOT_GID=0" >> $(LINUX26_DIR)/.config
 endif
 ifeq ($(BR2_PACKAGE_BUSYBOX_INITRAMFS),y)
+       # precedence for a small initramfs
        $(SED) '/CONFIG_INITRAMFS_SOURCE/d' $(LINUX26_DIR)/.config
+       $(SED) '/INITRAMFS_ROOT_.ID/d' $(LINUX26_DIR)/.config
        echo "CONFIG_INITRAMFS_SOURCE=\"$(BB_INITRAMFS_TARGET)\"" >> \
                $(LINUX26_DIR)/.config
-       $(SED) '/INITRAMFS_ROOT_.ID/d' $(LINUX26_DIR)/.config
        echo "CONFIG_INITRAMFS_ROOT_UID=0" >> $(LINUX26_DIR)/.config
        echo "CONFIG_INITRAMFS_ROOT_GID=0" >> $(LINUX26_DIR)/.config
 endif