Change in coreboot[master]: mb/intel/adlrvp: Adopt overridetree.cb for ADL RVP mainboards

[Subrata Banik (Code Review)]

Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47335 )

Change subject: mb/intel/adlrvp: Adopt overridetree.cb for ADL RVP mainboards
......................................................................

mb/intel/adlrvp: Adopt overridetree.cb for ADL RVP mainboards

List of changes:
1. Keep devicetree.cb inside 'variants/baseboard'
2. Create variant directory for ADL RVP with external EC as
'adlrvp_p_ext_ec'
3. Add initial overridetree.cb for 'adlrvp_p' and 'adlrvp_p_ext_ec'
to override 'variants/baseboard/devicetree.cb' as applicable.

TEST=Build and boot both ADLRVP with onboard/external EC.

Change-Id: I3591e214ed32dc9baaa49b92dff59579f29c7bd6
Signed-off-by: Subrata Banik 
---
M src/mainboard/intel/adlrvp/Kconfig
A src/mainboard/intel/adlrvp/variants/adlrvp_p/overridetree.cb
A src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
R src/mainboard/intel/adlrvp/variants/baseboard/devicetree.cb
4 files changed, 15 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/47335/1

diff --git a/src/mainboard/intel/adlrvp/Kconfig b/src/mainboard/intel/adlrvp/Kconfig
index 97b4bf7..e82d8dd 100644
--- a/src/mainboard/intel/adlrvp/Kconfig
+++ b/src/mainboard/intel/adlrvp/Kconfig
@@ -31,7 +31,8 @@

config VARIANT_DIR
    string
-	default "adlrvp_p"
+	default "adlrvp_p" if BOARD_INTEL_ADLRVP_P
+	default "adlrvp_p_ext_ec" if BOARD_INTEL_ADLRVP_P_EXT_EC

config GBB_HWID
    string
@@ -48,7 +49,11 @@

config DEVICETREE
    string
-	default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
+	default "variants/baseboard/devicetree.cb"
+
+config OVERRIDE_DEVICETREE
+	string
+	default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"

config DIMM_SPD_SIZE
    int
diff --git a/src/mainboard/intel/adlrvp/variants/adlrvp_p/overridetree.cb b/src/mainboard/intel/adlrvp/variants/adlrvp_p/overridetree.cb
new file mode 100644
index 0000000..e58e9fb
--- /dev/null
+++ b/src/mainboard/intel/adlrvp/variants/adlrvp_p/overridetree.cb
@@ -0,0 +1,4 @@
+chip soc/intel/alderlake
+
+	device domain 0 on end
+end
diff --git a/src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb b/src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
new file mode 100644
index 0000000..e58e9fb
--- /dev/null
+++ b/src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
@@ -0,0 +1,4 @@
+chip soc/intel/alderlake
+
+	device domain 0 on end
+end
diff --git a/src/mainboard/intel/adlrvp/variants/adlrvp_p/devicetree.cb b/src/mainboard/intel/adlrvp/variants/baseboard/devicetree.cb
similarity index 100%
rename from src/mainboard/intel/adlrvp/variants/adlrvp_p/devicetree.cb
rename to src/mainboard/intel/adlrvp/variants/baseboard/devicetree.cb

[Subrata Banik (Code Review)]

Hello build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/47335

to look at the new patch set (#2).

Change subject: mb/intel/adlrvp: Adopt overridetree.cb for ADL RVP mainboards
......................................................................

mb/intel/adlrvp: Adopt overridetree.cb for ADL RVP mainboards

List of changes:
1. Keep devicetree.cb inside 'variants/baseboard'
2. Create variant directory for ADL RVP with external EC as
'adlrvp_p_ext_ec'
3. Add initial overridetree.cb for 'adlrvp_p' and 'adlrvp_p_ext_ec'
to override 'variants/baseboard/devicetree.cb' as applicable.
4. Move all common files between 'adlrvp_p' and 'adlrvp_p_ext_ec'
to 'variants/baseboard' directory

TEST=Build and boot both ADLRVP with onboard/external EC.

Change-Id: I3591e214ed32dc9baaa49b92dff59579f29c7bd6
Signed-off-by: Subrata Banik 
---
M src/mainboard/intel/adlrvp/Kconfig
A src/mainboard/intel/adlrvp/variants/adlrvp_p/overridetree.cb
A src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
R src/mainboard/intel/adlrvp/variants/baseboard/Makefile.inc
R src/mainboard/intel/adlrvp/variants/baseboard/devicetree.cb
R src/mainboard/intel/adlrvp/variants/baseboard/early_gpio.c
R src/mainboard/intel/adlrvp/variants/baseboard/gpio.c
R src/mainboard/intel/adlrvp/variants/baseboard/memory.c
8 files changed, 15 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/47335/2

[Subrata Banik (Code Review)]

Subrata Banik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47335 )

Change subject: mb/intel/adlrvp: Adopt overridetree.cb for ADL RVP mainboards
......................................................................

Patch Set 2:

Angel,Tim: if you could review this CL. we might need to rebase a series of CL based on approval of this CL.

The reason this split is that Chrome SKU handles Type-C differently compare on non-Chrome SKU hence we need to maintain override tree for the same

[Subrata Banik (Code Review)]

Subrata Banik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47335 )

Change subject: mb/intel/adlrvp: Adopt overridetree.cb for ADL RVP mainboards
......................................................................

Patch Set 2:
> Patch Set 2:
>
> Angel,Tim: if you could review this CL. we might need to rebase a series of CL based on approval of this CL.
>
> The reason this split is that Chrome SKU handles Type-C differently compare on non-Chrome SKU hence we need to maintain override tree for the same

Background is here https://review.coreboot.org/c/coreboot/+/47289

[Subrata Banik (Code Review)]

Hello Subrata Banik, build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth, Tim Wawrzynczak, Angel Pons,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/47335

to look at the new patch set (#3).

Change subject: mb/intel/adlrvp: Adopt overridetree.cb for ADL RVP mainboards
......................................................................

mb/intel/adlrvp: Adopt overridetree.cb for ADL RVP mainboards

List of changes:
1. Keep devicetree.cb inside 'variants/baseboard'
2. Create variant directory for ADL RVP with external EC as
'adlrvp_p_ext_ec'
3. Add initial overridetree.cb for 'adlrvp_p' and 'adlrvp_p_ext_ec'
to override 'variants/baseboard/devicetree.cb' as applicable.
4. Move all common files between 'adlrvp_p' and 'adlrvp_p_ext_ec'
to 'variants/baseboard' directory

TEST=Build and boot both ADLRVP with onboard/external EC.

Change-Id: I3591e214ed32dc9baaa49b92dff59579f29c7bd6
Signed-off-by: Subrata Banik 
---
M src/mainboard/intel/adlrvp/Kconfig
A src/mainboard/intel/adlrvp/variants/adlrvp_p/overridetree.cb
A src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
R src/mainboard/intel/adlrvp/variants/baseboard/Makefile.inc
R src/mainboard/intel/adlrvp/variants/baseboard/devicetree.cb
R src/mainboard/intel/adlrvp/variants/baseboard/early_gpio.c
R src/mainboard/intel/adlrvp/variants/baseboard/gpio.c
R src/mainboard/intel/adlrvp/variants/baseboard/memory.c
8 files changed, 15 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/47335/3

[Subrata Banik (Code Review)]

Hello build bot (Jenkins), Subrata Banik, Furquan Shaikh, Patrick Georgi, Martin Roth, Tim Wawrzynczak, Angel Pons,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/47335

to look at the new patch set (#4).

Change subject: mb/intel/adlrvp: Adopt overridetree.cb for ADL RVP mainboards
......................................................................

mb/intel/adlrvp: Adopt overridetree.cb for ADL RVP mainboards

List of changes:
1. Keep devicetree.cb inside 'variants/baseboard'
2. Create variant directory for ADL RVP with external EC as
'adlrvp_p_ext_ec'
3. Add initial overridetree.cb for 'adlrvp_p' and 'adlrvp_p_ext_ec'
to override 'variants/baseboard/devicetree.cb' as applicable.
4. Move all common files between 'adlrvp_p' and 'adlrvp_p_ext_ec'
to 'variants/baseboard' directory

TEST=Build and boot both ADLRVP with onboard and external EC.

Change-Id: I3591e214ed32dc9baaa49b92dff59579f29c7bd6
Signed-off-by: Subrata Banik 
---
M src/mainboard/intel/adlrvp/Kconfig
A src/mainboard/intel/adlrvp/variants/adlrvp_p/overridetree.cb
A src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
R src/mainboard/intel/adlrvp/variants/baseboard/Makefile.inc
R src/mainboard/intel/adlrvp/variants/baseboard/devicetree.cb
R src/mainboard/intel/adlrvp/variants/baseboard/early_gpio.c
R src/mainboard/intel/adlrvp/variants/baseboard/gpio.c
R src/mainboard/intel/adlrvp/variants/baseboard/memory.c
8 files changed, 15 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/47335/4

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47335 )

Change subject: mb/intel/adlrvp: Adopt overridetree.cb for ADL RVP mainboards
......................................................................

Patch Set 4: Code-Review+1

(1 comment)

https://review.coreboot.org/c/coreboot/+/47335/4/src/mainboard/intel/adlrvp/... 
File src/mainboard/intel/adlrvp/Kconfig:

https://review.coreboot.org/c/coreboot/+/47335/4/src/mainboard/intel/adlrvp/... 
PS4, Line 53: 	default "variants/baseboard/devicetree.cb"
I would prefer to avoid having the "variants/baseboard/" subdirectory, and simply place the baseboard files in "src/mb/intel/adlrvp/"

[Subrata Banik (Code Review)]

Hello build bot (Jenkins), Subrata Banik, Furquan Shaikh, Patrick Georgi, Martin Roth, Tim Wawrzynczak, Angel Pons,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/47335

to look at the new patch set (#5).

Change subject: mb/intel/adlrvp: Adopt overridetree.cb for ADL RVP mainboards
......................................................................

mb/intel/adlrvp: Adopt overridetree.cb for ADL RVP mainboards

List of changes:
1. Keep devicetree.cb inside mainboard directory
2. Create variant directory for ADL RVP with external EC as
'adlrvp_p_ext_ec'
3. Add initial overridetree.cb for 'adlrvp_p' and 'adlrvp_p_ext_ec'
to override 'devicetree.cb' as applicable.
4. Move all common files between 'adlrvp_p' and 'adlrvp_p_ext_ec'
to mainboard directory

TEST=Build and boot both ADLRVP with onboard and external EC.

Change-Id: I3591e214ed32dc9baaa49b92dff59579f29c7bd6
Signed-off-by: Subrata Banik 
---
M src/mainboard/intel/adlrvp/Kconfig
M src/mainboard/intel/adlrvp/Makefile.inc
R src/mainboard/intel/adlrvp/devicetree.cb
R src/mainboard/intel/adlrvp/early_gpio.c
R src/mainboard/intel/adlrvp/gpio.c
R src/mainboard/intel/adlrvp/include/baseboard/ec.h
R src/mainboard/intel/adlrvp/include/baseboard/gpio.h
R src/mainboard/intel/adlrvp/include/baseboard/variants.h
R src/mainboard/intel/adlrvp/memory.c
D src/mainboard/intel/adlrvp/variants/adlrvp_p/Makefile.inc
A src/mainboard/intel/adlrvp/variants/adlrvp_p/overridetree.cb
A src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
12 files changed, 17 insertions(+), 13 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/47335/5

[Subrata Banik (Code Review)]

Subrata Banik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47335 )

Change subject: mb/intel/adlrvp: Adopt overridetree.cb for ADL RVP mainboards
......................................................................

Patch Set 5:

(1 comment)

https://review.coreboot.org/c/coreboot/+/47335/4/src/mainboard/intel/adlrvp/... 
File src/mainboard/intel/adlrvp/Kconfig:

https://review.coreboot.org/c/coreboot/+/47335/4/src/mainboard/intel/adlrvp/... 
PS4, Line 53: 	default "variants/baseboard/devicetree.cb"
> I would prefer to avoid having the "variants/baseboard/" subdirectory, and simply place the baseboar […]

Done

Change in coreboot[master]: mb/intel/adlrvp: Refactor ADLRVP code to get rid of 'variants/baseboard'

[Subrata Banik (Code Review)]

Hello build bot (Jenkins), Subrata Banik, Furquan Shaikh, Patrick Georgi, Martin Roth, Tim Wawrzynczak, Angel Pons,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/47335

to look at the new patch set (#6).

Change subject: mb/intel/adlrvp: Refactor ADLRVP code to get rid of 'variants/baseboard'
......................................................................

mb/intel/adlrvp: Refactor ADLRVP code to get rid of 'variants/baseboard'

List of changes:
1. Use devicetree.cb from default location
2. Create variant directory for ADL RVP with external EC as
'adlrvp_p_ext_ec'
3. Add initial overridetree.cb for 'adlrvp_p' and 'adlrvp_p_ext_ec'
to override 'devicetree.cb' as applicable.
4. Move all common files between 'adlrvp_p' and 'adlrvp_p_ext_ec'
to mainboard directory

TEST=Build and boot both ADLRVP with onboard and external EC.

Change-Id: I3591e214ed32dc9baaa49b92dff59579f29c7bd6
Signed-off-by: Subrata Banik 
---
M src/mainboard/intel/adlrvp/Kconfig
M src/mainboard/intel/adlrvp/Makefile.inc
R src/mainboard/intel/adlrvp/devicetree.cb
R src/mainboard/intel/adlrvp/early_gpio.c
R src/mainboard/intel/adlrvp/gpio.c
R src/mainboard/intel/adlrvp/include/baseboard/ec.h
R src/mainboard/intel/adlrvp/include/baseboard/gpio.h
R src/mainboard/intel/adlrvp/include/baseboard/variants.h
R src/mainboard/intel/adlrvp/memory.c
D src/mainboard/intel/adlrvp/variants/adlrvp_p/Makefile.inc
A src/mainboard/intel/adlrvp/variants/adlrvp_p/overridetree.cb
A src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
12 files changed, 17 insertions(+), 13 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/47335/6

Change in coreboot[master]: mb/intel/adlrvp: Refactor ADLRVP code to get rid of 'variants/baseboard'

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47335 )

Change subject: mb/intel/adlrvp: Refactor ADLRVP code to get rid of 'variants/baseboard'
......................................................................

Patch Set 6: Code-Review+2

Change in coreboot[master]: mb/intel/adlrvp: Refactor ADLRVP code to get rid of 'variants/baseboard'

[V Sowmya (Code Review)]

V Sowmya has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47335 )

Change subject: mb/intel/adlrvp: Refactor ADLRVP code to get rid of 'variants/baseboard'
......................................................................

Patch Set 7: Code-Review+2

Change in coreboot[master]: mb/intel/adlrvp: Refactor ADLRVP code to get rid of 'variants/baseboard'

[Subrata Banik (Code Review)]

Subrata Banik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47335 )

Change subject: mb/intel/adlrvp: Refactor ADLRVP code to get rid of 'variants/baseboard'
......................................................................

Patch Set 7:
> Patch Set 2:
> > Patch Set 2:
> >
> > Angel,Tim: if you could review this CL. we might need to rebase a series of CL based on approval of this CL.
> >
> > The reason this split is that Chrome SKU handles Type-C differently compare on non-Chrome SKU hence we need to maintain override tree for the same
>
> Background is here https://review.coreboot.org/c/coreboot/+/47289

Thanks Angel for your prompt review. :) Always appreciate

Change in coreboot[master]: mb/intel/adlrvp: Refactor ADLRVP code to get rid of 'variants/baseboard'

[Subrata Banik (Code Review)]

Subrata Banik has submitted this change. ( https://review.coreboot.org/c/coreboot/+/47335 )

Change subject: mb/intel/adlrvp: Refactor ADLRVP code to get rid of 'variants/baseboard'
......................................................................

mb/intel/adlrvp: Refactor ADLRVP code to get rid of 'variants/baseboard'

List of changes:
1. Use devicetree.cb from default location
2. Create variant directory for ADL RVP with external EC as
'adlrvp_p_ext_ec'
3. Add initial overridetree.cb for 'adlrvp_p' and 'adlrvp_p_ext_ec'
to override 'devicetree.cb' as applicable.
4. Move all common files between 'adlrvp_p' and 'adlrvp_p_ext_ec'
to mainboard directory

TEST=Build and boot both ADLRVP with onboard and external EC.

Change-Id: I3591e214ed32dc9baaa49b92dff59579f29c7bd6
Signed-off-by: Subrata Banik 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47335
Reviewed-by: V Sowmya 
Reviewed-by: Angel Pons 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/intel/adlrvp/Kconfig
M src/mainboard/intel/adlrvp/Makefile.inc
R src/mainboard/intel/adlrvp/devicetree.cb
R src/mainboard/intel/adlrvp/early_gpio.c
R src/mainboard/intel/adlrvp/gpio.c
R src/mainboard/intel/adlrvp/include/baseboard/ec.h
R src/mainboard/intel/adlrvp/include/baseboard/gpio.h
R src/mainboard/intel/adlrvp/include/baseboard/variants.h
R src/mainboard/intel/adlrvp/memory.c
D src/mainboard/intel/adlrvp/variants/adlrvp_p/Makefile.inc
A src/mainboard/intel/adlrvp/variants/adlrvp_p/overridetree.cb
A src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
12 files changed, 17 insertions(+), 13 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  V Sowmya: Looks good to me, approved
  Angel Pons: Looks good to me, approved

diff --git a/src/mainboard/intel/adlrvp/Kconfig b/src/mainboard/intel/adlrvp/Kconfig
index 2a3dbb0..a41c186 100644
--- a/src/mainboard/intel/adlrvp/Kconfig
+++ b/src/mainboard/intel/adlrvp/Kconfig
@@ -32,7 +32,8 @@

config VARIANT_DIR
    string
-	default "adlrvp_p"
+	default "adlrvp_p" if BOARD_INTEL_ADLRVP_P
+	default "adlrvp_p_ext_ec" if BOARD_INTEL_ADLRVP_P_EXT_EC

config GBB_HWID
    string
@@ -47,9 +48,9 @@
    string
    default "Intel_adlrvp"

-config DEVICETREE
+config OVERRIDE_DEVICETREE
    string
-	default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
+	default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"

config DIMM_SPD_SIZE
    int
diff --git a/src/mainboard/intel/adlrvp/Makefile.inc b/src/mainboard/intel/adlrvp/Makefile.inc
index 2ca32f3..de92406 100644
--- a/src/mainboard/intel/adlrvp/Makefile.inc
+++ b/src/mainboard/intel/adlrvp/Makefile.inc
@@ -4,12 +4,14 @@

bootblock-y += bootblock.c
 bootblock-$(CONFIG_CHROMEOS) += chromeos.c
+bootblock-y += early_gpio.c

verstage-$(CONFIG_CHROMEOS) += chromeos.c

romstage-$(CONFIG_CHROMEOS) += chromeos.c
 romstage-y += romstage_fsp_params.c
 romstage-y += board_id.c
+romstage-y += memory.c

smm-y += smihandler.c

@@ -17,8 +19,8 @@
 ramstage-y += ec.c
 ramstage-y += mainboard.c
 ramstage-y += board_id.c
+ramstage-y += gpio.c

-subdirs-y += variants/baseboard
-CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
+CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include

subdirs-y += variants/$(VARIANT_DIR)
diff --git a/src/mainboard/intel/adlrvp/variants/adlrvp_p/devicetree.cb b/src/mainboard/intel/adlrvp/devicetree.cb
similarity index 100%
rename from src/mainboard/intel/adlrvp/variants/adlrvp_p/devicetree.cb
rename to src/mainboard/intel/adlrvp/devicetree.cb
diff --git a/src/mainboard/intel/adlrvp/variants/adlrvp_p/early_gpio.c b/src/mainboard/intel/adlrvp/early_gpio.c
similarity index 100%
rename from src/mainboard/intel/adlrvp/variants/adlrvp_p/early_gpio.c
rename to src/mainboard/intel/adlrvp/early_gpio.c
diff --git a/src/mainboard/intel/adlrvp/variants/adlrvp_p/gpio.c b/src/mainboard/intel/adlrvp/gpio.c
similarity index 100%
rename from src/mainboard/intel/adlrvp/variants/adlrvp_p/gpio.c
rename to src/mainboard/intel/adlrvp/gpio.c
diff --git a/src/mainboard/intel/adlrvp/variants/baseboard/include/baseboard/ec.h b/src/mainboard/intel/adlrvp/include/baseboard/ec.h
similarity index 100%
rename from src/mainboard/intel/adlrvp/variants/baseboard/include/baseboard/ec.h
rename to src/mainboard/intel/adlrvp/include/baseboard/ec.h
diff --git a/src/mainboard/intel/adlrvp/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/intel/adlrvp/include/baseboard/gpio.h
similarity index 100%
rename from src/mainboard/intel/adlrvp/variants/baseboard/include/baseboard/gpio.h
rename to src/mainboard/intel/adlrvp/include/baseboard/gpio.h
diff --git a/src/mainboard/intel/adlrvp/variants/baseboard/include/baseboard/variants.h b/src/mainboard/intel/adlrvp/include/baseboard/variants.h
similarity index 100%
rename from src/mainboard/intel/adlrvp/variants/baseboard/include/baseboard/variants.h
rename to src/mainboard/intel/adlrvp/include/baseboard/variants.h
diff --git a/src/mainboard/intel/adlrvp/variants/adlrvp_p/memory.c b/src/mainboard/intel/adlrvp/memory.c
similarity index 98%
rename from src/mainboard/intel/adlrvp/variants/adlrvp_p/memory.c
rename to src/mainboard/intel/adlrvp/memory.c
index ec7ae88..d51caf7 100644
--- a/src/mainboard/intel/adlrvp/variants/adlrvp_p/memory.c
+++ b/src/mainboard/intel/adlrvp/memory.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */

#include <arch/cpu.h>
-#include "../../board_id.h"
+#include "board_id.h"
 #include <baseboard/variants.h>
 #include <soc/romstage.h>

diff --git a/src/mainboard/intel/adlrvp/variants/adlrvp_p/Makefile.inc b/src/mainboard/intel/adlrvp/variants/adlrvp_p/Makefile.inc
deleted file mode 100644
index 513963e..0000000
--- a/src/mainboard/intel/adlrvp/variants/adlrvp_p/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-## SPDX-License-Identifier: GPL-2.0-only
-
-bootblock-y += early_gpio.c
-
-romstage-y += memory.c
-
-ramstage-y += gpio.c
diff --git a/src/mainboard/intel/adlrvp/variants/adlrvp_p/overridetree.cb b/src/mainboard/intel/adlrvp/variants/adlrvp_p/overridetree.cb
new file mode 100644
index 0000000..e58e9fb
--- /dev/null
+++ b/src/mainboard/intel/adlrvp/variants/adlrvp_p/overridetree.cb
@@ -0,0 +1,4 @@
+chip soc/intel/alderlake
+
+	device domain 0 on end
+end
diff --git a/src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb b/src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
new file mode 100644
index 0000000..e58e9fb
--- /dev/null
+++ b/src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
@@ -0,0 +1,4 @@
+chip soc/intel/alderlake
+
+	device domain 0 on end
+end