X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=aa6c3e644e5eb924693fab77e1630d85f1e39860;hb=24a04d22869658abcc96067349a588845cf9a80c;hp=712d177d86d4ed1d3dbbbd569f614cc9117ee27a;hpb=3878baac72b0db18a254b84f65a65a0f033e9be4;p=sigrok-firmware-fx2lafw.git diff --git a/Makefile.am b/Makefile.am index 712d177d..aa6c3e64 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,8 +15,7 @@ ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## along with this program; if not, see . ## GNUMAKEFLAGS = --no-print-directory @@ -24,8 +23,7 @@ SUFFIXES = .a51 .c .fw .ihx .rel # Flags for firmware hex file generation SDCC_LINK_FLAGS = --code-size 0x1c00 --xram-size 0x0200 --xram-loc 0x1c00 -Wl"-b DSCR_AREA=0x1e00" -Wl"-b INT2JT=0x1f00" -SDCC_LINK_FLAGS_HANTEK_6022BE = --code-size 0x3c00 --xram-size 0x0100 --xram-loc 0x3c00 -Wl"-b DSCR_AREA=0x3d00" -Wl"-b INT2JT=0x3f00" -SDCC_LINK_FLAGS_SAINSMART_DDS120 = $(SDCC_LINK_FLAGS_HANTEK_6022BE) +SDCC_LINK_FLAGS_SCOPE = --code-size 0x3c00 --xram-size 0x0100 --xram-loc 0x3c00 -Wl"-b DSCR_AREA=0x3d00" -Wl"-b INT2JT=0x3f00" # Include paths as_includes = -I$(srcdir)/include @@ -50,7 +48,9 @@ dirstamps = \ hw/sigrok-fx2-8ch/$(dirstamp) \ hw/sigrok-fx2-16ch/$(dirstamp) \ hw/hantek-6022be/$(dirstamp) \ - hw/sainsmart-dds120/$(dirstamp) + hw/hantek-6022bl/$(dirstamp) \ + hw/sainsmart-dds120/$(dirstamp) \ + hw/yixingdianzi-mdso/$(dirstamp) # Final firmware files firmware_binaries = \ @@ -64,7 +64,9 @@ firmware_binaries = \ hw/sigrok-fx2-8ch/fx2lafw-sigrok-fx2-8ch.fw \ hw/sigrok-fx2-16ch/fx2lafw-sigrok-fx2-16ch.fw \ hw/hantek-6022be/fx2lafw-hantek-6022be.fw \ - hw/sainsmart-dds120/fx2lafw-sainsmart-dds120.fw + hw/hantek-6022bl/fx2lafw-hantek-6022bl.fw \ + hw/sainsmart-dds120/fx2lafw-sainsmart-dds120.fw \ + hw/yixingdianzi-mdso/fx2lafw-yixingdianzi-mdso.fw fx2lafw_headers = \ include/command.h \ @@ -81,25 +83,26 @@ fx2lafw_objects = \ fx2lafw.rel \ gpif-acquisition.rel -hantek_6022be_headers = \ - include/dscr_hantek_6022be.inc \ +scope_headers = \ + include/dscr_scope.inc \ + include/scope.inc \ include/common.inc -hantek_6022be_sources = \ - hantek_6022be.c +hantek_6022be_headers = $(scope_headers) +hantek_6022be_sources = hw/hantek-6022be/fw.c +hantek_6022be_objects = hw/hantek-6022be/fw.rel -hantek_6022be_objects = \ - hantek_6022be.rel +hantek_6022bl_headers = $(scope_headers) +hantek_6022bl_sources = hw/hantek-6022bl/fw.c +hantek_6022bl_objects = hw/hantek-6022bl/fw.rel -sainsmart_dds120_headers = \ - include/dscr_hantek_6022be.inc \ - include/common.inc - -sainsmart_dds120_sources = \ - sainsmart_dds120.c +sainsmart_dds120_headers = $(scope_headers) +sainsmart_dds120_sources = hw/sainsmart-dds120/fw.c +sainsmart_dds120_objects = hw/sainsmart-dds120/fw.rel -sainsmart_dds120_objects = \ - sainsmart_dds120.rel +yixingdianzi_mdso_headers = $(scope_headers) +yixingdianzi_mdso_sources = hw/yixingdianzi-mdso/fw.c +yixingdianzi_mdso_objects = hw/yixingdianzi-mdso/fw.rel fx2lib_headers = \ fx2lib/include/autovector.h \ @@ -240,15 +243,23 @@ hw_sources = \ hw/sigrok-fx2-8ch/dscr.a51 \ hw/sigrok-fx2-16ch/dscr.a51 \ hw/hantek-6022be/dscr.a51 \ - hw/sainsmart-dds120/dscr.a51 + hw/hantek-6022bl/dscr.a51 \ + hw/sainsmart-dds120/dscr.a51 \ + hw/yixingdianzi-mdso/dscr.a51 firmwaredir = $(datadir)/sigrok-firmware firmware_DATA = $(firmware_binaries) -dist_noinst_DATA = $(fx2lafw_headers) $(fx2lafw_sources) $(hantek_6022be_headers) $(hantek_6022be_sources) $(sainsmart_dds120_sources) $(sainsmart_dds120_headers) $(fx2lib_headers) $(fx2lib_sources) $(fx2lib_ints_sources) $(hw_sources) +dist_noinst_DATA = \ + $(fx2lafw_headers) $(fx2lafw_sources) \ + $(hantek_6022be_headers) $(hantek_6022be_sources) \ + $(hantek_6022bl_headers) $(hantek_6022bl_sources) \ + $(sainsmart_dds120_sources) $(sainsmart_dds120_headers) \ + $(yixingdianzi_mdso_sources) $(yixingdianzi_mdso_headers) \ + $(fx2lib_headers) $(fx2lib_sources) $(fx2lib_ints_sources) $(hw_sources) dist_noinst_SCRIPTS = autogen.sh -MOSTLYCLEANFILES = *.asm fx2lib/lib/*.asm fx2lib/lib/*.lib fx2lib/lib/interrupts/*.asm fx2lib/lib/interrupts/*.lib +MOSTLYCLEANFILES = *.asm fx2lib/lib/*.asm hw/**/*.asm fx2lib/lib/*.lib fx2lib/lib/interrupts/*.asm fx2lib/lib/interrupts/*.lib CLEANFILES = $(firmware_binaries) DISTCLEANFILES = $(dirstamps) @@ -310,8 +321,10 @@ hw/cypress-fx2/dscr.rel: hw/cypress-fx2/$(dirstamp) include/dscr.inc hw/saleae-logic/dscr.rel: hw/saleae-logic/$(dirstamp) include/dscr.inc hw/sigrok-fx2-8ch/dscr.rel: hw/sigrok-fx2-8ch/$(dirstamp) include/dscr.inc hw/sigrok-fx2-16ch/dscr.rel: hw/sigrok-fx2-16ch/$(dirstamp) include/dscr.inc -hw/hantek-6022be/dscr.rel: hw/hantek-6022be/$(dirstamp) include/dscr_hantek_6022be.inc -hw/sainsmart-dds120/dscr.rel: hw/sainsmart-dds120/$(dirstamp) include/dscr_hantek_6022be.inc +hw/hantek-6022be/dscr.rel: hw/hantek-6022be/$(dirstamp) include/dscr_scope.inc +hw/hantek-6022bl/dscr.rel: hw/hantek-6022bl/$(dirstamp) include/dscr_scope.inc +hw/sainsmart-dds120/dscr.rel: hw/sainsmart-dds120/$(dirstamp) include/dscr_scope.inc +hw/yixingdianzi-mdso/dscr.rel: hw/yixingdianzi-mdso/$(dirstamp) include/dscr_scope.inc # Create build subdirectories @@ -321,11 +334,11 @@ $(dirstamps): fx2lib/lib/fx2.lib: $(fx2lib_objects) -$(AM_V_at)rm -f $@ - $(AM_V_GEN)$(SDCCLIB) $@ $(fx2lib_objects) + $(AM_V_GEN)$(SDAR) -rc $@ $(fx2lib_objects) fx2lib/lib/interrupts/ints.lib: $(fx2lib_ints_objects) -$(AM_V_at)rm -f $@ - $(AM_V_GEN)$(SDCCLIB) $@ $(fx2lib_ints_objects) + $(AM_V_GEN)$(SDAR) -rc $@ $(fx2lib_ints_objects) hw/braintechnology-usb-lps/fx2lafw-braintechnology-usb-lps.ihx: hw/braintechnology-usb-lps/dscr.rel $(fx2lafw_objects) $(fx2lib_libs) $(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS) -o $@ hw/braintechnology-usb-lps/dscr.rel $(fx2lafw_objects) $(fx2lib_libs) @@ -355,10 +368,16 @@ hw/sigrok-fx2-16ch/fx2lafw-sigrok-fx2-16ch.ihx: hw/sigrok-fx2-16ch/dscr.rel $(fx $(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS) -o $@ hw/sigrok-fx2-16ch/dscr.rel $(fx2lafw_objects) $(fx2lib_libs) hw/hantek-6022be/fx2lafw-hantek-6022be.ihx: hw/hantek-6022be/dscr.rel $(hantek_6022be_objects) $(fx2lib_libs) - $(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS_HANTEK_6022BE) -o $@ hw/hantek-6022be/dscr.rel $(hantek_6022be_objects) $(fx2lib_libs) + $(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS_SCOPE) -o $@ hw/hantek-6022be/dscr.rel $(hantek_6022be_objects) $(fx2lib_libs) + +hw/hantek-6022bl/fx2lafw-hantek-6022bl.ihx: hw/hantek-6022bl/dscr.rel $(hantek_6022bl_objects) $(fx2lib_libs) + $(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS_SCOPE) -o $@ hw/hantek-6022bl/dscr.rel $(hantek_6022bl_objects) $(fx2lib_libs) hw/sainsmart-dds120/fx2lafw-sainsmart-dds120.ihx: hw/sainsmart-dds120/dscr.rel $(sainsmart_dds120_objects) $(fx2lib_libs) - $(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS_SAINSMART_DDS120) -o $@ hw/sainsmart-dds120/dscr.rel $(sainsmart_dds120_objects) $(fx2lib_libs) + $(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS_SCOPE) -o $@ hw/sainsmart-dds120/dscr.rel $(sainsmart_dds120_objects) $(fx2lib_libs) + +hw/yixingdianzi-mdso/fx2lafw-yixingdianzi-mdso.ihx: hw/yixingdianzi-mdso/dscr.rel $(yixingdianzi_mdso_objects) $(fx2lib_libs) + $(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS_SCOPE) -o $@ hw/yixingdianzi-mdso/dscr.rel $(yixingdianzi_mdso_objects) $(fx2lib_libs) .a51.rel: $(SF_V_SDAS)$(SDAS8051) -glos $(as_includes) $@ $<