diff options
Diffstat (limited to 'src/cpu/amd')
| -rw-r--r-- | src/cpu/amd/agesa/romstage.c | 2 | ||||
| -rw-r--r-- | src/cpu/amd/pi/Kconfig | 3 | ||||
| -rw-r--r-- | src/cpu/amd/pi/Makefile.inc | 7 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/cpu/amd/agesa/romstage.c b/src/cpu/amd/agesa/romstage.c index a7d2ff90b7..91c5518207 100644 --- a/src/cpu/amd/agesa/romstage.c +++ b/src/cpu/amd/agesa/romstage.c @@ -131,7 +131,7 @@ void asmlinkage romstage_after_car(void) if (HAS_LEGACY_WRAPPER) agesa_postcar(cb); - if (cb->s3resume) + if (!IS_ENABLED(CONFIG_CPU_AMD_PI) && cb->s3resume) set_resume_cache(); run_ramstage(); diff --git a/src/cpu/amd/pi/Kconfig b/src/cpu/amd/pi/Kconfig index c0e942837e..51897b6dd8 100644 --- a/src/cpu/amd/pi/Kconfig +++ b/src/cpu/amd/pi/Kconfig @@ -30,6 +30,9 @@ config CPU_AMD_PI if CPU_AMD_PI +config BINARYPI_LEGACY_WRAPPER + def_bool n + config XIP_ROM_SIZE hex default 0x100000 diff --git a/src/cpu/amd/pi/Makefile.inc b/src/cpu/amd/pi/Makefile.inc index 7e3c8c03cc..3171bb5d67 100644 --- a/src/cpu/amd/pi/Makefile.inc +++ b/src/cpu/amd/pi/Makefile.inc @@ -19,7 +19,12 @@ subdirs-$(CONFIG_CPU_AMD_PI_00660F01) += 00660F01 cpu_incs-y += $(src)/cpu/amd/agesa/cache_as_ram.inc +ifeq ($(CONFIG_BINARYPI_LEGACY_WRAPPER), y) romstage-y += romstage.c +ramstage-y += amd_late_init.c +else +romstage-y += ../agesa/romstage.c +endif + romstage-y += ../agesa/heapmanager.c ramstage-y += ../agesa/heapmanager.c -ramstage-y += amd_late_init.c |