linux-ramdump-parser-v2: fix cpu values for 8916, 8939 and 8994

Fix the cpu values for 8916, 8939 and 8994 so that the cpu_type
used while creating the t32_startup_script.cmm is correct.

Change-Id: Ib43aebebde5492a3aa6cbf39467ccae8a94a5fe7

linux-ramdump-parser-v2/boards.py

@@ -171,7 +171,7 @@ class Board8939(Board):
         super(Board8939, self).__init__()
         self.socid = socid
         self.board_num = 8939
-        self.cpu = 'CORTEXA7'
+        self.cpu = 'CORTEXA53'
         self.ram_start = 0x80000000
         self.smem_addr = 0xe200000
         self.phys_offset = 0x80000000
@@ -184,7 +184,7 @@ class Board8994(Board):
         super(Board8994, self).__init__()
         self.socid = socid
         self.board_num = 8994
-        self.cpu = 'CORTEXA7'
+        self.cpu = 'CORTEXA57A53'
         self.ram_start = 0x0
         self.smem_addr = 0x6a00000
         self.phys_offset = 0x0

linux-ramdump-parser-v2/ramdump.py

@@ -693,14 +693,10 @@ class RamDump():
 
         startup_script = open(out_path + '/t32_startup_script.cmm', 'wb')
 
-        # This is a semi hack until A53 support is fully integrated and tested.
-        # Remove this at the earliest convenience.
-        if self.arm64:
-            startup_script.write(
-                'sys.cpu CORTEXA53\n'.encode('ascii', 'ignore'))
+        if self.arm64 and self.hw_id == 8916:
+            startup_script.write('sys.cpu CORTEXA53\n'.encode('ascii', 'ignore'))
         else:
-            startup_script.write(
-                'sys.cpu {0}\n'.format(self.cpu_type).encode('ascii', 'ignore'))
+            startup_script.write('sys.cpu {0}\n'.format(self.cpu_type).encode('ascii', 'ignore'))
         startup_script.write('sys.up\n'.encode('ascii', 'ignore'))
 
         for ram in self.ebi_files: