From 73d7bc111e40d514530951005f9cbfa6e611eb81 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Tue, 26 May 2015 18:44:09 +0200 Subject: [PATCH 1/2] cn0363: Add missing Makefiles Those were accidentally overlooked during the initial commit of the project. Signed-off-by: Lars-Peter Clausen --- projects/cn0363/Makefile | 21 ++++++++ projects/cn0363/zed/Makefile | 97 ++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 projects/cn0363/Makefile create mode 100644 projects/cn0363/zed/Makefile diff --git a/projects/cn0363/Makefile b/projects/cn0363/Makefile new file mode 100644 index 000000000..141f88d2a --- /dev/null +++ b/projects/cn0363/Makefile @@ -0,0 +1,21 @@ +#################################################################################### +#################################################################################### +## Copyright 2011(c) Analog Devices, Inc. +## Auto-generated, do not modify! +#################################################################################### +#################################################################################### + +.PHONY: all clean clean-all +all: + -make -C zed all + + +clean: + make -C zed clean + + +clean-all: + make -C zed clean-all + +#################################################################################### +#################################################################################### diff --git a/projects/cn0363/zed/Makefile b/projects/cn0363/zed/Makefile new file mode 100644 index 000000000..56eabd849 --- /dev/null +++ b/projects/cn0363/zed/Makefile @@ -0,0 +1,97 @@ +#################################################################################### +#################################################################################### +## Copyright 2011(c) Analog Devices, Inc. +## Auto-generated, do not modify! +#################################################################################### +#################################################################################### + +M_DEPS := system_project.tcl +M_DEPS += ../../scripts/adi_env.tcl +M_DEPS += ../../scripts/adi_project.tcl +M_DEPS += ../../scripts/adi_board.tcl +M_DEPS += system_bd.tcl +M_DEPS += ../../common/zed/zed_system_bd.tcl +M_DEPS += ../../../library/axi_clkgen/axi_clkgen.xpr +M_DEPS += ../../../library/axi_dmac/axi_dmac.xpr +M_DEPS += ../../../library/axi_generic_adc/axi_generic_adc.xpr +M_DEPS += ../../../library/axi_hdmi_tx/axi_hdmi_tx.xpr +M_DEPS += ../../../library/axi_i2s_adi/axi_i2s_adi.xpr +M_DEPS += ../../../library/axi_spdif_tx/axi_spdif_tx.xpr +M_DEPS += ../../../library/spi_engine/axi_spi_engine/axi_spi_engine.xpr +M_DEPS += ../../../library/cn0363/cn0363_dma_sequencer/cn0363_dma_sequencer.xpr +M_DEPS += ../../../library/cn0363/cn0363_phase_data_sync/cn0363_phase_data_sync.xpr +M_DEPS += ../../../library/cordic_demod/cordic_demod.xpr +M_DEPS += ../../../library/spi_engine/spi_engine_execution/spi_engine_execution.xpr +M_DEPS += ../../../library/spi_engine/spi_engine_interconnect/spi_engine_interconnect.xpr +M_DEPS += ../../../library/spi_engine/spi_engine_offload/spi_engine_offload.xpr +M_DEPS += ../../../library/util_axis_resize/util_axis_resize.xpr +M_DEPS += ../../../library/util_i2c_mixer/util_i2c_mixer.xpr +M_DEPS += ../../../library/util_sigma_delta_spi/util_sigma_delta_spi.xpr + +M_VIVADO := vivado -mode batch -source + +M_FLIST := *.cache +M_FLIST += *.data +M_FLIST += *.xpr +M_FLIST += *.log +M_FLIST += *.jou +M_FLIST += xgui +M_FLIST += *.runs +M_FLIST += *.srcs +M_FLIST += *.sdk +M_FLIST += .Xil + + + +.PHONY: all lib clean clean-all +all: lib cn0363_zed.sdk/system_top.hdf + + +clean: + rm -rf $(M_FLIST) + + +clean-all:clean + make -C ../../../library/axi_clkgen clean + make -C ../../../library/axi_dmac clean + make -C ../../../library/axi_generic_adc clean + make -C ../../../library/axi_hdmi_tx clean + make -C ../../../library/axi_i2s_adi clean + make -C ../../../library/axi_spdif_tx clean + make -C ../../../library/spi_engine/axi_spi_engine clean + make -C ../../../library/cn0363/cn0363_dma_sequencer clean + make -C ../../../library/cn0363/cn0363_phase_data_sync clean + make -C ../../../library/cordic_demod clean + make -C ../../../library/spi_engine/spi_engine_execution clean + make -C ../../../library/spi_engine/spi_engine_interconnect clean + make -C ../../../library/spi_engine/spi_engine_offload clean + make -C ../../../library/util_axis_resize clean + make -C ../../../library/util_i2c_mixer clean + make -C ../../../library/util_sigma_delta_spi clean + + +cn0363_zed.sdk/system_top.hdf: $(M_DEPS) + rm -rf $(M_FLIST) + $(M_VIVADO) system_project.tcl >> cn0363_zed_vivado.log 2>&1 + + +lib: + make -C ../../../library/axi_clkgen + make -C ../../../library/axi_dmac + make -C ../../../library/axi_generic_adc + make -C ../../../library/axi_hdmi_tx + make -C ../../../library/axi_i2s_adi + make -C ../../../library/axi_spdif_tx + make -C ../../../library/spi_engine/axi_spi_engine + make -C ../../../library/cn0363/cn0363_dma_sequencer + make -C ../../../library/cn0363/cn0363_phase_data_sync + make -C ../../../library/cordic_demod + make -C ../../../library/spi_engine/spi_engine_execution + make -C ../../../library/spi_engine/spi_engine_interconnect + make -C ../../../library/spi_engine/spi_engine_offload + make -C ../../../library/util_axis_resize + make -C ../../../library/util_i2c_mixer + make -C ../../../library/util_sigma_delta_spi + +#################################################################################### +#################################################################################### From 52506351622c49bbbb4cbc264d5ba4a2ad839e1b Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Wed, 27 May 2015 13:25:13 +0200 Subject: [PATCH 2/2] cn0363: Fix ad_iobuf signal names The signal names for the ad_iobuf were recently changed, adjust the cn0363 project accordingly. Signed-off-by: Lars-Peter Clausen --- projects/cn0363/zed/system_top.v | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/projects/cn0363/zed/system_top.v b/projects/cn0363/zed/system_top.v index b2b39d75e..5a1df69a1 100644 --- a/projects/cn0363/zed/system_top.v +++ b/projects/cn0363/zed/system_top.v @@ -175,36 +175,36 @@ module system_top ( ad_iobuf #( .DATA_WIDTH(1) ) i_sdo_iobuf ( - .dt(spi_sdo_t), - .di(spi_sdo_o), - .dio(spi_sdo) + .dio_t(spi_sdo_t), + .dio_i(spi_sdo_o), + .dio_p(spi_sdo) ); ad_iobuf #( .DATA_WIDTH(32) ) i_iobuf ( - .dt(gpio_t[31:0]), - .di(gpio_o[31:0]), - .do(gpio_i[31:0]), - .dio(gpio_bd) + .dio_t(gpio_t[31:0]), + .dio_i(gpio_o[31:0]), + .dio_o(gpio_i[31:0]), + .dio_p(gpio_bd) ); ad_iobuf #( .DATA_WIDTH(2) ) i_iic_mux_scl ( - .dt({iic_mux_scl_t_s, iic_mux_scl_t_s}), - .di(iic_mux_scl_o_s), - .do(iic_mux_scl_i_s), - .dio(iic_mux_scl) + .dio_t({iic_mux_scl_t_s, iic_mux_scl_t_s}), + .dio_i(iic_mux_scl_o_s), + .dio_o(iic_mux_scl_i_s), + .dio_p(iic_mux_scl) ); ad_iobuf #( .DATA_WIDTH(2) ) i_iic_mux_sda ( - .dt({iic_mux_sda_t_s, iic_mux_sda_t_s}), - .di(iic_mux_sda_o_s), - .do(iic_mux_sda_i_s), - .dio(iic_mux_sda) + .dio_t({iic_mux_sda_t_s, iic_mux_sda_t_s}), + .dio_i(iic_mux_sda_o_s), + .dio_o(iic_mux_sda_i_s), + .dio_p(iic_mux_sda) ); system_wrapper i_system_wrapper (