Changeset 992

Timestamp:

May 14, 2015, 10:45:44 PM (9 years ago)

Author:

alain

Message:

Introduce a new driver for SD Card using the 4bits wide SD bus.
THere is now 5 supported block device peripherals, and the driver names
have been re-organised: reset_ioc_xxx with xxx in (bdv, hba, rdk, spi, sdc)

Location:

trunk/softs/tsar_boot

Files:

• Makefile (modified) (2 diffs)
• drivers/reset_bdv.c (deleted)
• drivers/reset_bdv.h (deleted)
• drivers/reset_hba.c (deleted)
• drivers/reset_hba.h (deleted)
• drivers/reset_ioc_bdv.c (added)
• drivers/reset_ioc_bdv.h (added)
• drivers/reset_ioc_hba.c (added)
• drivers/reset_ioc_hba.h (added)
• drivers/reset_ioc_rdk.c (added)
• drivers/reset_ioc_rdk.h (added)
• drivers/reset_ioc_sdc.c (added)
• drivers/reset_ioc_sdc.h (added)
• drivers/reset_ioc_spi.c (added)
• drivers/reset_ioc_spi.h (added)
• drivers/reset_rdk.c (deleted)
• drivers/reset_rdk.h (deleted)
• drivers/reset_sdc.c (deleted)
• drivers/reset_sdc.h (deleted)
• drivers/reset_tty.c (modified) (1 diff)
• drivers/sdcard.c (deleted)
• drivers/sdcard.h (deleted)
• include/reset_ioc.h (modified) (1 diff)
• src/reset_elf_loader.c (modified) (2 diffs)
• src/reset_ioc.c (modified) (4 diffs)
• src/reset_utils.c (modified) (2 diffs)

trunk/softs/tsar_boot/Makefile

@@ -2 +2 @@
 -include ./build.mk
 
-USE_DT     ?= 1
-DTS        ?= platform.dts
-
-MAKECMDGOALS ?= none
+USE_DT           ?= 0
+DTS              ?= platform.dts
+HARD_CONFIG_PATH ?= ../../../giet_vm
+MAKECMDGOALS     ?= none
 
 ifneq ($(MAKECMDGOALS),$(filter $(MAKECMDGOALS),clean distclean clean-doc doc))
@@ -78 +78 @@
 DRV_SRCS   := reset_tty.c        \
               reset_inval.c      \
-              reset_sdc.c        \
-              reset_bdv.c        \
-              reset_rdk.c        \
-              reset_hba.c        \
-              sdcard.c           \
+              reset_ioc_spi.c    \
+              reset_ioc_bdv.c    \
+              reset_ioc_rdk.c    \
+              reset_ioc_hba.c    \
+              reset_ioc_sdc.c    \
               spi.c
 

trunk/softs/tsar_boot/drivers/reset_tty.c

@@ -105 +105 @@
 
     reset_puts("\n!!! Exit Processor ");
-    reset_putx(pid);
+    reset_putx(pid & 0x3FF);
     reset_puts(" !!!\n");
 

trunk/softs/tsar_boot/include/reset_ioc.h

@@ -9 +9 @@
  *         on the USE_IOC_BDV, USE_IOC_SDC or USE_IOC_HBA USE_IOC_RDK flags
  */
+
 #ifndef RESET_IOC_H
 #define RESET_IOC_H

trunk/softs/tsar_boot/src/reset_elf_loader.c

@@ -44 +44 @@
     }
 
-#if (RESET_DEBUG == 1)
+#if (RESET_DEBUG > 1)
     reset_display_block( (char*)&elf_header );
 #endif
@@ -68 +68 @@
 
 #if (RESET_DEBUG == 1)
-        reset_puts("[RESET DEBUG] Loadable segment found:\n");
+        reset_puts("\n[RESET DEBUG] Loadable segment found:\n");
         reset_print_elf_phdr(&elf_pht[pseg]);
 #endif

trunk/softs/tsar_boot/src/reset_ioc.c

@@ -6 +6 @@
  * \brief  API for accessing the disk controller
  *
- * \note   These functions call the specific disk controller driver depending
- *         on the USE_IOC_BDV, USE_IOC_SDC or USE_IOC_RDK constants
+ * \note   These functions call the specific disk controller driver depending on
+ *          USE_IOC_BDV / USE_IOC_SDC / USE_IOC_RDK / USE_IOC_SDC / USE_IOC_SPI
  */
 
@@ -13 +13 @@
 #include <defs.h>
 
-#if (USE_IOC_BDV + USE_IOC_SDC + USE_IOC_RDK + USE_IOC_HBA) != 1
+#if (USE_IOC_BDV + USE_IOC_SDC + USE_IOC_RDK + USE_IOC_HBA + USE_IOC_SPI) != 1
 #   error "in reset_ioc.c : undefined disk controller in hard_config.h"
 #endif
 
 #if USE_IOC_SDC
-#include <reset_sdc.h>
+#include <reset_ioc_sdc.h> 
 #endif
 
 #if USE_IOC_BDV
-#include <reset_bdv.h>
+#include <reset_ioc_bdv.h>
 #endif
 
 #if USE_IOC_RDK
-#include <reset_rdk.h>
+#include <reset_ioc_rdk.h>
 #endif
 
 #if USE_IOC_HBA
-#include <reset_hba.h>
+#include <reset_ioc_hba.h>
+#endif
+
+#if USE_IOC_SPI
+#include <reset_ioc_spi.h>
 #endif
 
@@ -47 +51 @@
 #elif USE_IOC_HBA
     return reset_hba_init();
+#elif USE_IOC_SPI
+    return reset_spi_init();
 #else
 #   error "in reset_ioc_init.c : undefined disk controller in hard_config.h"
@@ -72 +78 @@
 #elif USE_IOC_HBA
     return reset_hba_read(lba, buffer, count);
+#elif USE_IOC_SPI
+    return reset_spi_read(lba, buffer, count);
 #else
 #   error "in reset_ioc_read.c : undefined disk controller in hard_config.h"

trunk/softs/tsar_boot/src/reset_utils.c

@@ -231 +231 @@
     unsigned int word;
 
-    reset_puts("***********************************************************************\n");
+    reset_puts("\n***********************************************************************\n");
     for ( line = 0 ; line < 32 ; line++ )
     {
@@ -241 +241 @@
         for ( word=0 ; word<4 ; word++ )
         {
-            unsigned int byte  = (line<<5) + (word<<2);
+            unsigned int byte  = (line<<4) + (word<<2);
             unsigned int hexa  = (buffer[byte  ]<<24) |
                                  (buffer[byte+1]<<16) |