Patchwork [3/3] xilinx_axi*: Share devices between microblaze and microblazeel

login
register
mail settings
Submitter Andreas Färber
Date June 9, 2012, 1:54 a.m.
Message ID <1339206871-4706-4-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/163881/
State New
Headers show

Comments

Andreas Färber - June 9, 2012, 1:54 a.m.
Speeds up the build.

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 default-configs/microblaze-softmmu.mak   |    1 +
 default-configs/microblazeel-softmmu.mak |    1 +
 hw/Makefile.objs                         |    2 ++
 hw/microblaze/Makefile.objs              |    2 --
 4 files changed, 4 insertions(+), 2 deletions(-)
Peter A. G. Crosthwaite - June 9, 2012, 2:16 a.m.
On Sat, Jun 9, 2012 at 11:54 AM, Andreas Färber <afaerber@suse.de> wrote:
> Speeds up the build.
>
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
>  default-configs/microblaze-softmmu.mak   |    1 +
>  default-configs/microblazeel-softmmu.mak |    1 +
>  hw/Makefile.objs                         |    2 ++
>  hw/microblaze/Makefile.objs              |    2 --
>  4 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/microblaze-softmmu.mak
> index 08e7449..64c9485 100644
> --- a/default-configs/microblaze-softmmu.mak
> +++ b/default-configs/microblaze-softmmu.mak
> @@ -4,3 +4,4 @@ CONFIG_PTIMER=y
>  CONFIG_PFLASH_CFI01=y
>  CONFIG_SERIAL=y
>  CONFIG_XILINX=y
> +CONFIG_XILINX_AXI=y
> diff --git a/default-configs/microblazeel-softmmu.mak b/default-configs/microblazeel-softmmu.mak
> index a9578e1..a962276 100644
> --- a/default-configs/microblazeel-softmmu.mak
> +++ b/default-configs/microblazeel-softmmu.mak
> @@ -4,3 +4,4 @@ CONFIG_PTIMER=y
>  CONFIG_PFLASH_CFI01=y
>  CONFIG_SERIAL=y
>  CONFIG_XILINX=y
> +CONFIG_XILINX_AXI=y
> diff --git a/hw/Makefile.objs b/hw/Makefile.objs
> index 102ebcf..3d77259 100644
> --- a/hw/Makefile.objs
> +++ b/hw/Makefile.objs
> @@ -63,6 +63,8 @@ hw-obj-$(CONFIG_JAZZ_LED) += jazz_led.o
>  hw-obj-$(CONFIG_XILINX) += xilinx_intc.o
>  hw-obj-$(CONFIG_XILINX) += xilinx_timer.o
>  hw-obj-$(CONFIG_XILINX) += xilinx_uartlite.o
> +hw-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o
> +hw-obj-$(CONFIG_XILINX_AXI) += xilinx_axienet.o
>

Ahh nvm, got it.

>  # PCI watchdog devices
>  hw-obj-$(CONFIG_PCI) += wdt_i6300esb.o
> diff --git a/hw/microblaze/Makefile.objs b/hw/microblaze/Makefile.objs
> index 59ea20f..274d2c5 100644
> --- a/hw/microblaze/Makefile.objs
> +++ b/hw/microblaze/Makefile.objs
> @@ -4,8 +4,6 @@ obj-y += microblaze_boot.o
>
>  obj-y += microblaze_pic_cpu.o
>  obj-y += xilinx_ethlite.o
> -obj-y += xilinx_axidma.o
> -obj-y += xilinx_axienet.o
>  obj-$(CONFIG_FDT) += ../device_tree.o
>
>  obj-y := $(addprefix ../,$(obj-y))
> --
> 1.7.7
>
>

Patch

diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/microblaze-softmmu.mak
index 08e7449..64c9485 100644
--- a/default-configs/microblaze-softmmu.mak
+++ b/default-configs/microblaze-softmmu.mak
@@ -4,3 +4,4 @@  CONFIG_PTIMER=y
 CONFIG_PFLASH_CFI01=y
 CONFIG_SERIAL=y
 CONFIG_XILINX=y
+CONFIG_XILINX_AXI=y
diff --git a/default-configs/microblazeel-softmmu.mak b/default-configs/microblazeel-softmmu.mak
index a9578e1..a962276 100644
--- a/default-configs/microblazeel-softmmu.mak
+++ b/default-configs/microblazeel-softmmu.mak
@@ -4,3 +4,4 @@  CONFIG_PTIMER=y
 CONFIG_PFLASH_CFI01=y
 CONFIG_SERIAL=y
 CONFIG_XILINX=y
+CONFIG_XILINX_AXI=y
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 102ebcf..3d77259 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -63,6 +63,8 @@  hw-obj-$(CONFIG_JAZZ_LED) += jazz_led.o
 hw-obj-$(CONFIG_XILINX) += xilinx_intc.o
 hw-obj-$(CONFIG_XILINX) += xilinx_timer.o
 hw-obj-$(CONFIG_XILINX) += xilinx_uartlite.o
+hw-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o
+hw-obj-$(CONFIG_XILINX_AXI) += xilinx_axienet.o
 
 # PCI watchdog devices
 hw-obj-$(CONFIG_PCI) += wdt_i6300esb.o
diff --git a/hw/microblaze/Makefile.objs b/hw/microblaze/Makefile.objs
index 59ea20f..274d2c5 100644
--- a/hw/microblaze/Makefile.objs
+++ b/hw/microblaze/Makefile.objs
@@ -4,8 +4,6 @@  obj-y += microblaze_boot.o
 
 obj-y += microblaze_pic_cpu.o
 obj-y += xilinx_ethlite.o
-obj-y += xilinx_axidma.o
-obj-y += xilinx_axienet.o
 obj-$(CONFIG_FDT) += ../device_tree.o
 
 obj-y := $(addprefix ../,$(obj-y))