commit b35ef48e5b531da253165246b82d446e71293edb
author Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com> Fri Mar 06 11:17:15 2020 -0600
committer Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com> Fri Mar 06 11:17:15 2020 -0600
tree cb9631c7229d6f9ee11a64c46ff408a6f17d2550
parent 16c79fd521139bd01ccc17fa93eb73c82a09c2bd

Revert "linux/defconfig: Set ipr.fast_reboot=1"

This reverts commit e920f5dedb75e5c3f451c3607ea016f3fef2961c:
(linux/defconfig: Set ipr.fast_reboot=1)

This setting is not currently compatible with Simics p10

Conflicts:
	openpower/configs/linux/skiroot_p9_defconfig
        (no longer exists)

openpower/configs/linux/skiroot_defconfig

diff --git a/openpower/configs/linux/skiroot_defconfig b/openpower/configs/linux/skiroot_defconfig
index d0cda0e..2fb25a8 100644
--- a/openpower/configs/linux/skiroot_defconfig
+++ b/openpower/configs/linux/skiroot_defconfig
@@ -46,7 +46,7 @@
 CONFIG_PPC_64K_PAGES=y
 CONFIG_SCHED_SMT=y
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=tty0 console=hvc0 ipr.fast_reboot=1 quiet"
+CONFIG_CMDLINE="console=tty0 console=hvc0 quiet"
 # CONFIG_SECCOMP is not set
 # CONFIG_PPC_MEM_KEYS is not set
 CONFIG_JUMP_LABEL=y