Skip to content

Commit 238f1ad

Browse files
committed
common: add --qemu option to override configs
1 parent e54635c commit 238f1ad

File tree

8 files changed

+302
-309
lines changed

8 files changed

+302
-309
lines changed

build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ buildroot_component = Component(
8484
name_to_component_map = {
8585
# Leaves without dependencies.
8686
'baremetal-qemu': Component(
87-
lambda arch: run_cmd(['build-baremetal'], arch),
87+
lambda arch: run_cmd(['build-baremetal', '--qemu'], arch),
8888
supported_archs=common.crosstool_ng_supported_archs,
8989
),
9090
'baremetal-gem5': Component(

build-baremetal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class BaremetalComponent(common.Component):
2222
else:
2323
os.environ['PATH'] = common.crosstool_ng_bin_dir + os.environ['PATH']
2424
gcc = common.get_toolchain_tool('gcc', allowed_toolchains=['crosstool-ng'])
25-
if args.gem5:
25+
if common.emulator == 'gem5':
2626
if common.machine == 'VExpress_GEM5_V1':
2727
entry_address = 0x80000000
2828
uart_address = 0x1c090000

build-buildroot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ usually extra Buildroot targets.
7171
extra_make_args = common.add_newlines(args.extra_make_args)
7272
if args.build_linux:
7373
extra_make_args.extend(['linux-reconfigure', common.Newline])
74-
if args.gem5:
74+
if common.emulator == 'gem5':
7575
extra_make_args.extend(['gem5-reconfigure', common.Newline])
7676
if args.arch == 'x86_64':
7777
defconfig = 'qemu_x86_64_defconfig'

0 commit comments

Comments
 (0)