misc: Merge branch 'stable' into 'develop'
This ensures all commits in v23.0 are now in the develop branch. Change-Id: I791346115dd123f3541a3c8060482e00cf4dbfb5
This commit is contained in:
@@ -262,7 +262,7 @@ board.set_kernel_disk_workload(
|
||||
kernel=Resource("x86-linux-kernel-4.19.83"),
|
||||
# The location of the x86 SPEC CPU 2017 image
|
||||
disk_image=CustomDiskImageResource(
|
||||
args.image, disk_root_partition=args.partition
|
||||
args.image, root_partition=args.partition
|
||||
),
|
||||
readfile_contents=command,
|
||||
)
|
||||
|
||||
@@ -278,7 +278,7 @@ board.set_kernel_disk_workload(
|
||||
kernel=Resource("x86-linux-kernel-4.19.83"),
|
||||
# The location of the x86 SPEC CPU 2017 image
|
||||
disk_image=CustomDiskImageResource(
|
||||
args.image, disk_root_partition=args.partition
|
||||
args.image, root_partition=args.partition
|
||||
),
|
||||
readfile_contents=command,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user