HackENS/liminix-fork
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

in uimage FIT, honour ${arch}

Browse source
This commit is contained in:
Daniel Barlow 2023-10-29 11:50:23 +00:00
parent e6cb5e319b
commit 824536f9b3
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/kernel/kernel_fdt.its
View file

@ -1,6 +1,6 @@
/dts-v1/; /dts-v1/;
// used on aarch64 to provide a U-bootable image that combines // used on arm/aarch64 to provide a U-bootable image that combines
// kernel and fdt // kernel and fdt
/ { / {
@ -12,7 +12,7 @@
description = "Vanilla Linux kernel"; description = "Vanilla Linux kernel";
// data = /incbin/("./vmlinux.bin.gz"); // data = /incbin/("./vmlinux.bin.gz");
type = "kernel"; type = "kernel";
arch = "arm64"; // arch = "arm64";
os = "linux"; os = "linux";
// compression = "gzip"; // compression = "gzip";
// load = <00000000>; // load = <00000000>;
@ -28,7 +28,7 @@
description = "Flattened Device Tree blob"; description = "Flattened Device Tree blob";
// data = /incbin/("./target.dtb"); // data = /incbin/("./target.dtb");
type = "flat_dt"; type = "flat_dt";
arch = "arm64"; // arch = "arm64";
compression = "none"; compression = "none";
hash-1 { hash-1 {
algo = "crc32"; algo = "crc32";

6
pkgs/kernel/uimage.nix
View file

@ -59,9 +59,13 @@ in {
data = /incbin/("./vmlinux.bin.lzma"); data = /incbin/("./vmlinux.bin.lzma");
load = <${loadAddress}>; load = <${loadAddress}>;
entry = <${entryPoint}>; entry = <${entryPoint}>;
arch = "${arch}";
compression = "lzma"; compression = "lzma";
}; };
fdt-1 { data = /incbin/("./tmp.dtb"); }; fdt-1 {
data = /incbin/("./tmp.dtb");
arch = "${arch}";
};
}; };
}; };
_VARS _VARS