diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-07-11 19:08:36 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-07-15 20:58:37 +0200 |
| commit | 3cae16db021601b5437622f89a86d5c489799fb3 (patch) | |
| tree | 7505b8b5136dae496ed4ec48752f6842be0333c5 | |
| parent | 2d1794e9562ef39e320a1e08a34831c152c18c1a (diff) | |
| download | focaccia-qemu-3cae16db021601b5437622f89a86d5c489799fb3.tar.gz focaccia-qemu-3cae16db021601b5437622f89a86d5c489799fb3.zip | |
create_config: remove $(CONFIG_SOFTMMU) hack
CONFIG_TPM is defined to a rather weird $(CONFIG_SOFTMMU) so that it expands to the right thing in hw/Makefile.objs. This however is not needed anymore and it has a corresponding hack in create_config to turn it into "#define CONFIG_TPM 1". Clean up. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rwxr-xr-x | configure | 2 | ||||
| -rwxr-xr-x | scripts/create_config | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure index 4983c8b533..eb635c3b9a 100755 --- a/configure +++ b/configure @@ -7159,7 +7159,7 @@ if test "$live_block_migration" = "yes" ; then fi if test "$tpm" = "yes"; then - echo 'CONFIG_TPM=$(CONFIG_SOFTMMU)' >> $config_host_mak + echo 'CONFIG_TPM=y' >> $config_host_mak fi echo "TRACE_BACKENDS=$trace_backends" >> $config_host_mak diff --git a/scripts/create_config b/scripts/create_config index 00e86c82b0..6d8f08b39d 100755 --- a/scripts/create_config +++ b/scripts/create_config @@ -54,7 +54,7 @@ case $line in done echo " NULL" ;; - CONFIG_*='$(CONFIG_SOFTMMU)'|CONFIG_*=y) # configuration + CONFIG_*=y) # configuration name=${line%=*} echo "#define $name 1" ;; |