From d8fa011494a7c1be13ef29a083b0addbebf9548d Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 25 Nov 2003 15:36:00 +0000 Subject: [PATCH] Ok, things are working now... --- Makefile.am | 14 ++++++++++++++ configure.in | 10 ++++++++++ cvscompile | 14 ++++++++++++++ hdsploader/Makefile.am | 30 +++++++++++++++++++++++++++++- hdsploader/tobin.c | 11 +++++++++++ mixartloader/Makefile.am | 9 ++++++++- vxloader/Makefile.am | 10 +++++++++- 7 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 Makefile.am create mode 100644 configure.in create mode 100644 cvscompile diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..e59f047 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,14 @@ +# # Process this file with automake to produce Makefile.in. +AUTOMAKE_OPTIONS = 1.3 foreign + +SUBDIRS = hdsploader mixartloader vxloader + +EXTRA_DIST = depcomp + +dist-hook: + -chmod -R a+r $(distdir) + @if ! test -z "$(AMTAR)"; then \ + $(AMTAR) --create --verbose --file=- $(distdir) | bzip2 -c -9 > $(distdir).tar.bz2 ; \ + else \ + $(TAR) --create --verbose --file=- $(distdir) | bzip2 -c -9 > $(distdir).tar.bz2 ; \ + fi diff --git a/configure.in b/configure.in new file mode 100644 index 0000000..431eaeb --- /dev/null +++ b/configure.in @@ -0,0 +1,10 @@ +AC_INIT(hdsploader/tobin.c) +AM_INIT_AUTOMAKE(alsa-firmware, 1.0.0pre3) +AC_PROG_CC +AC_PROG_INSTALL +AC_HEADER_STDC + +AC_OUTPUT(Makefile \ + hdsploader/Makefile \ + mixartloader/Makefile \ + vxloader/Makefile) diff --git a/cvscompile b/cvscompile new file mode 100644 index 0000000..961d771 --- /dev/null +++ b/cvscompile @@ -0,0 +1,14 @@ +#!/bin/bash + +libtoolize --automake --copy +aclocal $ACLOCAL_FLAGS +automake --foreign --copy --add-missing +autoconf +export CFLAGS='-O2 -Wall -W -pipe -g' +echo "CFLAGS=$CFLAGS" +echo "./configure $@" +./configure $@ || exit 1 +unset CFLAGS +if [ -z "$CVSCOMPILE_NO_MAKE" ]; then + make +fi diff --git a/hdsploader/Makefile.am b/hdsploader/Makefile.am index 9688111..4f23847 100644 --- a/hdsploader/Makefile.am +++ b/hdsploader/Makefile.am @@ -1 +1,29 @@ -EXTRA_DIST = $(wildcard *.dat) +# # Process this file with automake to produce Makefile.in. +MYNAME = hdsploader +EXTRA_DIST = digiface_firmware.dat \ + digiface_firmware_rev11.dat \ + multiface_firmware.dat \ + multiface_firmware_rev11.dat \ + tobin.c +CLEANFILES = tobin *.bin + +firmwaredir = $(datadir)/alsa/firmware/$(MYNAME) +firmware_DATA = digiface_firware.bin \ + digiface_firmware_rev11.bin \ + multiface_firmware.bin \ + multiface_firmware_rev11.bin + +tobin: tobin.c $(wildcat *.dat) + $(CC) -o tobin tobin.c + ./tobin + +digiface_firware.bin: tobin +digiface_firmware_rev11.bin: tobin +multiface_firmware.bin: tobin +multiface_firmware_rev11.bin: tobin + +alsa-dist: distdir + @rm -rf ../distdir/$(MYNAME) + @mkdir -p ../distdir/$(MYNAME) + @cp -RLpv $(distdir)/* ../distdir/$(MYNAME) + @rm -rf $(distdir) diff --git a/hdsploader/tobin.c b/hdsploader/tobin.c index 967703e..4232f65 100644 --- a/hdsploader/tobin.c +++ b/hdsploader/tobin.c @@ -1,6 +1,7 @@ #include #include #include +#include #include "digiface_firmware.dat" #include "digiface_firmware_rev11.dat" @@ -13,6 +14,16 @@ int write_bin_file(u_int32_t *array, const char *filename) if ((out = fopen(filename, "w+")) == NULL) return -1; +#if __BYTE_ORDER == __BIG_ENDIAN + { + unsigned int idx; + for (idx = 0; idx < 24413; idx++) + array[idx] = ((array[idx] & 0x000000ff) << 16) | + ((array[idx] & 0x0000ff00) << 8) | + ((array[idx] & 0x00ff0000) >> 8) | + ((array[idx] & 0xff000000) >> 16); + } +#endif if (fwrite(array, 4, 24413, out) != 24413) { fclose(out); return -1; diff --git a/mixartloader/Makefile.am b/mixartloader/Makefile.am index 661578e..622dbc6 100644 --- a/mixartloader/Makefile.am +++ b/mixartloader/Makefile.am @@ -1,3 +1,5 @@ +MYNAME = mixartloader + cfg_files = miXart.conf \ miXart8AES.xlx \ miXart8.elf \ @@ -5,6 +7,11 @@ cfg_files = miXart.conf \ EXTRA_DIST = $(cfg_files) -firmwaredir = $(datadir)/alsa/firmware/mixartloader +firmwaredir = $(datadir)/alsa/firmware/$(MYNAME) firmware_DATA = $(cfg_files) +alsa-dist: distdir + @rm -rf ../distdir/$(MYNAME) + @mkdir -p ../distdir/$(MYNAME) + @cp -RLpv $(distdir)/* ../distdir/$(MYNAME) + @rm -rf $(distdir) diff --git a/vxloader/Makefile.am b/vxloader/Makefile.am index d111e71..a9f8560 100644 --- a/vxloader/Makefile.am +++ b/vxloader/Makefile.am @@ -1,3 +1,5 @@ +MYNAME = vxloader + cfg_files = vx222.conf vxboard.conf vxpocket.conf vxp440.conf \ bd56002.boot \ bd563s3.boot \ @@ -15,5 +17,11 @@ cfg_files = vx222.conf vxboard.conf vxpocket.conf vxp440.conf \ EXTRA_DIST = $(cfg_files) -firmwaredir = $(datadir)/alsa/firmware/vxloader +firmwaredir = $(datadir)/alsa/firmware/$(MYNAME) firmware_DATA = $(cfg_files) + +alsa-dist: distdir + @rm -rf ../distdir/$(MYNAME) + @mkdir -p ../distdir/$(MYNAME) + @cp -RLpv $(distdir)/* ../distdir/$(MYNAME) + @rm -rf $(distdir) -- 2.47.1