From 2684d4ee358bbc206d6f6a9e57dca2e2b9ec6e63 Mon Sep 17 00:00:00 2001 From: Teo Boon Tiong Date: Tue, 10 Jan 2017 21:10:40 +0800 Subject: [PATCH] UPSTREAM: soc/intel/skylake: Rename car_stage.S for fsp2_0 Cosmetic changes to rename car_stage.S to car_stage_fsp20.S, so that it is associated with FSP driver version that is being used. Tested on Kabylake Rvp11. BUG=none BRANCH=none TEST=none Change-Id: I32a6ede3d310f9a48fce42f47d4eeb729abb53da Signed-off-by: Patrick Georgi Original-Commit-Id: 15b71638213dd3ae4b38fad34c63ef2b197ba730 Original-Change-Id: I869df6eb746e3982e5912c272255eab6cb008838 Original-Signed-off-by: Teo Boon Tiong Original-Reviewed-on: https://review.coreboot.org/18083 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Aaron Durbin Reviewed-on: https://chromium-review.googlesource.com/428261 Commit-Ready: Aaron Durbin --- src/soc/intel/skylake/romstage/Makefile.inc | 2 +- .../intel/skylake/romstage/{car_stage.S => car_stage_fsp20.S} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/soc/intel/skylake/romstage/{car_stage.S => car_stage_fsp20.S} (100%) diff --git a/src/soc/intel/skylake/romstage/Makefile.inc b/src/soc/intel/skylake/romstage/Makefile.inc index 877712f58e..c19301f734 100644 --- a/src/soc/intel/skylake/romstage/Makefile.inc +++ b/src/soc/intel/skylake/romstage/Makefile.inc @@ -1,6 +1,6 @@ verstage-y += power_state.c -romstage-$(CONFIG_PLATFORM_USES_FSP2_0) += car_stage.S +romstage-$(CONFIG_PLATFORM_USES_FSP2_0) += car_stage_fsp20.S romstage-y += pmc.c romstage-y += power_state.c romstage-$(CONFIG_PLATFORM_USES_FSP1_1) += romstage.c diff --git a/src/soc/intel/skylake/romstage/car_stage.S b/src/soc/intel/skylake/romstage/car_stage_fsp20.S similarity index 100% rename from src/soc/intel/skylake/romstage/car_stage.S rename to src/soc/intel/skylake/romstage/car_stage_fsp20.S