|
@@ -17,7 +17,7 @@ base_its = '''
|
|
#address-cells = <1>;
|
|
#address-cells = <1>;
|
|
|
|
|
|
images {
|
|
images {
|
|
- kernel@1 {
|
|
|
|
|
|
+ kernel-1 {
|
|
data = /incbin/("%(kernel)s");
|
|
data = /incbin/("%(kernel)s");
|
|
type = "kernel";
|
|
type = "kernel";
|
|
arch = "sandbox";
|
|
arch = "sandbox";
|
|
@@ -26,7 +26,7 @@ base_its = '''
|
|
load = <0x40000>;
|
|
load = <0x40000>;
|
|
entry = <0x8>;
|
|
entry = <0x8>;
|
|
};
|
|
};
|
|
- kernel@2 {
|
|
|
|
|
|
+ kernel-2 {
|
|
data = /incbin/("%(loadables1)s");
|
|
data = /incbin/("%(loadables1)s");
|
|
type = "kernel";
|
|
type = "kernel";
|
|
arch = "sandbox";
|
|
arch = "sandbox";
|
|
@@ -35,19 +35,19 @@ base_its = '''
|
|
%(loadables1_load)s
|
|
%(loadables1_load)s
|
|
entry = <0x0>;
|
|
entry = <0x0>;
|
|
};
|
|
};
|
|
- fdt@1 {
|
|
|
|
|
|
+ fdt-1 {
|
|
description = "snow";
|
|
description = "snow";
|
|
data = /incbin/("%(fdt)s");
|
|
data = /incbin/("%(fdt)s");
|
|
type = "flat_dt";
|
|
type = "flat_dt";
|
|
arch = "sandbox";
|
|
arch = "sandbox";
|
|
%(fdt_load)s
|
|
%(fdt_load)s
|
|
compression = "%(compression)s";
|
|
compression = "%(compression)s";
|
|
- signature@1 {
|
|
|
|
|
|
+ signature-1 {
|
|
algo = "sha1,rsa2048";
|
|
algo = "sha1,rsa2048";
|
|
key-name-hint = "dev";
|
|
key-name-hint = "dev";
|
|
};
|
|
};
|
|
};
|
|
};
|
|
- ramdisk@1 {
|
|
|
|
|
|
+ ramdisk-1 {
|
|
description = "snow";
|
|
description = "snow";
|
|
data = /incbin/("%(ramdisk)s");
|
|
data = /incbin/("%(ramdisk)s");
|
|
type = "ramdisk";
|
|
type = "ramdisk";
|
|
@@ -56,7 +56,7 @@ base_its = '''
|
|
%(ramdisk_load)s
|
|
%(ramdisk_load)s
|
|
compression = "%(compression)s";
|
|
compression = "%(compression)s";
|
|
};
|
|
};
|
|
- ramdisk@2 {
|
|
|
|
|
|
+ ramdisk-2 {
|
|
description = "snow";
|
|
description = "snow";
|
|
data = /incbin/("%(loadables2)s");
|
|
data = /incbin/("%(loadables2)s");
|
|
type = "ramdisk";
|
|
type = "ramdisk";
|
|
@@ -67,10 +67,10 @@ base_its = '''
|
|
};
|
|
};
|
|
};
|
|
};
|
|
configurations {
|
|
configurations {
|
|
- default = "conf@1";
|
|
|
|
- conf@1 {
|
|
|
|
- kernel = "kernel@1";
|
|
|
|
- fdt = "fdt@1";
|
|
|
|
|
|
+ default = "conf-1";
|
|
|
|
+ conf-1 {
|
|
|
|
+ kernel = "kernel-1";
|
|
|
|
+ fdt = "fdt-1";
|
|
%(ramdisk_config)s
|
|
%(ramdisk_config)s
|
|
%(loadables_config)s
|
|
%(loadables_config)s
|
|
};
|
|
};
|
|
@@ -410,7 +410,7 @@ def test_fit(u_boot_console):
|
|
|
|
|
|
# Try a ramdisk
|
|
# Try a ramdisk
|
|
with cons.log.section('Kernel + FDT + Ramdisk load'):
|
|
with cons.log.section('Kernel + FDT + Ramdisk load'):
|
|
- params['ramdisk_config'] = 'ramdisk = "ramdisk@1";'
|
|
|
|
|
|
+ params['ramdisk_config'] = 'ramdisk = "ramdisk-1";'
|
|
params['ramdisk_load'] = 'load = <%#x>;' % params['ramdisk_addr']
|
|
params['ramdisk_load'] = 'load = <%#x>;' % params['ramdisk_addr']
|
|
fit = make_fit(mkimage, params)
|
|
fit = make_fit(mkimage, params)
|
|
cons.restart_uboot()
|
|
cons.restart_uboot()
|
|
@@ -419,7 +419,7 @@ def test_fit(u_boot_console):
|
|
|
|
|
|
# Configuration with some Loadables
|
|
# Configuration with some Loadables
|
|
with cons.log.section('Kernel + FDT + Ramdisk load + Loadables'):
|
|
with cons.log.section('Kernel + FDT + Ramdisk load + Loadables'):
|
|
- params['loadables_config'] = 'loadables = "kernel@2", "ramdisk@2";'
|
|
|
|
|
|
+ params['loadables_config'] = 'loadables = "kernel-2", "ramdisk-2";'
|
|
params['loadables1_load'] = ('load = <%#x>;' %
|
|
params['loadables1_load'] = ('load = <%#x>;' %
|
|
params['loadables1_addr'])
|
|
params['loadables1_addr'])
|
|
params['loadables2_load'] = ('load = <%#x>;' %
|
|
params['loadables2_load'] = ('load = <%#x>;' %
|