summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorEmil Medve <Emilian.Medve@Freescale.com>2014-01-07 08:11:42 (GMT)
committerEmilian Medve <Emilian.Medve@freescale.com>2014-01-07 16:26:56 (GMT)
commit32b93163f0224216c40d64065e0904c3ed0ad894 (patch)
tree5d7ba3cdbdfe4f3c1c4eab659389efc6fb946169 /arch
parent2cb595d22d27850240f9311bbc0d0c95d5e96e51 (diff)
downloadlinux-fsl-qoriq-32b93163f0224216c40d64065e0904c3ed0ad894.tar.xz
powerpc/e6500: Use CORENET_GENERIC
As per '9e096757 powerpc/85xx: use one kernel option for all the CoreNet_Generic boards' drivers/edac/mpc85xx_edac.c: In function ‘mpc85xx_mc_clear_rfxe’: drivers/edac/mpc85xx_edac.c:1228:103: error: ‘HID1_RFXE’ undeclared (first use in this function) mtspr(SPRN_HID1, (orig_hid1[smp_processor_id()] & ~HID1_RFXE)); ^ Signed-off-by: Chunhe Lan <Chunhe.Lan@freescale.com> Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com> Change-Id: Icedce355da55a2b1f32e3ba1d323b00fec2ca922 Reviewed-on: http://git.am.freescale.net:8181/7626 Reviewed-by: Emilian Medve <Emilian.Medve@freescale.com> Tested-by: Emilian Medve <Emilian.Medve@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/configs/85xx/e6500rev1_defconfig5
-rw-r--r--arch/powerpc/configs/85xx/e6500rev2_defconfig5
2 files changed, 2 insertions, 8 deletions
diff --git a/arch/powerpc/configs/85xx/e6500rev1_defconfig b/arch/powerpc/configs/85xx/e6500rev1_defconfig
index 4b9235b..3b2a229 100644
--- a/arch/powerpc/configs/85xx/e6500rev1_defconfig
+++ b/arch/powerpc/configs/85xx/e6500rev1_defconfig
@@ -29,11 +29,8 @@ CONFIG_MODVERSIONS=y
# CONFIG_BLK_DEV_BSG is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_MAC_PARTITION=y
-CONFIG_P5020_DS=y
-CONFIG_P5040_DS=y
CONFIG_PPC_QEMU_E500=y
-CONFIG_T4240_QDS=y
-CONFIG_B4_QDS=y
+CONFIG_CORENET_GENERIC=y
# CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
CONFIG_BINFMT_MISC=m
diff --git a/arch/powerpc/configs/85xx/e6500rev2_defconfig b/arch/powerpc/configs/85xx/e6500rev2_defconfig
index 5cc95af..e78619c 100644
--- a/arch/powerpc/configs/85xx/e6500rev2_defconfig
+++ b/arch/powerpc/configs/85xx/e6500rev2_defconfig
@@ -28,11 +28,8 @@ CONFIG_MODVERSIONS=y
# CONFIG_BLK_DEV_BSG is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_MAC_PARTITION=y
-CONFIG_P5020_DS=y
-CONFIG_P5040_DS=y
CONFIG_PPC_QEMU_E500=y
-CONFIG_T4240_QDS=y
-CONFIG_B4_QDS=y
+CONFIG_CORENET_GENERIC=y
# CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
CONFIG_BINFMT_MISC=m