ron minnich has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32709
Change subject: Define ENV_PAYLOAD_LOADER ......................................................................
Define ENV_PAYLOAD_LOADER
We've been assuming that ENV_RAMSTAGE is always the payload loader. In order to test out different models, we need a way to mark the "stage we are in" as the payload loader.
Define a new rule, ENV_PAYLOAD_LOADER. For now, it is set to ENV_RAMSTAGE. It is not used yet pending approval of this approach.
Change-Id: I7d4aa71bad92987374d57ff350b9b0178ee7c12b Signed-off-by: Ronald G. Minnich rminnich@gmail.com --- M src/include/rules.h 1 file changed, 10 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/09/32709/1
diff --git a/src/include/rules.h b/src/include/rules.h index ea8335f..9698765 100644 --- a/src/include/rules.h +++ b/src/include/rules.h @@ -24,6 +24,7 @@ #define ENV_BOOTBLOCK 0 #define ENV_ROMSTAGE 0 #define ENV_RAMSTAGE 0 +#define ENV_PAYLOAD_LOADER 0 #define ENV_SMM 0 #define ENV_VERSTAGE 0 #define ENV_RMODULE 0 @@ -36,6 +37,7 @@ #define ENV_BOOTBLOCK 1 #define ENV_ROMSTAGE 0 #define ENV_RAMSTAGE 0 +#define ENV_PAYLOAD_LOADER 0 #define ENV_SMM 0 #define ENV_VERSTAGE 0 #define ENV_RMODULE 0 @@ -48,6 +50,7 @@ #define ENV_BOOTBLOCK 0 #define ENV_ROMSTAGE 1 #define ENV_RAMSTAGE 0 +#define ENV_PAYLOAD_LOADER 0 #define ENV_SMM 0 #define ENV_VERSTAGE 0 #define ENV_RMODULE 0 @@ -60,6 +63,7 @@ #define ENV_BOOTBLOCK 0 #define ENV_ROMSTAGE 0 #define ENV_RAMSTAGE 0 +#define ENV_PAYLOAD_LOADER 0 #define ENV_SMM 1 #define ENV_VERSTAGE 0 #define ENV_RMODULE 0 @@ -72,6 +76,7 @@ #define ENV_BOOTBLOCK 0 #define ENV_ROMSTAGE 0 #define ENV_RAMSTAGE 0 +#define ENV_PAYLOAD_LOADER 0 #define ENV_SMM 0 #define ENV_VERSTAGE 1 #define ENV_RMODULE 0 @@ -84,6 +89,7 @@ #define ENV_BOOTBLOCK 0 #define ENV_ROMSTAGE 0 #define ENV_RAMSTAGE 1 +#define ENV_PAYLOAD_LOADER 1 #define ENV_SMM 0 #define ENV_VERSTAGE 0 #define ENV_RMODULE 0 @@ -96,6 +102,7 @@ #define ENV_BOOTBLOCK 0 #define ENV_ROMSTAGE 0 #define ENV_RAMSTAGE 0 +#define ENV_PAYLOAD_LOADER 0 #define ENV_SMM 0 #define ENV_VERSTAGE 0 #define ENV_RMODULE 1 @@ -108,6 +115,7 @@ #define ENV_BOOTBLOCK 0 #define ENV_ROMSTAGE 0 #define ENV_RAMSTAGE 0 +#define ENV_PAYLOAD_LOADER 0 #define ENV_SMM 0 #define ENV_VERSTAGE 0 #define ENV_RMODULE 0 @@ -120,6 +128,7 @@ #define ENV_BOOTBLOCK 0 #define ENV_ROMSTAGE 0 #define ENV_RAMSTAGE 0 +#define ENV_PAYLOAD_LOADER 0 #define ENV_SMM 0 #define ENV_VERSTAGE 0 #define ENV_RMODULE 0 @@ -136,6 +145,7 @@ #define ENV_BOOTBLOCK 0 #define ENV_ROMSTAGE 0 #define ENV_RAMSTAGE 0 +#define ENV_PAYLOAD_LOADER 0 #define ENV_SMM 0 #define ENV_VERSTAGE 0 #define ENV_RMODULE 0
Subrata Banik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32709 )
Change subject: Define ENV_PAYLOAD_LOADER ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/#/c/32709/1/src/include/rules.h File src/include/rules.h:
https://review.coreboot.org/#/c/32709/1/src/include/rules.h@92 PS1, Line 92: 1 now our next step would be replace all ENV_RAMSTAGE with ENV_PAYLOAD_LOADER ?
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32709 )
Change subject: Define ENV_PAYLOAD_LOADER ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/#/c/32709/1/src/include/rules.h File src/include/rules.h:
https://review.coreboot.org/#/c/32709/1/src/include/rules.h@92 PS1, Line 92: 1
now our next step would be replace all ENV_RAMSTAGE with ENV_PAYLOAD_LOADER ?
Or just move ENV_PAYLOAD_LOADER outside of these conditionals and set it to ENV_RAMSTAGE. Then, when adding more logic, update the definition?
Hello Subrata Banik, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32709
to look at the new patch set (#2).
Change subject: Define ENV_PAYLOAD_LOADER ......................................................................
Define ENV_PAYLOAD_LOADER
We've been assuming that ENV_RAMSTAGE is always the payload loader. In order to test out different models, we need a way to mark the "stage we are in" as the payload loader.
Define a new rule, ENV_PAYLOAD_LOADER. For now, it is set to ENV_RAMSTAGE. It is not used yet pending approval of this approach.
Change-Id: I7d4aa71bad92987374d57ff350b9b0178ee7c12b Signed-off-by: Ronald G. Minnich rminnich@gmail.com --- M src/include/rules.h 1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/09/32709/2
ron minnich has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32709 )
Change subject: Define ENV_PAYLOAD_LOADER ......................................................................
Patch Set 2:
(1 comment)
OK, take a look.
https://review.coreboot.org/#/c/32709/1/src/include/rules.h File src/include/rules.h:
https://review.coreboot.org/#/c/32709/1/src/include/rules.h@92 PS1, Line 92: 1
Or just move ENV_PAYLOAD_LOADER outside of these conditionals and set it to ENV_RAMSTAGE. […]
Aaron, I thought about that, I like that as well. Let me redo this and you can see what you think.
subrata, next step is to replace ENV_RAMSTAGE *where appropriate*, yes.
Subrata Banik has uploaded a new patch set (#3) to the change originally created by ron minnich. ( https://review.coreboot.org/c/coreboot/+/32709 )
Change subject: Define ENV_PAYLOAD_LOADER ......................................................................
Define ENV_PAYLOAD_LOADER
We've been assuming that ENV_RAMSTAGE is always the payload loader. In order to test out different models, we need a way to mark the "stage we are in" as the payload loader.
Define a new rule, ENV_PAYLOAD_LOADER. For now, it is set to ENV_RAMSTAGE. It is not used yet pending approval of this approach.
Change-Id: I7d4aa71bad92987374d57ff350b9b0178ee7c12b Signed-off-by: Ronald G. Minnich rminnich@gmail.com --- M src/include/rules.h 1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/09/32709/3
ron minnich has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32709 )
Change subject: Define ENV_PAYLOAD_LOADER ......................................................................
Patch Set 3: Code-Review+2
looks fine now
ron minnich has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32709 )
Change subject: Define ENV_PAYLOAD_LOADER ......................................................................
Define ENV_PAYLOAD_LOADER
We've been assuming that ENV_RAMSTAGE is always the payload loader. In order to test out different models, we need a way to mark the "stage we are in" as the payload loader.
Define a new rule, ENV_PAYLOAD_LOADER. For now, it is set to ENV_RAMSTAGE. It is not used yet pending approval of this approach.
Change-Id: I7d4aa71bad92987374d57ff350b9b0178ee7c12b Signed-off-by: Ronald G. Minnich rminnich@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/32709 Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/include/rules.h 1 file changed, 4 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified ron minnich: Looks good to me, approved
diff --git a/src/include/rules.h b/src/include/rules.h index ea8335f..ce968f0 100644 --- a/src/include/rules.h +++ b/src/include/rules.h @@ -257,6 +257,10 @@
#endif
+/* ENV_PAYLOAD_LOADER is set when you are in a stage that loads the payload. + * For now, that is the ramstage. */ +#define ENV_PAYLOAD_LOADER ENV_RAMSTAGE + /** * For pre-DRAM stages and post-CAR always build with simple device model, ie. * PCI, PNP and CPU functions operate without use of devicetree. The reason
-
Aaron Durbin (Code Review) -
ron minnich (Code Review)
-
Subrata Banik (Code Review)