summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorHarninder Rai <harninder.rai@freescale.com>2014-04-22 12:08:33 (GMT)
committerJose Rivera <German.Rivera@freescale.com>2014-05-07 21:58:14 (GMT)
commitbe673ad57b22d8992c8ad280509969f937a28073 (patch)
tree97f48d7fb29bbf600891c5a202560e02c50239e8 /arch
parent8510291e0fbec408d70fc968bfe1d8eb0c8bd9b5 (diff)
downloadlinux-fsl-qoriq-be673ad57b22d8992c8ad280509969f937a28073.tar.xz
powerpc/defconfig: Remove miscellaneous deprecated config flags
This patch removes lot of deprecated config flags from 913x defconfigs. Some of them are: - CONFIG_EXPERIMENTAL - CONFIG_MTD_CHAR - CONFIG_ARPD - CONFIG_MII Signed-off-by: Harninder Rai <harninder.rai@freescale.com> Change-Id: I83ca07888d40c30c71f50a839ba27f34eb6acd7b Reviewed-on: http://git.am.freescale.net:8181/11920 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Naveen Burmi <NaveenBurmi@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/configs/85xx/bsc913x_defconfig8
-rw-r--r--arch/powerpc/configs/85xx/bsc913x_smp_defconfig8
2 files changed, 2 insertions, 14 deletions
diff --git a/arch/powerpc/configs/85xx/bsc913x_defconfig b/arch/powerpc/configs/85xx/bsc913x_defconfig
index 10f037d..b9bcb46 100644
--- a/arch/powerpc/configs/85xx/bsc913x_defconfig
+++ b/arch/powerpc/configs/85xx/bsc913x_defconfig
@@ -1,5 +1,4 @@
CONFIG_PPC_85xx=y
-CONFIG_EXPERIMENTAL=y
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
@@ -57,7 +56,6 @@ CONFIG_NET_IPIP=y
CONFIG_IP_MROUTE=y
CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
-CONFIG_ARPD=y
CONFIG_INET_AH=y
CONFIG_INET_ESP=y
CONFIG_INET_IPCOMP=y
@@ -82,7 +80,6 @@ CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_MTD=y
CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
CONFIG_FTL=y
CONFIG_MTD_CFI=y
@@ -116,7 +113,6 @@ CONFIG_BLK_DEV_MD=y
CONFIG_MD_RAID456=y
CONFIG_NETDEVICES=y
CONFIG_DUMMY=y
-CONFIG_MII=y
# CONFIG_NET_VENDOR_3COM is not set
CONFIG_GIANFAR=y
CONFIG_E1000E=y
@@ -178,9 +174,6 @@ CONFIG_UDF_FS=m
CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=y
CONFIG_NTFS_FS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_ISO8859_1=y
CONFIG_PROC_KCORE=y
CONFIG_TMPFS=y
CONFIG_JFFS2_FS=y
@@ -198,6 +191,7 @@ CONFIG_ROOT_NFS=y
CONFIG_NFSD=y
CONFIG_CIFS=y
CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
CONFIG_NLS_ISO8859_1=y
CONFIG_CRC_T10DIF=y
# CONFIG_FTRACE is not set
diff --git a/arch/powerpc/configs/85xx/bsc913x_smp_defconfig b/arch/powerpc/configs/85xx/bsc913x_smp_defconfig
index 6fd47773..4ba3944 100644
--- a/arch/powerpc/configs/85xx/bsc913x_smp_defconfig
+++ b/arch/powerpc/configs/85xx/bsc913x_smp_defconfig
@@ -1,7 +1,6 @@
CONFIG_PPC_85xx=y
CONFIG_SMP=y
CONFIG_NR_CPUS=2
-CONFIG_EXPERIMENTAL=y
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
@@ -59,7 +58,6 @@ CONFIG_NET_IPIP=y
CONFIG_IP_MROUTE=y
CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
-CONFIG_ARPD=y
CONFIG_INET_AH=y
CONFIG_INET_ESP=y
CONFIG_INET_IPCOMP=y
@@ -84,7 +82,6 @@ CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_MTD=y
CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
CONFIG_FTL=y
CONFIG_MTD_CFI=y
@@ -118,7 +115,6 @@ CONFIG_BLK_DEV_MD=y
CONFIG_MD_RAID456=y
CONFIG_NETDEVICES=y
CONFIG_DUMMY=y
-CONFIG_MII=y
# CONFIG_NET_VENDOR_3COM is not set
CONFIG_GIANFAR=y
CONFIG_E1000E=y
@@ -180,9 +176,6 @@ CONFIG_UDF_FS=m
CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=y
CONFIG_NTFS_FS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_ISO8859_1=y
CONFIG_PROC_KCORE=y
CONFIG_TMPFS=y
CONFIG_JFFS2_FS=y
@@ -200,6 +193,7 @@ CONFIG_ROOT_NFS=y
CONFIG_NFSD=y
CONFIG_CIFS=y
CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
CONFIG_NLS_ISO8859_1=y
CONFIG_CRC_T10DIF=y
# CONFIG_FTRACE is not set