From b942e603e96cbe9ddcaca9ee36c192910d526cfd Mon Sep 17 00:00:00 2001 From: Josh Blum <josh@joshknows.com> Date: Tue, 16 Feb 2010 15:31:40 -0800 Subject: Restored microblaze build (accidentally removed makefile ams and gitignores when doing cmake for host) --- firmware/microblaze/.gitignore | 42 +++++++++++++ firmware/microblaze/Makefile.am | 27 ++++++++ firmware/microblaze/apps/.gitignore | 8 +++ firmware/microblaze/apps/Makefile.am | 82 ++++++++++++++++++++++++ firmware/microblaze/apps/txrx.c | 2 +- firmware/microblaze/config.guess | 1 + firmware/microblaze/config.sub | 1 + firmware/microblaze/include/.gitignore | 2 + firmware/microblaze/include/Makefile.am | 30 +++++++++ firmware/microblaze/include/net/.gitignore | 2 + firmware/microblaze/include/net/Makefile.am | 23 +++++++ firmware/microblaze/lib/.gitignore | 40 ++++++++++++ firmware/microblaze/lib/Makefile.am | 97 +++++++++++++++++++++++++++++ 13 files changed, 356 insertions(+), 1 deletion(-) create mode 100644 firmware/microblaze/.gitignore create mode 100644 firmware/microblaze/Makefile.am create mode 100644 firmware/microblaze/apps/.gitignore create mode 100644 firmware/microblaze/apps/Makefile.am create mode 120000 firmware/microblaze/config.guess create mode 120000 firmware/microblaze/config.sub create mode 100644 firmware/microblaze/include/.gitignore create mode 100644 firmware/microblaze/include/Makefile.am create mode 100644 firmware/microblaze/include/net/.gitignore create mode 100644 firmware/microblaze/include/net/Makefile.am create mode 100644 firmware/microblaze/lib/.gitignore create mode 100644 firmware/microblaze/lib/Makefile.am (limited to 'firmware') diff --git a/firmware/microblaze/.gitignore b/firmware/microblaze/.gitignore new file mode 100644 index 000000000..01787fd6f --- /dev/null +++ b/firmware/microblaze/.gitignore @@ -0,0 +1,42 @@ +/*-stamp +/*.a +/*.bin +/*.dump +/*.log +/*.rom +/.deps +/Makefile +/Makefile.in +/aclocal.m4 +/autom4te.cache +/blink_leds +/blink_leds2 +/build +/compile +/config.h +/config.h.in +/config.log +/config.status +/configure +/depcomp +/eth_test +/gen_eth_packets +/ibs_rx_test +/ibs_tx_test +/install-sh +/libtool +/ltmain.sh +/missing +/py-compile +/rcv_eth_packets +/run_tests.sh +/stamp-h1 +/test1 +/test_phy_comm +/timer_test +/buf_ram_test +/buf_ram_zero +/hello +/configure.lineno +/configure.guess +/configure.sub diff --git a/firmware/microblaze/Makefile.am b/firmware/microblaze/Makefile.am new file mode 100644 index 000000000..676c4fe42 --- /dev/null +++ b/firmware/microblaze/Makefile.am @@ -0,0 +1,27 @@ +# +# Copyright 2010 Ettus Research LLC +# +# Copyright 2007,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 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/>. +# + +include $(top_srcdir)/Makefile.common + +EXTRA_DIST = \ + u2_flash_tool + +SUBDIRS = include lib apps + + diff --git a/firmware/microblaze/apps/.gitignore b/firmware/microblaze/apps/.gitignore new file mode 100644 index 000000000..968b04cd7 --- /dev/null +++ b/firmware/microblaze/apps/.gitignore @@ -0,0 +1,8 @@ +/*.elf +/*.bin +/*.dump +/*.log +/*.rom +/*.map +/Makefile +/Makefile.in diff --git a/firmware/microblaze/apps/Makefile.am b/firmware/microblaze/apps/Makefile.am new file mode 100644 index 000000000..eb6ee6534 --- /dev/null +++ b/firmware/microblaze/apps/Makefile.am @@ -0,0 +1,82 @@ +# +# Copyright 2010 Ettus Research LLC +# +# Copyright 2007,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 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/>. +# + +include $(top_srcdir)/Makefile.common + +LDADD = $(top_srcdir)/lib/libu2fw.a + +AM_CFLAGS += -I$(top_srcdir)/../../lib/usrp/mboard + +noinst_PROGRAMS = txrx.elf + +# blink_leds \ +# blink_leds2 \ +# buf_ram_test \ +# burn_dbsrx_eeprom \ +# can_i_sub \ +# echo \ +# hello \ +# read_dbids \ +# set_hw_rev \ +# test1 \ +# test_db_spi \ +# test_i2c \ +# test_sd \ +# test_ram \ +# test_phy_comm \ +# test_lsadc \ +# test_lsdac \ +# timer_test \ +# txrx \ +# burnrev30 \ +# burnrev31 \ +# burnrev40 \ +# sd_gentest \ +# sd_bounce +# + +#nononono = \ +# eth_serdes \ +# gen_eth_packets \ +# rcv_eth_packets \ +# tx_standalone \ +# factory_test \ +# serdes_txrx \ +# mimo_tx \ +# mimo_tx_slave \ +# ibs_rx_test \ +# ibs_tx_test + +# tx_drop_SOURCES = tx_drop.c app_common.c +# tx_drop_rate_limited_SOURCES = tx_drop_rate_limited.c app_common.c +# tx_drop2_SOURCES = tx_drop2.c app_common.c +txrx_elf_SOURCES = txrx.c +# app_common_v2.c +#factory_test_SOURCES = factory_test.c app_common_v2.c +#eth_serdes_SOURCES = eth_serdes.c app_passthru_v2.c +#serdes_txrx_SOURCES = serdes_txrx.c app_common_v2.c +#mimo_tx_SOURCES = mimo_tx.c mimo_app_common_v2.c +#mimo_tx_slave_SOURCES = mimo_tx_slave.c app_common_v2.c + +#noinst_HEADERS = \ +# app_common_v2.h \ +# app_passthru_v2.h \ +# mimo_app_common_v2.h +# + diff --git a/firmware/microblaze/apps/txrx.c b/firmware/microblaze/apps/txrx.c index 8e71f2d8e..e2500f42e 100644 --- a/firmware/microblaze/apps/txrx.c +++ b/firmware/microblaze/apps/txrx.c @@ -42,7 +42,7 @@ #include <string.h> #include "clocks.h" #include <vrt/bits.h> -#include "usrp2_fw_common.h" +#include "usrp2/fw_common.h" #include <db.h> #define FW_SETS_SEQNO 1 // define to 0 or 1 (FIXME must be 1 for now) diff --git a/firmware/microblaze/config.guess b/firmware/microblaze/config.guess new file mode 120000 index 000000000..405bc3235 --- /dev/null +++ b/firmware/microblaze/config.guess @@ -0,0 +1 @@ +/usr/share/automake-1.11/config.guess \ No newline at end of file diff --git a/firmware/microblaze/config.sub b/firmware/microblaze/config.sub new file mode 120000 index 000000000..4d47fbcbc --- /dev/null +++ b/firmware/microblaze/config.sub @@ -0,0 +1 @@ +/usr/share/automake-1.11/config.sub \ No newline at end of file diff --git a/firmware/microblaze/include/.gitignore b/firmware/microblaze/include/.gitignore new file mode 100644 index 000000000..b336cc7ce --- /dev/null +++ b/firmware/microblaze/include/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/firmware/microblaze/include/Makefile.am b/firmware/microblaze/include/Makefile.am new file mode 100644 index 000000000..6afbbcd12 --- /dev/null +++ b/firmware/microblaze/include/Makefile.am @@ -0,0 +1,30 @@ +# +# Copyright 2010 Ettus Research LLC +# +# 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 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/>. +# + +include $(top_srcdir)/Makefile.common + +SUBDIRS = net + +noinst_HEADERS = \ + usrp2_fpga_regs.h \ + usrp2_i2c_addr.h \ + usrp2_clock_bits.h \ + usrp2_types.h \ + vrt/bits.h \ + vrt/types.h diff --git a/firmware/microblaze/include/net/.gitignore b/firmware/microblaze/include/net/.gitignore new file mode 100644 index 000000000..282522db0 --- /dev/null +++ b/firmware/microblaze/include/net/.gitignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/firmware/microblaze/include/net/Makefile.am b/firmware/microblaze/include/net/Makefile.am new file mode 100644 index 000000000..32b0bf9dc --- /dev/null +++ b/firmware/microblaze/include/net/Makefile.am @@ -0,0 +1,23 @@ +# +# 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/>. +# + +include $(top_srcdir)/Makefile.common + +noinst_HEADERS = \ + eth_mac_addr.h \ + padded_eth_hdr.h \ + socket_address.h diff --git a/firmware/microblaze/lib/.gitignore b/firmware/microblaze/lib/.gitignore new file mode 100644 index 000000000..5d838bf6c --- /dev/null +++ b/firmware/microblaze/lib/.gitignore @@ -0,0 +1,40 @@ +*~ +/*-stamp +/*.a +/*.bin +/*.dump +/*.log +/*.rom +/.deps +/Makefile +/Makefile.in +/aclocal.m4 +/autom4te.cache +/blink_leds +/blink_leds2 +/build +/compile +/config.h +/config.h.in +/config.log +/config.status +/configure +/depcomp +/eth_test +/gen_eth_packets +/ibs_rx_test +/ibs_tx_test +/install-sh +/libtool +/ltmain.sh +/missing +/py-compile +/rcv_eth_packets +/run_tests.sh +/stamp-h1 +/test1 +/test_phy_comm +/timer_test +/buf_ram_test +/buf_ram_zero +/hello diff --git a/firmware/microblaze/lib/Makefile.am b/firmware/microblaze/lib/Makefile.am new file mode 100644 index 000000000..4ca05739c --- /dev/null +++ b/firmware/microblaze/lib/Makefile.am @@ -0,0 +1,97 @@ +# +# Copyright 2010 Ettus Research LLC +# +# Copyright 2007 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 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/>. +# + +include $(top_srcdir)/Makefile.common + +noinst_LIBRARIES = \ + libu2fw.a + +libu2fw_a_SOURCES = \ + abort.c \ + ad9510.c \ + ad9777.c \ + bsm12.c \ + buffer_pool.c \ + clocks.c \ + db_init.c \ + dbsm.c \ + eeprom.c \ + ethernet.c \ + eth_mac.c \ + _exit.c \ + exit.c \ + hal_io.c \ + hal_uart.c \ + i2c.c \ + lsadc.c \ + lsdac.c \ + mdelay.c \ + memcpy_wa.c \ + memset_wa.c \ + nonstdio.c \ + pic.c \ + print_mac_addr.c \ + print_rmon_regs.c \ + print_fxpt.c \ + print_buffer.c \ + printf.c \ + sd.c \ + spi.c \ + u2_init.c \ + net_common.c \ + arp_cache.c \ + banal.c + +noinst_HEADERS = \ + ad9510.h \ + ad9777.h \ + ad9777_regs.h \ + bsm12.h \ + buffer_pool.h \ + clocks.h \ + db.h \ + dbsm.h \ + eth_mac.h \ + eth_mac_regs.h \ + eth_phy.h \ + ethernet.h \ + hal_io.h \ + hal_uart.h \ + i2c.h \ + lsadc.h \ + lsdac.h \ + mdelay.h \ + memcpy_wa.h \ + memory_map.h \ + memset_wa.h \ + nonstdio.h \ + pic.h \ + print_rmon_regs.h \ + sd.h \ + spi.h \ + stdint.h \ + stdio.h \ + u2_init.h \ + usrp2_bytesex.h \ + wb16550.h \ + net_common.h \ + if_arp.h \ + arp_cache.h \ + banal.h \ + ethertype.h -- cgit v1.2.3