diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2007-01-26 01:23:34 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-01-26 01:23:34 -0500 |
commit | 4d52719a767455d319263d598e0f59e027895e00 (patch) | |
tree | a442521e5f32ce7160d7ac45d08df092eb4bb7ff | |
parent | 8b629a1f01b2c975074c51c752915ad50ee4e5fc (diff) |
[POWERPC] 83xx: Fix Kconfig to only enable FP math emulation for the MPC832x
Updated MATH_EMULATION depends to be on PPC_MPC832x instead of PPC_83xx. Only
the the MPC832x has no floating point unit in the core. Updated the other
83xx defconfigs that got math emulation turned on incorrectly.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r-- | arch/powerpc/Kconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/configs/mpc834x_itx_defconfig | 7 | ||||
-rw-r--r-- | arch/powerpc/configs/mpc834x_mds_defconfig | 3 | ||||
-rw-r--r-- | arch/powerpc/configs/mpc8360emds_defconfig | 3 |
4 files changed, 7 insertions, 8 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 0855d55c194..54d77a5b59f 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -720,7 +720,7 @@ config FORCE_MAX_ZONEORDER | |||
720 | 720 | ||
721 | config MATH_EMULATION | 721 | config MATH_EMULATION |
722 | bool "Math emulation" | 722 | bool "Math emulation" |
723 | depends on 4xx || 8xx || E200 || PPC_83xx || E500 | 723 | depends on 4xx || 8xx || E200 || PPC_MPC832x || E500 |
724 | ---help--- | 724 | ---help--- |
725 | Some PowerPC chips designed for embedded applications do not have | 725 | Some PowerPC chips designed for embedded applications do not have |
726 | a floating-point unit and therefore do not implement the | 726 | a floating-point unit and therefore do not implement the |
diff --git a/arch/powerpc/configs/mpc834x_itx_defconfig b/arch/powerpc/configs/mpc834x_itx_defconfig index 45757b61370..7902806429f 100644 --- a/arch/powerpc/configs/mpc834x_itx_defconfig +++ b/arch/powerpc/configs/mpc834x_itx_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.20-rc5 | 3 | # Linux kernel version: 2.6.20-rc5 |
4 | # Mon Jan 22 22:23:43 2007 | 4 | # Fri Jan 26 00:19:02 2007 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | CONFIG_PPC32=y | 7 | CONFIG_PPC32=y |
@@ -149,7 +149,6 @@ CONFIG_PREEMPT_NONE=y | |||
149 | # CONFIG_PREEMPT is not set | 149 | # CONFIG_PREEMPT is not set |
150 | CONFIG_BINFMT_ELF=y | 150 | CONFIG_BINFMT_ELF=y |
151 | # CONFIG_BINFMT_MISC is not set | 151 | # CONFIG_BINFMT_MISC is not set |
152 | CONFIG_MATH_EMULATION=y | ||
153 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 152 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
154 | CONFIG_ARCH_FLATMEM_ENABLE=y | 153 | CONFIG_ARCH_FLATMEM_ENABLE=y |
155 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 154 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
@@ -324,6 +323,7 @@ CONFIG_MTD=y | |||
324 | # User Modules And Translation Layers | 323 | # User Modules And Translation Layers |
325 | # | 324 | # |
326 | CONFIG_MTD_CHAR=y | 325 | CONFIG_MTD_CHAR=y |
326 | # CONFIG_MTD_BLKDEVS is not set | ||
327 | # CONFIG_MTD_BLOCK is not set | 327 | # CONFIG_MTD_BLOCK is not set |
328 | # CONFIG_MTD_BLOCK_RO is not set | 328 | # CONFIG_MTD_BLOCK_RO is not set |
329 | # CONFIG_FTL is not set | 329 | # CONFIG_FTL is not set |
@@ -366,6 +366,7 @@ CONFIG_MTD_PHYSMAP=y | |||
366 | CONFIG_MTD_PHYSMAP_START=0xfe000000 | 366 | CONFIG_MTD_PHYSMAP_START=0xfe000000 |
367 | CONFIG_MTD_PHYSMAP_LEN=0x1000000 | 367 | CONFIG_MTD_PHYSMAP_LEN=0x1000000 |
368 | CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | 368 | CONFIG_MTD_PHYSMAP_BANKWIDTH=2 |
369 | # CONFIG_MTD_PHYSMAP_OF is not set | ||
369 | # CONFIG_MTD_PLATRAM is not set | 370 | # CONFIG_MTD_PLATRAM is not set |
370 | 371 | ||
371 | # | 372 | # |
@@ -390,6 +391,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
390 | # NAND Flash Device Drivers | 391 | # NAND Flash Device Drivers |
391 | # | 392 | # |
392 | # CONFIG_MTD_NAND is not set | 393 | # CONFIG_MTD_NAND is not set |
394 | # CONFIG_MTD_NAND_CAFE is not set | ||
393 | 395 | ||
394 | # | 396 | # |
395 | # OneNAND Flash Device Drivers | 397 | # OneNAND Flash Device Drivers |
@@ -1011,7 +1013,6 @@ CONFIG_USB=y | |||
1011 | CONFIG_USB_DEVICEFS=y | 1013 | CONFIG_USB_DEVICEFS=y |
1012 | # CONFIG_USB_BANDWIDTH is not set | 1014 | # CONFIG_USB_BANDWIDTH is not set |
1013 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1015 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1014 | # CONFIG_USB_MULTITHREAD_PROBE is not set | ||
1015 | # CONFIG_USB_OTG is not set | 1016 | # CONFIG_USB_OTG is not set |
1016 | 1017 | ||
1017 | # | 1018 | # |
diff --git a/arch/powerpc/configs/mpc834x_mds_defconfig b/arch/powerpc/configs/mpc834x_mds_defconfig index c24db58be45..9eaed3a3698 100644 --- a/arch/powerpc/configs/mpc834x_mds_defconfig +++ b/arch/powerpc/configs/mpc834x_mds_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.20-rc5 | 3 | # Linux kernel version: 2.6.20-rc5 |
4 | # Mon Jan 22 22:24:10 2007 | 4 | # Fri Jan 26 00:19:27 2007 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | CONFIG_PPC32=y | 7 | CONFIG_PPC32=y |
@@ -149,7 +149,6 @@ CONFIG_PREEMPT_NONE=y | |||
149 | # CONFIG_PREEMPT is not set | 149 | # CONFIG_PREEMPT is not set |
150 | CONFIG_BINFMT_ELF=y | 150 | CONFIG_BINFMT_ELF=y |
151 | # CONFIG_BINFMT_MISC is not set | 151 | # CONFIG_BINFMT_MISC is not set |
152 | CONFIG_MATH_EMULATION=y | ||
153 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 152 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
154 | CONFIG_ARCH_FLATMEM_ENABLE=y | 153 | CONFIG_ARCH_FLATMEM_ENABLE=y |
155 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 154 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
diff --git a/arch/powerpc/configs/mpc8360emds_defconfig b/arch/powerpc/configs/mpc8360emds_defconfig index 58e6795dbfe..bbe38ccc3d8 100644 --- a/arch/powerpc/configs/mpc8360emds_defconfig +++ b/arch/powerpc/configs/mpc8360emds_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.20-rc5 | 3 | # Linux kernel version: 2.6.20-rc5 |
4 | # Mon Jan 22 22:24:40 2007 | 4 | # Fri Jan 26 00:19:45 2007 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | CONFIG_PPC32=y | 7 | CONFIG_PPC32=y |
@@ -150,7 +150,6 @@ CONFIG_PREEMPT_NONE=y | |||
150 | # CONFIG_PREEMPT is not set | 150 | # CONFIG_PREEMPT is not set |
151 | CONFIG_BINFMT_ELF=y | 151 | CONFIG_BINFMT_ELF=y |
152 | # CONFIG_BINFMT_MISC is not set | 152 | # CONFIG_BINFMT_MISC is not set |
153 | CONFIG_MATH_EMULATION=y | ||
154 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 153 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
155 | CONFIG_ARCH_FLATMEM_ENABLE=y | 154 | CONFIG_ARCH_FLATMEM_ENABLE=y |
156 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 155 | CONFIG_ARCH_POPULATES_NODE_MAP=y |