gwj / at91sam9263 · Commits

Commit ce05c32384e1698053b862dbf1932cee69d99276

Authored by bellard
1 parent 1ce549ab

allow ACPI table build 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1982 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 11 additions and 2 deletions
Makefile.target
  View file @ce05c32
@@ -490,8 +490,10 @@ loader.o: loader.c elf_ops.h @@ -490,8 +490,10 @@ loader.o: loader.c elf_ops.h
490 490
491 acpi.o: acpi.c acpi-dsdt.hex 491 acpi.o: acpi.c acpi-dsdt.hex
492 492
493 -#$(SRC_PATH)/hw/acpi-dsdt.hex: acpi-dsdt.dsl  
494 -# iasl -tc -p $@ $< 493 +ifdef BUILD_ACPI_TABLES
  494 +$(SRC_PATH)/hw/acpi-dsdt.hex: acpi-dsdt.dsl
  495 + iasl -tc -p $@ $<
  496 +endif
495 497
496 ifeq ($(TARGET_ARCH), sh4) 498 ifeq ($(TARGET_ARCH), sh4)
497 op.o: op.c op_mem.c cpu.h 499 op.o: op.c op_mem.c cpu.h
configure
  View file @ce05c32
@@ -95,6 +95,7 @@ check_gcc=&quot;yes&quot; @@ -95,6 +95,7 @@ check_gcc=&quot;yes&quot;
95 softmmu="yes" 95 softmmu="yes"
96 user="no" 96 user="no"
97 build_docs="no" 97 build_docs="no"
  98 +build_acpi_tables="no"
98 uname_release="" 99 uname_release=""
99 100
100 # OS specific 101 # OS specific
@@ -240,6 +241,8 @@ for opt do @@ -240,6 +241,8 @@ for opt do
240 ;; 241 ;;
241 --enable-uname-release=*) uname_release="$optarg" 242 --enable-uname-release=*) uname_release="$optarg"
242 ;; 243 ;;
  244 + --enable-iasl) build_acpi_tables="yes"
  245 + ;;
243 esac 246 esac
244 done 247 done
245 248
@@ -288,6 +291,7 @@ echo &quot; --disable-user disable all linux usermode emulation targets&quot; @@ -288,6 +291,7 @@ echo &quot; --disable-user disable all linux usermode emulation targets&quot;
288 echo " --fmod-lib path to FMOD library" 291 echo " --fmod-lib path to FMOD library"
289 echo " --fmod-inc path to FMOD includes" 292 echo " --fmod-inc path to FMOD includes"
290 echo " --enable-uname-release=R Return R for uname -r in usermode emulation" 293 echo " --enable-uname-release=R Return R for uname -r in usermode emulation"
  294 +echo " --enable-iasl compilation of ACPI tables with the IASL compiler"
291 echo "" 295 echo ""
292 echo "NOTE: The object files are build at the place where configure is launched" 296 echo "NOTE: The object files are build at the place where configure is launched"
293 exit 1 297 exit 1
@@ -708,6 +712,9 @@ echo &quot;TARGET_DIRS=$target_list&quot; &gt;&gt; $config_mak @@ -708,6 +712,9 @@ echo &quot;TARGET_DIRS=$target_list&quot; &gt;&gt; $config_mak
708 if [ "$build_docs" = "yes" ] ; then 712 if [ "$build_docs" = "yes" ] ; then
709 echo "BUILD_DOCS=yes" >> $config_mak 713 echo "BUILD_DOCS=yes" >> $config_mak
710 fi 714 fi
  715 +if [ "$build_acpi_tables" = "yes" ] ; then
  716 + echo "BUILD_ACPI_TABLES=yes" >> $config_mak
  717 +fi
711 718
712 # XXX: suppress that 719 # XXX: suppress that
713 if [ "$bsd" = "yes" ] ; then 720 if [ "$bsd" = "yes" ] ; then