gwj / at91sam9263 · Commits

Commit 777553406dcc3dd0ea54dae5b963b08af54c4f0d

Authored by ths
1 parent c0ce998e

Make installing bios files optional. 

Signed-off-by: Riku Voipio <riku.voipio@iki.fi>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5800 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 19 additions and 3 deletions
Makefile
  View file @7775534
@@ -221,6 +221,14 @@ KEYMAPS=da en-gb et fr fr-ch is lt modifiers no pt-br sv \ @@ -221,6 +221,14 @@ KEYMAPS=da en-gb et fr fr-ch is lt modifiers no pt-br sv \
221 ar de en-us fi fr-be hr it lv nl pl ru th \ 221 ar de en-us fi fr-be hr it lv nl pl ru th \
222 common de-ch es fo fr-ca hu ja mk nl-be pt sl tr 222 common de-ch es fo fr-ca hu ja mk nl-be pt sl tr
223 223
  224 +ifdef INSTALL_BLOBS
  225 +BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
  226 +video.x openbios-sparc32 openbios-sparc64 pxe-ne2k_pci.bin \
  227 +pxe-rtl8139.bin pxe-pcnet.bin pxe-e1000.bin
  228 +else
  229 +BLOBS=
  230 +endif
  231 +
224 install-doc: $(DOCS) 232 install-doc: $(DOCS)
225 mkdir -p "$(DESTDIR)$(docdir)" 233 mkdir -p "$(DESTDIR)$(docdir)"
226 $(INSTALL) -m 644 qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)" 234 $(INSTALL) -m 644 qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)"
@@ -236,12 +244,12 @@ install: all $(if $(BUILD_DOCS),install-doc) @@ -236,12 +244,12 @@ install: all $(if $(BUILD_DOCS),install-doc)
236 ifneq ($(TOOLS),) 244 ifneq ($(TOOLS),)
237 $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" 245 $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
238 endif 246 endif
  247 +ifneq ($(BLOBS),)
239 mkdir -p "$(DESTDIR)$(datadir)" 248 mkdir -p "$(DESTDIR)$(datadir)"
240 - set -e; for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \  
241 - video.x openbios-sparc32 openbios-sparc64 pxe-ne2k_pci.bin \  
242 - pxe-rtl8139.bin pxe-pcnet.bin pxe-e1000.bin; do \ 249 + set -e; for x in $(BLOBS); do \
243 $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \ 250 $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
244 done 251 done
  252 +endif
245 ifndef CONFIG_WIN32 253 ifndef CONFIG_WIN32
246 mkdir -p "$(DESTDIR)$(datadir)/keymaps" 254 mkdir -p "$(DESTDIR)$(datadir)/keymaps"
247 set -e; for x in $(KEYMAPS); do \ 255 set -e; for x in $(KEYMAPS); do \
configure
  View file @7775534
@@ -118,6 +118,7 @@ bluez=&quot;yes&quot; @@ -118,6 +118,7 @@ bluez=&quot;yes&quot;
118 kvm="yes" 118 kvm="yes"
119 kerneldir="" 119 kerneldir=""
120 aix="no" 120 aix="no"
  121 +blobs="yes"
121 122
122 # OS specific 123 # OS specific
123 targetos=`uname -s` 124 targetos=`uname -s`
@@ -372,6 +373,8 @@ for opt do @@ -372,6 +373,8 @@ for opt do
372 ;; 373 ;;
373 --disable-aio) aio="no" 374 --disable-aio) aio="no"
374 ;; 375 ;;
  376 + --disable-blobs) blobs="no"
  377 + ;;
375 --kerneldir=*) kerneldir="$optarg" 378 --kerneldir=*) kerneldir="$optarg"
376 ;; 379 ;;
377 *) echo "ERROR: unknown option $opt"; show_help="yes" 380 *) echo "ERROR: unknown option $opt"; show_help="yes"
@@ -483,6 +486,7 @@ echo &quot; --enable-uname-release=R Return R for uname -r in usermode emulation&quot; @@ -483,6 +486,7 @@ echo &quot; --enable-uname-release=R Return R for uname -r in usermode emulation&quot;
483 echo " --sparc_cpu=V Build qemu for Sparc architecture v7, v8, v8plus, v8plusa, v9" 486 echo " --sparc_cpu=V Build qemu for Sparc architecture v7, v8, v8plus, v8plusa, v9"
484 echo " --disable-vde disable support for vde network" 487 echo " --disable-vde disable support for vde network"
485 echo " --disable-aio disable AIO support" 488 echo " --disable-aio disable AIO support"
  489 +echo " --disable-blobs disable installing provided firmware blobs"
486 echo " --kerneldir=PATH look for kernel includes in PATH" 490 echo " --kerneldir=PATH look for kernel includes in PATH"
487 echo "" 491 echo ""
488 echo "NOTE: The object files are built at the place where configure is launched" 492 echo "NOTE: The object files are built at the place where configure is launched"
@@ -1083,6 +1087,7 @@ echo &quot;uname -r $uname_release&quot; @@ -1083,6 +1087,7 @@ echo &quot;uname -r $uname_release&quot;
1083 echo "NPTL support $nptl" 1087 echo "NPTL support $nptl"
1084 echo "vde support $vde" 1088 echo "vde support $vde"
1085 echo "AIO support $aio" 1089 echo "AIO support $aio"
  1090 +echo "Install blobs $blobs"
1086 echo "KVM support $kvm" 1091 echo "KVM support $kvm"
1087 1092
1088 if test $sdl_too_old = "yes"; then 1093 if test $sdl_too_old = "yes"; then
@@ -1357,6 +1362,9 @@ if test &quot;$aio&quot; = &quot;yes&quot; ; then @@ -1357,6 +1362,9 @@ if test &quot;$aio&quot; = &quot;yes&quot; ; then
1357 echo "#define CONFIG_AIO 1" >> $config_h 1362 echo "#define CONFIG_AIO 1" >> $config_h
1358 echo "CONFIG_AIO=yes" >> $config_mak 1363 echo "CONFIG_AIO=yes" >> $config_mak
1359 fi 1364 fi
  1365 +if test "$blobs" = "yes" ; then
  1366 + echo "INSTALL_BLOBS=yes" >> $config_mak
  1367 +fi
1360 1368
1361 # XXX: suppress that 1369 # XXX: suppress that
1362 if [ "$bsd" = "yes" ] ; then 1370 if [ "$bsd" = "yes" ] ; then