From 3f7b34dd5f3438fc1957c2d876e27c67cc52c8a6 Mon Sep 17 00:00:00 2001 From: Matt Sealey Date: Wed, 24 Nov 2010 15:41:10 -0600 Subject: [PATCH] Modify configs to disable CMDLINE_FORCE by default --- arch/arm/configs/mx51_efikamx_defconfig | 1 + arch/arm/configs/mx51_efikamx_devtmpfs_defconfig | 1 + arch/arm/configs/mx51_efikasb_defconfig | 1 + arch/arm/configs/mx51_efikasb_devtmpfs_defconfig | 1 + 4 files changed, 4 insertions(+) diff --git a/arch/arm/configs/mx51_efikamx_defconfig b/arch/arm/configs/mx51_efikamx_defconfig index 2ff167d41d8..43d73f87c97 100644 --- a/arch/arm/configs/mx51_efikamx_defconfig +++ b/arch/arm/configs/mx51_efikamx_defconfig @@ -303,6 +303,7 @@ CONFIG_UACCESS_WITH_MEMCPY=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" +# CONFIG_CMDLINE_FORCE is not set # CONFIG_XIP_KERNEL is not set # CONFIG_KEXEC is not set diff --git a/arch/arm/configs/mx51_efikamx_devtmpfs_defconfig b/arch/arm/configs/mx51_efikamx_devtmpfs_defconfig index 0657860bace..2e92ab57e07 100644 --- a/arch/arm/configs/mx51_efikamx_devtmpfs_defconfig +++ b/arch/arm/configs/mx51_efikamx_devtmpfs_defconfig @@ -303,6 +303,7 @@ CONFIG_UACCESS_WITH_MEMCPY=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" +# CONFIG_CMDLINE_FORCE is not set # CONFIG_XIP_KERNEL is not set # CONFIG_KEXEC is not set diff --git a/arch/arm/configs/mx51_efikasb_defconfig b/arch/arm/configs/mx51_efikasb_defconfig index 73b16ee86b0..0cf53b8cb79 100644 --- a/arch/arm/configs/mx51_efikasb_defconfig +++ b/arch/arm/configs/mx51_efikasb_defconfig @@ -304,6 +304,7 @@ CONFIG_UACCESS_WITH_MEMCPY=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" +# CONFIG_CMDLINE_FORCE is not set # CONFIG_XIP_KERNEL is not set # CONFIG_KEXEC is not set diff --git a/arch/arm/configs/mx51_efikasb_devtmpfs_defconfig b/arch/arm/configs/mx51_efikasb_devtmpfs_defconfig index bec8c4dc621..2886b2a3416 100644 --- a/arch/arm/configs/mx51_efikasb_devtmpfs_defconfig +++ b/arch/arm/configs/mx51_efikasb_devtmpfs_defconfig @@ -304,6 +304,7 @@ CONFIG_UACCESS_WITH_MEMCPY=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" +# CONFIG_CMDLINE_FORCE is not set # CONFIG_XIP_KERNEL is not set # CONFIG_KEXEC is not set