Changeset 1049 for trunk

Timestamp:

Apr 6, 2017, 4:43:37 PM (8 years ago)

Author:

alain

Message:

Cosmetic change in the hard_config.h file : XCU -> ICU , TTY -> TXT

Location:

trunk/softs/tsar_boot

Files:

• Makefile (modified) (1 diff)
• drivers/reset_tty.c (modified) (1 diff)
• include/defs.h (modified) (1 diff)
• src/reset.S (modified) (5 diffs)

trunk/softs/tsar_boot/Makefile

@@ -4 +4 @@
 USE_DT           ?= 0
 DTS              ?= platform.dts
-HARD_CONFIG_PATH ?= ../../../giet_vm
+HARD_CONFIG_PATH ?= ../../../almos-mkh
 MAKECMDGOALS     ?= none
 BS_PROC          ?= 0

trunk/softs/tsar_boot/drivers/reset_tty.c

@@ -11 +11 @@
 #include <defs.h>
 
-#ifndef SEG_TTY_BASE
-#   error "SEG_TTY_BASE constant must be defined in the hard_config.h file"
+#ifndef SEG_TXT_BASE
+#   error "SEG_TXT_BASE constant must be defined in the hard_config.h file"
 #endif
 
-static int* const tty_address = (int* const)SEG_TTY_BASE;
+static int* const tty_address = (int* const)SEG_TXT_BASE;
 
 enum tty_registers {

trunk/softs/tsar_boot/include/defs.h

@@ -45 +45 @@
 #endif
 
-#ifndef SEG_XCU_BASE
-#   error "SEG_XCU_BASE constant must be defined in the hard_config.h file"
+#ifndef SEG_ICU_BASE
+#   error "SEG_ICU_BASE constant must be defined in the hard_config.h file"
 #endif
 

trunk/softs/tsar_boot/src/reset.S

@@ -97 +97 @@
 
 #if USE_32BIT
+
     /*** VERSION 1 : 32 bits ***/
 
@@ -106 +107 @@
      * In each cluster, the XICU base address depends on the cluster_xy
      */
-    la      t3,     SEG_XCU_BASE      /* t3 <= ICU base address             */
+    la      t3,     SEG_ICU_BASE      /* t3 <= ICU base address             */
     li      t4,     1                 /* t4 <= 1                            */
     sll     t4,     t4,     X_WIDTH   /* t4 <= 1 << X_WIDTH                 */
@@ -136 +137 @@
     sllv    t4,     t4,     t1       /* Set XICU[MSK_WTI][INDEX][local_id]  */
     sw      t4,     0(t5)            /* XICU[MSK_WTI][INDEX] <= t4          */
+
 #else
+
     /*** VERSION 2 : 40 bits ***/
 
@@ -144 +147 @@
      * In each cluster, the XICU base address depends on the cluster_xy
      */
-    la      t3,     SEG_XCU_BASE      /* t3 <= ICU base address             */
+    la      t3,     SEG_ICU_BASE      /* t3 <= ICU base address             */
     move    t4,     t1                /* t4 <= local_id                     */
     li      t5,     IRQ_PER_PROCESSOR /* t5 <= IRQ_PER_PROCESSOR            */
@@ -163 +166 @@
     sw      t4,     0(t5)            /* XICU[MSK_WTI][INDEX] <= t4          */
     mtc2    zero,   CP2_PADDR_EXT    /* reset PADDR extension               */
+
 #endif