Changeset 556 for trunk/boot

Timestamp:

Sep 21, 2018, 10:25:39 PM (6 years ago)

Author:

nicolas.van.phan@…

Message:

Gather LETI-specific macros into hard_config.h

Location:

trunk/boot/tsar_mips32

Files:

• boot.c (modified) (1 diff)
• boot_tty_driver.c (modified) (3 diffs)

trunk/boot/tsar_mips32/boot.c

@@ -404 +404 @@
     boot_info->x_max        = header->x_size; // [FIXME]
     boot_info->y_max        = header->name[5] == 'l' ? header->y_size - 1 : header->y_size; // [FIXME]
-    boot_info->use_mty0     = header->name[5] == 'l' ? true : false;
     boot_info->paddr_width  = header->paddr_width;
     boot_info->io_cxy       = header->io_cxy;

trunk/boot/tsar_mips32/boot_tty_driver.c

@@ -43 +43 @@
 #endif
 
-#ifdef IS_LETI
-  #define TARGET_CLUSTER    0
-#else
-  #define TARGET_CLUSTER    ((X_IO << Y_WIDTH) + Y_IO)
+#ifndef TXT_TGT_CLUSTER
+# error "The TXT_TGT_CLUSTER value should be defined in the 'hard_config.h' file"
 #endif
-
 
 /////////////////////////////////////////////////////////////////////////////
@@ -57 +54 @@
 static uint32_t boot_tty_get_register( uint32_t reg )
 {
-    cxy_t      cxy = TARGET_CLUSTER;
+    cxy_t      cxy = TXT_TGT_CLUSTER;
     uint32_t * ptr = (uint32_t *)SEG_TXT_BASE + reg;
     
@@ -72 +69 @@
                                    uint32_t val )
 {
-    cxy_t      cxy = TARGET_CLUSTER;
+    cxy_t      cxy = TXT_TGT_CLUSTER;
     uint32_t * ptr = (uint32_t *)SEG_TXT_BASE + reg;