| Message ID | 1384197913-24610-1-git-send-email-Lijun.Pan@freescale.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Scott Wood |
| Headers | show |
On Nov 11, 2013, at 1:25 PM, Lijun Pan <Lijun.Pan@freescale.com> wrote: > mpc85xx_smp_defconfig and mpc85xx_defconfig already have CONFIG_P1023RDS=y. > Merge CONFIG_P1023RDB=y and other relevant configurations into mpc85xx_smp_defconfig and mpc85_defconfig. > > Signed-off-by: Lijun Pan <Lijun.Pan@freescale.com> > --- > arch/powerpc/configs/85xx/p1023_defconfig | 188 ---------------------------- > arch/powerpc/configs/mpc85xx_defconfig | 18 +++ > arch/powerpc/configs/mpc85xx_smp_defconfig | 17 +++ > 3 files changed, 35 insertions(+), 188 deletions(-) > delete mode 100644 arch/powerpc/configs/85xx/p1023_defconfig How much of the changes to mpc85xx_defconfig & mpc85xx_smp_defconfig are based on just updating them vs changes for p1023? Can we do this as two patches. One that updates mpc85xx_defconfig & mpc85xx_smp_defconfig and one that makes the p1023 changes. That is much easier to review as well. - k
On Mon, Nov 11, 2013 at 1:25 PM, Lijun Pan <Lijun.Pan@freescale.com> wrote:
> +CONFIG_P1023_RDB=y
I think this is the only line you should be adding to the defconfigs.
None of the others should be necessary.
On Mon, 2013-11-11 at 13:25 -0600, Lijun Pan wrote: > mpc85xx_smp_defconfig and mpc85xx_defconfig already have CONFIG_P1023RDS=y. > Merge CONFIG_P1023RDB=y and other relevant configurations into mpc85xx_smp_defconfig and mpc85_defconfig. > > Signed-off-by: Lijun Pan <Lijun.Pan@freescale.com> > --- > arch/powerpc/configs/85xx/p1023_defconfig | 188 ---------------------------- > arch/powerpc/configs/mpc85xx_defconfig | 18 +++ > arch/powerpc/configs/mpc85xx_smp_defconfig | 17 +++ > 3 files changed, 35 insertions(+), 188 deletions(-) > delete mode 100644 arch/powerpc/configs/85xx/p1023_defconfig Are we still going to want to have one defconfig if and when we finally get datapath support upstream? That's a lot of code to add to the 85xx config just for this one chip. -Scott
> -----Original Message----- > From: Linuxppc-dev [mailto:linuxppc-dev-bounces+tie- > fei.zang=freescale.com@lists.ozlabs.org] On Behalf Of Scott Wood > Sent: Tuesday, November 12, 2013 4:05 PM > To: Pan Lijun-B44306 > Cc: linuxppc-dev@ozlabs.org > Subject: Re: [PATCH V2] powerpc/85xx: Merge 85xx/p1023_defconfig into > mpc85xx_smp_defconfig and mpc85xx_defconfig > > On Mon, 2013-11-11 at 13:25 -0600, Lijun Pan wrote: > > mpc85xx_smp_defconfig and mpc85xx_defconfig already have > CONFIG_P1023RDS=y. > > Merge CONFIG_P1023RDB=y and other relevant configurations into > mpc85xx_smp_defconfig and mpc85_defconfig. > > > > Signed-off-by: Lijun Pan <Lijun.Pan@freescale.com> > > --- > > arch/powerpc/configs/85xx/p1023_defconfig | 188 -------------------- > -------- > > arch/powerpc/configs/mpc85xx_defconfig | 18 +++ > > arch/powerpc/configs/mpc85xx_smp_defconfig | 17 +++ > > 3 files changed, 35 insertions(+), 188 deletions(-) delete mode > > 100644 arch/powerpc/configs/85xx/p1023_defconfig > > Are we still going to want to have one defconfig if and when we finally > get datapath support upstream? That's a lot of code to add to the 85xx > config just for this one chip. P1023 has dpaa. Will mpc85xx_defconfig or mpc85xx_smp_defconfig support dpaa? Thanks. Roy
On Tue, 2013-11-12 at 16:49 -0600, Zang Roy-R61911 wrote: > > > -----Original Message----- > > From: Linuxppc-dev [mailto:linuxppc-dev-bounces+tie- > > fei.zang=freescale.com@lists.ozlabs.org] On Behalf Of Scott Wood > > Sent: Tuesday, November 12, 2013 4:05 PM > > To: Pan Lijun-B44306 > > Cc: linuxppc-dev@ozlabs.org > > Subject: Re: [PATCH V2] powerpc/85xx: Merge 85xx/p1023_defconfig into > > mpc85xx_smp_defconfig and mpc85xx_defconfig > > > > On Mon, 2013-11-11 at 13:25 -0600, Lijun Pan wrote: > > > mpc85xx_smp_defconfig and mpc85xx_defconfig already have > > CONFIG_P1023RDS=y. > > > Merge CONFIG_P1023RDB=y and other relevant configurations into > > mpc85xx_smp_defconfig and mpc85_defconfig. > > > > > > Signed-off-by: Lijun Pan <Lijun.Pan@freescale.com> > > > --- > > > arch/powerpc/configs/85xx/p1023_defconfig | 188 -------------------- > > -------- > > > arch/powerpc/configs/mpc85xx_defconfig | 18 +++ > > > arch/powerpc/configs/mpc85xx_smp_defconfig | 17 +++ > > > 3 files changed, 35 insertions(+), 188 deletions(-) delete mode > > > 100644 arch/powerpc/configs/85xx/p1023_defconfig > > > > Are we still going to want to have one defconfig if and when we finally > > get datapath support upstream? That's a lot of code to add to the 85xx > > config just for this one chip. > P1023 has dpaa. > Will mpc85xx_defconfig or mpc85xx_smp_defconfig support dpaa? That's the question I'm asking. Though I suppose we could take a patch like this one for now, and then introduce mpc85xx_dpaa_defconfig when it becomes relevant (which would make clear why the defconfig is separate). p1023 would still work with the non-dpaa defconfigs, but without dpaa support. -Scott
> -----Original Message----- > From: Wood Scott-B07421 > Sent: Tuesday, November 12, 2013 4:52 PM > To: Zang Roy-R61911 > Cc: Pan Lijun-B44306; linuxppc-dev@ozlabs.org > Subject: Re: [PATCH V2] powerpc/85xx: Merge 85xx/p1023_defconfig into > mpc85xx_smp_defconfig and mpc85xx_defconfig > > On Tue, 2013-11-12 at 16:49 -0600, Zang Roy-R61911 wrote: > > > > > -----Original Message----- > > > From: Linuxppc-dev [mailto:linuxppc-dev-bounces+tie- > > > fei.zang=freescale.com@lists.ozlabs.org] On Behalf Of Scott Wood > > > Sent: Tuesday, November 12, 2013 4:05 PM > > > To: Pan Lijun-B44306 > > > Cc: linuxppc-dev@ozlabs.org > > > Subject: Re: [PATCH V2] powerpc/85xx: Merge 85xx/p1023_defconfig > > > into mpc85xx_smp_defconfig and mpc85xx_defconfig > > > > > > On Mon, 2013-11-11 at 13:25 -0600, Lijun Pan wrote: > > > > mpc85xx_smp_defconfig and mpc85xx_defconfig already have > > > CONFIG_P1023RDS=y. > > > > Merge CONFIG_P1023RDB=y and other relevant configurations into > > > mpc85xx_smp_defconfig and mpc85_defconfig. > > > > > > > > Signed-off-by: Lijun Pan <Lijun.Pan@freescale.com> > > > > --- > > > > arch/powerpc/configs/85xx/p1023_defconfig | 188 > > > > -------------------- > > > -------- > > > > arch/powerpc/configs/mpc85xx_defconfig | 18 +++ > > > > arch/powerpc/configs/mpc85xx_smp_defconfig | 17 +++ > > > > 3 files changed, 35 insertions(+), 188 deletions(-) delete mode > > > > 100644 arch/powerpc/configs/85xx/p1023_defconfig > > > > > > Are we still going to want to have one defconfig if and when we > > > finally get datapath support upstream? That's a lot of code to add > > > to the 85xx config just for this one chip. > > P1023 has dpaa. > > Will mpc85xx_defconfig or mpc85xx_smp_defconfig support dpaa? > > That's the question I'm asking. Though I suppose we could take a patch > like this one for now, and then introduce mpc85xx_dpaa_defconfig when it > becomes relevant (which would make clear why the defconfig is separate). > p1023 would still work with the non-dpaa defconfigs, but without dpaa > support. It will be hard to find a seat for P1023 in mpc85xx_dpaa_defconfig. P1023 does not have corenet. It has e500v2 core. All the other DPAA SOCs have corenet. I suggest leaving p1023 defconfig standalone. Roy
On Tue, 2013-11-12 at 17:05 -0600, Zang Roy-R61911 wrote: > > > -----Original Message----- > > From: Wood Scott-B07421 > > Sent: Tuesday, November 12, 2013 4:52 PM > > To: Zang Roy-R61911 > > Cc: Pan Lijun-B44306; linuxppc-dev@ozlabs.org > > Subject: Re: [PATCH V2] powerpc/85xx: Merge 85xx/p1023_defconfig into > > mpc85xx_smp_defconfig and mpc85xx_defconfig > > > > On Tue, 2013-11-12 at 16:49 -0600, Zang Roy-R61911 wrote: > > > > > > > -----Original Message----- > > > > From: Linuxppc-dev [mailto:linuxppc-dev-bounces+tie- > > > > fei.zang=freescale.com@lists.ozlabs.org] On Behalf Of Scott Wood > > > > Sent: Tuesday, November 12, 2013 4:05 PM > > > > To: Pan Lijun-B44306 > > > > Cc: linuxppc-dev@ozlabs.org > > > > Subject: Re: [PATCH V2] powerpc/85xx: Merge 85xx/p1023_defconfig > > > > into mpc85xx_smp_defconfig and mpc85xx_defconfig > > > > > > > > On Mon, 2013-11-11 at 13:25 -0600, Lijun Pan wrote: > > > > > mpc85xx_smp_defconfig and mpc85xx_defconfig already have > > > > CONFIG_P1023RDS=y. > > > > > Merge CONFIG_P1023RDB=y and other relevant configurations into > > > > mpc85xx_smp_defconfig and mpc85_defconfig. > > > > > > > > > > Signed-off-by: Lijun Pan <Lijun.Pan@freescale.com> > > > > > --- > > > > > arch/powerpc/configs/85xx/p1023_defconfig | 188 > > > > > -------------------- > > > > -------- > > > > > arch/powerpc/configs/mpc85xx_defconfig | 18 +++ > > > > > arch/powerpc/configs/mpc85xx_smp_defconfig | 17 +++ > > > > > 3 files changed, 35 insertions(+), 188 deletions(-) delete mode > > > > > 100644 arch/powerpc/configs/85xx/p1023_defconfig > > > > > > > > Are we still going to want to have one defconfig if and when we > > > > finally get datapath support upstream? That's a lot of code to add > > > > to the 85xx config just for this one chip. > > > P1023 has dpaa. > > > Will mpc85xx_defconfig or mpc85xx_smp_defconfig support dpaa? > > > > That's the question I'm asking. Though I suppose we could take a patch > > like this one for now, and then introduce mpc85xx_dpaa_defconfig when it > > becomes relevant (which would make clear why the defconfig is separate). > > p1023 would still work with the non-dpaa defconfigs, but without dpaa > > support. > > It will be hard to find a seat for P1023 in mpc85xx_dpaa_defconfig. What do you mean? > P1023 does not have corenet. It has e500v2 core. > All the other DPAA SOCs have corenet. > I suggest leaving p1023 defconfig standalone. I didn't say "mpc85xx_corenet_defconfig", nor did I suggest that mpc85xx_dpaa_defconfig replace corenet32_defconfig. Perhaps e500v2_dpaa_defconfig would be a better name. It would effectively be a standalone p1023 defconfig, but with a name that reflects the reason for it, and which would accommodate future e500v2 dpaa chips in the unlikely case that such things are made. Do you know how large the current SDK datapath code is? Though perhaps the eventual upstream version will be smaller. -Scott
On Tue, 2013-11-12 at 16:57 -0600, Emil Medve wrote: > Hello Scott, > > > On 11/12/2013 04:04 PM, Scott Wood wrote: > > On Mon, 2013-11-11 at 13:25 -0600, Lijun Pan wrote: > >> mpc85xx_smp_defconfig and mpc85xx_defconfig already have CONFIG_P1023RDS=y. > >> Merge CONFIG_P1023RDB=y and other relevant configurations into mpc85xx_smp_defconfig and mpc85_defconfig. > >> > >> Signed-off-by: Lijun Pan <Lijun.Pan@freescale.com> > >> --- > >> arch/powerpc/configs/85xx/p1023_defconfig | 188 ---------------------------- > >> arch/powerpc/configs/mpc85xx_defconfig | 18 +++ > >> arch/powerpc/configs/mpc85xx_smp_defconfig | 17 +++ > >> 3 files changed, 35 insertions(+), 188 deletions(-) > >> delete mode 100644 arch/powerpc/configs/85xx/p1023_defconfig > > > > Are we still going to want to have one defconfig if and when we finally > > get datapath support upstream? That's a lot of code to add to the 85xx > > config just for this one chip. > > Yes. But for mpc85xx_/smp_defconfig the datapath support shouldn't be > enabled by default given that just one SoC in that family has the > datapath (and we don't plan to put it in another e500v2 based SoC). For > regression/automation purposes config fragments should be used Is there any way to specify a meta-config for p1023 (or e500v2-dpaa or whatever) that says to combine mpc85xx_smp_defconfig with a dpaa fragment? Do we have any config fragments in the tree so far? -Scott
On Tue, 2013-11-12 at 20:34 -0600, Emil Medve wrote: > Hello Scott, > > > On 11/12/2013 07:46 PM, Scott Wood wrote: > > On Tue, 2013-11-12 at 16:57 -0600, Emil Medve wrote: > >> Hello Scott, > >> > >> > >> On 11/12/2013 04:04 PM, Scott Wood wrote: > >>> On Mon, 2013-11-11 at 13:25 -0600, Lijun Pan wrote: > >>>> mpc85xx_smp_defconfig and mpc85xx_defconfig already have CONFIG_P1023RDS=y. > >>>> Merge CONFIG_P1023RDB=y and other relevant configurations into mpc85xx_smp_defconfig and mpc85_defconfig. > >>>> > >>>> Signed-off-by: Lijun Pan <Lijun.Pan@freescale.com> > >>>> --- > >>>> arch/powerpc/configs/85xx/p1023_defconfig | 188 ---------------------------- > >>>> arch/powerpc/configs/mpc85xx_defconfig | 18 +++ > >>>> arch/powerpc/configs/mpc85xx_smp_defconfig | 17 +++ > >>>> 3 files changed, 35 insertions(+), 188 deletions(-) > >>>> delete mode 100644 arch/powerpc/configs/85xx/p1023_defconfig > >>> > >>> Are we still going to want to have one defconfig if and when we finally > >>> get datapath support upstream? That's a lot of code to add to the 85xx > >>> config just for this one chip. > >> > >> Yes. But for mpc85xx_/smp_defconfig the datapath support shouldn't be > >> enabled by default given that just one SoC in that family has the > >> datapath (and we don't plan to put it in another e500v2 based SoC). For > >> regression/automation purposes config fragments should be used > > > > Is there any way to specify a meta-config for p1023 (or e500v2-dpaa or > > whatever) that says to combine mpc85xx_smp_defconfig with a dpaa > > fragment? > > Not aware of it Then it's not yet a substitute for having a defconfig. > > Do we have any config fragments in the tree so far? > > Nope. However, just to make sure, the fragment was my secondary point > and not necessarily as a candidate for upstreaming. My main point was > that the datapath support should simply not be enabled by default in the > mpc85xx_[smp_]defconfig I think we should get numbers on how big the datapath code is (in its eventual upstream form) before deciding that, but if we do end up deciding not to enable it in mpc85xx_smp_defconfig, then there should be a separate defconfig for p1023 (possibly with a more generic name as discussed earlier). If and when there's support for defconfigs that direct fragments to be included, then we can change the p1023 defconfig to use that, but I don't want to just leave it up to the user to enable manually. If there's any way we can get the datapath code down to a reasonable size for inclusion in mpc85xx_smp_defconfig, that would be ideal. -Scott
On Wed, 2013-11-13 at 12:29 -0600, Emil Medve wrote: > Somebody gratuitously added a P1023 defconfig more then two years ago > with the notion that P1023 is special due to its datapath and we're > still one year out before we'll have the (P1023) datapath driver > upstream. As of now this defconfig is just bit-rotting in the tree > creating confusion. Let's just remove it for now and we'll deal with the > entire e500v2_dpaa business when the datapath support will be upstreamed Sure. -Scott
diff --git a/arch/powerpc/configs/85xx/p1023_defconfig b/arch/powerpc/configs/85xx/p1023_defconfig deleted file mode 100644 index b06d37d..0000000 --- a/arch/powerpc/configs/85xx/p1023_defconfig +++ /dev/null @@ -1,188 +0,0 @@ -CONFIG_PPC_85xx=y -CONFIG_SMP=y -CONFIG_NR_CPUS=2 -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_AUDIT=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_RCU_FANOUT=32 -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_KALLSYMS_ALL=y -CONFIG_EMBEDDED=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_PARTITION_ADVANCED=y -CONFIG_MAC_PARTITION=y -CONFIG_PHYSICAL_START=0x00000000 -CONFIG_P1023_RDB=y -CONFIG_P1023_RDS=y -CONFIG_QUICC_ENGINE=y -CONFIG_QE_GPIO=y -CONFIG_CPM2=y -CONFIG_HIGHMEM=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_BINFMT_MISC=m -CONFIG_MATH_EMULATION=y -CONFIG_SWIOTLB=y -CONFIG_PCI=y -CONFIG_PCIEPORTBUS=y -# CONFIG_PCIEAER is not set -# CONFIG_PCIEASPM is not set -CONFIG_PCI_MSI=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=y -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_NET_IPIP=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -CONFIG_ARPD=y -CONFIG_INET_ESP=y -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -CONFIG_IPV6=y -CONFIG_IP_SCTP=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP_OF=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_FSL_ELBC=y -CONFIG_PROC_DEVICETREE=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=131072 -CONFIG_EEPROM_AT24=y -CONFIG_EEPROM_LEGACY=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=y -CONFIG_BLK_DEV_SR=y -CONFIG_CHR_DEV_SG=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_LOGGING=y -CONFIG_ATA=y -CONFIG_SATA_FSL=y -CONFIG_SATA_SIL24=y -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_FS_ENET=y -CONFIG_FSL_PQ_MDIO=y -CONFIG_E1000E=y -CONFIG_PHYLIB=y -CONFIG_AT803X_PHY=y -CONFIG_MARVELL_PHY=y -CONFIG_DAVICOM_PHY=y -CONFIG_CICADA_PHY=y -CONFIG_VITESSE_PHY=y -CONFIG_FIXED_PHY=y -CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_SERIO_LIBPS2=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=2 -CONFIG_SERIAL_8250_RUNTIME_UARTS=2 -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_8250_DETECT_IRQ=y -CONFIG_SERIAL_8250_RSA=y -CONFIG_HW_RANDOM=y -CONFIG_NVRAM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_CPM=m -CONFIG_I2C_MPC=y -CONFIG_GPIO_MPC8XXX=y -# CONFIG_HWMON is not set -CONFIG_VIDEO_OUTPUT_CONTROL=y -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y -# CONFIG_SND_SUPPORT_OLD_API is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_FSL=y -CONFIG_USB_STORAGE=y -CONFIG_EDAC=y -CONFIG_EDAC_MM_EDAC=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_DS1307=y -CONFIG_RTC_DRV_CMOS=y -CONFIG_DMADEVICES=y -CONFIG_FSL_DMA=y -# CONFIG_NET_DMA is not set -CONFIG_STAGING=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=y -CONFIG_NTFS_FS=y -CONFIG_PROC_KCORE=y -CONFIG_TMPFS=y -CONFIG_ADFS_FS=m -CONFIG_AFFS_FS=m -CONFIG_HFS_FS=m -CONFIG_HFSPLUS_FS=m -CONFIG_BEFS_FS=m -CONFIG_BFS_FS=m -CONFIG_EFS_FS=m -CONFIG_CRAMFS=y -CONFIG_VXFS_FS=m -CONFIG_HPFS_FS=m -CONFIG_QNX4FS_FS=m -CONFIG_SYSV_FS=m -CONFIG_UFS_FS=m -CONFIG_NFS_FS=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=y -CONFIG_CRC_T10DIF=y -CONFIG_FRAME_WARN=8092 -CONFIG_DEBUG_FS=y -CONFIG_DETECT_HUNG_TASK=y -# CONFIG_DEBUG_BUGVERBOSE is not set -CONFIG_DEBUG_INFO=y -CONFIG_STRICT_DEVMEM=y -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_AES=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRYPTO_DEV_FSL_CAAM=y diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index d2e0fab..b5b03ff 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig @@ -6,6 +6,7 @@ CONFIG_AUDIT=y CONFIG_IRQ_DOMAIN_DEBUG=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_RCU_FANOUT=32 CONFIG_BSD_PROCESS_ACCT=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y @@ -13,6 +14,7 @@ CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y CONFIG_EXPERT=y CONFIG_KALLSYMS_ALL=y +CONFIG_EMBEDDED=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y @@ -20,6 +22,7 @@ CONFIG_MODVERSIONS=y # CONFIG_BLK_DEV_BSG is not set CONFIG_PARTITION_ADVANCED=y CONFIG_MAC_PARTITION=y +CONFIG_PHYSICAL_START=0x00000000 CONFIG_MPC8540_ADS=y CONFIG_MPC8560_ADS=y CONFIG_MPC85xx_CDS=y @@ -31,6 +34,7 @@ CONFIG_C293_PCIE=y CONFIG_P1010_RDB=y CONFIG_P1022_DS=y CONFIG_P1022_RDK=y +CONFIG_P1023_RDB=y CONFIG_P1023_RDS=y CONFIG_SOCRATES=y CONFIG_KSI8560=y @@ -44,12 +48,15 @@ CONFIG_TQM8560=y CONFIG_SBC8548=y CONFIG_QUICC_ENGINE=y CONFIG_QE_GPIO=y +CONFIG_CPM2=y CONFIG_HIGHMEM=y CONFIG_BINFMT_MISC=m CONFIG_MATH_EMULATION=y +CONFIG_SWIOTLB=y CONFIG_FORCE_MAX_ZONEORDER=12 CONFIG_FSL_IFC=y CONFIG_PCI=y +CONFIG_PCIEPORTBUS=y CONFIG_PCI_MSI=y CONFIG_RAPIDIO=y CONFIG_NET=y @@ -113,6 +120,7 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_NBD=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=131072 +CONFIG_EEPROM_AT24=y CONFIG_EEPROM_LEGACY=y CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_ST=y @@ -129,10 +137,12 @@ CONFIG_PATA_VIA=y CONFIG_NETDEVICES=y CONFIG_DUMMY=y CONFIG_FS_ENET=y +CONFIG_FSL_PQ_MDIO=y CONFIG_UCC_GETH=y CONFIG_GIANFAR=y CONFIG_E1000=y CONFIG_E1000E=y +CONFIG_PHYLIB=y CONFIG_IGB=y CONFIG_MARVELL_PHY=y CONFIG_DAVICOM_PHY=y @@ -172,6 +182,8 @@ CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y CONFIG_SOUND=y CONFIG_SND=y +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y # CONFIG_SND_SUPPORT_OLD_API is not set # CONFIG_SND_DRIVERS is not set CONFIG_SND_INTEL8X0=y @@ -196,6 +208,7 @@ CONFIG_HID_SAMSUNG=y CONFIG_HID_SONY=y CONFIG_HID_SUNPLUS=y CONFIG_USB=y +CONFIG_USB_DEVICEFS=y CONFIG_USB_MON=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_FSL=y @@ -210,10 +223,12 @@ CONFIG_MMC_SDHCI_OF_ESDHC=y CONFIG_EDAC=y CONFIG_EDAC_MM_EDAC=y CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_DS1307=y CONFIG_RTC_DRV_CMOS=y CONFIG_DMADEVICES=y CONFIG_FSL_DMA=y # CONFIG_NET_DMA is not set +CONFIG_STAGING=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set @@ -254,6 +269,7 @@ CONFIG_NFS_V4=y CONFIG_ROOT_NFS=y CONFIG_NFSD=y CONFIG_CRC_T10DIF=y +CONFIG_FRAME_WARN=8092 CONFIG_CRC16=y CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y @@ -263,9 +279,11 @@ CONFIG_CRYPTO_LZO=y CONFIG_DEBUG_FS=y CONFIG_DETECT_HUNG_TASK=y CONFIG_DEBUG_INFO=y +CONFIG_STRICT_DEVMEM=y CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y +CONFIG_CRYPTO_AES=y # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_DEV_FSL_CAAM=y CONFIG_CRYPTO_DEV_TALITOS=y diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig index 4cb7b59..7d96a9f 100644 --- a/arch/powerpc/configs/mpc85xx_smp_defconfig +++ b/arch/powerpc/configs/mpc85xx_smp_defconfig @@ -10,12 +10,14 @@ CONFIG_AUDIT=y CONFIG_IRQ_DOMAIN_DEBUG=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_RCU_FANOUT=32 CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y CONFIG_EXPERT=y CONFIG_KALLSYMS_ALL=y +CONFIG_EMBEDDED=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y @@ -23,6 +25,7 @@ CONFIG_MODVERSIONS=y # CONFIG_BLK_DEV_BSG is not set CONFIG_PARTITION_ADVANCED=y CONFIG_MAC_PARTITION=y +CONFIG_PHYSICAL_START=0x00000000 CONFIG_MPC8540_ADS=y CONFIG_MPC8560_ADS=y CONFIG_MPC85xx_CDS=y @@ -34,6 +37,7 @@ CONFIG_C293_PCIE=y CONFIG_P1010_RDB=y CONFIG_P1022_DS=y CONFIG_P1022_RDK=y +CONFIG_P1023_RDB=y CONFIG_P1023_RDS=y CONFIG_SOCRATES=y CONFIG_KSI8560=y @@ -47,12 +51,15 @@ CONFIG_TQM8560=y CONFIG_SBC8548=y CONFIG_QUICC_ENGINE=y CONFIG_QE_GPIO=y +CONFIG_CPM2=y CONFIG_HIGHMEM=y CONFIG_BINFMT_MISC=m CONFIG_MATH_EMULATION=y +CONFIG_SWIOTLB=y CONFIG_FORCE_MAX_ZONEORDER=12 CONFIG_FSL_IFC=y CONFIG_PCI=y +CONFIG_PCIEPORTBUS=y CONFIG_PCI_MSI=y CONFIG_RAPIDIO=y CONFIG_NET=y @@ -116,6 +123,7 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_NBD=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=131072 +CONFIG_EEPROM_AT24=y CONFIG_EEPROM_LEGACY=y CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_ST=y @@ -131,9 +139,11 @@ CONFIG_PATA_ALI=y CONFIG_NETDEVICES=y CONFIG_DUMMY=y CONFIG_FS_ENET=y +CONFIG_FSL_PQ_MDIO=y CONFIG_UCC_GETH=y CONFIG_GIANFAR=y CONFIG_E1000E=y +CONFIG_PHYLIB=y CONFIG_MARVELL_PHY=y CONFIG_DAVICOM_PHY=y CONFIG_CICADA_PHY=y @@ -173,6 +183,8 @@ CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y CONFIG_SOUND=y CONFIG_SND=y +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y # CONFIG_SND_SUPPORT_OLD_API is not set # CONFIG_SND_DRIVERS is not set CONFIG_SND_INTEL8X0=y @@ -197,6 +209,7 @@ CONFIG_HID_SAMSUNG=y CONFIG_HID_SONY=y CONFIG_HID_SUNPLUS=y CONFIG_USB=y +CONFIG_USB_DEVICEFS=y CONFIG_USB_MON=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_FSL=y @@ -211,10 +224,12 @@ CONFIG_MMC_SDHCI_OF_ESDHC=y CONFIG_EDAC=y CONFIG_EDAC_MM_EDAC=y CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_DS1307=y CONFIG_RTC_DRV_CMOS=y CONFIG_DMADEVICES=y CONFIG_FSL_DMA=y # CONFIG_NET_DMA is not set +CONFIG_STAGING=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set @@ -256,6 +271,7 @@ CONFIG_ROOT_NFS=y CONFIG_NFSD=y CONFIG_CRC_T10DIF=y CONFIG_CRC16=y +CNOFIG_FRAME_WARN=8092 CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y @@ -264,6 +280,7 @@ CONFIG_CRYPTO_LZO=y CONFIG_DEBUG_FS=y CONFIG_DETECT_HUNG_TASK=y CONFIG_DEBUG_INFO=y +CONFIG_STRICT_DEVMEM=y CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y
mpc85xx_smp_defconfig and mpc85xx_defconfig already have CONFIG_P1023RDS=y. Merge CONFIG_P1023RDB=y and other relevant configurations into mpc85xx_smp_defconfig and mpc85_defconfig. Signed-off-by: Lijun Pan <Lijun.Pan@freescale.com> --- arch/powerpc/configs/85xx/p1023_defconfig | 188 ---------------------------- arch/powerpc/configs/mpc85xx_defconfig | 18 +++ arch/powerpc/configs/mpc85xx_smp_defconfig | 17 +++ 3 files changed, 35 insertions(+), 188 deletions(-) delete mode 100644 arch/powerpc/configs/85xx/p1023_defconfig