diff options
| author | Stewart Smith <stewart@linux.ibm.com> | 2019-06-18 17:29:10 +1000 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.ibm.com> | 2019-06-24 15:59:07 +1000 |
| commit | 7e6602e30975579047bdf27eb9f55b14f23dced3 (patch) | |
| tree | 90fc2b8e25de44e9dccb1d6e48058491abb9ea6b | |
| parent | bad74d247bcc8d06460fb1ea13d8413a69497344 (diff) | |
| download | skiboot-7e6602e30975579047bdf27eb9f55b14f23dced3.zip skiboot-7e6602e30975579047bdf27eb9f55b14f23dced3.tar.gz skiboot-7e6602e30975579047bdf27eb9f55b14f23dced3.tar.bz2 | |
Move more FSP functions to FSP platform
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
| -rw-r--r-- | core/init.c | 12 | ||||
| -rw-r--r-- | platforms/ibm-fsp/common.c | 13 |
2 files changed, 13 insertions, 12 deletions
diff --git a/core/init.c b/core/init.c index 3db9df3..9990483 100644 --- a/core/init.c +++ b/core/init.c @@ -558,16 +558,6 @@ void __noreturn load_and_boot_kernel(bool is_reboot) */ nvram_wait_for_load(); - /* Wait for FW VPD data read to complete */ - fsp_code_update_wait_vpd(true); - - /* - * OCC takes few secs to boot. Call this as late as - * as possible to avoid delay. - */ - if (fsp_present()) - occ_pstates_init(); - if (!occ_sensors_init()) dts_sensor_create_nodes(sensor_node); @@ -580,8 +570,6 @@ void __noreturn load_and_boot_kernel(bool is_reboot) occ_pstates_init(); } - fsp_console_select_stdout(); - /* Use nvram bootargs over device tree */ cmdline = nvram_query_safe("bootargs"); if (cmdline) { diff --git a/platforms/ibm-fsp/common.c b/platforms/ibm-fsp/common.c index a7f2bee..573cd51 100644 --- a/platforms/ibm-fsp/common.c +++ b/platforms/ibm-fsp/common.c @@ -180,6 +180,19 @@ void ibm_fsp_exit(void) * ensure we have all the LED information. */ create_led_device_nodes(); + + /* Wait for FW VPD data read to complete */ + fsp_code_update_wait_vpd(true); + + /* + * OCC takes few secs to boot. Call this as late as + * as possible to avoid delay. + */ + if (fsp_present()) + occ_pstates_init(); + + fsp_console_select_stdout(); + } int64_t ibm_fsp_cec_reboot(void) |