From 79dac89552e7ef0fa4376ba028b10ad7d2f1ca69 Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Wed, 23 Feb 2011 15:10:48 -0600 Subject: ARM: Clarifies creation of Linux and baremetal ARM systems. makeArmSystem creates both bare-metal and Linux systems more cleanly. machine_type was never optional though listed as an optional argument; a system such as "RealView_PBX" must now be explicitly specified. Now that it is a required argument, the placement of the arguments has changed slightly requiring some changes to calls that create ARM systems. --- configs/example/fs.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'configs/example') diff --git a/configs/example/fs.py b/configs/example/fs.py index b392f1a91..420cf1f8b 100644 --- a/configs/example/fs.py +++ b/configs/example/fs.py @@ -134,8 +134,9 @@ elif buildEnv['TARGET_ISA'] == "x86": test_sys = makeLinuxX86System(test_mem_mode, options.num_cpus, bm[0]) setWorkCountOptions(test_sys, options) elif buildEnv['TARGET_ISA'] == "arm": - test_sys = makeLinuxArmSystem(test_mem_mode, bm[0], - bare_metal=options.bare_metal, machine_type=options.machine_type) + test_sys = makeArmSystem(test_mem_mode, + options.machine_type, bm[0], + bare_metal=options.bare_metal) else: fatal("incapable of building non-alpha or non-sparc full system!") @@ -184,7 +185,8 @@ if len(bm) == 2: elif buildEnv['TARGET_ISA'] == 'x86': drive_sys = makeX86System(drive_mem_mode, np, bm[1]) elif buildEnv['TARGET_ISA'] == 'arm': - drive_sys = makeLinuxArmSystem(drive_mem_mode, bm[1]) + drive_sys = makeArmSystem(drive_mem_mode, + machine_options.machine_type, bm[1]) drive_sys.cpu = DriveCPUClass(cpu_id=0) drive_sys.cpu.connectAllPorts(drive_sys.membus) if options.fastmem: -- cgit v1.2.3