usrp2: remove ram macros from memory map, conditionally load fw update

3 files changed, 0 insertions, 41 deletions

diff --git a/firmware/zpu/usrp2/CMakeLists.txt b/firmware/zpu/usrp2/CMakeLists.txt
index 8ed31b8d4..ca5c6d92a 100644
--- a/firmware/zpu/usrp2/CMakeLists.txt
+++ b/firmware/zpu/usrp2/CMakeLists.txt
@@ -23,7 +23,6 @@ ADD_LIBRARY(libusrp2fw STATIC
     ${COMMON_SRCS}
     sd.c
     ethernet.c
-    udp_fw_update.c
 )
 
 ########################################################################
diff --git a/firmware/zpu/usrp2/memory_map.h b/firmware/zpu/usrp2/memory_map.h
index 40c5e6540..b1ca4aa6d 100644
--- a/firmware/zpu/usrp2/memory_map.h
+++ b/firmware/zpu/usrp2/memory_map.h
@@ -53,12 +53,6 @@
 
 #define ROUTER_RAM_BASE 0x8000
 
-#define RAM_NLINES	   0x0200	// number of 32-bit lines in a buffer
-
-#define _router_ram ((uint32_t *) ROUTER_RAM_BASE)
-#define router_ram(n) (&_router_ram[(n) * RAM_NLINES])
-
-
 /////////////////////////////////////////////////////
 // SPI Core, Slave 2.  See core docs for more info
 #define SPI_BASE 0xC000   // Base address (16-bit)
diff --git a/firmware/zpu/usrp2/udp_fw_update.c b/firmware/zpu/usrp2/udp_fw_update.c
deleted file mode 100644
index 14eb0b1ee..000000000
--- a/firmware/zpu/usrp2/udp_fw_update.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- c++ -*- */
-/*
- * 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/>.
- */
-
-//Routines to handle updating the SPI Flash firmware via UDP
-
-#include "net_common.h"
-#include "usrp2/fw_common.h"
-#include <nonstdio.h>
-#include "udp_fw_update.h"
-
-//Firmware update packet handler
-void handle_udp_fw_update_packet(struct socket_address src, struct socket_address dst,
-                                 unsigned char *payload, int payload_len) {
-
-  usrp2_fw_update_data_t update_data_out;
-  update_data_out.id = USRP2_FW_UPDATE_ID_WAT;
-
-  send_udp_pkt(USRP2_UDP_UPDATE_PORT, src, &update_data_out, sizeof(update_data_out));
-}