diff --git a/src/mainboard/intel/mtlrvp/Kconfig b/src/mainboard/intel/mtlrvp/Kconfig index db7c161ec9..2905407893 100644 --- a/src/mainboard/intel/mtlrvp/Kconfig +++ b/src/mainboard/intel/mtlrvp/Kconfig @@ -8,6 +8,9 @@ config BOARD_INTEL_MTLRVP_COMMON config BOARD_INTEL_MTLRVP_P select BOARD_INTEL_MTLRVP_COMMON +config BOARD_INTEL_MTLRVP_P_EXT_EC + select BOARD_INTEL_MTLRVP_COMMON + if BOARD_INTEL_MTLRVP_COMMON config MAINBOARD_DIR @@ -15,7 +18,7 @@ config MAINBOARD_DIR config BASEBOARD_DIR string - default "mtlrvp" + default "mtlrvp_p" if BOARD_INTEL_MTLRVP_P || BOARD_INTEL_MTLRVP_P_EXT_EC config MAINBOARD_PART_NUMBER string @@ -31,9 +34,14 @@ config MAINBOARD_FAMILY config VARIANT_DIR string default "mtlrvp_p" if BOARD_INTEL_MTLRVP_P + default "mtlrvp_p_ext_ec" if BOARD_INTEL_MTLRVP_P_EXT_EC config DEVICETREE string - default "devicetree.cb" + default "variants/baseboard/\$(CONFIG_BASEBOARD_DIR)/devicetree.cb" + +config OVERRIDE_DEVICETREE + string + default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" endif # BOARD_INTEL_MTLRVP_COMMON diff --git a/src/mainboard/intel/mtlrvp/Kconfig.name b/src/mainboard/intel/mtlrvp/Kconfig.name index b643b94234..e14c6280c0 100644 --- a/src/mainboard/intel/mtlrvp/Kconfig.name +++ b/src/mainboard/intel/mtlrvp/Kconfig.name @@ -1,2 +1,5 @@ config BOARD_INTEL_MTLRVP_P bool "Meteorlake-P RVP" + +config BOARD_INTEL_MTLRVP_P_EXT_EC + bool "Meteorlake-P RVP with Chrome EC" diff --git a/src/mainboard/intel/mtlrvp/devicetree.cb b/src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp_p/devicetree.cb similarity index 100% rename from src/mainboard/intel/mtlrvp/devicetree.cb rename to src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp_p/devicetree.cb diff --git a/src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp/include/baseboard/gpio.h b/src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp_p/include/baseboard/gpio.h similarity index 100% rename from src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp/include/baseboard/gpio.h rename to src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp_p/include/baseboard/gpio.h diff --git a/src/mainboard/intel/mtlrvp/variants/mtlrvp_p/overridetree.cb b/src/mainboard/intel/mtlrvp/variants/mtlrvp_p/overridetree.cb new file mode 100644 index 0000000000..7ca002470e --- /dev/null +++ b/src/mainboard/intel/mtlrvp/variants/mtlrvp_p/overridetree.cb @@ -0,0 +1,4 @@ +chip soc/intel/meteorlake + + device domain 0 on end +end diff --git a/src/mainboard/intel/mtlrvp/variants/mtlrvp_p_ext_ec/overridetree.cb b/src/mainboard/intel/mtlrvp/variants/mtlrvp_p_ext_ec/overridetree.cb new file mode 100644 index 0000000000..7ca002470e --- /dev/null +++ b/src/mainboard/intel/mtlrvp/variants/mtlrvp_p_ext_ec/overridetree.cb @@ -0,0 +1,4 @@ +chip soc/intel/meteorlake + + device domain 0 on end +end