Переглянути джерело

adjusted the tools according to the most recent release structure/naming

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8084 8c9fc860-2736-0410-a75d-ab315db34111
eth.morozova 7 роки тому
батько
коміт
1dd6f8ba15
3 змінених файлів з 27 додано та 27 видалено
  1. 9 9
      ARM/TE0726.Tool
  2. 9 9
      ARM/Zedboard.Tool
  3. 9 9
      ARM/Zybo.Tool

+ 9 - 9
ARM/TE0726.Tool

@@ -37,7 +37,7 @@ DisplayLinear.VertBackPorch = 32;
 DisplayLinear.VertSyncPolarity = TRUE;
 DisplayLinear.VertSyncPolarity = TRUE;
 ~
 ~
 
 
-SystemTools.DoCommands
+System.DoCommands
 
 
 (* 1. Mount Filesystems *)
 (* 1. Mount Filesystems *)
 FSTools.Mount MINOS RelativeFileSystem ARM/Minos~
 FSTools.Mount MINOS RelativeFileSystem ARM/Minos~
@@ -78,13 +78,13 @@ The bootloader is composed of 3 parts:
 Compiler.Compile -p=ARMA2 --metaData=simple
 Compiler.Compile -p=ARMA2 --metaData=simple
 	ZBL:/Boot.Mos
 	ZBL:/Boot.Mos
 ~
 ~
-StaticLinker.Link --fileName=Init.Bin --displacement=0H -a
+Linker.Link --fileName=Init.Bin --displacement=0H -a
 	Boot
 	Boot
 ~
 ~
 Release.Build -b -f=ZBL:/BootloaderRelease.Tool --only=Bootstrap TE0726 ~
 Release.Build -b -f=ZBL:/BootloaderRelease.Tool --only=Bootstrap TE0726 ~
 
 
 MinosLinker.Link Init.bin 0H Zbl.bin
 MinosLinker.Link Init.bin 0H Zbl.bin
-Platform Board TclInit ZynqInitializer FPE64 ARMRuntime PsUartMin Trace TraceDevice Caches Memory 
+Platform Board TclInit ZynqInitializer FPE64 Builtins PsUartMin Trace TraceDevice Caches Memory 
 MemoryMapping Interrupts Bit Clocks KernelUtils GlobalTimer Kernel Utils Strings Heaps OFS Modules 
 MemoryMapping Interrupts Bit Clocks KernelUtils GlobalTimer Kernel Utils Strings Heaps OFS Modules 
 SdEnvironment Sd Disks SdDisks SdControllers OFSDiskVolumes Bootstrap ~
 SdEnvironment Sd Disks SdDisks SdControllers OFSDiskVolumes Bootstrap ~
 
 
@@ -131,10 +131,10 @@ ZYNQ:/Zynq.DisplayLinear.Mod
 ~
 ~
 
 
 
 
-StaticLinker.Link --fileName=A2.Bin --displacement=100000H -a --path=build/
-Runtime Initializer Platform FPE64 ARMRuntime Trace BootConfig PsUartMin PsUart TraceDevice PrivateWatchdog Machine Heaps Modules Objects Kernel KernelLog Plugins
+Linker.Link --fileName=A2.Bin --displacement=100000H -a --path=build/
+Runtime Initializer Platform FPE64 Builtins Trace BootConfig PsUartMin PsUart TraceDevice PrivateWatchdog Machine Heaps Modules Objects Kernel KernelLog Plugins
 Streams Pipes Commands Reals Clock Dates Strings Files Disks Reflection TrapWriters Traps Locks Options PsConfig SdEnvironment
 Streams Pipes Commands Reals Clock Dates Strings Files Disks Reflection TrapWriters Traps Locks Options PsConfig SdEnvironment
-Sd SdDisks SdControllers Caches DiskVolumes DiskFS BitSets StringPool ObjectFile Diagnostics GenericLinker GenericLoader
+Sd SdDisks SdControllers Caches DiskVolumes DiskFS BitSets StringPool ObjectFile Diagnostics GenericLinker Loader
 BootConsole ~
 BootConsole ~
 
 
 (* ShellController Shell Displays AcAxisIo StreamVideoOut AxiDma DisplayLinear UTF8Strings CLUTs Raster WMRectangles
 (* ShellController Shell Displays AcAxisIo StreamVideoOut AxiDma DisplayLinear UTF8Strings CLUTs Raster WMRectangles
@@ -208,7 +208,7 @@ Partitions.Format VDISK0#3 AosFS ~
 FSTools.Mount ZYNQA2 AosFS VDISK0#3 ~
 FSTools.Mount ZYNQA2 AosFS VDISK0#3 ~
 ZipTool.ExtractAll --prefix=ZYNQA2: --sourcePath=build/ --overwrite --silent
 ZipTool.ExtractAll --prefix=ZYNQA2: --sourcePath=build/ --overwrite --silent
 	BootConsole.zip DMA.zip FpgaDisplay.zip FS.zip Kernel.zip Math.zip
 	BootConsole.zip DMA.zip FpgaDisplay.zip FS.zip Kernel.zip Math.zip
-	SD.zip Shell.zip System.zip SystemExt.zip SystemTools.zip Usb.zip 
+	SD.zip Shell.zip System.zip SystemExt.zip System.zip Usb.zip 
 	Profiler.zip GUI.zip Gfx.zip Crypto.zip
 	Profiler.zip GUI.zip Gfx.zip Crypto.zip
 	Compiler.zip
 	Compiler.zip
 ~
 ~
@@ -221,7 +221,7 @@ FSTools.CopyFiles -o
 FSTools.Unmount ZYNQA2 ~
 FSTools.Unmount ZYNQA2 ~
 VirtualDisks.Uninstall VDISK0 ~
 VirtualDisks.Uninstall VDISK0 ~
 
 
-SystemTools.Show 'TE0726 Zynq A2 image has been built!' ~
+System.Show 'TE0726 Zynq A2 image has been built!' ~
 FSTools.CloseFiles build/TE0726.ZynqA2.img ~
 FSTools.CloseFiles build/TE0726.ZynqA2.img ~
 ~
 ~
 
 
@@ -231,7 +231,7 @@ FSTools.CloseFiles build/TE0726.ZynqA2.img ~
 WinDisks.Install E: RW ~
 WinDisks.Install E: RW ~
 VirtualDisks.Install -b=512 VDISK0 build/TE0726.ZynqA2.img ~
 VirtualDisks.Install -b=512 VDISK0 build/TE0726.ZynqA2.img ~
 
 
-SystemTools.DoCommands
+System.DoCommands
 
 
 FSTools.Mount BOOT FatFS VDISK0#1 ~
 FSTools.Mount BOOT FatFS VDISK0#1 ~
 FSTools.Mount BL AosFS VDISK0#2 ~
 FSTools.Mount BL AosFS VDISK0#2 ~

+ 9 - 9
ARM/Zedboard.Tool

@@ -37,7 +37,7 @@ DisplayLinear.VertBackPorch = 32;
 DisplayLinear.VertSyncPolarity = TRUE;
 DisplayLinear.VertSyncPolarity = TRUE;
 ~
 ~
 
 
-SystemTools.DoCommands
+System.DoCommands
 
 
 (* 1. Mount Filesystems *)
 (* 1. Mount Filesystems *)
 FSTools.Mount MINOS RelativeFileSystem ARM/Minos~
 FSTools.Mount MINOS RelativeFileSystem ARM/Minos~
@@ -78,13 +78,13 @@ The bootloader is composed of 3 parts:
 Compiler.Compile -p=ARMA2 --metaData=simple
 Compiler.Compile -p=ARMA2 --metaData=simple
 	ZBL:/Boot.Mos
 	ZBL:/Boot.Mos
 ~
 ~
-StaticLinker.Link --fileName=Init.Bin --displacement=0H -a
+Linker.Link --fileName=Init.Bin --displacement=0H -a
 	Boot
 	Boot
 ~
 ~
 Release.Build -b -f=ZBL:/BootloaderRelease.Tool --only=Bootstrap Zedboard ~
 Release.Build -b -f=ZBL:/BootloaderRelease.Tool --only=Bootstrap Zedboard ~
 
 
 MinosLinker.Link Init.bin 0H Zbl.bin
 MinosLinker.Link Init.bin 0H Zbl.bin
-Platform Board TclInit ZynqInitializer FPE64 ARMRuntime PsUartMin Trace TraceDevice Caches Memory 
+Platform Board TclInit ZynqInitializer FPE64 Builtins PsUartMin Trace TraceDevice Caches Memory 
 MemoryMapping Interrupts Bit Clocks KernelUtils GlobalTimer Kernel Utils Strings Heaps OFS Modules 
 MemoryMapping Interrupts Bit Clocks KernelUtils GlobalTimer Kernel Utils Strings Heaps OFS Modules 
 SdEnvironment Sd Disks SdDisks SdControllers OFSDiskVolumes Bootstrap ~
 SdEnvironment Sd Disks SdDisks SdControllers OFSDiskVolumes Bootstrap ~
 
 
@@ -131,10 +131,10 @@ ZYNQ:/Zynq.DisplayLinear.Mod
 ~
 ~
 
 
 
 
-StaticLinker.Link --fileName=A2.Bin --displacement=100000H -a --path=build/
-Runtime Initializer Platform FPE64 ARMRuntime Trace BootConfig PsUartMin PsUart TraceDevice PrivateWatchdog Machine Heaps Modules Objects Kernel KernelLog Plugins
+Linker.Link --fileName=A2.Bin --displacement=100000H -a --path=build/
+Runtime Initializer Platform FPE64 Builtins Trace BootConfig PsUartMin PsUart TraceDevice PrivateWatchdog Machine Heaps Modules Objects Kernel KernelLog Plugins
 Streams Pipes Commands Reals Clock Dates Strings Files Disks Reflection TrapWriters Traps Locks Options PsConfig SdEnvironment
 Streams Pipes Commands Reals Clock Dates Strings Files Disks Reflection TrapWriters Traps Locks Options PsConfig SdEnvironment
-Sd SdDisks SdControllers Caches DiskVolumes DiskFS BitSets StringPool ObjectFile Diagnostics GenericLinker GenericLoader
+Sd SdDisks SdControllers Caches DiskVolumes DiskFS BitSets StringPool ObjectFile Diagnostics GenericLinker Loader
 BootConsole ~
 BootConsole ~
 
 
 (* ShellController Shell Displays AcAxisIo StreamVideoOut AxiDma DisplayLinear UTF8Strings CLUTs Raster WMRectangles
 (* ShellController Shell Displays AcAxisIo StreamVideoOut AxiDma DisplayLinear UTF8Strings CLUTs Raster WMRectangles
@@ -209,7 +209,7 @@ Partitions.Format VDISK0#3 AosFS ~
 FSTools.Mount ZYNQA2 AosFS VDISK0#3 ~
 FSTools.Mount ZYNQA2 AosFS VDISK0#3 ~
 ZipTool.ExtractAll --prefix=ZYNQA2: --sourcePath=build/ --overwrite --silent
 ZipTool.ExtractAll --prefix=ZYNQA2: --sourcePath=build/ --overwrite --silent
 	BootConsole.zip DMA.zip FpgaDisplay.zip FS.zip Kernel.zip Math.zip
 	BootConsole.zip DMA.zip FpgaDisplay.zip FS.zip Kernel.zip Math.zip
-	SD.zip Shell.zip System.zip SystemExt.zip SystemTools.zip Usb.zip 
+	SD.zip Shell.zip System.zip SystemExt.zip System.zip Usb.zip 
 	Profiler.zip GUI.zip Gfx.zip Crypto.zip
 	Profiler.zip GUI.zip Gfx.zip Crypto.zip
 	Compiler.zip PET.zip Zip.zip
 	Compiler.zip PET.zip Zip.zip
 ~
 ~
@@ -222,7 +222,7 @@ FSTools.CopyFiles -o
 FSTools.Unmount ZYNQA2 ~
 FSTools.Unmount ZYNQA2 ~
 VirtualDisks.Uninstall VDISK0 ~
 VirtualDisks.Uninstall VDISK0 ~
 
 
-SystemTools.Show 'Zedboard Zynq A2 image has been built!' ~
+System.Show 'Zedboard Zynq A2 image has been built!' ~
 FSTools.CloseFiles build/Zedboard.ZynqA2.img ~
 FSTools.CloseFiles build/Zedboard.ZynqA2.img ~
 ~
 ~
 
 
@@ -232,7 +232,7 @@ FSTools.CloseFiles build/Zedboard.ZynqA2.img ~
 WinDisks.Install E: RW ~
 WinDisks.Install E: RW ~
 VirtualDisks.Install -b=512 VDISK0 build/Zedboard.ZynqA2.img ~
 VirtualDisks.Install -b=512 VDISK0 build/Zedboard.ZynqA2.img ~
 
 
-SystemTools.DoCommands
+System.DoCommands
 
 
 FSTools.Mount BOOT FatFS VDISK0#1 ~
 FSTools.Mount BOOT FatFS VDISK0#1 ~
 FSTools.Mount BL AosFS VDISK0#2 ~
 FSTools.Mount BL AosFS VDISK0#2 ~

+ 9 - 9
ARM/Zybo.Tool

@@ -54,7 +54,7 @@ DisplayLinear.VertBackPorch = 32;
 DisplayLinear.VertSyncPolarity = TRUE;
 DisplayLinear.VertSyncPolarity = TRUE;
 ~
 ~
 
 
-SystemTools.DoCommands
+System.DoCommands
 
 
 (* 1. Mount Filesystems *)
 (* 1. Mount Filesystems *)
 FSTools.Mount MINOS RelativeFileSystem ARM/Minos~
 FSTools.Mount MINOS RelativeFileSystem ARM/Minos~
@@ -95,13 +95,13 @@ The bootloader is composed of 3 parts:
 Compiler.Compile -p=ARMA2 --metaData=simple
 Compiler.Compile -p=ARMA2 --metaData=simple
 	ZBL:/Boot.Mos
 	ZBL:/Boot.Mos
 ~
 ~
-StaticLinker.Link --fileName=Init.Bin --displacement=0H -a
+Linker.Link --fileName=Init.Bin --displacement=0H -a
 	Boot
 	Boot
 ~
 ~
 Release.Build -b -f=ZBL:/BootloaderRelease.Tool --only=Bootstrap Zybo ~
 Release.Build -b -f=ZBL:/BootloaderRelease.Tool --only=Bootstrap Zybo ~
 
 
 MinosLinker.Link Init.bin 0H Zbl.bin
 MinosLinker.Link Init.bin 0H Zbl.bin
-Platform Board TclInit ZynqInitializer FPE64 ARMRuntime PsUartMin Trace TraceDevice Caches Memory 
+Platform Board TclInit ZynqInitializer FPE64 Builtins PsUartMin Trace TraceDevice Caches Memory 
 MemoryMapping Interrupts Bit Clocks KernelUtils GlobalTimer Kernel Utils Strings Heaps OFS Modules 
 MemoryMapping Interrupts Bit Clocks KernelUtils GlobalTimer Kernel Utils Strings Heaps OFS Modules 
 SdEnvironment Sd Disks SdDisks SdControllers OFSDiskVolumes Bootstrap ~
 SdEnvironment Sd Disks SdDisks SdControllers OFSDiskVolumes Bootstrap ~
 
 
@@ -148,10 +148,10 @@ ZYNQ:/Zynq.DisplayLinear.Mod
 ~
 ~
 
 
 
 
-StaticLinker.Link --fileName=A2.Bin --displacement=100000H -a --path=build/
-Runtime Initializer Platform FPE64 ARMRuntime Trace BootConfig PsUartMin PsUart TraceDevice PrivateWatchdog Machine Heaps Modules Objects Kernel KernelLog Plugins
+Linker.Link --fileName=A2.Bin --displacement=100000H -a --path=build/
+Runtime Initializer Platform FPE64 Builtins Trace BootConfig PsUartMin PsUart TraceDevice PrivateWatchdog Machine Heaps Modules Objects Kernel KernelLog Plugins
 Streams Pipes Commands Reals Clock Dates Strings Files Disks Reflection TrapWriters Traps Locks Options PsConfig SdEnvironment
 Streams Pipes Commands Reals Clock Dates Strings Files Disks Reflection TrapWriters Traps Locks Options PsConfig SdEnvironment
-Sd SdDisks SdControllers Caches DiskVolumes DiskFS BitSets StringPool ObjectFile Diagnostics GenericLinker GenericLoader
+Sd SdDisks SdControllers Caches DiskVolumes DiskFS BitSets StringPool ObjectFile Diagnostics GenericLinker Loader
 BootConsole ~
 BootConsole ~
 
 
 (* ShellController Shell Displays AcAxisIo StreamVideoOut AxiDma DisplayLinear UTF8Strings CLUTs Raster WMRectangles
 (* ShellController Shell Displays AcAxisIo StreamVideoOut AxiDma DisplayLinear UTF8Strings CLUTs Raster WMRectangles
@@ -226,7 +226,7 @@ Partitions.Format VDISK0#3 AosFS ~
 FSTools.Mount ZYNQA2 AosFS VDISK0#3 ~
 FSTools.Mount ZYNQA2 AosFS VDISK0#3 ~
 ZipTool.ExtractAll --prefix=ZYNQA2: --sourcePath=build/ --overwrite --silent
 ZipTool.ExtractAll --prefix=ZYNQA2: --sourcePath=build/ --overwrite --silent
 	BootConsole.zip DMA.zip FpgaDisplay.zip FS.zip Kernel.zip Math.zip
 	BootConsole.zip DMA.zip FpgaDisplay.zip FS.zip Kernel.zip Math.zip
-	SD.zip Shell.zip System.zip SystemExt.zip SystemTools.zip Usb.zip 
+	SD.zip Shell.zip System.zip SystemExt.zip System.zip Usb.zip 
 	Profiler.zip GUI.zip Gfx.zip Crypto.zip
 	Profiler.zip GUI.zip Gfx.zip Crypto.zip
 	Compiler.zip PET.zip Zip.zip
 	Compiler.zip PET.zip Zip.zip
 ~
 ~
@@ -239,7 +239,7 @@ FSTools.CopyFiles -o
 FSTools.Unmount ZYNQA2 ~
 FSTools.Unmount ZYNQA2 ~
 VirtualDisks.Uninstall VDISK0 ~
 VirtualDisks.Uninstall VDISK0 ~
 
 
-SystemTools.Show 'Zybo Zynq A2 image has been built!' ~
+System.Show 'Zybo Zynq A2 image has been built!' ~
 FSTools.CloseFiles build/Zybo.ZynqA2.img ~
 FSTools.CloseFiles build/Zybo.ZynqA2.img ~
 ~
 ~
 
 
@@ -249,7 +249,7 @@ FSTools.CloseFiles build/Zybo.ZynqA2.img ~
 WinDisks.Install E: RW ~
 WinDisks.Install E: RW ~
 VirtualDisks.Install -b=512 VDISK0 build/Zybo.ZynqA2.img ~
 VirtualDisks.Install -b=512 VDISK0 build/Zybo.ZynqA2.img ~
 
 
-SystemTools.DoCommands
+System.DoCommands
 
 
 FSTools.Mount BOOT FatFS VDISK0#1 ~
 FSTools.Mount BOOT FatFS VDISK0#1 ~
 FSTools.Mount BL AosFS VDISK0#2 ~
 FSTools.Mount BL AosFS VDISK0#2 ~