From 1493e2d6ee5d593d3deeb052449844b5f6ef261c Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Mon, 8 Feb 2021 10:25:03 +0100 Subject: [PATCH] Makefile.inc: Don't ignore _HID & _ADR coexisting in Broadwell ASL code Issue fixed in commit d152837 so don't allow use of _HID and _ADR at same time. Change-Id: I52beba66230a3542a7039f496b51be0aa4bdcce4 Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/c/coreboot/+/50384 Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) --- Makefile.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 54adaa220bce..a57fac0dfda7 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -259,14 +259,14 @@ EMPTY_RESOURCE_TEMPLATE_WARNING = 3150 # Redundant offset remarks are not useful in any way and are masking useful # ones that might indicate an issue so it is better to hide them. REDUNDANT_OFFSET_REMARK = 2158 -# Ignore _HID & _ADR coexisting in Intel Lynxpoint and Broadwell ASL code. -# See cb:38803 & cb:38802 +# Ignore _HID & _ADR coexisting in Intel Lynxpoint ASL code. +# See cb:38802 # "Multiple types (Device object requires either a _HID or _ADR, but not both)" MULTIPLE_TYPES_WARNING = 3073 IASL_WARNINGS_LIST = $(EMPTY_RESOURCE_TEMPLATE_WARNING) $(REDUNDANT_OFFSET_REMARK) -ifeq ($(CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT)$(CONFIG_SOC_INTEL_BROADWELL),y) +ifeq ($(CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT),y) IASL_WARNINGS_LIST += $(MULTIPLE_TYPES_WARNING) endif