[Qemu-devel] [RFC PATCH v2 12/37] hw/nios2/Makefile.objs: Conditionally build nios2

Yang Zhong posted 37 patches 6 years, 9 months ago
There is a newer version of this series
[Qemu-devel] [RFC PATCH v2 12/37] hw/nios2/Makefile.objs: Conditionally build nios2
Posted by Yang Zhong 6 years, 9 months ago
CONFIG_NIOS2_10M50_BOARD added for 10m50 dev board.

Signed-off-by: Yang Zhong <yang.zhong@intel.com>
---
 default-configs/nios2-softmmu.mak | 1 +
 hw/nios2/Makefile.objs            | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/default-configs/nios2-softmmu.mak b/default-configs/nios2-softmmu.mak
index 74dc70caae..f634c36d36 100644
--- a/default-configs/nios2-softmmu.mak
+++ b/default-configs/nios2-softmmu.mak
@@ -4,3 +4,4 @@ CONFIG_NIOS2=y
 CONFIG_SERIAL=y
 CONFIG_PTIMER=y
 CONFIG_ALTERA_TIMER=y
+CONFIG_NIOS2_10M50_BOARD=y
diff --git a/hw/nios2/Makefile.objs b/hw/nios2/Makefile.objs
index 6b5c421760..12a2891395 100644
--- a/hw/nios2/Makefile.objs
+++ b/hw/nios2/Makefile.objs
@@ -1 +1,2 @@
-obj-y = boot.o cpu_pic.o 10m50_devboard.o
+obj-y = boot.o cpu_pic.o
+obj-$(CONFIG_NIOS2_10M50_BOARD) += 10m50_devboard.o
-- 
2.17.1


Re: [Qemu-devel] [RFC PATCH v2 12/37] hw/nios2/Makefile.objs: Conditionally build nios2
Posted by Thomas Huth 6 years, 9 months ago
On 2019-01-15 15:10, Yang Zhong wrote:
> CONFIG_NIOS2_10M50_BOARD added for 10m50 dev board.
> 
> Signed-off-by: Yang Zhong <yang.zhong@intel.com>
> ---
>  default-configs/nios2-softmmu.mak | 1 +
>  hw/nios2/Makefile.objs            | 3 ++-
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/default-configs/nios2-softmmu.mak b/default-configs/nios2-softmmu.mak
> index 74dc70caae..f634c36d36 100644
> --- a/default-configs/nios2-softmmu.mak
> +++ b/default-configs/nios2-softmmu.mak
> @@ -4,3 +4,4 @@ CONFIG_NIOS2=y
>  CONFIG_SERIAL=y
>  CONFIG_PTIMER=y
>  CONFIG_ALTERA_TIMER=y
> +CONFIG_NIOS2_10M50_BOARD=y
> diff --git a/hw/nios2/Makefile.objs b/hw/nios2/Makefile.objs
> index 6b5c421760..12a2891395 100644
> --- a/hw/nios2/Makefile.objs
> +++ b/hw/nios2/Makefile.objs
> @@ -1 +1,2 @@
> -obj-y = boot.o cpu_pic.o 10m50_devboard.o
> +obj-y = boot.o cpu_pic.o
> +obj-$(CONFIG_NIOS2_10M50_BOARD) += 10m50_devboard.o
> 

I'd maybe rather only name it CONFIG_NIOS2_10M50 ... anyway:

Reviewed-by: Thomas Huth <thuth@redhat.com>