Thanks, applied as b5515256f0b1c49c28a2939a15e6b5401c78efc1.
Michael
[sent from post-receive hook]
On Fri, 27 Nov 2020 09:39:06 +0100, Alex Vazquez <avazquez....@gmail.com> wrote:
> Make it possible to specify load/entry addresses for the kernel.
> These are required by the FIT image specification, but in some cases
> users may not want to include them, so they are made optional.
>
> Also add mandatory "os" property for kernel and ramdisk.
>
> Signed-off-by: AVazquez <avazquez....@gmail.com>
> Message-Id: <1605526881-13215-1-git-send-email-avazquez....@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de>
>
> diff --git a/platforms/kernel-fit.in b/platforms/kernel-fit.in
> index 8cbc1a85a9dd..9585ce64a1ec 100644
> --- a/platforms/kernel-fit.in
> +++ b/platforms/kernel-fit.in
> @@ -17,6 +17,18 @@ menuconfig KERNEL_FIT
>
> if KERNEL_FIT
>
> +config KERNEL_FIT_LOAD
> + string
> + prompt "Kernel load address (optional)"
> + help
> + Required by most bootloaders. Optional for Barebox.
> +
> +config KERNEL_FIT_ENTRY
> + string
> + prompt "Kernel entry address (optional)"
> + help
> + Required by most bootloaders. Optional for Barebox.
> +
> config KERNEL_FIT_SIGNED
> bool
> prompt "sign FIT image"
> diff --git a/scripts/lib/ptxd_make_fit_image.sh
> b/scripts/lib/ptxd_make_fit_image.sh
> index 9754d1e84630..af535665d7b2 100644
> --- a/scripts/lib/ptxd_make_fit_image.sh
> +++ b/scripts/lib/ptxd_make_fit_image.sh
> @@ -21,7 +21,20 @@ ptxd_make_image_fit_its() {
> data = /incbin/("${image_kernel}");
> type = "kernel";
> arch = "$(ptxd_get_ptxconf PTXCONF_ARCH_STRING)";
> + os = "linux";
> compression = "none";
> +EOF
> + if [ -n "$(ptxd_get_ptxconf PTXCONF_KERNEL_FIT_LOAD)" ]; then
> + cat << EOF
> + load = <$(ptxd_get_ptxconf PTXCONF_KERNEL_FIT_LOAD)>;
> +EOF
> + fi
> + if [ -n "$(ptxd_get_ptxconf PTXCONF_KERNEL_FIT_ENTRY)" ]; then
> + cat << EOF
> + entry = <$(ptxd_get_ptxconf PTXCONF_KERNEL_FIT_ENTRY)>;
> +EOF
> + fi
> + cat << EOF
> hash-1 {
> algo = "sha256";
> };
> @@ -33,6 +46,7 @@ EOF
> description = "initramfs";
> data = /incbin/("${image_initramfs}");
> type = "ramdisk";
> + os = "linux";
> compression = "none";
> hash-1 {
> algo = "sha256";
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
