Changeset 1046 for trunk

Timestamp:

Sep 6, 2016, 3:36:43 PM (8 years ago)

Author:

alain

Message:

Modify top.cpp to select the virtual disk as a parameter.
Fix a bug in arch_info.py.

Location:

trunk/platforms/tsar_generic_iob

Files:

• arch_info.py (modified) (1 diff)
• top.cpp (modified) (3 diffs)

trunk/platforms/tsar_generic_iob/arch_info.py

@@ -149 +149 @@
                       y_width        = y_width,
                       irqs_per_core  = irqs_per_core,
-                      use_ramdisk    = (ioc_type == 'RDK'),
                       io_cxy         = io_cxy,          
                       boot_cxy       = boot_cxy,
-                      reset_address  = rom_base )
+                      reset_address  = rom_base, 
+                      p_width        = p_width )
 
     ####################################################

trunk/platforms/tsar_generic_iob/top.cpp

@@ -159 +159 @@
 
 //////////////////////////////////////////////////////////////////
-//      For ALMOS
+//      Virtual disk selection => OS selection
 //////////////////////////////////////////////////////////////////
 
-#define USE_ALMOS 0
-
-#define almos_bootloader_pathname "bootloader.bin"
-#define almos_kernel_pathname     "kernel-soclib.bin@0xbfc10000:D"
-#define almos_archinfo_pathname   "arch-info.bin@0xBFC08000:D"
-
+#define USE_ALMOS 1
+#define USE_GIET  0
+
+#if ( USE_ALMOS + USE_GIET != 1 ) 
+#error  "OS UNDEFINED"
+#endif
+
+#if USE_ALMOS
+#define DISK_IMAGE_NAME       "almos_virt_hdd.dmg"
+#endif
+
+#if USE_GIET
+#define DISK_IMAGE_NAME       "giet_virt_hdd.dmg"
+#endif
 //////////////////////////////////////////////////////////////////
 //        Parallelisation
@@ -226 +234 @@
 #define L1_DWAYS              4
 #define L1_DSETS              64
-
-#define DISK_IMAGE_NAME       "virt_hdd.dmg"
 
 #define ROM_SOFT_NAME         "../../softs/tsar_boot/preloader.elf"
@@ -984 +990 @@
    sc_signal<bool>   signal_sdc_dat_value_from_card[4];
 
-    ////////////////////////////
-    //      Loader
-    ////////////////////////////
-
-#if USE_ALMOS
-    soclib::common::Loader loader(almos_bootloader_pathname,
-                                 almos_archinfo_pathname,
-                                 almos_kernel_pathname);
-#else
+    ////////////////////////////////////////////////
+    //      Load the preloader code in the ROM
+    ////////////////////////////////////////////////
+
     soclib::common::Loader loader(soft_name);
-#endif
 
     typedef soclib::common::GdbServer<soclib::common::Mips32ElIss> proc_iss;