aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBecky Bruce <beckyb@kernel.crashing.org>2011-10-10 16:50:45 -0400
committerKumar Gala <galak@kernel.crashing.org>2011-10-12 00:28:38 -0400
commit7c4b2f099f9b9c3580a3b606aff1fe13218fce48 (patch)
treec66e30c0a942753c4c27f57d3f547e57d53ad296
parentde423ff5b0b50746616dfacbd67a2290ed70b590 (diff)
powerpc: Update mpc85xx/corenet 32-bit defconfigs
Results from updates via make savedefconfig. Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat
-rw-r--r--arch/powerpc/configs/corenet32_smp_defconfig8
-rw-r--r--arch/powerpc/configs/mpc85xx_defconfig5
-rw-r--r--arch/powerpc/configs/mpc85xx_smp_defconfig6
3 files changed, 2 insertions, 17 deletions
diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig
index 49cfe85232f7..797e1fd1a5b9 100644
--- a/arch/powerpc/configs/corenet32_smp_defconfig
+++ b/arch/powerpc/configs/corenet32_smp_defconfig
@@ -12,9 +12,7 @@ CONFIG_IKCONFIG=y
12CONFIG_IKCONFIG_PROC=y 12CONFIG_IKCONFIG_PROC=y
13CONFIG_LOG_BUF_SHIFT=14 13CONFIG_LOG_BUF_SHIFT=14
14CONFIG_BLK_DEV_INITRD=y 14CONFIG_BLK_DEV_INITRD=y
15# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
16CONFIG_KALLSYMS_ALL=y 15CONFIG_KALLSYMS_ALL=y
17CONFIG_KALLSYMS_EXTRA_PASS=y
18CONFIG_EMBEDDED=y 16CONFIG_EMBEDDED=y
19CONFIG_PERF_EVENTS=y 17CONFIG_PERF_EVENTS=y
20CONFIG_SLAB=y 18CONFIG_SLAB=y
@@ -69,7 +67,6 @@ CONFIG_IPV6=y
69CONFIG_IP_SCTP=m 67CONFIG_IP_SCTP=m
70CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 68CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
71CONFIG_MTD=y 69CONFIG_MTD=y
72CONFIG_MTD_PARTITIONS=y
73CONFIG_MTD_CMDLINE_PARTS=y 70CONFIG_MTD_CMDLINE_PARTS=y
74CONFIG_MTD_CHAR=y 71CONFIG_MTD_CHAR=y
75CONFIG_MTD_BLOCK=y 72CONFIG_MTD_BLOCK=y
@@ -107,7 +104,6 @@ CONFIG_FSL_PQ_MDIO=y
107# CONFIG_INPUT_MOUSE is not set 104# CONFIG_INPUT_MOUSE is not set
108CONFIG_SERIO_LIBPS2=y 105CONFIG_SERIO_LIBPS2=y
109# CONFIG_LEGACY_PTYS is not set 106# CONFIG_LEGACY_PTYS is not set
110CONFIG_PPC_EPAPR_HV_BYTECHAN=y
111CONFIG_SERIAL_8250=y 107CONFIG_SERIAL_8250=y
112CONFIG_SERIAL_8250_CONSOLE=y 108CONFIG_SERIAL_8250_CONSOLE=y
113CONFIG_SERIAL_8250_EXTENDED=y 109CONFIG_SERIAL_8250_EXTENDED=y
@@ -136,8 +132,6 @@ CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
136CONFIG_USB_STORAGE=y 132CONFIG_USB_STORAGE=y
137CONFIG_MMC=y 133CONFIG_MMC=y
138CONFIG_MMC_SDHCI=y 134CONFIG_MMC_SDHCI=y
139CONFIG_MMC_SDHCI_OF=y
140CONFIG_MMC_SDHCI_OF_ESDHC=y
141CONFIG_EDAC=y 135CONFIG_EDAC=y
142CONFIG_EDAC_MM_EDAC=y 136CONFIG_EDAC_MM_EDAC=y
143CONFIG_EDAC_MPC85XX=y 137CONFIG_EDAC_MPC85XX=y
@@ -146,7 +140,6 @@ CONFIG_RTC_DRV_DS3232=y
146CONFIG_RTC_DRV_CMOS=y 140CONFIG_RTC_DRV_CMOS=y
147CONFIG_UIO=y 141CONFIG_UIO=y
148CONFIG_STAGING=y 142CONFIG_STAGING=y
149# CONFIG_STAGING_EXCLUDE_BUILD is not set
150CONFIG_VIRT_DRIVERS=y 143CONFIG_VIRT_DRIVERS=y
151CONFIG_FSL_HV_MANAGER=y 144CONFIG_FSL_HV_MANAGER=y
152CONFIG_EXT2_FS=y 145CONFIG_EXT2_FS=y
@@ -173,7 +166,6 @@ CONFIG_MAC_PARTITION=y
173CONFIG_NLS_ISO8859_1=y 166CONFIG_NLS_ISO8859_1=y
174CONFIG_NLS_UTF8=m 167CONFIG_NLS_UTF8=m
175CONFIG_MAGIC_SYSRQ=y 168CONFIG_MAGIC_SYSRQ=y
176CONFIG_DEBUG_KERNEL=y
177CONFIG_DEBUG_SHIRQ=y 169CONFIG_DEBUG_SHIRQ=y
178CONFIG_DETECT_HUNG_TASK=y 170CONFIG_DETECT_HUNG_TASK=y
179CONFIG_DEBUG_INFO=y 171CONFIG_DEBUG_INFO=y
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
index 250091207452..a1e5a178a4ac 100644
--- a/arch/powerpc/configs/mpc85xx_defconfig
+++ b/arch/powerpc/configs/mpc85xx_defconfig
@@ -10,10 +10,8 @@ CONFIG_IKCONFIG=y
10CONFIG_IKCONFIG_PROC=y 10CONFIG_IKCONFIG_PROC=y
11CONFIG_LOG_BUF_SHIFT=14 11CONFIG_LOG_BUF_SHIFT=14
12CONFIG_BLK_DEV_INITRD=y 12CONFIG_BLK_DEV_INITRD=y
13# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
14CONFIG_EXPERT=y 13CONFIG_EXPERT=y
15CONFIG_KALLSYMS_ALL=y 14CONFIG_KALLSYMS_ALL=y
16CONFIG_KALLSYMS_EXTRA_PASS=y
17CONFIG_MODULES=y 15CONFIG_MODULES=y
18CONFIG_MODULE_UNLOAD=y 16CONFIG_MODULE_UNLOAD=y
19CONFIG_MODULE_FORCE_UNLOAD=y 17CONFIG_MODULE_FORCE_UNLOAD=y
@@ -41,7 +39,6 @@ CONFIG_TQM8560=y
41CONFIG_SBC8548=y 39CONFIG_SBC8548=y
42CONFIG_QUICC_ENGINE=y 40CONFIG_QUICC_ENGINE=y
43CONFIG_QE_GPIO=y 41CONFIG_QE_GPIO=y
44CONFIG_GPIO_MPC8XXX=y
45CONFIG_HIGHMEM=y 42CONFIG_HIGHMEM=y
46CONFIG_NO_HZ=y 43CONFIG_NO_HZ=y
47CONFIG_HIGH_RES_TIMERS=y 44CONFIG_HIGH_RES_TIMERS=y
@@ -123,6 +120,7 @@ CONFIG_NVRAM=y
123CONFIG_I2C=y 120CONFIG_I2C=y
124CONFIG_I2C_CPM=m 121CONFIG_I2C_CPM=m
125CONFIG_I2C_MPC=y 122CONFIG_I2C_MPC=y
123CONFIG_GPIO_MPC8XXX=y
126# CONFIG_HWMON is not set 124# CONFIG_HWMON is not set
127CONFIG_VIDEO_OUTPUT_CONTROL=y 125CONFIG_VIDEO_OUTPUT_CONTROL=y
128CONFIG_FB=y 126CONFIG_FB=y
@@ -206,7 +204,6 @@ CONFIG_PARTITION_ADVANCED=y
206CONFIG_MAC_PARTITION=y 204CONFIG_MAC_PARTITION=y
207CONFIG_CRC_T10DIF=y 205CONFIG_CRC_T10DIF=y
208CONFIG_DEBUG_FS=y 206CONFIG_DEBUG_FS=y
209CONFIG_DEBUG_KERNEL=y
210CONFIG_DETECT_HUNG_TASK=y 207CONFIG_DETECT_HUNG_TASK=y
211CONFIG_DEBUG_INFO=y 208CONFIG_DEBUG_INFO=y
212CONFIG_SYSCTL_SYSCALL_CHECK=y 209CONFIG_SYSCTL_SYSCALL_CHECK=y
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig
index a4ba13b0ef1f..dd1e41386c4c 100644
--- a/arch/powerpc/configs/mpc85xx_smp_defconfig
+++ b/arch/powerpc/configs/mpc85xx_smp_defconfig
@@ -12,10 +12,8 @@ CONFIG_IKCONFIG=y
12CONFIG_IKCONFIG_PROC=y 12CONFIG_IKCONFIG_PROC=y
13CONFIG_LOG_BUF_SHIFT=14 13CONFIG_LOG_BUF_SHIFT=14
14CONFIG_BLK_DEV_INITRD=y 14CONFIG_BLK_DEV_INITRD=y
15# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
16CONFIG_EXPERT=y 15CONFIG_EXPERT=y
17CONFIG_KALLSYMS_ALL=y 16CONFIG_KALLSYMS_ALL=y
18CONFIG_KALLSYMS_EXTRA_PASS=y
19CONFIG_MODULES=y 17CONFIG_MODULES=y
20CONFIG_MODULE_UNLOAD=y 18CONFIG_MODULE_UNLOAD=y
21CONFIG_MODULE_FORCE_UNLOAD=y 19CONFIG_MODULE_FORCE_UNLOAD=y
@@ -42,7 +40,6 @@ CONFIG_TQM8560=y
42CONFIG_SBC8548=y 40CONFIG_SBC8548=y
43CONFIG_QUICC_ENGINE=y 41CONFIG_QUICC_ENGINE=y
44CONFIG_QE_GPIO=y 42CONFIG_QE_GPIO=y
45CONFIG_GPIO_MPC8XXX=y
46CONFIG_HIGHMEM=y 43CONFIG_HIGHMEM=y
47CONFIG_NO_HZ=y 44CONFIG_NO_HZ=y
48CONFIG_HIGH_RES_TIMERS=y 45CONFIG_HIGH_RES_TIMERS=y
@@ -124,6 +121,7 @@ CONFIG_NVRAM=y
124CONFIG_I2C=y 121CONFIG_I2C=y
125CONFIG_I2C_CPM=m 122CONFIG_I2C_CPM=m
126CONFIG_I2C_MPC=y 123CONFIG_I2C_MPC=y
124CONFIG_GPIO_MPC8XXX=y
127# CONFIG_HWMON is not set 125# CONFIG_HWMON is not set
128CONFIG_VIDEO_OUTPUT_CONTROL=y 126CONFIG_VIDEO_OUTPUT_CONTROL=y
129CONFIG_FB=y 127CONFIG_FB=y
@@ -207,10 +205,8 @@ CONFIG_PARTITION_ADVANCED=y
207CONFIG_MAC_PARTITION=y 205CONFIG_MAC_PARTITION=y
208CONFIG_CRC_T10DIF=y 206CONFIG_CRC_T10DIF=y
209CONFIG_DEBUG_FS=y 207CONFIG_DEBUG_FS=y
210CONFIG_DEBUG_KERNEL=y
211CONFIG_DETECT_HUNG_TASK=y 208CONFIG_DETECT_HUNG_TASK=y
212CONFIG_DEBUG_INFO=y 209CONFIG_DEBUG_INFO=y
213# CONFIG_RCU_CPU_STALL_DETECTOR is not set
214CONFIG_SYSCTL_SYSCALL_CHECK=y 210CONFIG_SYSCTL_SYSCALL_CHECK=y
215CONFIG_VIRQ_DEBUG=y 211CONFIG_VIRQ_DEBUG=y
216CONFIG_CRYPTO_PCBC=m 212CONFIG_CRYPTO_PCBC=m
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-01 00:18:02 -0400