Commit 44d54014 authored by Scott Wood's avatar Scott Wood
Browse files

powerpc/85xx: Use kconfig fragments 



Unify mpc85xx and corenet configs using fragments, to ease maintenance
and avoid the sort of drift that the previous patch fixed.

Hardware and software options are separated, with the hope that other
embedded platforms could share the software options, and to make it
easier to maintain custom/alternate configs that focus on either
hardware or software options.

Due to the previous patch, this patch should not affect the results of
any of the affected defconfigs -- only how those results are achieved.
The resulting config is more or less the union of the options that any
of the configs previously selected.  No attempt was made in this (or
the previous) patch to edit out questionable options, but this patch
will make it easier to do so in future patches.

Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
parent 7e2ad2ef

arch/powerpc/Makefile

+20 −0
Original line number Diff line number Diff line
@@ -288,6 +288,26 @@ PHONY += pseries_le_defconfig 
pseries_le_defconfig:

	$(call merge_into_defconfig,pseries_defconfig,le)



PHONY += mpc85xx_defconfig

mpc85xx_defconfig:

	$(call merge_into_defconfig,mpc85xx_basic_defconfig,\

		85xx-32bit 85xx-hw fsl-emb-nonhw)



PHONY += mpc85xx_smp_defconfig

mpc85xx_smp_defconfig:

	$(call merge_into_defconfig,mpc85xx_basic_defconfig,\

		85xx-32bit 85xx-smp 85xx-hw fsl-emb-nonhw)



PHONY += corenet32_smp_defconfig

corenet32_smp_defconfig:

	$(call merge_into_defconfig,corenet_basic_defconfig,\

		85xx-32bit 85xx-smp 85xx-hw fsl-emb-nonhw)



PHONY += corenet64_smp_defconfig

corenet64_smp_defconfig:

	$(call merge_into_defconfig,corenet_basic_defconfig,\

		85xx-64bit 85xx-smp altivec 85xx-hw fsl-emb-nonhw)



define archhelp

  @echo '* zImage          - Build default images selected by kernel config'

  @echo '  zImage.*        - Compressed kernel image (arch/$(ARCH)/boot/zImage.*)'

arch/powerpc/configs/85xx-32bit.config

0 → 100644
+5 −0
Original line number Diff line number Diff line 
CONFIG_HIGHMEM=y

CONFIG_KEXEC=y

CONFIG_PPC_85xx=y

CONFIG_PROC_KCORE=y

CONFIG_PHYS_64BIT=y

arch/powerpc/configs/85xx-64bit.config

0 → 100644
+4 −0
Original line number Diff line number Diff line 
CONFIG_MATH_EMULATION=y

CONFIG_MATH_EMULATION_HW_UNIMPLEMENTED=y

CONFIG_PPC64=y

CONFIG_PPC_BOOK3E_64=y

arch/powerpc/configs/corenet32_smp_defconfig→arch/powerpc/configs/85xx-hw.config

+114 −238
Original line number Diff line number Diff line 
CONFIG_PPC_85xx=y

CONFIG_SMP=y

CONFIG_NR_CPUS=24

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_FHANDLE=y

CONFIG_AUDIT=y

CONFIG_IRQ_DOMAIN_DEBUG=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_CGROUPS=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_SCHED=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

CONFIG_KALLSYMS_ALL=y

CONFIG_PERF_EVENTS=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_C293_PCIE=y

CONFIG_CORENET_GENERIC=y

CONFIG_QUICC_ENGINE=y

CONFIG_QE_GPIO=y

CONFIG_HIGHMEM=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_MISC=m

CONFIG_KEXEC=y

CONFIG_FORCE_MAX_ZONEORDER=13

CONFIG_PCI=y

CONFIG_PCIEPORTBUS=y

# CONFIG_PCIEASPM is not set

CONFIG_PCI_MSI=y

CONFIG_RAPIDIO=y

CONFIG_FSL_RIO=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=y

CONFIG_XFRM_SUB_POLICY=y

CONFIG_XFRM_STATISTICS=y

CONFIG_NET_KEY=y

CONFIG_NET_KEY_MIGRATE=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_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=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_BLOCK=y

CONFIG_FTL=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_PHYSMAP_OF=y

CONFIG_MTD_PLATRAM=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_FSL_ELBC=y

CONFIG_MTD_NAND_FSL_IFC=y

CONFIG_MTD_SPI_NOR=y

CONFIG_MTD_UBI=y

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_AT803X_PHY=y

CONFIG_ATA=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=y

CONFIG_BLK_DEV_SR=y

CONFIG_BLK_DEV_SR_VENDOR=y

CONFIG_BLK_DEV_SR=y

CONFIG_BROADCOM_PHY=y

CONFIG_C293_PCIE=y

CONFIG_CHR_DEV_SG=y

CONFIG_SCSI_LOGGING=y

CONFIG_SCSI_SYM53C8XX_2=y

CONFIG_ATA=y

CONFIG_SATA_AHCI=y

CONFIG_SATA_FSL=y

CONFIG_SATA_SIL24=y

CONFIG_SATA_SIL=y

CONFIG_PATA_ALI=y

CONFIG_PATA_SIL680=y

CONFIG_PATA_VIA=y

CONFIG_NETDEVICES=y

CONFIG_DUMMY=y

CONFIG_FSL_XGMAC_MDIO=y

CONFIG_UCC_GETH=y

CONFIG_GIANFAR=y

CONFIG_E1000=y

CONFIG_E1000E=y

CONFIG_IGB=y

CONFIG_AT803X_PHY=y

CONFIG_MARVELL_PHY=y

CONFIG_DAVICOM_PHY=y

CONFIG_CHR_DEV_ST=y

CONFIG_CICADA_PHY=y

CONFIG_VITESSE_PHY=y

CONFIG_BROADCOM_PHY=y

CONFIG_FIXED_PHY=y

CONFIG_MDIO_BUS_MUX_GPIO=y

CONFIG_MDIO_BUS_MUX_MMIOREG=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_LEGACY_PTYS is not set

CONFIG_PPC_EPAPR_HV_BYTECHAN=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=6

CONFIG_SERIAL_8250_RUNTIME_UARTS=6

CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_8250_DETECT_IRQ=y

CONFIG_SERIAL_8250_RSA=y

CONFIG_SERIAL_QE=m

CONFIG_NVRAM=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_MUX=y

CONFIG_I2C_MUX_PCA954x=y

CONFIG_I2C_MPC=y

CONFIG_SPI=y

CONFIG_SPI_GPIO=y

CONFIG_SPI_FSL_SPI=y

CONFIG_SPI_FSL_ESPI=y

CONFIG_SENSORS_LM90=y

CONFIG_SENSORS_INA2XX=y

CONFIG_FB=y

CONFIG_CLK_QORIQ=y

CONFIG_CRYPTO_DEV_FSL_CAAM=y

CONFIG_CRYPTO_DEV_TALITOS=y

CONFIG_DAVICOM_PHY=y

CONFIG_DMADEVICES=y

CONFIG_E1000E=y

CONFIG_E1000=y

CONFIG_EDAC_MM_EDAC=y

CONFIG_EDAC_MPC85XX=y

CONFIG_EDAC=y

CONFIG_EEPROM_AT24=y

CONFIG_EEPROM_LEGACY=y

CONFIG_FB_FSL_DIU=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_SOUND=y

CONFIG_SND=y

# CONFIG_SND_SUPPORT_OLD_API is not set

# CONFIG_SND_DRIVERS is not set

CONFIG_SND_INTEL8X0=y

# CONFIG_SND_PPC is not set

# CONFIG_SND_USB is not set

CONFIG_SND_SOC=y

CONFIG_SND_POWERPC_SOC=y

CONFIG_FS_ENET=y

CONFIG_FSL_CORENET_CF=y

CONFIG_FSL_DMA=y

CONFIG_FSL_HV_MANAGER=y

CONFIG_FSL_PQ_MDIO=y

CONFIG_FSL_RIO=y

CONFIG_FSL_XGMAC_MDIO=y

CONFIG_GIANFAR=y

CONFIG_GPIO_MPC8XXX=y

CONFIG_HID_A4TECH=y

CONFIG_HID_APPLE=y

CONFIG_HID_BELKIN=y
@@ -182,83 +45,96 @@ CONFIG_HID_PANTHERLORD=y 
CONFIG_HID_PETALYNX=y

CONFIG_HID_SAMSUNG=y

CONFIG_HID_SUNPLUS=y

CONFIG_USB_HID=m

CONFIG_USB=y

CONFIG_USB_MON=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_FSL=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_OHCI_HCD_PPC_OF_BE=y

CONFIG_USB_OHCI_HCD_PPC_OF_LE=y

CONFIG_USB_STORAGE=y

CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_CPM=m

CONFIG_I2C_MPC=y

CONFIG_I2C_MUX_PCA954x=y

CONFIG_I2C_MUX=y

CONFIG_I2C=y

CONFIG_IGB=y

CONFIG_INPUT_FF_MEMLESS=m

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSEDEV is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_MARVELL_PHY=y

CONFIG_MDIO_BUS_MUX_GPIO=y

CONFIG_MDIO_BUS_MUX_MMIOREG=y

CONFIG_MMC_SDHCI_OF_ESDHC=y

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=y

CONFIG_EDAC_MPC85XX=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_NAND_FSL_ELBC=y

CONFIG_MTD_NAND_FSL_IFC=y

CONFIG_MTD_NAND=y

CONFIG_MTD_PHYSMAP_OF=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_PLATRAM=y

CONFIG_MTD_SPI_NOR=y

CONFIG_NETDEVICES=y

CONFIG_NVRAM=y

CONFIG_PATA_ALI=y

CONFIG_PATA_SIL680=y

CONFIG_PATA_VIA=y

# CONFIG_PCIEASPM is not set

CONFIG_PCIEPORTBUS=y

CONFIG_PCI_MSI=y

CONFIG_PCI=y

CONFIG_PPC_EPAPR_HV_BYTECHAN=y

# CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set

CONFIG_QE_GPIO=y

CONFIG_QUICC_ENGINE=y

CONFIG_RAPIDIO=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_CMOS=y

CONFIG_RTC_DRV_DS1307=y

CONFIG_RTC_DRV_DS1374=y

CONFIG_RTC_DRV_DS3232=y

CONFIG_RTC_DRV_CMOS=y

CONFIG_DMADEVICES=y

CONFIG_FSL_DMA=y

CONFIG_UIO=y

CONFIG_SATA_AHCI=y

CONFIG_SATA_FSL=y

CONFIG_SATA_SIL24=y

CONFIG_SATA_SIL=y

CONFIG_SCSI_LOGGING=y

CONFIG_SCSI_SYM53C8XX_2=y

CONFIG_SENSORS_INA2XX=y

CONFIG_SENSORS_LM90=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_DETECT_IRQ=y

CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_8250_NR_UARTS=6

CONFIG_SERIAL_8250_RSA=y

CONFIG_SERIAL_8250_RUNTIME_UARTS=6

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_QE=m

CONFIG_SERIO_LIBPS2=y

# CONFIG_SND_DRIVERS is not set

CONFIG_SND_INTEL8X0=y

CONFIG_SND_POWERPC_SOC=y

# CONFIG_SND_PPC is not set

CONFIG_SND_SOC=y

# CONFIG_SND_SUPPORT_OLD_API is not set

# CONFIG_SND_USB is not set

CONFIG_SND=y

CONFIG_SOUND=y

CONFIG_SPI_FSL_ESPI=y

CONFIG_SPI_FSL_SPI=y

CONFIG_SPI_GPIO=y

CONFIG_SPI=y

CONFIG_UCC_GETH=y

CONFIG_USB_EHCI_FSL=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_HID=m

CONFIG_USB_MON=y

CONFIG_USB_OHCI_HCD_PPC_OF_BE=y

CONFIG_USB_OHCI_HCD_PPC_OF_LE=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_USB=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_VIRT_DRIVERS=y

CONFIG_FSL_HV_MANAGER=y

CONFIG_CLK_QORIQ=y

CONFIG_FSL_CORENET_CF=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_HUGETLBFS=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_JFFS2_FS=y

CONFIG_JFFS2_FS_DEBUG=1

CONFIG_UBIFS_FS=y

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_NLS_CODEPAGE_437=y

CONFIG_NLS_CODEPAGE_850=y

CONFIG_NLS_ISO8859_1=y

CONFIG_CRC_T10DIF=y

CONFIG_FONTS=y

CONFIG_FONT_8x8=y

CONFIG_FONT_8x16=y

CONFIG_DEBUG_INFO=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_SHIRQ=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_RCU_TRACE=y

CONFIG_CRYPTO_NULL=y

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_SHA512=y

CONFIG_CRYPTO_DEV_FSL_CAAM=y

CONFIG_CRYPTO_DEV_TALITOS=y
 
CONFIG_VITESSE_PHY=y

arch/powerpc/configs/85xx-smp.config

0 → 100644
+2 −0
Original line number Diff line number Diff line 
CONFIG_NR_CPUS=24

CONFIG_SMP=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE