FSConfig.py (7949:e59dac494020) FSConfig.py (8061:08e91664adac)
1# Copyright (c) 2010 ARM Limited
2# All rights reserved.
3#
4# The license below extends only to copyright in the software and shall
5# not be construed as granting a license to any other intellectual
6# property including but not limited to intellectual property relating
7# to a hardware implementation of the functionality of the software
8# licensed hereunder. You may use the software subject to the license

--- 170 unchanged lines hidden (view full) ---

179 self.hypervisor_bin = binary('q_new.bin')
180 self.openboot_bin = binary('openboot_new.bin')
181 self.nvram_bin = binary('nvram1')
182 self.hypervisor_desc_bin = binary('1up-hv.bin')
183 self.partition_desc_bin = binary('1up-md.bin')
184
185 return self
186
1# Copyright (c) 2010 ARM Limited
2# All rights reserved.
3#
4# The license below extends only to copyright in the software and shall
5# not be construed as granting a license to any other intellectual
6# property including but not limited to intellectual property relating
7# to a hardware implementation of the functionality of the software
8# licensed hereunder. You may use the software subject to the license

--- 170 unchanged lines hidden (view full) ---

179 self.hypervisor_bin = binary('q_new.bin')
180 self.openboot_bin = binary('openboot_new.bin')
181 self.nvram_bin = binary('nvram1')
182 self.hypervisor_desc_bin = binary('1up-hv.bin')
183 self.partition_desc_bin = binary('1up-md.bin')
184
185 return self
186
187def makeLinuxArmSystem(mem_mode, mdesc = None, bare_metal=False,
188 machine_type = None):
187def makeArmSystem(mem_mode, machine_type, mdesc = None, bare_metal=False):
188 assert machine_type
189
189 if bare_metal:
190 self = ArmSystem()
191 else:
192 self = LinuxArmSystem()
193
194 if not mdesc:
195 # generic system
196 mdesc = SysConfig()

--- 26 unchanged lines hidden (view full) ---

223 if machine_type == "RealView_PBX":
224 self.realview = RealViewPBX()
225 elif machine_type == "RealView_EB":
226 self.realview = RealViewEB()
227 else:
228 print "Unknown Machine Type"
229 sys.exit(1)
230
190 if bare_metal:
191 self = ArmSystem()
192 else:
193 self = LinuxArmSystem()
194
195 if not mdesc:
196 # generic system
197 mdesc = SysConfig()

--- 26 unchanged lines hidden (view full) ---

224 if machine_type == "RealView_PBX":
225 self.realview = RealViewPBX()
226 elif machine_type == "RealView_EB":
227 self.realview = RealViewEB()
228 else:
229 print "Unknown Machine Type"
230 sys.exit(1)
231
231 if not bare_metal and machine_type:
232 self.machine_type = machine_type
233 elif bare_metal:
232 if bare_metal:
233 # EOT character on UART will end the simulation
234 self.realview.uart.end_on_eot = True
234 self.realview.uart.end_on_eot = True
235 else:
236 self.machine_type = machine_type
237 self.kernel = binary('vmlinux.arm')
238 self.boot_osflags = 'earlyprintk mem=128MB console=ttyAMA0' + \
239 ' lpj=19988480 norandmaps slram=slram0,0x8000000,+0x8000000' + \
240 ' mtdparts=slram0:- rw loglevel=8 root=/dev/mtdblock0'
235
236 self.realview.attachOnChipIO(self.membus)
237 self.realview.attachIO(self.iobus)
238
239 self.intrctrl = IntrControl()
240 self.terminal = Terminal()
241 self.vncserver = VncServer()
241
242 self.realview.attachOnChipIO(self.membus)
243 self.realview.attachIO(self.iobus)
244
245 self.intrctrl = IntrControl()
246 self.terminal = Terminal()
247 self.vncserver = VncServer()
242 self.kernel = binary('vmlinux.arm')
243 self.boot_osflags = 'earlyprintk mem=128MB console=ttyAMA0 lpj=19988480' + \
244 ' norandmaps slram=slram0,0x8000000,+0x8000000' + \
245 ' mtdparts=slram0:- rw loglevel=8 root=/dev/mtdblock0'
246
247 return self
248
249
250def makeLinuxMipsSystem(mem_mode, mdesc = None):
251 class BaseMalta(Malta):
252 ethernet = NSGigE(pci_bus=0, pci_dev=1, pci_func=0)
253 ide = IdeController(disks=[Parent.disk0, Parent.disk2],

--- 286 unchanged lines hidden --- 		248
249 return self
250
251
252def makeLinuxMipsSystem(mem_mode, mdesc = None):
253 class BaseMalta(Malta):
254 ethernet = NSGigE(pci_bus=0, pci_dev=1, pci_func=0)
255 ide = IdeController(disks=[Parent.disk0, Parent.disk2],

--- 286 unchanged lines hidden ---