Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46944 )
Change subject: broadwell: Allow to use Haswell CPU code instead ......................................................................
broadwell: Allow to use Haswell CPU code instead
This allows individual boards to be adapted to use Haswell CPU code. Also rename the CPU_SPECIFIC_OPTIONS symbol to avoid any collisions.
Tested on out-of-tree Acer Aspire E5-573 with i5-5200U, still boots.
Change-Id: I65e878dacf0a0d53fd8d4defce6684f4ceb92588 Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/cpu/intel/haswell/haswell.h M src/soc/intel/broadwell/Kconfig M src/soc/intel/broadwell/Makefile.inc 3 files changed, 7 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/46944/1
diff --git a/src/cpu/intel/haswell/haswell.h b/src/cpu/intel/haswell/haswell.h index e45acd5..09cab17 100644 --- a/src/cpu/intel/haswell/haswell.h +++ b/src/cpu/intel/haswell/haswell.h @@ -176,7 +176,7 @@
static inline int haswell_is_ult(void) { - return CONFIG(INTEL_LYNXPOINT_LP); + return CONFIG(INTEL_LYNXPOINT_LP) || CONFIG(SOC_INTEL_BROADWELL); }
#endif diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig index ecb8299..5eebe59 100644 --- a/src/soc/intel/broadwell/Kconfig +++ b/src/soc/intel/broadwell/Kconfig @@ -5,7 +5,7 @@
if SOC_INTEL_BROADWELL
-config CPU_SPECIFIC_OPTIONS +config SOC_SPECIFIC_OPTIONS def_bool y select ACPI_INTEL_HARDWARE_SLEEP_VALUES select ARCH_ALL_STAGES_X86_32 diff --git a/src/soc/intel/broadwell/Makefile.inc b/src/soc/intel/broadwell/Makefile.inc index cda69e8..ac5eeb6 100644 --- a/src/soc/intel/broadwell/Makefile.inc +++ b/src/soc/intel/broadwell/Makefile.inc @@ -1,6 +1,11 @@ ifeq ($(CONFIG_SOC_INTEL_BROADWELL),y)
+ifeq ($(CONFIG_CPU_INTEL_HASWELL),y) +romstage-y += cpu/romstage.c +else subdirs-y += cpu +endif + subdirs-y += pch
bootblock-y += bootblock.c
Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/46944
to look at the new patch set (#5).
Change subject: broadwell: Allow to use Haswell CPU code instead ......................................................................
broadwell: Allow to use Haswell CPU code instead
This allows individual boards to be adapted to use Haswell CPU code. Also rename the CPU_SPECIFIC_OPTIONS symbol to avoid any collisions.
Tested on out-of-tree Acer Aspire E5-573 with i5-5200U, still boots.
Change-Id: I65e878dacf0a0d53fd8d4defce6684f4ceb92588 Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/cpu/intel/haswell/haswell.h M src/soc/intel/broadwell/Kconfig M src/soc/intel/broadwell/Makefile.inc 3 files changed, 7 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/46944/5
Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/46944
to look at the new patch set (#7).
Change subject: soc/intel/broadwell: Allow to use Haswell CPU code instead ......................................................................
soc/intel/broadwell: Allow to use Haswell CPU code instead
This allows individual boards to be adapted to use Haswell CPU code. Also rename the CPU_SPECIFIC_OPTIONS symbol to avoid any collisions.
Change-Id: I65e878dacf0a0d53fd8d4defce6684f4ceb92588 Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/soc/intel/broadwell/Kconfig M src/soc/intel/broadwell/Makefile.inc 2 files changed, 6 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/46944/7
Attention is currently required from: Angel Pons. Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46944 )
Change subject: soc/intel/broadwell: Allow to use Haswell CPU code instead ......................................................................
Patch Set 15: Code-Review+2
Angel Pons has submitted this change. ( https://review.coreboot.org/c/coreboot/+/46944 )
Change subject: soc/intel/broadwell: Allow to use Haswell CPU code instead ......................................................................
soc/intel/broadwell: Allow to use Haswell CPU code instead
This allows individual boards to be adapted to use Haswell CPU code. Also rename the CPU_SPECIFIC_OPTIONS symbol to avoid any collisions.
Change-Id: I65e878dacf0a0d53fd8d4defce6684f4ceb92588 Signed-off-by: Angel Pons th3fanbus@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/46944 Reviewed-by: Arthur Heymans arthur@aheymans.xyz Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/soc/intel/broadwell/Kconfig M src/soc/intel/broadwell/Makefile.inc 2 files changed, 6 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved
diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig index 537d4fa..7f27026 100644 --- a/src/soc/intel/broadwell/Kconfig +++ b/src/soc/intel/broadwell/Kconfig @@ -9,7 +9,7 @@ bool default y if SOC_INTEL_BROADWELL
-config CPU_SPECIFIC_OPTIONS +config SOC_SPECIFIC_OPTIONS def_bool y select ACPI_INTEL_HARDWARE_SLEEP_VALUES select ARCH_ALL_STAGES_X86_32 diff --git a/src/soc/intel/broadwell/Makefile.inc b/src/soc/intel/broadwell/Makefile.inc index 7d21665..01f351d 100644 --- a/src/soc/intel/broadwell/Makefile.inc +++ b/src/soc/intel/broadwell/Makefile.inc @@ -1,6 +1,11 @@ ifeq ($(CONFIG_SOC_INTEL_BROADWELL),y)
+ifeq ($(CONFIG_CPU_INTEL_HASWELL),y) +romstage-y += cpu/romstage.c +else subdirs-y += cpu +endif + subdirs-y += pch
bootblock-y += bootblock.c
-
Angel Pons (Code Review) -
Arthur Heymans (Code Review)