diff mbox

[13/15] configure: Copy some items from default configs to target configs

Message ID 1428436304-24044-14-git-send-email-minyard@acm.org
State New
Headers show

Commit Message

Corey Minyard April 7, 2015, 7:51 p.m. UTC 
From: Corey Minyard <cminyard@mvista.com>

This is to get CONFIG_ACPI into the target config so devices that may
use ACPI know to do this or not.

Signed-off-by: Corey Minyard <cminyard@mvista.com>
---
 configure | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Paolo Bonzini April 10, 2015, 11:47 a.m. UTC | #1 
On 07/04/2015 21:51, minyard@acm.org wrote:
> From: Corey Minyard <cminyard@mvista.com>
> 
> This is to get CONFIG_ACPI into the target config so devices that may
> use ACPI know to do this or not.
> 
> Signed-off-by: Corey Minyard <cminyard@mvista.com>
> ---
>  configure | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/configure b/configure
> index 09c9225..e301259 100755
> --- a/configure
> +++ b/configure
> @@ -5073,6 +5073,9 @@ if test "$linux" = "yes" ; then
>      fi
>  fi
>  
> +# Copy these from the default config to the target config
> +defconfig_to_target="CONFIG_ACPI"
> +
>  for target in $target_list; do
>  target_dir="$target"
>  config_target_mak=$target_dir/config-target.mak
> @@ -5431,6 +5434,10 @@ fi
>  echo "LDFLAGS+=$ldflags" >> $config_target_mak
>  echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak
>  
> +for i in $defconfig_to_target; do
> +        grep $i $source_path/default-configs/${target}.mak >> $config_target_mak
> +done
> +
>  done # for target in $targets
>  
>  if [ "$pixman" = "internal" ]; then
> 

This doesn't support "include" directives.

Also, it's ugly that you have to compile files per-target.

Perhaps you can use something like:

CONFIG_NOT_ACPI   := $(call lnot,$(CONFIG_ACPI))
CONFIG_NOT_SMBIOS := $(call lnot,$(CONFIG_SMBIOS))

common-obj-$(CONFIG_ISA_IPMI) += isa_ipmi.o
common-obj-$(call land,$(CONFIG_ISA_IPMI),$(CONFIG_ACPI))     += isa_ipmi-ssdt.o
common-obj-$(call land,$(CONFIG_ISA_IPMI),$(CONFIG_NOT_ACPI)) += isa_ipmi-ssdt-stub.o
common-obj-$(call land,$(CONFIG_ISA_IPMI),$(CONFIG_SMBIOS))   += isa_ipmi-smbios.o
common-obj-$(call land,$(CONFIG_ISA_IPMI),$(CONFIG_NOT_ACPI)) += isa_ipmi-smbios-stub.o

# Make toplevel always build these
common-obj-$(CONFIG_ALL) += isa_ipmi-ssdt-stub.o isa_ipmi-smbios-stub.o

Paolo
diff mbox

Patch

diff --git a/configure b/configure
index 09c9225..e301259 100755
--- a/configure
+++ b/configure
@@ -5073,6 +5073,9 @@  if test "$linux" = "yes" ; then
     fi
 fi
 
+# Copy these from the default config to the target config
+defconfig_to_target="CONFIG_ACPI"
+
 for target in $target_list; do
 target_dir="$target"
 config_target_mak=$target_dir/config-target.mak
@@ -5431,6 +5434,10 @@  fi
 echo "LDFLAGS+=$ldflags" >> $config_target_mak
 echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak
 
+for i in $defconfig_to_target; do
+        grep $i $source_path/default-configs/${target}.mak >> $config_target_mak
+done
+
 done # for target in $targets
 
 if [ "$pixman" = "internal" ]; then