usrp-n210: firmware changes related to init and bootloader

added u2p init file that is called by u2init
added spi flash init and added to u2pinit
implemented mdelay usage in bootloader

1 files changed, 9 insertions, 14 deletions

diff --git a/firmware/zpu/usrp2p/spi_flash.h b/firmware/zpu/usrp2p/spi_flash.h
index bbe7b650d..bfecab468 100644
--- a/firmware/zpu/usrp2p/spi_flash.h
+++ b/firmware/zpu/usrp2p/spi_flash.h
@@ -30,20 +30,15 @@
 
 uint32_t spi_flash_rdid(void);	/* Read ID */
 uint32_t spi_flash_rdsr(void);	/* Read Status Register */
-size_t spi_flash_log2_sector_size(void) __attribute__((pure));  /* either 16 or 18 */
-size_t spi_flash_log2_memory_size(void);
-
-static inline size_t
-spi_flash_sector_size(void)
-{
-  return ((size_t) 1) << spi_flash_log2_sector_size();
-}
-
-static inline size_t
-spi_flash_memory_size(void)
-{
-  return ((size_t) 1) << spi_flash_log2_memory_size();
-}
+
+//! call before using any spi flash utilities
+void spi_flash_init(void);
+
+size_t spi_flash_log2_sector_size(void);
+
+size_t spi_flash_sector_size(void);
+
+size_t spi_flash_memory_size(void);
 
 void spi_flash_read(uint32_t flash_addr,  size_t nbytes, void *buf);