Changeset 758 for trunk/softs/tsar_boot/include

Timestamp:

Jul 24, 2014, 3:19:18 PM (10 years ago)

Author:

cfuguet

Message:

tsar_boot: improving configuration infrastructure

• Using hard_config.h which respects the same sintax that the hard_config.h file of all TSAR platforms. This file can be then generated by the GIET-VM genmap tool or written manually.

• All peripheral drivers have been moved to a drivers directory and they are compiled as a static library. This allows GCC to only include in the final .ELF the object files of used peripherals and not all of them.

• Example hard_config.h and ldscripts have been introduced in the conf directory.

• Improving comments in all files

Location:

trunk/softs/tsar_boot/include

Files:

• block_device.h (deleted)
• defs.h (modified) (1 diff)
• inttypes.h (added)
• mcc.h (deleted)
• reset_ioc.h (modified) (1 diff)
• reset_utils.h (modified) (3 diffs)
• tty.h (deleted)

trunk/softs/tsar_boot/include/defs.h

@@ -1 @@
-#include <defs_platform.h>
+#include <hard_config.h>
 
-#define RESET_VERSION       0x00010002
-#define RESET_STACK_SIZE    0x2000
+#define RESET_VERSION         0x00010003
+#define RESET_STACK_SIZE      0x2000
+#define RESET_LOADER_LBA      2
+#define RESET_PHDR_ARRAY_SIZE 16
 
-#define BOOT_LOADER_LBA     2
-#define PHDR_ARRAY_SIZE     16
-
-#define BLOCK_SIZE          512
-
-#ifndef CLUSTER_IO
-#  define CLUSTER_IO        0
+#ifndef RESET_DEBUG
+#   define RESET_DEBUG        0
 #endif
 
-// vim: tabstop=4 : softtabstop=4 : shiftwidth=4 : expandtab
+#ifndef RESET_HARD_CC
+#   define RESET_HARD_CC      0
+#endif
 
+/**
+ * Default clock frequency (by default is 25 MHz for FPGA dev card DE2-115)
+ */
+#ifndef RESET_SYSTEM_CLK
+#   define RESET_SYSTEM_CLK   25000 /* KHz   */
+#endif
+
+/*
+ * TSAR platform independent hardware parameters
+ */
+
+#define BLOCK_SIZE            512   /* bytes */
+#define CACHE_LINE_SIZE       64    /* bytes */
+
+/*
+ * Verify that all used constants have been defined in the hard_config.h file
+ */
+
+#ifndef NB_PROCS_MAX
+#   error "NB_PROCS_MAX constant must be defined in hard_config.h"
+#endif
+
+#ifndef IRQ_PER_PROCESSOR
+#   error "IRQ_PER_PROCESSOR constant must be defined in hard_config.h file"
+#endif
+
+#ifndef SEG_XCU_BASE
+#   error "SEG_XCU_BASE constant must be defined in the hard_config.h file"
+#endif
+
+#ifndef SEG_ROM_BASE
+#   error "SEG_ROM_BASE constant must be defined in the hard_config.h file"
+#endif
+
+/*
+ * IO cluster constants
+ */
+
+#ifndef USE_IOB
+#   error "USE_IOB constant must be defined in the hard_config.h file"
+#endif
+
+#if !defined(X_IO) || !defined(Y_IO)
+#   error "X_IO and Y_IO constants must be defined in the hard_config.h file"
+#endif
+
+#if !defined(X_WIDTH) || !defined(Y_WIDTH)
+#   error "X_WIDTH and Y_WIDTH constants must be defined in the hard_config.h "
+          "file"
+#endif
+
+#define CLUSTER_IO  ((X_IO << Y_WIDTH) | Y_IO)
+
+/*
+ * vim: tabstop=4 : softtabstop=4 : shiftwidth=4 : expandtab
+ */

trunk/softs/tsar_boot/include/reset_ioc.h

@@ +1 @@
+/**
+ * \file   reset_ioc.h
+ * \date   December 14, 2013
+ * \author Cesar Fuguet
+ *
+ * \brief  API for accessing the disk controller
+ *
+ * \note   These functions call the specific disk controller driver depending
+ *         on the USE_IOC_BDV, USE_IOC_SPI or USE_RAMDISK constants
+ */
 #ifndef RESET_IOC_H
 #define RESET_IOC_H
 
-#if USE_SPI
-#include <sdcard.h>
-#include <spi.h>
-#endif /* USE_SPI */
+int reset_ioc_init();
 
-#if USE_BDV
-#include <block_device.h>
-#include <mcc.h>
-#endif /* USE_BDV */
-
-#include <defs.h>
-#include <reset_tty.h>
-#include <io.h>
-#include <reset_utils.h>
-
-#if USE_SPI
-extern int reset_ioc_init();
-#endif /* USE_SPI */
-
-extern int reset_ioc_read( unsigned int lba, 
-                           void*        buffer, 
-                           unsigned int count );
+int reset_ioc_read( unsigned int lba, void* buffer, unsigned int count );
 
 #endif /* RESET_IOC_H */
 
 /*
- * vim: tabstop=4 : shiftwidth=4 : expandtab
+ * vim: tabstop=4 : softtabstop=4 : shiftwidth=4 : expandtab
  */

trunk/softs/tsar_boot/include/reset_utils.h

@@ -5 +5 @@
  */
 
-#ifndef BOOT_UTILS_H
-#define BOOT_UTILS_H
+#ifndef RESET_UTILS_H
+#define RESET_UTILS_H
 
 #include <elf-types.h>
-#include <reset_tty.h>
-#include <reset_ioc.h>
+#include <inttypes.h>
 #include <defs.h>
-#include <mcc.h>
-#include <io.h>
-
-/********************************************************************
- * Integer types definition
- ********************************************************************/
-typedef unsigned int size_t;
-typedef unsigned int addr_t;
 
 /********************************************************************
@@ -26 +17 @@
 
 /*
- * cache line aligned disk block (sector) buffer 
+ * cache line aligned disk block (sector) buffer
  */
 struct aligned_blk
@@ -37 +28 @@
  ********************************************************************/
 
-extern unsigned int proctime();
+/**
+ * \brief processor waits for n cycles
+ */
+static inline void reset_sleep(int cycles)
+{
+    volatile int i;
+    for (i = 0; i < cycles; i++);
+}
 
-extern int pread(size_t file_offset, void *buf, size_t nbyte, size_t offset);
+/**
+ * \brief returns processor count
+ */
+static inline unsigned int proctime()
+{
+    register unsigned int ret asm ("v0");
+    asm volatile ("mfc0   %0,        $9":"=r" (ret));
+    return ret;
+}
 
-extern void* memcpy(void *_dst, const void *_src, size_t n);
-extern void* memset(void *_dst, int c, size_t len);
+int pread(size_t file_offset, void *buf, size_t nbyte, size_t offset);
 
-extern void check_elf_header(Elf32_Ehdr *ehdr);
-extern void reset_print_elf_phdr(Elf32_Phdr * elf_phdr_ptr);
+void* memcpy(void *_dst, const void *_src, size_t n);
+void* memset(void *_dst, int c, size_t len);
 
-#if USE_IOB
-void reset_mcc_invalidate (const void * buf, size_t size);
-#endif /* USE_IOB */
+void check_elf_header(Elf32_Ehdr *ehdr);
+void reset_print_elf_phdr(Elf32_Phdr * elf_phdr_ptr);
 
-#if (CACHE_COHERENCE == 0) || USE_IOB
-void reset_buf_invalidate (const void * buf, size_t line_size, size_t size);
-#endif /* (CACHE_COHERENCE == 0) || USE_IOB */
-#endif /* BOOT_UTILS_H */
+#endif /* RESET_UTILS_H */
 
 // vim: tabstop=4 : softtabstop=4 : shiftwidth=4 : expandtab