Merge branch 'mb_eeprom'

23 files changed, 142 insertions, 1716 deletions

diff --git a/firmware/fx2/config/.gitignore b/firmware/fx2/config/.gitignore
deleted file mode 100644
index 16f775e32..000000000
--- a/firmware/fx2/config/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-/*.cache
-/*.la
-/*.lo
-/*.pc
-/.deps
-/.la
-/.libs
-/.lo
-/Makefile
-/Makefile.in
-/libtool.m4
-/lt~obsolete.m4
-/ltsugar.m4
-/ltversion.m4
-/ltoptions.m4
diff --git a/firmware/fx2/config/CMakeASM_SDCCInformation.cmake b/firmware/fx2/config/CMakeASM_SDCCInformation.cmake
new file mode 100644
index 000000000..d9f28b8d3
--- /dev/null
+++ b/firmware/fx2/config/CMakeASM_SDCCInformation.cmake
@@ -0,0 +1,28 @@
+#
+# Copyright 2010 Ettus Research LLC
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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, see <http://www.gnu.org/licenses/>.
+#
+
+# support for the SDCC assembler, asx8051
+SET( ASM_DIALECT "_SDCC" )
+SET( CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS a51 )
+
+#i don't want to talk about it. i had such high hopes for CMake.
+SET( CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <FLAGS> -plosgff <SOURCE>" "${CMAKE_COMMAND} -DFILE=<OBJECT> -DSOURCE=<SOURCE> -P ${CMAKE_SOURCE_DIR}/config/Rename.cmake")
+
+INCLUDE( CMakeASMInformation )
+SET( CMAKE_ASM${ASM_DIALECT}_OUTPUT_EXTENSION ".rel" ) #must go here because the include appears to overwrite it, although it shouldn't
+# for future use
+SET( ASM_DIALECT )
diff --git a/firmware/fx2/config/CMakeDetermineASM_SDCCCompiler.cmake b/firmware/fx2/config/CMakeDetermineASM_SDCCCompiler.cmake
new file mode 100644
index 000000000..ab301b9f3
--- /dev/null
+++ b/firmware/fx2/config/CMakeDetermineASM_SDCCCompiler.cmake
@@ -0,0 +1,22 @@
+
+#=============================================================================
+# Copyright 2008-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distributed this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+# Find the MS assembler (masm or masm64)
+
+SET(ASM_DIALECT "_SDCC")
+
+SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT asx8051)
+
+INCLUDE(CMakeDetermineASMCompiler)
+SET(ASM_DIALECT)
diff --git a/firmware/fx2/config/CMakeTestASM_SDCCCompiler.cmake b/firmware/fx2/config/CMakeTestASM_SDCCCompiler.cmake
new file mode 100644
index 000000000..1cb71cd9d
--- /dev/null
+++ b/firmware/fx2/config/CMakeTestASM_SDCCCompiler.cmake
@@ -0,0 +1,23 @@
+
+#=============================================================================
+# Copyright 2007-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distributed this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+# This file is used by EnableLanguage in cmGlobalGenerator to
+# determine that that selected ASM-ATT compiler can actually compile
+# and link the most basic of programs.   If not, a fatal error
+# is set and cmake stops processing commands and will not generate
+# any makefiles or projects.
+
+SET(ASM_DIALECT "_SDCC")
+INCLUDE(CMakeTestASMCompiler)
+SET(ASM_DIALECT)
diff --git a/firmware/fx2/config/Makefile.am b/firmware/fx2/config/Makefile.am
deleted file mode 100644
index 487ceed1b..000000000
--- a/firmware/fx2/config/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright 2001,2006,2008,2009,2010 Free Software Foundation, Inc.
-# 
-# This file is part of GNU Radio
-# 
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-# 
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-# Install m4 macros in this directory
-m4datadir = $(datadir)/aclocal
-
-# List your m4 macros here
-m4macros = \
-	grc_build.m4 \
-	grc_fx2.m4 \
-	gr_git.m4 \
-	gr_lib64.m4 \
-	gr_no_undefined.m4 \
-	gr_pwin32.m4 \
-	gr_python.m4 \
-	gr_require_mc4020.m4 \
-	gr_scripting.m4 \
-	gr_set_md_cpu.m4 \
-	gr_standalone.m4 \
-	lf_cc.m4 \
-	lf_cxx.m4 \
-	lf_warnings.m4 \
-	lf_x11.m4 \
-	mkstemp.m4 \
-	onceonly.m4 \
-	pkg.m4 \
-	usrp_sdcc.m4
-
-EXTRA_DIST = $(m4macros) 
diff --git a/firmware/fx2/config/Rename.cmake b/firmware/fx2/config/Rename.cmake
new file mode 100644
index 000000000..36cd33527
--- /dev/null
+++ b/firmware/fx2/config/Rename.cmake
@@ -0,0 +1,37 @@
+#
+# Copyright 2010 Ettus Research LLC
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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, see <http://www.gnu.org/licenses/>.
+#
+
+#go and fetch the real compiler outputs because the compiler does things wrong and CMake is too damn brittle to cope
+#just incidentally, why the heck does aslink look for a .lst input? why should it care?
+
+#first the .rel
+get_filename_component(source_noext ${SOURCE} NAME_WE)
+get_filename_component(source_path ${SOURCE} PATH)
+set(compiled_ext .rel)
+list(APPEND compiled_filepath ${source_path}/${source_noext}${compiled_ext})
+#EXECUTE_PROCESS(COMMAND echo Moving ${compiled_filepath} to ${FILE})
+EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E rename ${compiled_filepath} ${FILE})
+
+#now do the same for the .lst
+set(compiled_lst .lst)
+get_filename_component(src_ext ${SOURCE} EXT)
+get_filename_component(lst_noext ${FILE} NAME_WE)
+get_filename_component(lst_path ${FILE} PATH)
+list(APPEND compiled_lstpath ${source_path}/${source_noext}${compiled_lst})
+list(APPEND compiled_outputlstpath ${lst_path}/${lst_noext}${src_ext}${compiled_lst})
+#EXECUTE_PROCESS(COMMAND echo Moving ${compiled_lstpath} to ${compiled_outputlstpath})
+EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E rename ${compiled_lstpath} ${compiled_outputlstpath})
diff --git a/firmware/fx2/config/Toolchain-sdcc.cmake b/firmware/fx2/config/Toolchain-sdcc.cmake
new file mode 100644
index 000000000..733d8f563
--- /dev/null
+++ b/firmware/fx2/config/Toolchain-sdcc.cmake
@@ -0,0 +1,32 @@
+#
+# Copyright 2010 Ettus Research LLC
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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, see <http://www.gnu.org/licenses/>.
+#
+
+# the name of the target operating system
+SET(CMAKE_SYSTEM_NAME Generic)
+# which compilers to use for C and C++
+SET(CMAKE_C_COMPILER sdcc)
+
+# here is where the target environment is located
+SET(CMAKE_FIND_ROOT_PATH  /usr/bin /usr/share/sdcc)
+
+# adjust the default behaviour of the FIND_XXX() commands:
+# search headers and libraries in the target environment, search 
+# programs in the host environment
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
diff --git a/firmware/fx2/config/gr_git.m4 b/firmware/fx2/config/gr_git.m4
deleted file mode 100644
index 5e8aa663b..000000000
--- a/firmware/fx2/config/gr_git.m4
+++ /dev/null
@@ -1,58 +0,0 @@
-dnl Copyright 2009,2010 Free Software Foundation, Inc.
-dnl 
-dnl This file is part of GNU Radio
-dnl 
-dnl GNU Radio is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
-dnl 
-dnl GNU Radio is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl 
-dnl You should have received a copy of the GNU General Public License
-dnl along with GNU Radio; see the file COPYING.  If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street,
-dnl Boston, MA 02110-1301, USA.
-
-
-AC_DEFUN([GR_GIT],[
-  dnl Identify git binary
-  AC_PATH_PROG([GIT],[git])
-  
-  dnl If it exists, get either 'git describe' or fallback to current commit
-  if test x$GIT != x ; then
-    AC_MSG_CHECKING([existence of git version control directory])
-    if test -d $srcdir/.git ; then
-      AC_MSG_RESULT([ok])
-      AC_MSG_CHECKING([git description of current commit])
-      if (cd $srcdir && $GIT describe >/dev/null 2>&1); then
-        GIT_DESCRIBE=`cd $srcdir && $GIT describe --abbrev=8 --long`
-	GIT_TAG=`echo $GIT_DESCRIBE | cut -f 1 -d '-'`
-        GIT_SEQNO=`echo $GIT_DESCRIBE | cut -f 2 -d '-'`
-	GIT_COMMIT=`echo $GIT_DESCRIBE | cut -f 3 -d '-' | cut -f 2- -d 'g'`
-        # Release candidate tags create an extra -rcX field
-	if test x`echo $GIT_DESCRIBE | cut -f 1- -d '-' --output-delimiter=' ' | wc -w` = x4; then
-	  GIT_TAG=`echo $GIT_DESCRIBE | cut -f -2 -d '-'`
-	  GIT_SEQNO=`echo $GIT_DESCRIBE | cut -f 3 -d '-'`
-	  GIT_COMMIT=`echo $GIT_DESCRIBE | cut -f 4 -d '-' | cut -f 2- -d 'g'`
-	fi
-	AC_MSG_RESULT([$GIT_DESCRIBE])
-      else
-        AC_MSG_RESULT([unable to find, using current commit])
-	GIT_TAG=''
-	GIT_SEQNO=''
-	GIT_COMMIT=`cd $srcdir && $GIT describe --always --abbrev=8`
-      fi
-    else
-      AC_MSG_RESULT([not found])
-    fi
-
-    AC_SUBST([GIT_DESCRIBE])
-    AC_SUBST([GIT_TAG])
-    AC_SUBST([GIT_SEQNO])
-    AC_SUBST([GIT_COMMIT])
-  fi
-])
diff --git a/firmware/fx2/config/gr_lib64.m4 b/firmware/fx2/config/gr_lib64.m4
deleted file mode 100644
index 751f774b4..000000000
--- a/firmware/fx2/config/gr_lib64.m4
+++ /dev/null
@@ -1,85 +0,0 @@
-dnl
-dnl Copyright 2005,2008 Free Software Foundation, Inc.
-dnl 
-dnl This file is part of GNU Radio
-dnl 
-dnl GNU Radio is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
-dnl 
-dnl GNU Radio is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl 
-dnl You should have received a copy of the GNU General Public License
-dnl along with GNU Radio; see the file COPYING.  If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street,
-dnl Boston, MA 02110-1301, USA.
-dnl 
-
-dnl GR_LIB64()
-dnl
-dnl Checks to see if we're on a x86_64 or powerpc64 machine, and if so, determine
-dnl if libdir should end in "64" or not.
-dnl
-dnl Sets gr_libdir_suffix to "" or "64" and calls AC_SUBST(gr_libdir_suffix)
-dnl May append "64" to libdir.
-dnl
-dnl The current heuristic is:
-dnl   if the host_cpu isn't x86_64 or powerpc64, then ""
-dnl   if the host_os isn't linux, then ""
-dnl   if we're cross-compiling, ask the linker, by way of the selected compiler
-dnl   if we're x86_64 and there's a /lib64 and it's not a symlink, then "64", else ""
-dnl   else ask the compiler
-dnl
-AC_DEFUN([GR_LIB64],[
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([AC_PROG_CXX])
-
-  AC_MSG_CHECKING([gr_libdir_suffix])
-  gr_libdir_suffix=""
-  AC_SUBST(gr_libdir_suffix)
-
-  case "$host_os" in
-    linux*) is_linux=yes ;;
-    *)      is_linux=no  ;;
-  esac
-
-  if test "$is_linux" = no || test "$host_cpu" != "x86_64" && test "$host_cpu" != "powerpc64"; then
-    gr_libdir_suffix=""
-  elif test "$cross_compiling" = yes; then
-    _GR_LIB64_ASK_COMPILER
-  elif test "$host_cpu" = "x86_64"; then
-    if test -d /lib64 && test ! -L /lib64; then
-      gr_libdir_suffix=64
-    fi
-  else
-    _GR_LIB64_ASK_COMPILER  
-  fi
-  AC_MSG_RESULT([$gr_libdir_suffix])
-
-
-  AC_MSG_CHECKING([whether to append 64 to libdir])
-  t=${libdir##*/lib}
-  if test "$t" != 64 && test "$gr_libdir_suffix" = "64"; then
-    libdir=${libdir}64
-    AC_MSG_RESULT([yes. Setting libdir to $libdir])
-  else
-    AC_MSG_RESULT([no])
-  fi
-])
-
-dnl If we're using g++, extract the first SEARCH_DIR("...") entry from the linker script
-dnl and see if it contains a suffix after the final .../lib part of the path.
-dnl (This works because the linker script varies depending on whether we're generating
-dnl 32-bit or 64-bit executables)
-dnl
-AC_DEFUN([_GR_LIB64_ASK_COMPILER],[
-  if test "$ac_cv_cxx_compiler_gnu" = "yes";
-  then
-    gr_libdir_suffix=`$CXX -Wl,--verbose 2>/dev/null | sed -n -e '/SEARCH_DIR/{s/;.*$//; s,^.*/,,; s/".*$//; s/^lib//; p}'`
-  fi
-])
-
diff --git a/firmware/fx2/config/gr_no_undefined.m4 b/firmware/fx2/config/gr_no_undefined.m4
deleted file mode 100644
index c8d745d5f..000000000
--- a/firmware/fx2/config/gr_no_undefined.m4
+++ /dev/null
@@ -1,44 +0,0 @@
-dnl
-dnl Copyright 2005 Free Software Foundation, Inc.
-dnl 
-dnl This file is part of GNU Radio
-dnl 
-dnl GNU Radio is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
-dnl 
-dnl GNU Radio is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl 
-dnl You should have received a copy of the GNU General Public License
-dnl along with GNU Radio; see the file COPYING.  If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street,
-dnl Boston, MA 02110-1301, USA.
-dnl 
-
-# GR_NO_UNDEFINED()
-#
-# Detemine whether we need to use the -no-undefined linker flag
-# when building shared libraries.  
-# Sets NO_UNDEFINED to "" or "-no-undefined"
-# 
-# As far as I can tell, we need -no-undefined only when building
-# windows DLLs.  This occurs when using MinGW and Cygwin.
-#
-# For now, we stub this out.
-
-AC_DEFUN([GR_NO_UNDEFINED],[
-	AC_REQUIRE([AC_CANONICAL_HOST])
-	no_undefined=""
-	case "${host_os}" in
-		*mingw* | *cygwin*)
-
-		# on MinGW/Cygwin extra LDFLAGS are required
-		no_undefined="-no-undefined"
-		;;
-	esac
-	AC_SUBST(NO_UNDEFINED,[$no_undefined])
-])
diff --git a/firmware/fx2/config/gr_pwin32.m4 b/firmware/fx2/config/gr_pwin32.m4
deleted file mode 100644
index 495e9dd4d..000000000
--- a/firmware/fx2/config/gr_pwin32.m4
+++ /dev/null
@@ -1,149 +0,0 @@
-# Check for (mingw)win32 POSIX replacements.             -*- Autoconf -*-
-
-# Copyright 2003,2004,2005 Free Software Foundation, Inc.
-# 
-# This file is part of GNU Radio
-# 
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-# 
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-
-
-AC_DEFUN([GR_PWIN32],
-[
-AC_REQUIRE([AC_HEADER_TIME])
-AC_CHECK_HEADERS([sys/types.h fcntl.h io.h])
-AC_CHECK_HEADERS([windows.h])
-AC_CHECK_HEADERS([winioctl.h winbase.h], [], [], [
-	#if HAVE_WINDOWS_H
-	#include <windows.h>
-	#endif
-])
-
-AC_CHECK_FUNCS([getopt usleep gettimeofday nanosleep rand srand random srandom sleep sigaction])
-AC_CHECK_TYPES([struct timezone, struct timespec, ssize_t],[],[],[
-     #if HAVE_SYS_TYPES_H
-     # include <sys/types.h>
-     #endif
-     #if TIME_WITH_SYS_TIME
-     # include <sys/time.h>
-     # include <time.h>
-     #else
-     # if HAVE_SYS_TIME_H
-     #  include <sys/time.h>
-     # else
-     #  include <time.h>
-     # endif
-     #endif
-])
-
-dnl Checks for replacements
-AC_REPLACE_FUNCS([getopt usleep gettimeofday])
-
-
-AC_MSG_CHECKING(for Sleep)
-AC_TRY_LINK([   #include <windows.h>
-                #include <winbase.h>
-                ], [ Sleep(0); ],
-                [AC_DEFINE(HAVE_SSLEEP,1,[Define to 1 if you have win32 Sleep])
-                AC_MSG_RESULT(yes)],
-                AC_MSG_RESULT(no)
-                )
-
-dnl Under Win32, mkdir prototype in io.h has only one arg
-AC_MSG_CHECKING(whether mkdir accepts only one arg)
-AC_TRY_COMPILE([#include <sys/types.h>
-       #include <sys/stat.h>
-       #include <fcntl.h>], [
-       mkdir("")
- ], [ AC_MSG_RESULT(yes)
-     AC_DEFINE(MKDIR_TAKES_ONE_ARG,[],[Define if mkdir accepts only one arg]) ],
- [ AC_MSG_RESULT(no)
- ])
-
-AH_BOTTOM(
-[
-/* Define missing prototypes, implemented in replacement lib */
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifndef HAVE_GETOPT
-int getopt (int argc, char * const argv[], const char * optstring);
-extern char * optarg;
-extern int optind, opterr, optopt;
-#endif
-
-#ifndef HAVE_USLEEP
-int usleep(unsigned long usec);	/* SUSv2 */
-#endif
-
-#ifndef HAVE_NANOSLEEP
-#ifndef HAVE_STRUCT_TIMESPEC
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>	/* need time_t */
-#endif
-struct timespec {
-	time_t	tv_sec;
-	long	tv_nsec;
-};
-#endif
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-static inline int nanosleep(const struct timespec *req, struct timespec *rem) { return usleep(req->tv_sec*1000000+req->tv_nsec/1000); }
-#endif
-
-#if defined(HAVE_SSLEEP) && !defined(HAVE_SLEEP)
-#ifdef HAVE_WINBASE_H
-#include <windows.h>
-#include <winbase.h>
-#endif
-/* TODO: what about SleepEx? */
-static inline unsigned int sleep (unsigned int nb_sec) { Sleep(nb_sec*1000); return 0; }
-#endif
-
-#ifndef HAVE_GETTIMEOFDAY
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifndef HAVE_STRUCT_TIMEZONE
-struct timezone {
-        int  tz_minuteswest;
-	int  tz_dsttime;
-};
-#endif
-int gettimeofday(struct timeval *tv, struct timezone *tz);
-#endif
-
-#if !defined(HAVE_RANDOM) && defined(HAVE_RAND)
-#include <stdlib.h>
-static inline long int random (void) { return rand(); }
-#endif
-
-#if !defined(HAVE_SRANDOM) && defined(HAVE_SRAND)
-static inline void srandom (unsigned int seed) { srand(seed); }
-#endif
-
-#ifndef HAVE_SSIZE_T
-typedef size_t ssize_t;
-#endif
-
-#ifdef  __cplusplus
-}
-#endif
-])
-
-
-])
diff --git a/firmware/fx2/config/gr_python.m4 b/firmware/fx2/config/gr_python.m4
deleted file mode 100644
index 43ccfc015..000000000
--- a/firmware/fx2/config/gr_python.m4
+++ /dev/null
@@ -1,172 +0,0 @@
-dnl
-dnl Copyright 2003,2004,2005 Free Software Foundation, Inc.
-dnl 
-dnl This file is part of GNU Radio
-dnl 
-dnl GNU Radio is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
-dnl 
-dnl GNU Radio is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl 
-dnl You should have received a copy of the GNU General Public License
-dnl along with GNU Radio; see the file COPYING.  If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street,
-dnl Boston, MA 02110-1301, USA.
-dnl 
-
-# PYTHON_DEVEL()
-#
-# Checks for Python and tries to get the include path to 'Python.h'.
-# It sets the $(PYTHON_CPPFLAGS), $(PYTHON_LDFLAGS) and $(pythondir) output variables,
-#
-AC_DEFUN([PYTHON_DEVEL],[
-	AC_REQUIRE([AM_PATH_PYTHON])
-	AC_REQUIRE([AC_CANONICAL_HOST])
-
-	AC_ARG_WITH(pythondir,
-                    AC_HELP_STRING([--with-pythondir=DIR], 
-                       [python installation directory (cross-compiling) [[default=$prefix/lib/python2.5/site-packages]]]),
-		    [with_pythondir=${withval}],[with_pythondir=${prefix}/lib/python2.5/site-packages])
-
-	# if we're cross-compiling, asking the host python about any of
-	# this is completely useless...
-
-	if test x$cross_compiling != xno
-	then
-		pythondir=$with_pythondir
-		pyexecdir=$with_pythondir
-		AC_SUBST(PYTHON_CPPFLAGS)
-		AC_SUBST(PYTHON_LDFLAGS)
-        else
-
-	    # For Fedora Core 5 and 6, see ticket:39 in Trac
-	    if test -f '/etc/redhat-release'; then
-		    if  (echo $pyexecdir | grep -q lib64); then
-			    pythondir="$pyexecdir"
-		    fi
-	    fi
-
-	    # Check for Python include path
-	    AC_MSG_CHECKING([for Python include path])
-	    if test -z "$PYTHON" ; then
-		    AC_MSG_ERROR([cannot find Python path])
-	    fi
-
-	    # ask distutils which include path we should use
-	    python_cmd='
-import distutils.sysconfig
-import os
-path = distutils.sysconfig.get_python_inc(plat_specific=False)
-if os.sep == "\\":
-  path = path.replace("\\", "/")
-print path
-'
-	    python_path=`$PYTHON -c "$python_cmd"`
-	    AC_MSG_RESULT([$python_path])
-	    if test -z "$python_path" ; then
-		    AC_MSG_ERROR([cannot find Python include path])
-	    fi
-
-	    AC_SUBST(PYTHON_CPPFLAGS,[-I$python_path])
-
-	    # Check for Python headers usability
-	    python_save_CPPFLAGS=$CPPFLAGS
-	    CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
-	    AC_CHECK_HEADERS([Python.h], [],
-			    [AC_MSG_ERROR([cannot find usable Python headers])])
-	    CPPFLAGS="$python_save_CPPFLAGS"
-
-	    # Only set this on mingw and cygwin hosts, (only implemented
-	    # for mingw host, for crosscompiling you need to trick this)
-
-	    PYTHON_LDFLAGS=""
-	    case $host_os in
-		 *mingw* | *cygwin* )
-	      AC_MSG_CHECKING([for Python LDFLAGS])
-
-	    python_cmd='
-import distutils.sysconfig
-import os
-path = distutils.sysconfig.get_config_var("LIBPL")
-if path == None:
-  path = distutils.sysconfig.PREFIX + "/libs"
-if os.sep == "\\":
-  path = path.replace("\\", "/")
-print path
-'
-	      python_stdlib_path=`$PYTHON -c "$python_cmd"`
-
-	      python_version_nodot=`echo $PYTHON_VERSION | sed "s,\.,,"`
-	      libpython_name="python$PYTHON_VERSION"
-
-	      # Standard install of python for win32 has libpython24.a
-	      # instead of libpython2.4.a so we check for the library
-	      # without the dot in the version number.
-
-	      python_stdlib_filename=`find $python_stdlib_path -type f -name libpython$python_version_nodot.* -print | sed "1q"`
-	      if test -n "$python_stdlib_filename" ; then
-		    libpython_name="python$python_version_nodot"
-	      fi
-
-	      PYTHON_LDFLAGS="-L$python_stdlib_path -l$libpython_name"
-	      AC_MSG_RESULT($PYTHON_LDFLAGS) 
-	      # Replace all backslashes in PYTHON Paths with forward slashes
-	      pythondir=`echo $pythondir |sed 's,\\\\,/,g'`
-	      pkgpythondir=`echo $pkgpythondir |sed 's,\\\\,/,g'`
-	      pyexecdir=`echo $pyexecdir |sed 's,\\\\,/,g'`
-	      pkgpyexecdir=`echo $pkgpyexecdir |sed 's,\\\\,/,g'`
-	      ;;
-	    esac
-
-	    case $host_os in
-		 *mingw* )
-	      # Python 2.5 requires ".pyd" instead of ".dll" for extensions
-	      PYTHON_LDFLAGS="-shrext .pyd ${PYTHON_LDFLAGS}"
-	    esac
-
-	    AC_SUBST(PYTHON_LDFLAGS)
-	fi
-])
-
-# PYTHON_CHECK_MODULE
-#
-# Determines if a particular Python module can be imported
-#
-# $1 - module name
-# $2 - module description
-# $3 - action if found
-# $4 - action if not found
-# $5 - test command
-
-AC_DEFUN([PYTHON_CHECK_MODULE],[
-    AC_MSG_CHECKING([for $2])
-    dnl ########################################
-    dnl # import and test checking
-    dnl ########################################
-    if test "$5"; then
-        python_cmd='
-try:
-    import $1
-    assert $5
-except: exit(1)'
-    dnl ########################################
-    dnl # import checking only
-    dnl ########################################
-    else
-        python_cmd='
-try: import $1
-except: exit(1)'
-    fi
-    if ! $PYTHON -c "$python_cmd" 2> /dev/null; then
-        AC_MSG_RESULT([no])
-        $4
-    else
-        AC_MSG_RESULT([yes])
-        $3
-    fi
-])
diff --git a/firmware/fx2/config/gr_scripting.m4 b/firmware/fx2/config/gr_scripting.m4
deleted file mode 100644
index 2803e975f..000000000
--- a/firmware/fx2/config/gr_scripting.m4
+++ /dev/null
@@ -1,26 +0,0 @@
-dnl
-dnl Copyright 2003 Free Software Foundation, Inc.
-dnl 
-dnl This file is part of GNU Radio
-dnl 
-dnl GNU Radio is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
-dnl 
-dnl GNU Radio is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl 
-dnl You should have received a copy of the GNU General Public License
-dnl along with GNU Radio; see the file COPYING.  If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street,
-dnl Boston, MA 02110-1301, USA.
-dnl 
-
-AC_DEFUN([GR_SCRIPTING],[
-  AC_REQUIRE([AC_PROG_LN_S])
-  AC_REQUIRE([AC_PROG_CXX])
-  AC_REQUIRE([AC_PROG_LIBTOOL])
-])
diff --git a/firmware/fx2/config/gr_standalone.m4 b/firmware/fx2/config/gr_standalone.m4
deleted file mode 100644
index 370f7fb03..000000000
--- a/firmware/fx2/config/gr_standalone.m4
+++ /dev/null
@@ -1,116 +0,0 @@
-dnl
-dnl Copyright 2008 Free Software Foundation, Inc.
-dnl 
-dnl This file is part of GNU Radio
-dnl 
-dnl GNU Radio is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
-dnl 
-dnl GNU Radio is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl 
-dnl You should have received a copy of the GNU General Public License along
-dnl with this program; if not, write to the Free Software Foundation, Inc.,
-dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-dnl
-
-dnl
-dnl GR_STANDALONE([package],[version])
-dnl
-dnl Handles the bulk of the configure.ac work for an out-of-tree build
-dnl
-dnl N.B., this is an m4_define because if it were an AC_DEFUN it would
-dnl get called too late to be useful.
-
-m4_define([GR_STANDALONE],
-[
-  AC_INIT([$1],[$2])
-  AC_PREREQ(2.57)
-  AC_CONFIG_SRCDIR([config/gr_standalone.m4])
-  AC_CONFIG_AUX_DIR([.])	
-  AM_CONFIG_HEADER(config.h)
-
-  AC_CANONICAL_BUILD
-  AC_CANONICAL_HOST
-  AC_CANONICAL_TARGET
-
-  AM_INIT_AUTOMAKE
-
-  LF_CONFIGURE_CC
-  LF_CONFIGURE_CXX
-  GR_LIB64		dnl check for lib64 suffix after choosing compilers
-
-  dnl add ${prefix}/lib${gr_libdir_suffix}/pkgconfig to the head of the PKG_CONFIG_PATH
-  if test x${PKG_CONFIG_PATH} = x; then
-      PKG_CONFIG_PATH=${prefix}/lib${gr_libdir_suffix}/pkgconfig
-  else
-      PKG_CONFIG_PATH=${prefix}/lib${gr_libdir_suffix}/pkgconfig:${PKG_CONFIG_PATH}
-  fi
-  export PKG_CONFIG_PATH
-
-  LF_SET_WARNINGS
-  GR_SET_GPROF
-  GR_SET_PROF
-  AM_PROG_AS
-  AC_PROG_LN_S
-  AC_PROG_MAKE_SET
-  AC_PROG_INSTALL
-  AC_PATH_PROG([RM_PROG], [rm])
-
-  AC_LIBTOOL_WIN32_DLL
-  AC_ENABLE_SHARED	dnl do build shared libraries
-  AC_DISABLE_STATIC	dnl don't build static libraries
-  m4_ifdef([LT_INIT],[LT_INIT],[AC_PROG_LIBTOOL])
-  dnl GR_FORTRAN
-
-  GR_NO_UNDEFINED	dnl do we need the -no-undefined linker flag
-  GR_SCRIPTING		dnl Locate python, SWIG, etc
-
-  AC_ARG_WITH([python],
-    AC_HELP_STRING([--with-python], [Should we use python? [[default=yes]]]),
-    [case "$with_python" in
-      (no | yes) ;;
-      (*) AC_MSG_ERROR([Invalid argument ($with_python) to --with-python]) ;;
-     esac],
-    [with_python=yes])
-
-  AM_CONDITIONAL([USE_PYTHON], [test "$with_python" = yes])
-
-
-  dnl Set the c++ compiler that we use for the build system when cross compiling
-  if test "x$CXX_FOR_BUILD" = x
-  then
-    CXX_FOR_BUILD=${CXX}
-  fi
-  AC_SUBST(CXX_FOR_BUILD)
-
-  dnl Checks for header files.
-  AC_HEADER_STDC
-
-  dnl Checks for typedefs, structures, and compiler characteristics.
-  AC_C_CONST
-  AC_C_INLINE
-  AC_TYPE_SIZE_T
-  AC_HEADER_TIME
-  AC_C_BIGENDIAN
-
-  dnl Check for Mingw support
-  GR_PWIN32
-
-  AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
-  AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])
-
-  dnl Define where to look for cppunit includes and libs
-  dnl sets CPPUNIT_CFLAGS and CPPUNIT_LIBS
-  dnl Try using pkg-config first, then fall back to cppunit-config.
-  PKG_CHECK_EXISTS(cppunit,
-    [PKG_CHECK_MODULES(CPPUNIT, cppunit >= 1.9.14)],
-    [AM_PATH_CPPUNIT([1.9.14],[],
-		     [AC_MSG_ERROR([GNU Radio requires cppunit.  Stop])])])
-
-  PKG_CHECK_MODULES(GNURADIO_CORE, gnuradio-core >= 3)
-])
diff --git a/firmware/fx2/config/grc_build.m4 b/firmware/fx2/config/grc_build.m4
deleted file mode 100644
index 77b59db6b..000000000
--- a/firmware/fx2/config/grc_build.m4
+++ /dev/null
@@ -1,287 +0,0 @@
-dnl Copyright 2006,2008,2009 Free Software Foundation, Inc.
-dnl 
-dnl This file is part of GNU Radio
-dnl 
-dnl GNU Radio is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
-dnl 
-dnl GNU Radio is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl 
-dnl You should have received a copy of the GNU General Public License
-dnl along with GNU Radio; see the file COPYING.  If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street,
-dnl Boston, MA 02110-1301, USA.
-
-dnl Create --enable-foo argument for named component, create variables as needed
-dnl $1 is component name
-AC_DEFUN([GRC_ENABLE], [
-    _GRC_ENABLE($1,m4_bpatsubst($1,-,_))
-])
-dnl $2 is the '_'d component name
-dnl on exit variable enable_$2 will be set to [yes|no];
-dnl         passed will be [yes|no] (same as enable_$2)
-
-AC_DEFUN([_GRC_ENABLE],[
-    passed=yes
-    AC_ARG_ENABLE([$1],
-		  AC_HELP_STRING([--enable-$1],
-				 [Stop if $1 fails configuration]),
-		  [],[
-        [enable_]$2=$enable_all_components
-        if test x$enable_all_components = xno; then
-            passed=no
-        fi
-    ])
-])
-dnl Component specific configuration
-dnl The order of the GR_ macros determines the order of compilation
-dnl For -any- checks on $enable_all_components
-dnl use the following guildlines:
-dnl   yes : --enable-all-components was specified, so error out if any
-dnl         components do not pass configuration checks.
-dnl   no  : --disable-all-components was specified, so try to build the
-dnl         --enable'd components, and error out if any do not pass
-dnl         configuration checks.
-dnl   ""  : this option was not specified on the command line; try to
-dnl         build all components that are not --with'd, but don't
-dnl         error out if any component does not pass configuration checks.
-dnl
-dnl For each --enable-foo component, if that flag is not specified on
-dnl the command line, the related variable $enable_foo will be set to
-dnl $enable_all_components .
-
-dnl Create --with-foo argument for named compoment, create variables as needed
-dnl $1 is component name
-dnl $2 is what to do on success
-dnl $3 is the PKG_CONFIG name; if not given, then $1
-AC_DEFUN([GRC_WITH], [
-    if test [x]$3 = x; then
-        pc_comp_name="$1"
-    else
-        pc_comp_name="$3"
-    fi
-    _GRC_WITH($1,[$2],${pc_comp_name},m4_bpatsubst($1,-,_))
-])
-dnl $3 is the pkg-config component name
-dnl $4 is the '_'d component name
-dnl on exit variable passed will be [yes|no|with]:
-dnl   yes: if --enable-$1 and/or --enable-all-components was specified,
-dnl        but --with was not;
-dnl   with: if --with-$1 was specified, and passed checks;
-dnl   no: all other conditions
-AC_DEFUN([_GRC_WITH],[
-    AC_ARG_WITH([$1],
-	        AC_HELP_STRING([--with-$1@<:@=PATH@:>@],
-	 		       [Use package $1 if installed in PATH (if specified) or PKG_CONFIG_PATH (if PATH not specified); stop if $1 not found]),
-                [if test "x$withval" != "xyes"; then
-		    [with_]$4[_val]=$withval
-		    [with_]$4=yes
-		 fi],
-	        [])
-    if test x$[with_]$4 = xyes; then
-        if test x$[enable_]$4 = xyes; then
-	    AC_MSG_ERROR([Component $1: Cannot use both --enable and --with])
-        else
-	    _GRC_WITH_PKG_CONFIG_CHECK($1,$3,$4)
-	    ifelse([$2], , :, [$2])
-        fi
-    fi
-])
-
-dnl Use 'pkgconfig' to check for a package
-dnl $1 is the --with component name
-dnl $2 is the pkg-config component name, if provided; otherwise use $1 for this
-dnl on success, resulting INCLUDES, INCLUDEDIR, LA, and LIBDIRPATH variables
-dnl will be set; on failure, will exit with an error.
-AC_DEFUN([GRC_WITH_PKG_CONFIG_CHECK], [
-    if test [x]$2 = x; then
-        pc_comp_name="$1"
-    else
-        pc_comp_name="$2"
-    fi
-    _GRC_WITH_PKG_CONFIG_CHECK($1,${pc_comp_name},m4_bpatsubst($1,-,_))
-])
-dnl $2 is the pkg-config component name
-dnl $3 is the '_'d component name
-AC_DEFUN([_GRC_WITH_PKG_CONFIG_CHECK],[
-    dnl save PKG_CONFIG_PATH, restore at the end
-    s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
-
-    dnl create the PKG_CONFIG_PATH, via this component arg, if provided;
-    dnl else use the environment PKG_CONFIG_PATH
-    l_PKG_CONFIG_PATH=$[with_]$3[_val]
-    if test "x$l_PKG_CONFIG_PATH" != "x"; then
-        export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH
-
-        dnl verify that the file exists; if not, no point in continuing
-        if ! test -r ${l_PKG_CONFIG_PATH}/$2[.pc]; then
-	    AC_MSG_ERROR([Component $1: PKGCONFIG cannot find info for $2, with provided PKG_CONFIG_PATH = @<:@ $l_PKG_CONFIG_PATH @:>@ .])
-        fi
-    fi
-
-    dnl do the check; error out if not found
-    PKG_CHECK_EXISTS($2, [passed=with; check1=yes], [
-        check1=no
-        dnl pkg-config returned an error; this might be that the .pc
-	dnl file was not valid, or the Requires: were not met.
-	dnl If the arg was provided and the input PKG_CONFIG_PATH , then try
-	dnl again appending the whole PKG_CONFIG_PATH.
-	if test "x$l_PKG_CONFIG_PATH" != "x"; then
-            if test "x$s_PKG_CONFIG_PATH" != "x"; then
-                export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
-	        PKG_CHECK_EXISTS($2, passed=with, passed=no)
-            fi
-        fi
-        if test $passed != with; then
-            AC_MSG_ERROR([Component $1: PKGCONFIG cannot find info for $2, with PKG_CONFIG_PATH = @<:@ $PKG_CONFIG_PATH @:>@ .])
-        fi
-        dnl pkg-config Requires are now met; save the new PKG_CONFIG_PATH
-        s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
-    ])
-
-    dnl if PKG_CHECK_EXISTS returned, then this component's .pc file was
-    dnl found in the provided 'arg' PKG_CONFIG_PATH;
-    dnl retrieve various parameters
-    $3[_INCLUDES]=`$PKG_CONFIG --cflags-only-I $2`
-    $3[_LA]=`$PKG_CONFIG --libs $2`
-    $3[_INCLUDEDIR]=`$PKG_CONFIG --variable=includedir $2`
-
-    if test x$check1 = xyes; then
-        dnl prepend the args PKG_CONFIG_PATH to the saved one, if the
-	dnl saved version was not empty
-        if test "x$s_PKG_CONFIG_PATH" != "x"; then
-            export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
-        fi
-    fi
-])
-
-dnl Check the $prefix versus the --with libdirpath for this component
-dnl $1 is the prefix
-dnl $2 is the --with component name
-dnl $3 is the --with component library path
-AC_DEFUN([GRC_PREFIX_LDFLAGS],[
-    $2[_LIBDIRPATH]=$3
-    dnl create LDFLAGS for this --with, if different from the provided $prefix
-    if test [x]$1[/lib] != [x]$3; then
-        $2[_LDFLAG]=[-L]$3
-    else
-        $2[_LDFLAG]=
-    fi
-])
-
-dnl Check to make sure this dependency is fulfilled for this component
-dnl $1 is the component's name
-dnl $2 is the component dependency name
-dnl On input and exit, $passed will be:
-dnl   with : if --with passed muster
-dnl   yes  : if --enable passed muster
-dnl   no   : otherwise
-dnl If trying --with, will error-out if any dependency was not --with'd
-AC_DEFUN([GRC_CHECK_DEPENDENCY],[
-dnl    f0=[enable_]m4_bpatsubst($1,-,_)
-dnl    f1=[$enable_]m4_bpatsubst($1,-,_)
-dnl    echo
-dnl    echo "$1 : Checking Dependency $2"
-dnl    echo "$1 : enable_all_components is '$enable_all_components'"
-dnl    echo "$1 : $f0 is '$f1'"
-dnl    echo "$1 : passed is '$passed'"
-dnl    echo
-    if test $passed != no; then
-        if test $passed = yes; then
-            dnl make sure this dependency was not skipped
-            if test [x$]m4_bpatsubst($2,-,_)[_skipped] = xyes; then
-                AC_MSG_RESULT([Component $1 requires $2, which is not being built or specified via pre-installed files.])
-                passed=no
-            fi
-        else
-            dnl make sure this dependency was --with'd only; not --enable'd
-            if test [x$]m4_bpatsubst($2,-,_)[_with] = xno; then
-                AC_MSG_ERROR([Component $1 requires $2 to be included as --with-$2@<:@=arg@:>@])
-            fi
-        fi
-    fi
-])
-
-dnl Check to make sure GUILE is available
-dnl $1 is the component name
-AC_DEFUN([GRC_CHECK_GUILE],[
-    if test x"$GUILE" = x; then
-        AC_MSG_RESULT([Component $1 requires guile, which was not found.])
-        passed=no
-    fi
-])
-
-dnl Add the specified "with" list; clear the provided variable
-dnl $1 is the component name
-dnl $2 is the path list name suffix
-dnl $3 is the separator (for paths, ":"; for includes " ")
-AC_DEFUN([GRC_ADD_TO_LIST],[
-    if test "x${$1[_]$2}" != "x"; then
-        if test "x$[with_]$2" = "x"; then
-            [with_]$2="${$1[_]$2}"
-	else
-	    [with_]$2="${$1[_]$2}"$3"$[with_]$2"
-	fi
-	$1[_]$2=
-    fi
-])
-
-dnl Conditionally build named component.
-dnl $1 is component name
-dnl $2 is executed if configuration passes and build is desired
-AC_DEFUN([GRC_BUILD_CONDITIONAL],[
-    _GRC_BUILD_CONDITIONAL($1, $2, m4_bpatsubst($1,-,_))
-])
-dnl $3=m4_bpatsubst($1,-,_)
-dnl Use $passed=no to indicate configuration failure;
-dnl Use $passed=with to indicate the use of pre-installed libraries and headers;
-dnl Any other value of $passed, including blank, assumes success;
-dnl Defines $3_with=[yes|no] depending on if $passed=with or not (respectively)
-dnl Defines $3_skipped=[yes|no] depending on if $passed=no or not (respectively)
-AC_DEFUN([_GRC_BUILD_CONDITIONAL],[
-    $3[_with]=no
-    if test $passed = no; then
-	if test x$[enable_]$3 = xyes; then
-	    AC_MSG_ERROR([Component $1 has errors; stopping.])
-	else
-	    AC_MSG_RESULT([Not building component $1.])
-	fi
-    else
-        if test $passed = with; then
-	    with_dirs="$with_dirs $1"
-	    GRC_ADD_TO_LIST($3, INCLUDES, " ")
-	    GRC_ADD_TO_LIST($3, SWIG_INCLUDES, " ")
-	    GRC_ADD_TO_LIST($3, PYDIRPATH, ":")
-	    GRC_ADD_TO_LIST($3, SWIGDIRPATH, ":")
-	    GRC_ADD_TO_LIST($3, LIBDIRPATH, ":")
-	    AC_MSG_RESULT([Component $1 will be included from a pre-installed library and includes.])
-	    $3[_with]=yes
-	else
-	    $3[_LDFLAG]=
-            if test x$[enable_]$3 != xno; then
-	        ifelse([$2], , :, [$2])
-	        build_dirs="$build_dirs $1"
-	        AC_MSG_RESULT([Component $1 passed configuration checks; building.])
-            else
-	        passed=no
-	        AC_MSG_RESULT([Component $1 passed configuration checks; but not building.])
-	    fi
-	fi
-    fi
-    if test $passed = no; then
-        skipped_dirs="$skipped_dirs $1"
-        $3[_skipped]=yes
-    else
-        $3[_skipped]=no
-    fi
-    AC_SUBST($3[_INCLUDES])
-    AC_SUBST($3[_LA])
-    AC_SUBST($3[_INCLUDEDIR])
-    AC_SUBST($3[_LIBDIRPATH])
-    AC_SUBST($3[_LDFLAG])
-])
diff --git a/firmware/fx2/config/grc_fx2.m4 b/firmware/fx2/config/grc_fx2.m4
deleted file mode 100644
index 00a41c973..000000000
--- a/firmware/fx2/config/grc_fx2.m4
+++ /dev/null
@@ -1,58 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc.
-dnl 
-dnl This file is part of GNU Radio
-dnl 
-dnl GNU Radio is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
-dnl 
-dnl GNU Radio is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl 
-dnl You should have received a copy of the GNU General Public License
-dnl along with GNU Radio; see the file COPYING.  If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street,
-dnl Boston, MA 02110-1301, USA.
-
-AC_DEFUN([GRC_FX2],[
-    GRC_ENABLE(usrp)
-
-    GRC_WITH(usrp)
-
-    dnl If execution gets to here, $passed will be:
-    dnl   with : if the --with code didn't error out
-    dnl   yes  : if the --enable code passed muster and all dependencies are met
-    dnl   no   : otherwise
-    if test $passed = yes; then
-        dnl gnulib.
-        dnl FIXME: this needs to fail gracefully and continue, not implemented yet
-        UTILS_FUNC_MKSTEMP
-
-        dnl These checks don't fail
-        AC_C_BIGENDIAN
-        AC_CHECK_HEADERS([byteswap.h linux/compiler.h])
-        AC_CHECK_FUNCS([getrusage sched_setscheduler pthread_setschedparam])
-        AC_CHECK_FUNCS([sigaction snprintf])
-
-	dnl Make sure SDCC >= 2.4.0 is available.
-        USRP_SDCC([2.4.0],[],[passed=no;AC_MSG_RESULT([Unable to find firmware compiler SDCC.])])
-    fi
-    if test $passed != with; then
-	dnl how and where to find INCLUDES and LA
-	usrp_INCLUDES=" \
-		-I\${abs_top_srcdir}/include"
-    fi
-
-    AC_CONFIG_FILES([ \
-        include/Makefile \
-        lib/Makefile \
-        src/Makefile \
-        src/common/Makefile \
-        src/usrp1/Makefile \
-    ])
-
-    GRC_BUILD_CONDITIONAL(usrp)
-])
diff --git a/firmware/fx2/config/lf_cc.m4 b/firmware/fx2/config/lf_cc.m4
deleted file mode 100644
index b75e1a4c5..000000000
--- a/firmware/fx2/config/lf_cc.m4
+++ /dev/null
@@ -1,41 +0,0 @@
-dnl Autoconf support for C++
-dnl Copyright (C) 1988 Eleftherios Gkioulekas <lf@amath.washington.edu>
-dnl  
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3 of the License, or
-dnl (at your option) any later version.
-dnl 
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl 
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software 
-dnl Foundation, Inc., 51 Franklin Street, Boston, MA 02110-1301, USA.
-dnl 
-dnl As a special exception to the GNU General Public License, if you 
-dnl distribute this file as part of a program that contains a configuration 
-dnl script generated by Autoconf, you may include it under the same 
-dnl distribution terms that you use for the rest of that program.
-
-# -------------------------------------------------------------------------
-# Use this macro to configure your C compiler
-# When called the macro does the following things:
-# 1. It finds an appropriate C compiler.
-#    If you passed the flag --with-cc=foo then it uses that
-#    particular compiler
-# 2. Check whether the compiler works.
-# 3. Checks whether the compiler accepts the -g 
-# -------------------------------------------------------------------------
-
-AC_DEFUN([LF_CONFIGURE_CC],[
-  dnl Sing the song
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_PROG_CPP])dnl
-  AC_REQUIRE([AC_AIX])dnl
-  AC_REQUIRE([AC_ISC_POSIX])dnl
-  AC_REQUIRE([AC_HEADER_STDC])dnl
-])
-
diff --git a/firmware/fx2/config/lf_cxx.m4 b/firmware/fx2/config/lf_cxx.m4
deleted file mode 100644
index dfc6bfbfe..000000000
--- a/firmware/fx2/config/lf_cxx.m4
+++ /dev/null
@@ -1,67 +0,0 @@
-dnl Autoconf support for C++
-dnl Copyright (C) 1988 Eleftherios Gkioulekas <lf@amath.washington.edu>
-dnl  
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3 of the License, or
-dnl (at your option) any later version.
-dnl 
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl 
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software 
-dnl Foundation, Inc., 51 Franklin Street, Boston, MA 02110-1301, USA.
-dnl 
-dnl As a special exception to the GNU General Public License, if you 
-dnl distribute this file as part of a program that contains a configuration 
-dnl script generated by Autoconf, you may include it under the same 
-dnl distribution terms that you use for the rest of that program.
-
-# -----------------------------------------------------------------
-# This macro should be called to configure your C++ compiler.
-# When called, the macro does the following things:
-# 1. It finds an appropriate C++ compiler
-#    If you passed the flag --with-cxx=foo, then it uses that
-#    particular compiler
-# 2. Checks whether the compiler accepts the -g 
-# ------------------------------------------------------------------
-
-AC_DEFUN([LF_CONFIGURE_CXX],[
- AC_REQUIRE([AC_PROG_CXX])dnl
- AC_REQUIRE([AC_PROG_CXXCPP])dnl
- LF_CXX_PORTABILITY
-])
-
-# -----------------------------------------------------------------------
-# This macro tests the C++ compiler for various portability problem.
-# -----------------------------------------------------------------------
-
-
-AC_DEFUN([LF_CXX_PORTABILITY],[
-
-  dnl
-  dnl Check for common C++ portability problems
-  dnl
-
-  dnl AC_LANG_PUSH
-  dnl AC_LANG_CPLUSPLUS
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-
-
-  dnl Test whether C++ has std::isnan
-  AC_MSG_CHECKING(whether C++ has std::isnan)
-  AC_TRY_COMPILE([#include <cmath>], [
-   std::isnan(0);
-], [ AC_MSG_RESULT(yes)
-	AC_DEFINE(CXX_HAS_STD_ISNAN,[],[Define if has std::isnan]) ],
-   [ AC_MSG_RESULT(no) ])
-
-  dnl Done with the portability checks
-  dnl AC_LANG_POP([C++])
-  AC_LANG_RESTORE
-])
-
diff --git a/firmware/fx2/config/lf_warnings.m4 b/firmware/fx2/config/lf_warnings.m4
deleted file mode 100644
index d40c77f14..000000000
--- a/firmware/fx2/config/lf_warnings.m4
+++ /dev/null
@@ -1,121 +0,0 @@
-dnl Copyright (C) 1988 Eleftherios Gkioulekas <lf@amath.washington.edu>
-dnl Copyright (C) 2009 Free Software Foundation, Inc.
-dnl  
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3 of the License, or
-dnl (at your option) any later version.
-dnl 
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl 
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software 
-dnl Foundation, Inc., 51 Franklin Street, Boston, MA 02110-1301, USA.
-dnl 
-dnl As a special exception to the GNU General Public License, if you 
-dnl distribute this file as part of a program that contains a configuration 
-dnl script generated by Autoconf, you may include it under the same 
-dnl distribution terms that you use for the rest of that program.
-
-# --------------------------------------------------------------------------
-# Check whether the C++ compiler accepts a certain flag
-# If it does it adds the flag to lf_CXXFLAGS
-# If it does not then it returns an error to lf_ok
-# Usage:
-#   LF_CHECK_CXX_FLAG(-flag1 -flag2 -flag3 ...)
-# -------------------------------------------------------------------------
-
-AC_DEFUN([LF_CHECK_CXX_FLAG],[
-  echo 'void f(){}' > conftest.cc
-  for i in $1
-  do
-    AC_MSG_CHECKING([whether $CXX accepts $i])
-    if test -z "`${CXX} $i -c conftest.cc 2>&1`"
-    then
-      lf_CXXFLAGS="${lf_CXXFLAGS} $i"
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
-    fi
-  done
-  rm -f conftest.cc conftest.o
-  AC_SUBST(lf_CXXFLAGS)
-])
-
-# --------------------------------------------------------------------------
-# Check whether the C compiler accepts a certain flag
-# If it does it adds the flag to lf_CFLAGS
-# If it does not then it returns an error to lf_ok
-# Usage:
-#  LF_CHECK_CC_FLAG(-flag1 -flag2 -flag3 ...)
-# -------------------------------------------------------------------------
-
-AC_DEFUN([LF_CHECK_CC_FLAG],[
-  echo 'void f(){}' > conftest.c
-  for i in $1
-  do
-    AC_MSG_CHECKING([whether $CC accepts $i])
-    if test -z "`${CC} $i -c conftest.c 2>&1`"
-    then
-      lf_CFLAGS="${lf_CFLAGS} $i"
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
-    fi
-  done
-  rm -f conftest.c conftest.o
-  AC_SUBST(lf_CFLAGS)
-])
-
-# --------------------------------------------------------------------------
-# Check whether the Fortran compiler accepts a certain flag
-# If it does it adds the flag to lf_FFLAGS
-# If it does not then it returns an error to lf_ok
-# Usage:
-#  LF_CHECK_F77_FLAG(-flag1 -flag2 -flag3 ...)
-# -------------------------------------------------------------------------
-
-AC_DEFUN([LF_CHECK_F77_FLAG],[
-  cat << EOF > conftest.f
-c....:++++++++++++++++++++++++
-      PROGRAM MAIN
-      PRINT*,'Hello World!'
-      END
-EOF
-  for i in $1
-  do
-    AC_MSG_CHECKING([whether $F77 accepts $i])
-    if test -z "`${F77} $i -c conftest.f 2>&1`"
-    then
-      lf_FFLAGS="${lf_FFLAGS} $i"
-      AC_MSG_RESULT(yes)  
-    else
-      AC_MSG_RESULT(no)
-    fi
-  done
-  rm -f conftest.f conftest.o
-  AC_SUBST(lf_FFLAGS)
-])
-
-# ----------------------------------------------------------------------
-# Enable compiler warnings. 
-# Call this command AFTER you have configured ALL your compilers. 
-# ----------------------------------------------------------------------
-
-AC_DEFUN([LF_SET_WARNINGS],[
-  dnl Warnings for the two main compilers
-  dnl add -Wextra when you're got time to fix a bunch of them ;-)
-  cc_warning_flags="-Wall -Werror-implicit-function-declaration"
-  cxx_warning_flags="-Wall -Woverloaded-virtual"
-  if test -n "${CC}"
-  then
-    LF_CHECK_CC_FLAG($cc_warning_flags)
-  fi
-  if test -n "${CXX}" 
-  then
-    LF_CHECK_CXX_FLAG($cxx_warning_flags)
-  fi
-])
diff --git a/firmware/fx2/config/mkstemp.m4 b/firmware/fx2/config/mkstemp.m4
deleted file mode 100644
index 4af0f0a9b..000000000
--- a/firmware/fx2/config/mkstemp.m4
+++ /dev/null
@@ -1,89 +0,0 @@
-#serial 4
-
-# On some hosts (e.g., HP-UX 10.20, SunOS 4.1.4, Solaris 2.5.1), mkstemp has a
-# silly limit that it can create no more than 26 files from a given template.
-# Other systems lack mkstemp altogether.
-# On OSF1/Tru64 V4.0F, the system-provided mkstemp function can create
-# only 32 files per process.
-# On systems like the above, arrange to use the replacement function.
-AC_DEFUN([UTILS_FUNC_MKSTEMP],
-[dnl
-  AC_REPLACE_FUNCS(mkstemp)
-  if test $ac_cv_func_mkstemp = no; then
-    utils_cv_func_mkstemp_limitations=yes
-  else
-    AC_CACHE_CHECK([for mkstemp limitations],
-      utils_cv_func_mkstemp_limitations,
-      [
-	AC_TRY_RUN([
-#         include <stdlib.h>
-	  int main ()
-	  {
-	    int i;
-	    for (i = 0; i < 70; i++)
-	      {
-		char template[] = "conftestXXXXXX";
-		int fd = mkstemp (template);
-		if (fd == -1)
-		  exit (1);
-		close (fd);
-	      }
-	    exit (0);
-	  }
-	  ],
-	utils_cv_func_mkstemp_limitations=no,
-	utils_cv_func_mkstemp_limitations=yes,
-	utils_cv_func_mkstemp_limitations=yes
-	)
-      ]
-    )
-  fi
-
-  if test $utils_cv_func_mkstemp_limitations = yes; then
-    AC_LIBOBJ(mkstemp)
-    AC_LIBOBJ(tempname)
-    AC_DEFINE(mkstemp, rpl_mkstemp,
-      [Define to rpl_mkstemp if the replacement function should be used.])
-    gl_PREREQ_MKSTEMP
-    jm_PREREQ_TEMPNAME
-  fi
-])
-
-# Prerequisites of lib/mkstemp.c.
-AC_DEFUN([gl_PREREQ_MKSTEMP],
-[
-  AH_BOTTOM(
-  [
-  #ifndef HAVE_MKSTEMP
-  #ifdef  __cplusplus
-  extern "C" {
-  #endif
-  int rpl_mkstemp (char *templ);
-  #ifdef  __cplusplus
-  }
-  #endif
-  #endif
-  ])
-])
-
-# Prerequisites of lib/tempname.c.
-AC_DEFUN([jm_PREREQ_TEMPNAME],
-[
-  AC_REQUIRE([AC_HEADER_STAT])
-  AC_CHECK_HEADERS_ONCE(fcntl.h sys/time.h unistd.h)
-  AC_CHECK_HEADERS(stdint.h)
-  AC_CHECK_FUNCS(__secure_getenv gettimeofday lstat)
-  AC_CHECK_DECLS_ONCE(getenv)
-  # AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
-
-  dnl Under Win32, mkdir prototype in io.h has only one arg
-  AC_MSG_CHECKING(whether mkdir accepts only one arg)
-  AC_TRY_COMPILE([#include <sys/types.h>
-       #include <sys/stat.h>
-       #include <fcntl.h>], [
-       mkdir("")
-  ], [ AC_MSG_RESULT(yes)
-     AC_DEFINE(MKDIR_TAKES_ONE_ARG,[],[Define if mkdir accepts only one arg]) ],
-   [ AC_MSG_RESULT(no)
-     ])
-])
diff --git a/firmware/fx2/config/onceonly.m4 b/firmware/fx2/config/onceonly.m4
deleted file mode 100644
index f6fec37cb..000000000
--- a/firmware/fx2/config/onceonly.m4
+++ /dev/null
@@ -1,63 +0,0 @@
-# onceonly.m4 serial 3
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl This file defines some "once only" variants of standard autoconf macros.
-dnl   AC_CHECK_HEADERS_ONCE         like  AC_CHECK_HEADERS
-dnl   AC_CHECK_FUNCS_ONCE           like  AC_CHECK_FUNCS
-dnl   AC_CHECK_DECLS_ONCE           like  AC_CHECK_DECLS
-dnl   AC_REQUIRE([AC_HEADER_STDC])  like  AC_HEADER_STDC
-dnl The advantage is that the check for each of the headers/functions/decls
-dnl will be put only once into the 'configure' file. It keeps the size of
-dnl the 'configure' file down, and avoids redundant output when 'configure'
-dnl is run.
-dnl The drawback is that the checks cannot be conditionalized. If you write
-dnl   if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi
-dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
-dnl empty, and the check will be inserted before the body of the AC_DEFUNed
-dnl function.
-
-dnl Autoconf version 2.57 or newer is recommended.
-AC_PREREQ(2.54)
-
-# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
-# AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
-AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
-  :
-  AC_FOREACH([gl_HEADER_NAME], [$1], [
-    AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(defn([gl_HEADER_NAME]),
-                                                 [-./], [___])), [
-      AC_CHECK_HEADERS(gl_HEADER_NAME)
-    ])
-    AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
-                                                   [-./], [___])))
-  ])
-])
-
-# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of
-# AC_CHECK_FUNCS(FUNC1 FUNC2 ...).
-AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
-  :
-  AC_FOREACH([gl_FUNC_NAME], [$1], [
-    AC_DEFUN([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]), [
-      AC_CHECK_FUNCS(defn([gl_FUNC_NAME]))
-    ])
-    AC_REQUIRE([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]))
-  ])
-])
-
-# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of
-# AC_CHECK_DECLS(DECL1, DECL2, ...).
-AC_DEFUN([AC_CHECK_DECLS_ONCE], [
-  :
-  AC_FOREACH([gl_DECL_NAME], [$1], [
-    AC_DEFUN([gl_CHECK_DECL_]defn([gl_DECL_NAME]), [
-      AC_CHECK_DECLS(defn([gl_DECL_NAME]))
-    ])
-    AC_REQUIRE([gl_CHECK_DECL_]defn([gl_DECL_NAME]))
-  ])
-])
diff --git a/firmware/fx2/config/pkg.m4 b/firmware/fx2/config/pkg.m4
deleted file mode 100644
index 2d4d96109..000000000
--- a/firmware/fx2/config/pkg.m4
+++ /dev/null
@@ -1,201 +0,0 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-# Copyright © 2008 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.18])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-		
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_ifval([$2], [$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-    if test -n "$$1"; then
-        pkg_cv_[]$1="$$1"
-    else
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
-    fi
-else
-	pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-# E.g.,
-#   PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-#   defines:
-#
-#     GSTUFF_LIBS
-#     GSTUFF_CFLAGS
-#     GSTUFF_INCLUDEDIR
-#     GSTUFF_CPPFLAGS    # the -I, -D and -U's out of CFLAGS
-#
-# see pkg-config man page also defines GSTUFF_PKG_ERRORS on error
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],[
-AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_INCLUDEDIR], [includedir for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-
-if test x$cross_compiling = xyes
-then
-  dnl _PKG_CONFIG([$1][_LIBS], [libs-only-l --static], [$2])
-  _PKG_CONFIG([$1][_LIBS], [libs --static], [$2])
-  dnl prune out any -L/lib or -L/usr/lib since they're pointing to the wrong filesystem root
-  _pkg_tmp=
-  for flag in [$]pkg_cv_[$1][_LIBS]; do
-    case $flag in
-    (-L/lib* | -L/usr/lib* )	   ;; # ignore
-    (*) _pkg_tmp="$_pkg_tmp $flag" ;;
-    esac
-  done
-  pkg_cv_[$1][_LIBS]="$_pkg_tmp"
-else
-  _PKG_CONFIG([$1][_LIBS], [libs --static], [$2])
-fi
-
-_PKG_CONFIG([$1][_INCLUDEDIR], [variable=includedir], [$2])
-
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT
-])],
-		[AC_MSG_RESULT([no])
-                $4])
-elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-		[$4])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-	$1[]_INCLUDEDIR=$pkg_cv_[]$1[]_INCLUDEDIR
-
-	$1[]_CPPFLAGS=""
-	for flag in $$1[]_CFLAGS; do
-	  case $flag in
-          -I* | -D* | -U*) $1[]_CPPFLAGS="$$1[]_CPPFLAGS $flag" ;;
-          esac
-        done
-	pkg_cv_[]$1[]_CPPFLAGS=$$1[]_CPPFLAGS
-	AC_SUBST($1[]_CPPFLAGS)
-
-        AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES
diff --git a/firmware/fx2/config/usrp_sdcc.m4 b/firmware/fx2/config/usrp_sdcc.m4
deleted file mode 100644
index 86f6429e5..000000000
--- a/firmware/fx2/config/usrp_sdcc.m4
+++ /dev/null
@@ -1,75 +0,0 @@
-# Check for sdcc support.             		-*- Autoconf -*-
-
-# Copyright 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# 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 Street, Boston, MA
-# 02110-1301, USA.
-
-AC_DEFUN([USRP_SDCC],
-[
-	sdccok=yes
-	AC_CHECK_PROG(XCC, sdcc, sdcc -mmcs51 --no-xinit-opt,no)
-	AC_CHECK_PROG(XAS, asx8051, asx8051 -plosgff,no)
-
-	if test "$XCC" = "no" -o "$XAS" = "no" ; then
-		AC_MSG_RESULT([USRP requires sdcc. sdcc not found. See http://sdcc.sf.net])
-		sdccok=no
-	else
-		sdcc_version_min=$1
-
-		sdcc_version=`sdcc --version 2>&1 | \
-			sed  's/\(SDCC.* \)\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\)\( .*$\)/\2/'`
-
-	        AC_MSG_CHECKING([sdcc_version "$sdcc_version"])
-
-		sdcc_major_version=`echo $sdcc_version | \
-			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-		sdcc_minor_version=`echo $sdcc_version | \
-			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-		sdcc_micro_version=`echo $sdcc_version | \
-			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-		sdcc_major_min=`echo $sdcc_version_min | \
-			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-		sdcc_minor_min=`echo $sdcc_version_min | \
-			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-		sdcc_micro_min=`echo $sdcc_version_min | \
-			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-		sdcc_version_proper=`expr \
-			"$sdcc_major_version" \> "$sdcc_major_min" \| \
-			"$sdcc_major_version" \= "$sdcc_major_min" \& \
-	    		"$sdcc_minor_version" \> "$sdcc_minor_min" \| \
-			"$sdcc_major_version" \= "$sdcc_major_min" \& \
-			"$sdcc_minor_version" \= "$sdcc_minor_min" \& \
-			"$sdcc_micro_version" \>= "$sdcc_micro_min" `
-
-		if test "$sdcc_version_proper" = "1" ; then
-			AC_MSG_RESULT([$sdcc_major_version.$sdcc_minor_version.$sdcc_micro_version])
-		else
-			sdccok=no
-			AC_MSG_RESULT([USRP requires sdcc >= $sdcc_version_min. sdcc not found. See http://sdcc.sf.net])
-		fi
-
-		AC_SUBST(XCC)
-		AC_SUBST(XAS)
-	fi
-
-	if test $sdccok = yes; then
-		ifelse([$2], , :, [$2])
-	else
-		ifelse([$3], , :, [$3])
-	fi
-])