diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2007-12-09 23:17:43 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-12-14 00:45:00 -0500 |
commit | eb8dc843fc3c0dbac553ec79d7e5b4d8339aeb3d (patch) | |
tree | 351b54fd0daadb987e772ef738781acc07dfbe75 /arch | |
parent | 88f0178e6ec2c73167de973e4af86905b4dbfd45 (diff) |
[POWERPC] Make PS3_SYS_MANAGER default y, not m
Currently it's impossible to build a ps3_defconfig which will reboot
without modules installed. This makes it all too easy to find yourself
with a PS3 that won't reboot.
This is because the system manager driver, which provides the reboot
mechanism, is only selectable if PS3_ADVANCED is set, else it defaults
to m. In ps3_defconfig PS3_ADVANCED is not set, therefore the system
manager is built as a module.
It would be desirable IMHO for the defconfig to produce a kernel that
boots and reboots, without needing modules to be installed.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Acked-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/configs/ps3_defconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/ps3/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig index 5bd547ecd60a..0b5469fb6e0f 100644 --- a/arch/powerpc/configs/ps3_defconfig +++ b/arch/powerpc/configs/ps3_defconfig | |||
@@ -157,7 +157,7 @@ CONFIG_PS3_HTAB_SIZE=20 | |||
157 | CONFIG_PS3_USE_LPAR_ADDR=y | 157 | CONFIG_PS3_USE_LPAR_ADDR=y |
158 | CONFIG_PS3_VUART=y | 158 | CONFIG_PS3_VUART=y |
159 | CONFIG_PS3_PS3AV=y | 159 | CONFIG_PS3_PS3AV=y |
160 | CONFIG_PS3_SYS_MANAGER=m | 160 | CONFIG_PS3_SYS_MANAGER=y |
161 | CONFIG_PS3_STORAGE=y | 161 | CONFIG_PS3_STORAGE=y |
162 | CONFIG_PS3_DISK=y | 162 | CONFIG_PS3_DISK=y |
163 | CONFIG_PS3_ROM=y | 163 | CONFIG_PS3_ROM=y |
diff --git a/arch/powerpc/platforms/ps3/Kconfig b/arch/powerpc/platforms/ps3/Kconfig index 67144d1d1405..298f1c9679fb 100644 --- a/arch/powerpc/platforms/ps3/Kconfig +++ b/arch/powerpc/platforms/ps3/Kconfig | |||
@@ -91,7 +91,7 @@ config PS3_SYS_MANAGER | |||
91 | depends on PPC_PS3 | 91 | depends on PPC_PS3 |
92 | tristate "PS3 System Manager driver" if PS3_ADVANCED | 92 | tristate "PS3 System Manager driver" if PS3_ADVANCED |
93 | select PS3_VUART | 93 | select PS3_VUART |
94 | default m | 94 | default y |
95 | help | 95 | help |
96 | Include support for the PS3 System Manager. | 96 | Include support for the PS3 System Manager. |
97 | 97 | ||