diff options
Diffstat (limited to 'configs/common')
| -rw-r--r-- | configs/common/Benchmarks.py | 5 | ||||
| -rw-r--r-- | configs/common/FSConfig.py | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/configs/common/Benchmarks.py b/configs/common/Benchmarks.py index 74c5622dc..d4607dc55 100644 --- a/configs/common/Benchmarks.py +++ b/configs/common/Benchmarks.py @@ -111,7 +111,10 @@ Benchmarks = { 'ValStreamCopy': [SysConfig('micro_streamcopy.rcS', '512MB')], 'MutexTest': [SysConfig('mutex-test.rcS', '128MB')], - 'ArmAndroid': [SysConfig('null.rcS', '256MB', 'android-mbr.img')], + 'ArmAndroid': [SysConfig('null.rcS', '256MB', + 'ARMv7a-Gingerbread-Android.SMP.mouse.nolock.clean.img)')], + 'bbench': [SysConfig('bbench.rcS', '256MB', + 'ARMv7a-Gingerbread-Android.SMP.mouse.nolock.img')] } benchs = Benchmarks.keys() diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index 967570265..3e0a3df2e 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -252,7 +252,7 @@ def makeArmSystem(mem_mode, machine_type, mdesc = None, bare_metal=False): self.gic_cpu_addr = self.realview.gic.cpu_addr self.flags_addr = self.realview.realview_io.pio_addr + 0x30 - if mdesc.disk().count('android'): + if mdesc.disk().lower().count('android'): boot_flags += " init=/init " self.boot_osflags = boot_flags |