Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41816 )
Change subject: soc/amd/picasso: add psp_verstage ......................................................................
Patch Set 7:
(2 comments)
https://review.coreboot.org/c/coreboot/+/41816/7/src/soc/amd/picasso/memlayo... File src/soc/amd/picasso/memlayout.ld:
https://review.coreboot.org/c/coreboot/+/41816/7/src/soc/amd/picasso/memlayo... PS7, Line 3: #if ENV_SEPARATE_VERSTAGE && CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK)
I had done it based on ENV_X86/ENV_ARM here: https://chromium.googlesource. […]
Sounds good. I definitely like that option better.
https://review.coreboot.org/c/coreboot/+/41816/7/src/soc/amd/picasso/psp_ver... File src/soc/amd/picasso/psp_verstage/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/41816/7/src/soc/amd/picasso/psp_ver... PS7, Line 5: CPPFLAGS_verstage += -I$(src)/soc/amd/picasso/psp_verstage/include
Are there now two candidates for <arch/mmio. […]
Exactly, and the same for io.h. The other way I saw to do this cleanly was to put them in the ARMv7 code, which didn't seem to make sense since it's only used in the one place.
This is safe (until the makefiles gets refactored) as the other include path gets added to verstage-generic-ccopts which gets evaluated after CPPFLAGS_verstage by create_cc_template in the top level Makefile.
$(CC_$(1)) \ -MMD $$$$(CPPFLAGS_$(1)) $$$$(CFLAGS_$(1)) -MT $$$$(@) \ $(3) -c -o $$$$@ $$$$<
verstage-generic-ccopts is the '$(3)' here.
I'll add a comment as to why this is getting added to CPPFLAGS_verstage instead of verstage-generic-ccopts. The other 2 include paths can be added to whichever, so I just added them to the same variable, but could switch them if that's the preference.