From patchwork Wed Apr 11 23:50:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 151947 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 11D6CB7036 for ; Thu, 12 Apr 2012 09:52:47 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SI7LB-000212-Sp for incoming@patchwork.ozlabs.org; Wed, 11 Apr 2012 23:52:45 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SI7KD-0001we-2o for fwts-devel@lists.ubuntu.com; Wed, 11 Apr 2012 23:51:45 +0000 Received: from cpc19-craw6-2-0-cust5.croy.cable.virginmedia.com ([77.102.228.6] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SI7KC-00051L-TN for fwts-devel@lists.ubuntu.com; Wed, 11 Apr 2012 23:51:45 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH 03/11] acpica: update Makefiles Date: Thu, 12 Apr 2012 00:50:48 +0100 Message-Id: <1334188256-26566-4-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1334188256-26566-1-git-send-email-colin.king@canonical.com> References: <1334188256-26566-1-git-send-email-colin.king@canonical.com> X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: fwts-devel-bounces@lists.ubuntu.com Errors-To: fwts-devel-bounces@lists.ubuntu.com From: Colin Ian King Signed-off-by: Colin Ian King Acked-by: Keng-Yu Lin --- src/acpica/Makefile.am | 5 +++++ src/acpica/source/compiler/Makefile.am | 18 +++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/acpica/Makefile.am b/src/acpica/Makefile.am index f042a1a..9da918a 100644 --- a/src/acpica/Makefile.am +++ b/src/acpica/Makefile.am @@ -59,6 +59,7 @@ libfwtsacpica_la_SOURCES = \ $(ACPICA_COMP)/disassembler/dmresrcs.c \ $(ACPICA_COMP)/disassembler/dmutils.c \ $(ACPICA_COMP)/disassembler/dmwalk.c \ + $(ACPICA_COMP)/disassembler/dmresrcl2.c \ $(ACPICA_COMP)/dispatcher/dsfield.c \ $(ACPICA_COMP)/dispatcher/dsinit.c \ $(ACPICA_COMP)/dispatcher/dsmethod.c \ @@ -117,6 +118,8 @@ libfwtsacpica_la_SOURCES = \ $(ACPICA_COMP)/hardware/hwsleep.c \ $(ACPICA_COMP)/hardware/hwvalid.c \ $(ACPICA_COMP)/hardware/hwxface.c \ + $(ACPICA_COMP)/hardware/hwxfsleep.c \ + $(ACPICA_COMP)/hardware/hwesleep.c \ $(ACPICA_COMP)/namespace/nsaccess.c \ $(ACPICA_COMP)/namespace/nsalloc.c \ $(ACPICA_COMP)/namespace/nsdump.c \ @@ -157,12 +160,14 @@ libfwtsacpica_la_SOURCES = \ $(ACPICA_COMP)/resources/rsmisc.c \ $(ACPICA_COMP)/resources/rsutils.c \ $(ACPICA_COMP)/resources/rsxface.c \ + $(ACPICA_COMP)/resources/rsserial.c \ $(ACPICA_COMP)/tables/tbfadt.c \ $(ACPICA_COMP)/tables/tbfind.c \ $(ACPICA_COMP)/tables/tbinstal.c \ $(ACPICA_COMP)/tables/tbutils.c \ $(ACPICA_COMP)/tables/tbxface.c \ $(ACPICA_COMP)/tables/tbxfroot.c \ + $(ACPICA_COMP)/utilities/utaddress.c \ $(ACPICA_COMP)/utilities/utalloc.c \ $(ACPICA_COMP)/utilities/utcache.c \ $(ACPICA_COMP)/utilities/utcopy.c \ diff --git a/src/acpica/source/compiler/Makefile.am b/src/acpica/source/compiler/Makefile.am index a79467c..91db20b 100644 --- a/src/acpica/source/compiler/Makefile.am +++ b/src/acpica/source/compiler/Makefile.am @@ -40,10 +40,19 @@ dtparserparse.c: dtparser.y dtparserlex.c: dtparser.l ${LEX} ${AM_LFLAGS} -PDtParser -odtparserlex.c dtparser.l +prparserparse.c: prparser.y + ${YACC} ${AM_YFLAGS} -bprparser -pPrParser prparser.y + mv prparser.tab.c prparserparse.c + mv prparser.tab.h prparser.y.h + +prparserlex.c: prparser.l + ${LEX} ${AM_LFLAGS} -PPrParser -oprparserlex.c prparser.l + lib_LTLIBRARIES = libfwtsiasl.la BUILT_SOURCES = aslcompilerparse.c aslcompilerlex.c \ - dtparserparse.c dtparserlex.c + dtparserparse.c dtparserlex.c \ + prparserparse.c prparserlex.c # # Just export fwts specific API so we don't clash with core ACPICA library @@ -98,6 +107,13 @@ libfwtsiasl_la_SOURCES = \ $(ACPICA_COMPILER)/dtcompile.c \ $(ACPICA_COMPILER)/dtparserparse.c \ $(ACPICA_COMPILER)/dtparserlex.c \ + $(ACPICA_COMPILER)/prparserparse.c \ + $(ACPICA_COMPILER)/prparserlex.c \ + $(ACPICA_COMPILER)/prscan.c \ + $(ACPICA_COMPILER)/aslrestype2s.c \ + $(ACPICA_COMPILER)/prmacros.c \ + $(ACPICA_COMPILER)/prutils.c \ + $(ACPICA_COMPILER)/prexpress.c \ $(ACPICA_UTILS)/utalloc.c \ $(ACPICA_UTILS)/utcache.c \ $(ACPICA_UTILS)/utcopy.c \