diff options
| author | Lijun Pan <LIJUN.PAN@FREESCALE.COM> | 2013-11-15 23:28:20 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-01-08 01:06:04 (GMT) |
| commit | 3d73eb69fb6dca340e027b9b7a063b2892756a57 (patch) | |
| tree | 209557f3ea4e997f000cd3b78979552e7cfedef3 /arch/powerpc/configs/mpc85xx_smp_defconfig | |
| parent | b58a7bd6df7b61446b833a7c72f8a1f11066e0b0 (diff) | |
| download | linux-3d73eb69fb6dca340e027b9b7a063b2892756a57.tar.xz | |
powerpc/85xx: Merge 85xx/p1023_defconfig into mpc85xx_smp and mpc85xx
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>
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'arch/powerpc/configs/mpc85xx_smp_defconfig')
| -rw-r--r-- | arch/powerpc/configs/mpc85xx_smp_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig index 4cb7b59..4b68629 100644 --- a/arch/powerpc/configs/mpc85xx_smp_defconfig +++ b/arch/powerpc/configs/mpc85xx_smp_defconfig @@ -34,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 @@ -116,6 +117,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 @@ -212,6 +214,7 @@ CONFIG_EDAC=y CONFIG_EDAC_MM_EDAC=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_CMOS=y +CONFIG_RTC_DRV_DS1307=y CONFIG_DMADEVICES=y CONFIG_FSL_DMA=y # CONFIG_NET_DMA is not set |