aboutsummaryrefslogtreecommitdiff
path: root/core/init.c
diff options
context:
space:
mode:
authorNicholas Piggin <npiggin@gmail.com>2017-11-29 15:37:04 +1000
committerStewart Smith <stewart@linux.vnet.ibm.com>2017-12-03 22:10:56 -0600
commit09a2319fdebc6664738ad2b2b86f4624036b094d (patch)
tree1ef6fede2ace7303e98c0ddba1a697aecbb3649a /core/init.c
parent4cfd44c463e28bffb9dfc1a8987c10c969d032f2 (diff)
downloadskiboot-09a2319fdebc6664738ad2b2b86f4624036b094d.zip
skiboot-09a2319fdebc6664738ad2b2b86f4624036b094d.tar.gz
skiboot-09a2319fdebc6664738ad2b2b86f4624036b094d.tar.bz2
fast-reboot: move fdt freeing into init
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'core/init.c')
-rw-r--r--core/init.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/core/init.c b/core/init.c
index f2747c6..0fdd7f0 100644
--- a/core/init.c
+++ b/core/init.c
@@ -501,8 +501,14 @@ void __noreturn load_and_boot_kernel(bool is_reboot)
/* Wait for FW VPD data read to complete */
fsp_code_update_wait_vpd(true);
- } else
+
+ } else {
+ /* fdt will be rebuilt */
+ free(fdt);
+ fdt = NULL;
+
nvram_reinit();
+ }
fsp_console_select_stdout();