diff --git a/Makefile.inc b/Makefile.inc index 65aa71ca62..53b658b9ce 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -196,7 +196,11 @@ cbfs-files-$(if $(2),$(2),y) += $(call strip_quotes,$(CONFIG_CBFS_PREFIX))/$(1). $(obj)/$(1).aml: $(src)/mainboard/$(MAINBOARDDIR)/$(1).asl $(obj)/config.h @printf " IASL $$(subst $(top)/,,$$(@))\n" $(CC_ramstage) -x assembler-with-cpp -E -MMD -MT $$(@) $$(CPPFLAGS_ramstage) -D__ACPI__ -P -include $(src)/include/kconfig.h -I$(obj) -I$(src) -I$(src)/include -I$(src)/arch/$(ARCHDIR-$(ARCH-ramstage-y))/include -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$@ +ifeq ($(CONFIG_IASL_WARNINGS_ARE_ERRORS),y) + cd $$(dir $$@); $(IASL) -we -p $$(notdir $$@) $$(notdir $$@) +else cd $$(dir $$@); $(IASL) -p $$(notdir $$@) $$(notdir $$@) +endif endef ####################################################################### @@ -660,6 +664,10 @@ endif mv $@.tmp $@ @printf " CBFSPRINT $(subst $(obj)/,,$(@))\n\n" $(CBFSTOOL) $@ print +ifeq ($(CONFIG_IASL_WARNINGS_ARE_ERRORS),) + @printf "\n***** WARNING: IASL warnings as errors is disabled! *****\n" + @printf "***** Please fix the ASL for this platform. *****\n\n" +endif cbfs-files-$(CONFIG_BOOTSPLASH_IMAGE) += bootsplash.jpg bootsplash.jpg-file := $(call strip_quotes,$(CONFIG_BOOTSPLASH_FILE)) diff --git a/src/Kconfig b/src/Kconfig index ff20980a9e..8439a003ea 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -1067,6 +1067,19 @@ config WARNINGS_ARE_ERRORS bool default y +# TODO: Remove this when all platforms are fixed. +config IASL_WARNINGS_ARE_ERRORS + def_bool y + help + Select to Fail the build if a IASL generates a warning. + This will be defaulted to disabled for the platforms that + currently fail. This allows the REST of the platforms to + have this check enabled while we're working to get those + boards fixed. + + DO NOT ADD TO ANY ADDITIONAL PLATFORMS INSTEAD OF FIXING + THE ASL. + # The four POWER_BUTTON_DEFAULT_ENABLE, POWER_BUTTON_DEFAULT_DISABLE, # POWER_BUTTON_FORCE_ENABLE and POWER_BUTTON_FORCE_DISABLE options are # mutually exclusive. One of these options must be selected in the diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig index 825df9afaa..ccc69135ea 100644 --- a/src/mainboard/google/rambi/Kconfig +++ b/src/mainboard/google/rambi/Kconfig @@ -38,4 +38,8 @@ config HAVE_ME_BIN bool default n +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + endif # BOARD_INTEL_BAYLEYBAY diff --git a/src/mainboard/hp/pavilion_m6_1035dx/Kconfig b/src/mainboard/hp/pavilion_m6_1035dx/Kconfig index f78cfba26a..24ec6321d0 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/Kconfig +++ b/src/mainboard/hp/pavilion_m6_1035dx/Kconfig @@ -65,4 +65,8 @@ config VGA_BIOS_ID string default "1002,9900" +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + endif # BOARD_HP_PAVILION_M6_1035DX diff --git a/src/mainboard/ibase/mb899/Kconfig b/src/mainboard/ibase/mb899/Kconfig index 4f646acb35..66b8122b7a 100644 --- a/src/mainboard/ibase/mb899/Kconfig +++ b/src/mainboard/ibase/mb899/Kconfig @@ -49,4 +49,8 @@ config VGA_BIOS_FILE string default "amipci_01.20" +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + endif # BOARD_IBASE_MB899 diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig index 429a3040f2..2023216be4 100644 --- a/src/mainboard/intel/d945gclf/Kconfig +++ b/src/mainboard/intel/d945gclf/Kconfig @@ -50,4 +50,8 @@ config MAX_CPUS int default 4 +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + endif # BOARD_INTEL_D945GCLF diff --git a/src/mainboard/intel/eagleheights/Kconfig b/src/mainboard/intel/eagleheights/Kconfig index 702e2aff5a..bfcb4cef5f 100644 --- a/src/mainboard/intel/eagleheights/Kconfig +++ b/src/mainboard/intel/eagleheights/Kconfig @@ -35,4 +35,8 @@ config MAX_CPUS int default 4 +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + endif # BOARD_INTEL_EAGLEHEIGHTS diff --git a/src/mainboard/iwave/iWRainbowG6/Kconfig b/src/mainboard/iwave/iWRainbowG6/Kconfig index 5e92cfb7dd..fbcfb170dc 100644 --- a/src/mainboard/iwave/iWRainbowG6/Kconfig +++ b/src/mainboard/iwave/iWRainbowG6/Kconfig @@ -28,6 +28,10 @@ config IRQ_SLOT_COUNT int default 10 +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + # This mainboard might have a higher clocked UART or might not be able to run # serial output at 115200 baud diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig index 2a3cfe2e14..a589b461b2 100644 --- a/src/mainboard/kontron/986lcd-m/Kconfig +++ b/src/mainboard/kontron/986lcd-m/Kconfig @@ -42,4 +42,8 @@ config VGA_BIOS_FILE string default "amipci_01.20" +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + endif # BOARD_KONTRON_986LCD_M diff --git a/src/mainboard/lenovo/r400/Kconfig b/src/mainboard/lenovo/r400/Kconfig index 0966bf129e..3664eb0fe8 100644 --- a/src/mainboard/lenovo/r400/Kconfig +++ b/src/mainboard/lenovo/r400/Kconfig @@ -4,4 +4,8 @@ config MAINBOARD_PART_NUMBER string default "ThinkPad R400" +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + endif diff --git a/src/mainboard/lenovo/t400/Kconfig b/src/mainboard/lenovo/t400/Kconfig index 467cd630b4..8d258d98e9 100644 --- a/src/mainboard/lenovo/t400/Kconfig +++ b/src/mainboard/lenovo/t400/Kconfig @@ -51,4 +51,8 @@ config CBFS_SIZE hex default 0x200000 +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + endif # BOARD_LENOVO_T400 diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig index 65d37a75b1..0250bc0588 100644 --- a/src/mainboard/lenovo/t420s/Kconfig +++ b/src/mainboard/lenovo/t420s/Kconfig @@ -73,4 +73,8 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x21d2 +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + endif # BOARD_LENOVO_T420S diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig index 6e257ddbb1..2518330582 100644 --- a/src/mainboard/lenovo/t430s/Kconfig +++ b/src/mainboard/lenovo/t430s/Kconfig @@ -70,4 +70,8 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x21fb +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + endif # BOARD_LENOVO_T430S diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig index df7c2db602..ce33f04a58 100644 --- a/src/mainboard/lenovo/t520/Kconfig +++ b/src/mainboard/lenovo/t520/Kconfig @@ -73,4 +73,8 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x21cf +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + endif # BOARD_LENOVO_T520 diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig index 7b4ca7a6e6..c87521ac15 100644 --- a/src/mainboard/lenovo/t530/Kconfig +++ b/src/mainboard/lenovo/t530/Kconfig @@ -71,4 +71,8 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x21fa +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + endif # BOARD_LENOVO_T530 diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig index 52eeda3d38..02a5adae20 100644 --- a/src/mainboard/lenovo/t60/Kconfig +++ b/src/mainboard/lenovo/t60/Kconfig @@ -54,4 +54,8 @@ config SEABIOS_PS2_TIMEOUT int default 3000 +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + endif diff --git a/src/mainboard/lenovo/x200/Kconfig b/src/mainboard/lenovo/x200/Kconfig index 7bae12d56e..9b61f7588d 100644 --- a/src/mainboard/lenovo/x200/Kconfig +++ b/src/mainboard/lenovo/x200/Kconfig @@ -48,4 +48,8 @@ config CBFS_SIZE hex default 0x200000 +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + endif # BOARD_LENOVO_X200 diff --git a/src/mainboard/lenovo/x201/Kconfig b/src/mainboard/lenovo/x201/Kconfig index 7f96cbe820..39389ee511 100644 --- a/src/mainboard/lenovo/x201/Kconfig +++ b/src/mainboard/lenovo/x201/Kconfig @@ -49,4 +49,8 @@ config CPU_ADDR_BITS int default 36 +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + endif diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig index c13b644ba3..5fbda79e80 100644 --- a/src/mainboard/lenovo/x220/Kconfig +++ b/src/mainboard/lenovo/x220/Kconfig @@ -74,4 +74,8 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x21db +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + endif # BOARD_LENOVO_X220 diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig index 1d336ebf88..370eb778b0 100644 --- a/src/mainboard/lenovo/x230/Kconfig +++ b/src/mainboard/lenovo/x230/Kconfig @@ -74,4 +74,8 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x21fa +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + endif # BOARD_LENOVO_X230 diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig index ab4b58eaf3..1461c6b196 100644 --- a/src/mainboard/lenovo/x60/Kconfig +++ b/src/mainboard/lenovo/x60/Kconfig @@ -61,4 +61,8 @@ config SEABIOS_PS2_TIMEOUT int default 3000 +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + endif diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig b/src/mainboard/lippert/frontrunner-af/Kconfig index 1ec219e931..ebf362dcef 100644 --- a/src/mainboard/lippert/frontrunner-af/Kconfig +++ b/src/mainboard/lippert/frontrunner-af/Kconfig @@ -76,4 +76,8 @@ config SB800_AHCI_ROM bool default n +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + endif # BOARD_LIPPERT_FRONTRUNNER_AF diff --git a/src/mainboard/lippert/toucan-af/Kconfig b/src/mainboard/lippert/toucan-af/Kconfig index 590909ba50..9e29a85ae8 100644 --- a/src/mainboard/lippert/toucan-af/Kconfig +++ b/src/mainboard/lippert/toucan-af/Kconfig @@ -78,4 +78,8 @@ config SB800_AHCI_ROM bool default n +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + endif # BOARD_LIPPERT_TOUCAN_AF diff --git a/src/mainboard/pcengines/apu1/Kconfig b/src/mainboard/pcengines/apu1/Kconfig index 23287762e9..0754596ad9 100644 --- a/src/mainboard/pcengines/apu1/Kconfig +++ b/src/mainboard/pcengines/apu1/Kconfig @@ -110,4 +110,8 @@ config PINMUX_UART_D endchoice +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + endif # BOARD_PCENGINES_APU1 diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig index ac19be57b4..1660c27541 100644 --- a/src/mainboard/samsung/lumpy/Kconfig +++ b/src/mainboard/samsung/lumpy/Kconfig @@ -64,4 +64,8 @@ config EARLY_PCI_MMIO_BASE endif +# TODO: Remove this when platform ASL is fixed +config IASL_WARNINGS_ARE_ERRORS + def_bool n + endif # BOARD_SAMSUNG_LUMPY