diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-01-20 07:36:53 +0100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-01-20 08:06:58 +0100 |
| commit | a85cade6762bf566698e625ec1a4461245e40768 (patch) | |
| tree | e6dc30c400417d313c2546aa0bc93ca1905608b5 /arch/powerpc/configs/85xx/ppa8548_defconfig | |
| parent | powerpc/kvm: Create proper names for the kvm_host_state PMU fields (diff) | |
| download | linux-a85cade6762bf566698e625ec1a4461245e40768.tar.xz linux-a85cade6762bf566698e625ec1a4461245e40768.zip | |
powerpc: Update all configs using savedefconfig
It looks like it's ~4 years since we updated some of these, so do a bulk
update.
Verified that the before and after generated configs are exactly the
same.
Which begs the question why update them? The answer is that it can be
confusing when the stored defconfig drifts too far from the generated
result.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/configs/85xx/ppa8548_defconfig')
| -rw-r--r-- | arch/powerpc/configs/85xx/ppa8548_defconfig | 62 |
1 files changed, 22 insertions, 40 deletions
diff --git a/arch/powerpc/configs/85xx/ppa8548_defconfig b/arch/powerpc/configs/85xx/ppa8548_defconfig index e80bb9b21eac..190978a5b7d5 100644 --- a/arch/powerpc/configs/85xx/ppa8548_defconfig +++ b/arch/powerpc/configs/85xx/ppa8548_defconfig @@ -1,11 +1,16 @@ CONFIG_PPC_85xx=y -CONFIG_PPA8548=y -CONFIG_DTC=y -CONFIG_DEFAULT_UIMAGE=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y -# CONFIG_PCI is not set -# CONFIG_USB_SUPPORT is not set +CONFIG_PPA8548=y +CONFIG_FSL_LBC=y +CONFIG_RAPIDIO=y +CONFIG_FSL_RIO=y +CONFIG_RAPIDIO_DMA_ENGINE=y +CONFIG_RAPIDIO_ENUM_BASIC=y +CONFIG_RAPIDIO_TSI57X=y +CONFIG_RAPIDIO_CPS_XX=y +CONFIG_RAPIDIO_TSI568=y +CONFIG_RAPIDIO_CPS_GEN2=y CONFIG_ADVANCED_OPTIONS=y CONFIG_LOWMEM_SIZE_BOOL=y CONFIG_LOWMEM_SIZE=0x40000000 @@ -14,51 +19,28 @@ CONFIG_LOWMEM_CAM_NUM=4 CONFIG_PAGE_OFFSET_BOOL=y CONFIG_PAGE_OFFSET=0xb0000000 CONFIG_KERNEL_START_BOOL=y -CONFIG_KERNEL_START=0xb0000000 -# CONFIG_PHYSICAL_START_BOOL is not set -CONFIG_PHYSICAL_START=0x00000000 -CONFIG_PHYSICAL_ALIGN=0x04000000 CONFIG_TASK_SIZE_BOOL=y CONFIG_TASK_SIZE=0xb0000000 - -CONFIG_FSL_LBC=y -CONFIG_FSL_DMA=y -CONFIG_FSL_RIO=y - -CONFIG_RAPIDIO=y -CONFIG_RAPIDIO_DMA_ENGINE=y -CONFIG_RAPIDIO_TSI57X=y -CONFIG_RAPIDIO_TSI568=y -CONFIG_RAPIDIO_CPS_XX=y -CONFIG_RAPIDIO_CPS_GEN2=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_PROC_DEVICETREE=y - +CONFIG_NET=y +CONFIG_INET=y +CONFIG_IP_PNP=y CONFIG_MTD=y -CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CONCAT=y +CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_PHYSMAP_OF=y - +CONFIG_NETDEVICES=y +CONFIG_GIANFAR=y +CONFIG_MARVELL_PHY=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_I2C=y CONFIG_I2C_MPC=y -CONFIG_I2C_CHARDEV +# CONFIG_USB_SUPPORT is not set CONFIG_RTC_CLASS=y -CONFIG_RTC_HCTOSYS=y CONFIG_RTC_DRV_ISL1208=y - -CONFIG_NET=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_NETDEVICES=y -CONFIG_MII=y -CONFIG_GIANFAR=y -CONFIG_MARVELL_PHY=y +CONFIG_FSL_DMA=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y |