aboutsummaryrefslogtreecommitdiffstats
path: root/firmware/microblaze/apps
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/microblaze/apps')
-rw-r--r--firmware/microblaze/apps/.gitignore8
-rw-r--r--firmware/microblaze/apps/blinkenlights.c26
-rw-r--r--firmware/microblaze/apps/cruft/Makefile.am (renamed from firmware/microblaze/apps/Makefile.am)0
-rw-r--r--firmware/microblaze/apps/cruft/app_passthru_v2.c (renamed from firmware/microblaze/apps/app_passthru_v2.c)0
-rw-r--r--firmware/microblaze/apps/cruft/app_passthru_v2.h (renamed from firmware/microblaze/apps/app_passthru_v2.h)0
-rw-r--r--firmware/microblaze/apps/cruft/blink_leds.c (renamed from firmware/microblaze/apps/blink_leds.c)0
-rw-r--r--firmware/microblaze/apps/cruft/blink_leds2.c (renamed from firmware/microblaze/apps/blink_leds2.c)0
-rw-r--r--firmware/microblaze/apps/cruft/buf_ram_test.c (renamed from firmware/microblaze/apps/buf_ram_test.c)0
-rw-r--r--firmware/microblaze/apps/cruft/burn_dbsrx_eeprom.c (renamed from firmware/microblaze/apps/burn_dbsrx_eeprom.c)0
-rw-r--r--firmware/microblaze/apps/cruft/burnrev30.c (renamed from firmware/microblaze/apps/burnrev30.c)0
-rw-r--r--firmware/microblaze/apps/cruft/burnrev31.c (renamed from firmware/microblaze/apps/burnrev31.c)0
-rw-r--r--firmware/microblaze/apps/cruft/can_i_sub.c (renamed from firmware/microblaze/apps/can_i_sub.c)0
-rw-r--r--firmware/microblaze/apps/cruft/double_buffer_fragment.c (renamed from firmware/microblaze/apps/double_buffer_fragment.c)0
-rw-r--r--firmware/microblaze/apps/cruft/echo.c (renamed from firmware/microblaze/apps/echo.c)0
-rw-r--r--firmware/microblaze/apps/cruft/eth_serdes.c (renamed from firmware/microblaze/apps/eth_serdes.c)0
-rw-r--r--firmware/microblaze/apps/cruft/factory_test.c (renamed from firmware/microblaze/apps/factory_test.c)0
-rw-r--r--firmware/microblaze/apps/cruft/gen_eth_packets.c (renamed from firmware/microblaze/apps/gen_eth_packets.c)0
-rw-r--r--firmware/microblaze/apps/cruft/gen_pause_frames.c (renamed from firmware/microblaze/apps/gen_pause_frames.c)0
-rw-r--r--firmware/microblaze/apps/cruft/hello.c (renamed from firmware/microblaze/apps/hello.c)0
-rw-r--r--firmware/microblaze/apps/cruft/ibs_rx_test.c (renamed from firmware/microblaze/apps/ibs_rx_test.c)0
-rw-r--r--firmware/microblaze/apps/cruft/ibs_tx_test.c (renamed from firmware/microblaze/apps/ibs_tx_test.c)0
-rw-r--r--firmware/microblaze/apps/cruft/mimo_app_common_v2.c (renamed from firmware/microblaze/apps/mimo_app_common_v2.c)0
-rw-r--r--firmware/microblaze/apps/cruft/mimo_app_common_v2.h (renamed from firmware/microblaze/apps/mimo_app_common_v2.h)0
-rw-r--r--firmware/microblaze/apps/cruft/mimo_tx.c (renamed from firmware/microblaze/apps/mimo_tx.c)0
-rw-r--r--firmware/microblaze/apps/cruft/mimo_tx_slave.c (renamed from firmware/microblaze/apps/mimo_tx_slave.c)0
-rw-r--r--firmware/microblaze/apps/cruft/rcv_eth_packets.c (renamed from firmware/microblaze/apps/rcv_eth_packets.c)0
-rw-r--r--firmware/microblaze/apps/cruft/read_dbids.c (renamed from firmware/microblaze/apps/read_dbids.c)0
-rw-r--r--firmware/microblaze/apps/cruft/sd_bounce.c (renamed from firmware/microblaze/apps/sd_bounce.c)0
-rw-r--r--firmware/microblaze/apps/cruft/sd_gentest.c (renamed from firmware/microblaze/apps/sd_gentest.c)0
-rw-r--r--firmware/microblaze/apps/cruft/serdes_to_dsp.c (renamed from firmware/microblaze/apps/serdes_to_dsp.c)0
-rw-r--r--firmware/microblaze/apps/cruft/serdes_txrx.c (renamed from firmware/microblaze/apps/serdes_txrx.c)0
-rw-r--r--firmware/microblaze/apps/cruft/set_hw_rev.c (renamed from firmware/microblaze/apps/set_hw_rev.c)0
-rw-r--r--firmware/microblaze/apps/cruft/test1.c (renamed from firmware/microblaze/apps/test1.c)0
-rw-r--r--firmware/microblaze/apps/cruft/test_db_spi.c (renamed from firmware/microblaze/apps/test_db_spi.c)0
-rw-r--r--firmware/microblaze/apps/cruft/test_i2c.c (renamed from firmware/microblaze/apps/test_i2c.c)0
-rw-r--r--firmware/microblaze/apps/cruft/test_lsadc.c (renamed from firmware/microblaze/apps/test_lsadc.c)0
-rw-r--r--firmware/microblaze/apps/cruft/test_lsdac.c (renamed from firmware/microblaze/apps/test_lsdac.c)0
-rw-r--r--firmware/microblaze/apps/cruft/test_phy_comm.c (renamed from firmware/microblaze/apps/test_phy_comm.c)0
-rw-r--r--firmware/microblaze/apps/cruft/test_ram.c (renamed from firmware/microblaze/apps/test_ram.c)0
-rw-r--r--firmware/microblaze/apps/cruft/test_sd.c (renamed from firmware/microblaze/apps/test_sd.c)0
-rw-r--r--firmware/microblaze/apps/cruft/timer_test.c (renamed from firmware/microblaze/apps/timer_test.c)0
-rw-r--r--firmware/microblaze/apps/cruft/tx_standalone.c (renamed from firmware/microblaze/apps/tx_standalone.c)0
-rw-r--r--firmware/microblaze/apps/flash_test.c67
-rw-r--r--firmware/microblaze/apps/hardware_testbed.c47
-rw-r--r--firmware/microblaze/apps/txrx_uhd.c3
-rw-r--r--firmware/microblaze/apps/uart_flash_loader.c169
46 files changed, 310 insertions, 10 deletions
diff --git a/firmware/microblaze/apps/.gitignore b/firmware/microblaze/apps/.gitignore
deleted file mode 100644
index 968b04cd7..000000000
--- a/firmware/microblaze/apps/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/*.elf
-/*.bin
-/*.dump
-/*.log
-/*.rom
-/*.map
-/Makefile
-/Makefile.in
diff --git a/firmware/microblaze/apps/blinkenlights.c b/firmware/microblaze/apps/blinkenlights.c
new file mode 100644
index 000000000..4cebe5c9d
--- /dev/null
+++ b/firmware/microblaze/apps/blinkenlights.c
@@ -0,0 +1,26 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010 Ettus Research LLC
+ *
+ */
+
+#include "memory_map.h"
+#include <nonstdio.h>
+
+int main(int argc, char *argv[]) {
+
+ uint32_t c = 0;
+ uint8_t i = 0;
+
+ while(1) {
+ //delay(5000000);
+ for(c=0;c<5000000;c++) asm("NOP");
+ output_regs->leds = (i++ % 2) ? 0xFF : 0x00; //blink everything on that register
+ }
+
+ return 0;
+}
+
+//void delay(uint32_t t) {
+// while(t-- != 0) asm("NOP");
+//}
diff --git a/firmware/microblaze/apps/Makefile.am b/firmware/microblaze/apps/cruft/Makefile.am
index a4f79935b..a4f79935b 100644
--- a/firmware/microblaze/apps/Makefile.am
+++ b/firmware/microblaze/apps/cruft/Makefile.am
diff --git a/firmware/microblaze/apps/app_passthru_v2.c b/firmware/microblaze/apps/cruft/app_passthru_v2.c
index 406c56b3b..406c56b3b 100644
--- a/firmware/microblaze/apps/app_passthru_v2.c
+++ b/firmware/microblaze/apps/cruft/app_passthru_v2.c
diff --git a/firmware/microblaze/apps/app_passthru_v2.h b/firmware/microblaze/apps/cruft/app_passthru_v2.h
index 3904c670f..3904c670f 100644
--- a/firmware/microblaze/apps/app_passthru_v2.h
+++ b/firmware/microblaze/apps/cruft/app_passthru_v2.h
diff --git a/firmware/microblaze/apps/blink_leds.c b/firmware/microblaze/apps/cruft/blink_leds.c
index 682ca8db2..682ca8db2 100644
--- a/firmware/microblaze/apps/blink_leds.c
+++ b/firmware/microblaze/apps/cruft/blink_leds.c
diff --git a/firmware/microblaze/apps/blink_leds2.c b/firmware/microblaze/apps/cruft/blink_leds2.c
index 13e78afb3..13e78afb3 100644
--- a/firmware/microblaze/apps/blink_leds2.c
+++ b/firmware/microblaze/apps/cruft/blink_leds2.c
diff --git a/firmware/microblaze/apps/buf_ram_test.c b/firmware/microblaze/apps/cruft/buf_ram_test.c
index 1aca2aec5..1aca2aec5 100644
--- a/firmware/microblaze/apps/buf_ram_test.c
+++ b/firmware/microblaze/apps/cruft/buf_ram_test.c
diff --git a/firmware/microblaze/apps/burn_dbsrx_eeprom.c b/firmware/microblaze/apps/cruft/burn_dbsrx_eeprom.c
index 116d4d8d0..116d4d8d0 100644
--- a/firmware/microblaze/apps/burn_dbsrx_eeprom.c
+++ b/firmware/microblaze/apps/cruft/burn_dbsrx_eeprom.c
diff --git a/firmware/microblaze/apps/burnrev30.c b/firmware/microblaze/apps/cruft/burnrev30.c
index 40fa53e34..40fa53e34 100644
--- a/firmware/microblaze/apps/burnrev30.c
+++ b/firmware/microblaze/apps/cruft/burnrev30.c
diff --git a/firmware/microblaze/apps/burnrev31.c b/firmware/microblaze/apps/cruft/burnrev31.c
index f6b08d187..f6b08d187 100644
--- a/firmware/microblaze/apps/burnrev31.c
+++ b/firmware/microblaze/apps/cruft/burnrev31.c
diff --git a/firmware/microblaze/apps/can_i_sub.c b/firmware/microblaze/apps/cruft/can_i_sub.c
index ed49791f0..ed49791f0 100644
--- a/firmware/microblaze/apps/can_i_sub.c
+++ b/firmware/microblaze/apps/cruft/can_i_sub.c
diff --git a/firmware/microblaze/apps/double_buffer_fragment.c b/firmware/microblaze/apps/cruft/double_buffer_fragment.c
index cfc061247..cfc061247 100644
--- a/firmware/microblaze/apps/double_buffer_fragment.c
+++ b/firmware/microblaze/apps/cruft/double_buffer_fragment.c
diff --git a/firmware/microblaze/apps/echo.c b/firmware/microblaze/apps/cruft/echo.c
index 89108ee80..89108ee80 100644
--- a/firmware/microblaze/apps/echo.c
+++ b/firmware/microblaze/apps/cruft/echo.c
diff --git a/firmware/microblaze/apps/eth_serdes.c b/firmware/microblaze/apps/cruft/eth_serdes.c
index 2d2ddc1ca..2d2ddc1ca 100644
--- a/firmware/microblaze/apps/eth_serdes.c
+++ b/firmware/microblaze/apps/cruft/eth_serdes.c
diff --git a/firmware/microblaze/apps/factory_test.c b/firmware/microblaze/apps/cruft/factory_test.c
index e1fbb0e40..e1fbb0e40 100644
--- a/firmware/microblaze/apps/factory_test.c
+++ b/firmware/microblaze/apps/cruft/factory_test.c
diff --git a/firmware/microblaze/apps/gen_eth_packets.c b/firmware/microblaze/apps/cruft/gen_eth_packets.c
index 4d521f6bf..4d521f6bf 100644
--- a/firmware/microblaze/apps/gen_eth_packets.c
+++ b/firmware/microblaze/apps/cruft/gen_eth_packets.c
diff --git a/firmware/microblaze/apps/gen_pause_frames.c b/firmware/microblaze/apps/cruft/gen_pause_frames.c
index 0f81dafff..0f81dafff 100644
--- a/firmware/microblaze/apps/gen_pause_frames.c
+++ b/firmware/microblaze/apps/cruft/gen_pause_frames.c
diff --git a/firmware/microblaze/apps/hello.c b/firmware/microblaze/apps/cruft/hello.c
index bce843093..bce843093 100644
--- a/firmware/microblaze/apps/hello.c
+++ b/firmware/microblaze/apps/cruft/hello.c
diff --git a/firmware/microblaze/apps/ibs_rx_test.c b/firmware/microblaze/apps/cruft/ibs_rx_test.c
index bdc04747e..bdc04747e 100644
--- a/firmware/microblaze/apps/ibs_rx_test.c
+++ b/firmware/microblaze/apps/cruft/ibs_rx_test.c
diff --git a/firmware/microblaze/apps/ibs_tx_test.c b/firmware/microblaze/apps/cruft/ibs_tx_test.c
index ff9446d92..ff9446d92 100644
--- a/firmware/microblaze/apps/ibs_tx_test.c
+++ b/firmware/microblaze/apps/cruft/ibs_tx_test.c
diff --git a/firmware/microblaze/apps/mimo_app_common_v2.c b/firmware/microblaze/apps/cruft/mimo_app_common_v2.c
index 5dbecb0d0..5dbecb0d0 100644
--- a/firmware/microblaze/apps/mimo_app_common_v2.c
+++ b/firmware/microblaze/apps/cruft/mimo_app_common_v2.c
diff --git a/firmware/microblaze/apps/mimo_app_common_v2.h b/firmware/microblaze/apps/cruft/mimo_app_common_v2.h
index 1e62ced37..1e62ced37 100644
--- a/firmware/microblaze/apps/mimo_app_common_v2.h
+++ b/firmware/microblaze/apps/cruft/mimo_app_common_v2.h
diff --git a/firmware/microblaze/apps/mimo_tx.c b/firmware/microblaze/apps/cruft/mimo_tx.c
index e0f8aa6fa..e0f8aa6fa 100644
--- a/firmware/microblaze/apps/mimo_tx.c
+++ b/firmware/microblaze/apps/cruft/mimo_tx.c
diff --git a/firmware/microblaze/apps/mimo_tx_slave.c b/firmware/microblaze/apps/cruft/mimo_tx_slave.c
index cdf9c03c2..cdf9c03c2 100644
--- a/firmware/microblaze/apps/mimo_tx_slave.c
+++ b/firmware/microblaze/apps/cruft/mimo_tx_slave.c
diff --git a/firmware/microblaze/apps/rcv_eth_packets.c b/firmware/microblaze/apps/cruft/rcv_eth_packets.c
index 03fc94354..03fc94354 100644
--- a/firmware/microblaze/apps/rcv_eth_packets.c
+++ b/firmware/microblaze/apps/cruft/rcv_eth_packets.c
diff --git a/firmware/microblaze/apps/read_dbids.c b/firmware/microblaze/apps/cruft/read_dbids.c
index 24c6d9ab4..24c6d9ab4 100644
--- a/firmware/microblaze/apps/read_dbids.c
+++ b/firmware/microblaze/apps/cruft/read_dbids.c
diff --git a/firmware/microblaze/apps/sd_bounce.c b/firmware/microblaze/apps/cruft/sd_bounce.c
index c1b48f170..c1b48f170 100644
--- a/firmware/microblaze/apps/sd_bounce.c
+++ b/firmware/microblaze/apps/cruft/sd_bounce.c
diff --git a/firmware/microblaze/apps/sd_gentest.c b/firmware/microblaze/apps/cruft/sd_gentest.c
index 35e912615..35e912615 100644
--- a/firmware/microblaze/apps/sd_gentest.c
+++ b/firmware/microblaze/apps/cruft/sd_gentest.c
diff --git a/firmware/microblaze/apps/serdes_to_dsp.c b/firmware/microblaze/apps/cruft/serdes_to_dsp.c
index 4994e0a69..4994e0a69 100644
--- a/firmware/microblaze/apps/serdes_to_dsp.c
+++ b/firmware/microblaze/apps/cruft/serdes_to_dsp.c
diff --git a/firmware/microblaze/apps/serdes_txrx.c b/firmware/microblaze/apps/cruft/serdes_txrx.c
index 2c47c9628..2c47c9628 100644
--- a/firmware/microblaze/apps/serdes_txrx.c
+++ b/firmware/microblaze/apps/cruft/serdes_txrx.c
diff --git a/firmware/microblaze/apps/set_hw_rev.c b/firmware/microblaze/apps/cruft/set_hw_rev.c
index d4ac8ff81..d4ac8ff81 100644
--- a/firmware/microblaze/apps/set_hw_rev.c
+++ b/firmware/microblaze/apps/cruft/set_hw_rev.c
diff --git a/firmware/microblaze/apps/test1.c b/firmware/microblaze/apps/cruft/test1.c
index c3cc3be56..c3cc3be56 100644
--- a/firmware/microblaze/apps/test1.c
+++ b/firmware/microblaze/apps/cruft/test1.c
diff --git a/firmware/microblaze/apps/test_db_spi.c b/firmware/microblaze/apps/cruft/test_db_spi.c
index f4fa98ef1..f4fa98ef1 100644
--- a/firmware/microblaze/apps/test_db_spi.c
+++ b/firmware/microblaze/apps/cruft/test_db_spi.c
diff --git a/firmware/microblaze/apps/test_i2c.c b/firmware/microblaze/apps/cruft/test_i2c.c
index f349ead88..f349ead88 100644
--- a/firmware/microblaze/apps/test_i2c.c
+++ b/firmware/microblaze/apps/cruft/test_i2c.c
diff --git a/firmware/microblaze/apps/test_lsadc.c b/firmware/microblaze/apps/cruft/test_lsadc.c
index 5fda29cd7..5fda29cd7 100644
--- a/firmware/microblaze/apps/test_lsadc.c
+++ b/firmware/microblaze/apps/cruft/test_lsadc.c
diff --git a/firmware/microblaze/apps/test_lsdac.c b/firmware/microblaze/apps/cruft/test_lsdac.c
index 8c1bf333b..8c1bf333b 100644
--- a/firmware/microblaze/apps/test_lsdac.c
+++ b/firmware/microblaze/apps/cruft/test_lsdac.c
diff --git a/firmware/microblaze/apps/test_phy_comm.c b/firmware/microblaze/apps/cruft/test_phy_comm.c
index d312ca4cc..d312ca4cc 100644
--- a/firmware/microblaze/apps/test_phy_comm.c
+++ b/firmware/microblaze/apps/cruft/test_phy_comm.c
diff --git a/firmware/microblaze/apps/test_ram.c b/firmware/microblaze/apps/cruft/test_ram.c
index 77ee693f6..77ee693f6 100644
--- a/firmware/microblaze/apps/test_ram.c
+++ b/firmware/microblaze/apps/cruft/test_ram.c
diff --git a/firmware/microblaze/apps/test_sd.c b/firmware/microblaze/apps/cruft/test_sd.c
index 494432d7f..494432d7f 100644
--- a/firmware/microblaze/apps/test_sd.c
+++ b/firmware/microblaze/apps/cruft/test_sd.c
diff --git a/firmware/microblaze/apps/timer_test.c b/firmware/microblaze/apps/cruft/timer_test.c
index 44e80b5f1..44e80b5f1 100644
--- a/firmware/microblaze/apps/timer_test.c
+++ b/firmware/microblaze/apps/cruft/timer_test.c
diff --git a/firmware/microblaze/apps/tx_standalone.c b/firmware/microblaze/apps/cruft/tx_standalone.c
index 1645fa8ba..1645fa8ba 100644
--- a/firmware/microblaze/apps/tx_standalone.c
+++ b/firmware/microblaze/apps/cruft/tx_standalone.c
diff --git a/firmware/microblaze/apps/flash_test.c b/firmware/microblaze/apps/flash_test.c
new file mode 100644
index 000000000..5b4569030
--- /dev/null
+++ b/firmware/microblaze/apps/flash_test.c
@@ -0,0 +1,67 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010 Ettus Research LLC
+ *
+ */
+
+#include <memory_map.h>
+#include <hal_io.h>
+#include <hal_uart.h>
+#include <xilinx_s3_icap.h>
+#include <nonstdio.h>
+#include <spi_flash.h>
+#include <spi.h>
+#include <clocks.h>
+#include <string.h>
+
+//just a test to write to SPI flash and retrieve the same values.
+//uses the MOBFLEET SPI flash library
+
+void delay(uint32_t t) {
+ while(t-- != 0) asm("NOP");
+}
+
+int main(int argc, char *argv[]) {
+ uint16_t i, t;
+ uint8_t buf[260];
+ const uint8_t testdata[] = {0xDE, 0xAD, 0xBE, 0xEF, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C};
+
+ hal_disable_ints(); // In case we got here via jmp 0x0
+// spi_init();
+ hal_uart_init();
+// clocks_init(); //set up AD9510, enable FPGA clock @ 1x divisor
+
+ puts("SPI Flash test\n");
+ puts("Initializing SPI\n");
+
+ spif_init();
+ delay(800000);
+ puts("Erasing sector 1\n");
+ spi_flash_erase(0x00010000, 256);
+ delay(800000);
+ puts("Reading back data\n");
+ spi_flash_read(0x00010000, 256, buf);
+ delay(800000);
+
+ t=1;
+ for(i=4; i<250; i++) {
+ if(buf[i] != 0xFF) t=0;
+ }
+
+ if(!t) puts("Data was not initialized to 0xFF. Unsuccessful erase or read\n");
+ else puts("Data initialized to 0xFF, erase confirmed\n");
+
+ puts("Writing test buffer\n");
+ spi_flash_program(0x00010000, 16, testdata);
+ //memset(buf, 0, 256);
+
+ delay(800000);
+ puts("Wrote data, reading back\n");
+
+ spi_flash_read(0x00010000, 16, buf);
+
+ if(memcmp(testdata, buf, 16)) puts("Data is not the same between read and write. Unsuccessful write or read\n");
+ else puts("Successful write! Flash write correct\n");
+
+ return 0;
+}
diff --git a/firmware/microblaze/apps/hardware_testbed.c b/firmware/microblaze/apps/hardware_testbed.c
new file mode 100644
index 000000000..e68e68ff7
--- /dev/null
+++ b/firmware/microblaze/apps/hardware_testbed.c
@@ -0,0 +1,47 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010 Ettus Research LLC
+ *
+ */
+
+#include <memory_map.h>
+#include <nonstdio.h>
+#include <hal_io.h>
+#include <xilinx_s3_icap.h>
+#include <spi_flash.h>
+//#include <spi_flash_private.h>
+#include <clocks.h>
+#include <ihex.h>
+#include <bootloader_utils.h>
+#include <string.h>
+#include <hal_uart.h>
+#include <spi.h>
+
+//so this is just an evolving file used to set up and test different bits of hardware (EEPROM, clock chip, A/D, D/A, PHY)
+void delay(uint32_t t) {
+ while(t-- != 0) asm("NOP");
+}
+
+int main(int argc, char *argv[]) {
+
+ hal_disable_ints();
+ hal_uart_init();
+ spi_init();
+
+ puts("Hardware testbed. Init clocks...");
+
+ clocks_init();
+
+ //now, hopefully, we should be running at 100MHz instead of 50MHz, meaning our UART is twice as fast and we're talking at 230400.
+
+ while(1) {
+ delay(500000);
+ puts("Eat at Joe's.");
+ }
+
+
+
+
+
+ return 0;
+}
diff --git a/firmware/microblaze/apps/txrx_uhd.c b/firmware/microblaze/apps/txrx_uhd.c
index 6b45f8f3b..092d216aa 100644
--- a/firmware/microblaze/apps/txrx_uhd.c
+++ b/firmware/microblaze/apps/txrx_uhd.c
@@ -41,7 +41,6 @@
#include <stdlib.h>
#include <string.h>
#include "clocks.h"
-#include <vrt/bits.h>
#include "usrp2/fw_common.h"
#include <i2c.h>
#include <ethertype.h>
@@ -266,7 +265,7 @@ void handle_udp_ctrl_packet(
* Peek and Poke Register
******************************************************************/
case USRP2_CTRL_ID_POKE_THIS_REGISTER_FOR_ME_BRO:
- if (ctrl_data_in->data.poke_args.addr < 0xC000){
+ if (0){//ctrl_data_in->data.poke_args.addr < 0xC000){
printf("error! tried to poke into 0x%x\n", ctrl_data_in->data.poke_args.addr);
}
else switch(ctrl_data_in->data.poke_args.num_bytes){
diff --git a/firmware/microblaze/apps/uart_flash_loader.c b/firmware/microblaze/apps/uart_flash_loader.c
new file mode 100644
index 000000000..d67b84677
--- /dev/null
+++ b/firmware/microblaze/apps/uart_flash_loader.c
@@ -0,0 +1,169 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010 Ettus Research LLC
+ *
+ */
+
+//#include <stdio.h>
+#include <stdlib.h>
+#include <memory_map.h>
+#include <nonstdio.h>
+#include <hal_io.h>
+#include <hal_uart.h>
+#include <xilinx_s3_icap.h>
+#include <spi_flash.h>
+#include <spi_flash_private.h>
+//#include <clocks.h>
+#include <ihex.h>
+#include <bootloader_utils.h>
+
+//uses UART to load files to Flash in Intel HEX 16-bit format.
+//this is one example of a "safe" firmware image to be loaded by a bootloader into main RAM.
+//this CANNOT write to main RAM, since it is resident there.
+
+//Sector 0-31: Safe FPGA bootloader image
+//Sector 32-63: Production bootloader image
+//Sector 64: Production firmware image
+//Sector 127: Safe firmware image
+
+
+void uart_flash_loader(void) {
+
+ char buf[256]; //input data buffer
+ uint8_t ihx[32]; //ihex data buffer
+ uint32_t slot_offset = PROD_FW_IMAGE_LOCATION_ADDR; //initial slot offset to program to.
+ uint32_t extended_addr = 0x00000000; //extended Intel hex segment address
+
+ size_t sector_size = spi_flash_log2_sector_size();
+ ihex_record_t ihex_record;
+ ihex_record.data = ihx;
+ int i;
+
+
+ //not gonna win a turing prize for my C text parsing
+ while(1) {
+ gets(buf);
+ if(!strncmp(buf, "!SECTORSIZE", 7)) { //return the sector size in log format
+ putstr("OK ");
+ puthex8((uint32_t) sector_size); //err, this should probably be decimal for human readability. we do have itoa now...
+ putstr("\n");
+ }
+ else if(!strncmp(buf, "!SETADDR", 7)) { //set start address for programming
+ slot_offset = atol(&buf[8]);
+ puts("OK");
+// puthex32(slot_offset);
+// putstr("\n");
+ }
+ else if(!strncmp(buf, "!ERASE", 6)) { //erase a sector
+ uint32_t sector = atol(&buf[6]);
+ uint32_t size = 2 << (sector_size-1);
+ uint32_t addr = sector << sector_size;
+
+ spi_flash_erase(addr, size); //we DO NOT implement write protection here. it is up to the HOST PROGRAM to not issue an ERASE unless it means it.
+ //unfortunately the Flash cannot write-protect the segments that really matter, so we only use global write-protect
+ //as a means of avoiding accidental writes from runaway code / garbage on the SPI bus.
+ puts("OK");
+ }
+//can't exactly run firmware if you're already executing out of main RAM
+/* else if(!strncmp(buf, "!RUNSFW", 7)) {
+ if(is_valid_fw_image(SAFE_FW_IMAGE_LOCATION_ADDR)) {
+ puts("OK");
+ spi_flash_read(SAFE_FW_IMAGE_LOCATION_ADDR, FW_IMAGE_SIZE_BYTES, (void *)RAM_BASE);
+ start_program(RAM_BASE);
+ } else {
+ puts("NOK");
+ }
+ }
+ else if(!strncmp(buf, "!RUNPFW", 7)) {
+ if(is_valid_fw_image(PROD_FW_IMAGE_LOCATION_ADDR)) {
+ puts("OK");
+ spi_flash_read(PROD_FW_IMAGE_LOCATION_ADDR, FW_IMAGE_SIZE_BYTES-1, (void *)RAM_BASE);
+ start_program(RAM_BASE);
+ } else {
+ puts("NOK");
+ }
+ }
+*/
+ else if(!strncmp(buf, "!RUNPFPGA", 8)) {
+ if(is_valid_fpga_image(PROD_FPGA_IMAGE_LOCATION_ADDR)) {
+ puts("OK");
+ //icap_reload_fpga(PROD_FPGA_IMAGE_LOCATION_ADDR);
+ } else {
+ puts("NOK");
+ }
+ }
+ else if(!strncmp(buf, "!RUNSFPGA", 8)) {
+ if(is_valid_fpga_image(SAFE_FPGA_IMAGE_LOCATION_ADDR)) {
+ puts("OK");
+ //icap_reload_fpga(SAFE_FPGA_IMAGE_LOCATION_ADDR);
+ } else {
+ puts("NOK");
+ }
+ }
+ else if(!strncmp(buf, "!READ", 5)) {
+ uint32_t addr = atol(&buf[5]);
+ spi_flash_read(addr, 16, ihx);
+ for(i=0; i < 16; i++) {
+ puthex8(ihx[i]);
+ }
+ putstr("\n");
+ }
+
+ else if(!ihex_parse(buf, &ihex_record)) { //last, try to see if the input was a valid IHEX line
+ switch (ihex_record.type) {
+ case 0:
+ spi_flash_program(ihex_record.addr + slot_offset + extended_addr, ihex_record.length, ihex_record.data);
+ puts("OK");
+ break;
+ case 1:
+ //here we would expect a CRC checking or something else to take place. for now we do nothing.
+ //well, we set the extended segment addr back to 0
+ extended_addr = 0;
+ puts("DONE");
+ break;
+ case 4:
+ //set the upper 16 bits of the address
+ extended_addr = ((ihex_record.data[0] << 8) + ihex_record.data[1]) << 16;
+ puts("OK");
+ break;
+ default:
+ puts("NOK");
+ }
+ }
+ else puts("NOK");
+ } //while(1)
+}
+
+void delay(uint32_t t) {
+ while(t-- != 0) asm("NOP");
+}
+
+int main(int argc, char *argv[]) {
+ uint8_t buf[32];
+ int i = 0;
+
+ hal_disable_ints(); // In case we got here via jmp 0x0
+
+// delay(10000000);
+
+ //before anything else you might want to blinkenlights just to indicate code startup to the user.
+
+ hal_uart_init();
+ spif_init();
+// i2c_init(); //for EEPROM
+ puts("USRP2+ UART firmware loader");
+
+// puts("Debug: loading production image, 10 bytes.");
+
+// spi_flash_read(PROD_FW_IMAGE_LOCATION_ADDR, 10, buf);
+// for(i=0; i < 10; i++) {
+// puthex8(buf[i]);
+// }
+
+ uart_flash_loader();
+
+ //shouldn't get here. should reboot.
+ puts("shit happened.\n");
+
+ return 0;
+}