powerpc/85xx: Merge 85xx/p1023_defconfig into mpc85xx_smp and mpc85xx
authorLijun Pan <LIJUN.PAN@FREESCALE.COM>
Fri, 15 Nov 2013 23:28:20 +0000 (17:28 -0600)
committerScott Wood <scottwood@freescale.com>
Wed, 8 Jan 2014 01:06:04 +0000 (19:06 -0600)
commit3d73eb69fb6dca340e027b9b7a063b2892756a57
tree209557f3ea4e997f000cd3b78979552e7cfedef3
parentb58a7bd6df7b61446b833a7c72f8a1f11066e0b0
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>
arch/powerpc/configs/85xx/p1023_defconfig [deleted file]
arch/powerpc/configs/mpc85xx_defconfig
arch/powerpc/configs/mpc85xx_smp_defconfig