Patch merged into coreboot/master: x86: parameterize asl_template for CBFS inclusion

the following patch was just integrated into master:
commit ab454c6b71fd54b61cc90165fe801250890894d2
Author: Aaron Durbin 
Date:   Thu Jul 30 12:44:58 2015 -0500

x86: parameterize asl_template for CBFS inclusion

The asl_template previously unconditionally included
    dsdt.aml. However, COMPILE_IN_DSDT=y results in the
    dsdt.aml being linked directly into ramstage. Thus
    the information is duplicated.

The inclusion of this file unconditionally throws
    some errors as certain assets need to be included
    in CBFS. However, as there isn't fine-grained
    ordering control in how files are added fixed
    resource requirements for other assets collide
    result in failure to build.

To remedy both things, provide a 2nd argument to
    asl_template which defaults to 'y' for CBFS
    addition. In the COMPILE_IN_DSDT=y case pass
    'n' so that dsdt.aml is no longer added.

BUG=chrome-os-partner:43419
    BRANCH=None
    TEST=For glados:
         Built with COMPILE_IN_DSDT=y. dsdt.aml not included.
         Built with COMPILE_IN_DSDT=n. dsdt.aml was included.

Original-Change-Id: I4767e5be2915c1732251fe415017f30314c5efc9
    Original-Signed-off-by: Aaron Durbin 
    Original-Reviewed-on: https://chromium-review.googlesource.com/289840
    Original-Reviewed-by: Duncan Laurie

Change-Id: Id1828627ba0a034eb05b2fe23be76e19f3040444
    Signed-off-by: Aaron Durbin 
    Reviewed-on: http://review.coreboot.org/11166
    Reviewed-by: Patrick Georgi 
    Tested-by: build bot (Jenkins)

See http://review.coreboot.org/11166 for details.

-gerrit