Support u-boot noload images for arm as used by, NetBSD/evbarm GENERIC kernel.
PATCH v4 1/1 Support u-boot noload images for arm as used by, NetBSD/evbarm GENERIC kernel.
noload kernels are loaded with the u-boot image header and as a result the header size needs adding to the entry point. Fake up a hdr so the kernel image is loaded at the right address and the entry point is adjusted appropriately.
The default location for the uboot file is 32MiB above bottom of DRAM. This matches the recommendation in Documentation/arm/Booting.
Clarify the load_uimage API to state the passing of a load address when an image doesn't specify one, or when loading a ramdisk is expected.
Adjust callers of load_uimage, etc.
--- hw/arm/boot.c | 8 +++++--- hw/core/loader.c | 19 ++++++++++++++++--- hw/core/uboot_image.h | 1 + hw/microblaze/boot.c | 2 +- hw/nios2/boot.c | 2 +- hw/ppc/e500.c | 1 + hw/ppc/ppc440_bamboo.c | 2 +- hw/ppc/sam460ex.c | 2 +- include/hw/loader.h | 7 ++++++- 9 files changed, 33 insertions(+), 11 deletions(-)
hw/arm/boot.c +5 -3
@@ -30,8 +30,9 @@* Documentation/arm/Booting and Documentation/arm64/booting.txt * They have different preferred image load offsets from system RAM base. */ -#define KERNEL_ARGS_ADDR 0x100 -#define KERNEL_LOAD_ADDR 0x00010000 +#define KERNEL_ARGS_ADDR 0x100 +#define KERNEL_NOLOAD_ADDR 0x02000000 +#define KERNEL_LOAD_ADDR 0x00010000#define KERNEL64_LOAD_ADDR 0x00080000#define ARM64_TEXT_OFFSET_OFFSET 8
@@ -1082,7 +1083,8 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) } entry = elf_entry;if (kernel_size <0 ) { - kernel_size =load_uimage_as (info->kernel_filename, &entry,NULL , +uint64_t loadaddr = info->loader_start +KERNEL_NOLOAD_ADDR ; + kernel_size =load_uimage_as (info->kernel_filename, &entry, &loadaddr, &is_linux,NULL ,NULL , as); }if (arm_feature (&cpu->env,ARM_FEATURE_AARCH64 ) && kernel_size <0 ) {
hw/core/loader.c +16 -3
@@ -613,13 +613,26 @@ static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr, goto out;if (hdr->ih_type != image_type) { -fprintf (stderr,"Wrong image type %d, expected %d\n" , hdr->ih_type, - image_type); - goto out; +if (!(image_type ==IH_TYPE_KERNEL && + hdr->ih_type ==IH_TYPE_KERNEL_NOLOAD )) { +fprintf (stderr,"Wrong image type %d, expected %d\n" , hdr->ih_type, + image_type); + goto out; + } }/* TODO: Implement other image types. */ switch (hdr->ih_type) { +case IH_TYPE_KERNEL_NOLOAD : +if (!loadaddr || *loadaddr ==LOAD_UIMAGE_LOADADDR_INVALID ) { +fprintf (stderr,"this image format (kernel_noload) cannot be " +"loaded on this machine type" ); + goto out; + } + + hdr->ih_load = *loadaddr +sizeof (*hdr); + hdr->ih_ep += hdr->ih_load; +/* fall through */ case IH_TYPE_KERNEL : address = hdr->ih_load;if (translate_fn) {
hw/core/uboot_image.h +1 -0
@@ -124,6 +124,7 @@#define IH_TYPE_SCRIPT 6/* Script file */ #define IH_TYPE_FILESYSTEM 7/* Filesystem Image (any type) */ #define IH_TYPE_FLATDT 8/* Binary Flat Device Tree Blob */ +#define IH_TYPE_KERNEL_NOLOAD 14/* OS Kernel Image (noload) */ /* * Compression Types
hw/microblaze/boot.c +1 -1
@@ -156,7 +156,7 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,/* If it wasn't an ELF image, try an u-boot image. */ if (kernel_size <0 ) { -hwaddr uentry, loadaddr; +hwaddr uentry, loadaddr =LOAD_UIMAGE_LOADADDR_INVALID ; kernel_size =load_uimage (kernel_filename, &uentry, &loadaddr,0 ,NULL ,NULL );
hw/nios2/boot.c +1 -1
@@ -161,7 +161,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base,/* If it wasn't an ELF image, try an u-boot image. */ if (kernel_size <0 ) { -hwaddr uentry, loadaddr; +hwaddr uentry, loadaddr =LOAD_UIMAGE_LOADADDR_INVALID ; kernel_size =load_uimage (kernel_filename, &uentry, &loadaddr,0 ,NULL ,NULL );
hw/ppc/e500.c +1 -0
@@ -995,6 +995,7 @@ void ppce500_init(MachineState *machine)* Hrm. No ELF image? Try a uImage, maybe someone is giving us an * ePAPR compliant kernel */ + loadaddr =LOAD_UIMAGE_LOADADDR_INVALID ; payload_size =load_uimage (filename, &bios_entry, &loadaddr,NULL ,NULL ,NULL );if (payload_size <0 ) {
hw/ppc/ppc440_bamboo.c +1 -1
@@ -179,7 +179,7 @@ static void bamboo_init(MachineState *machine)CPUPPCState *env;uint64_t elf_entry;uint64_t elf_lowaddr; -hwaddr loadaddr =0 ; +hwaddr loadaddr =LOAD_UIMAGE_LOADADDR_INVALID ;target_long initrd_size =0 ;DeviceState *dev;int success;
hw/ppc/sam460ex.c +1 -1
@@ -402,7 +402,7 @@ static void sam460ex_init(MachineState *machine)CPUPPCState *env;PPC4xxI2CState *i2c[2 ];hwaddr entry =UBOOT_ENTRY ; -hwaddr loadaddr =0 ; +hwaddr loadaddr =LOAD_UIMAGE_LOADADDR_INVALID ;target_long initrd_size =0 ;DeviceState *dev;SysBusDevice *sbdev;
include/hw/loader.h +6 -1
@@ -175,10 +175,15 @@ void load_elf_hdr(const char *filename, void *hdr, bool *is64, Error **errp);int load_aout (const char *filename,hwaddr addr,int max_sz,int bswap_needed,hwaddr target_page_size); +#define LOAD_UIMAGE_LOADADDR_INVALID (-1) +/** load_uimage_as: * @filename: Path of uimage file * @ep: Populated with program entry point. Ignored if NULL. -* @loadaddr: Populated with the load address. Ignored if NULL. +* @loadaddr: load address if none specified in the image or when loading a ramdisk. +* Populated with the the load address. Ignored if NULL or +* LOAD_UIMAGE_LOADADDR_INVALID (images which do not specify a load address +* will not be loadable). * @is_linux: Is set to true if the image loaded is Linux. Ignored if NULL. * @translate_fn: optional function to translate load addresses * @translate_opaque: opaque data passed to @translate_fn
Signature · 1 line
2.17.1
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Subject: [Qemu-devel] [PATCH v4] Support u-boot noload images for arm as used by, NetBSD/evbarm GENERIC kernel.
Type: series
Message-id: [email protected]
=== TEST SCRIPT BEGIN ===
#!/bin/bash
BASE=base
n=1
total=$(git log --oneline $BASE.. | wc -l)
failed=0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
commits="$(git log --format=%H --reverse $BASE..)" for c in $commits; do
echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..."
if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
failed=1
echo
fi
n=$((n+1))done
exit $failed
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
e2a15da Support u-boot noload images for arm as used by, NetBSD/evbarm GENERIC kernel.
=== OUTPUT BEGIN ===
Checking PATCH 1/1: Support u-boot noload images for arm as used by, NetBSD/evbarm GENERIC kernel....
ERROR: code indent should never use tabs
#89: FILE: hw/core/uboot_image.h:127:
+#define IH_TYPE_KERNEL_NOLOAD 14^I/* OS Kernel Image (noload)^I*/$
WARNING: line over 80 characters
#171: FILE: include/hw/loader.h:183:
+ * @loadaddr: load address if none specified in the image or when loading a ramdisk.
WARNING: line over 80 characters
#173: FILE: include/hw/loader.h:185:
+ * LOAD_UIMAGE_LOADADDR_INVALID (images which do not specify a load address
ERROR: Missing Signed-off-by: line(s)
total: 2 errors, 2 warnings, 111 lines checked
Your patch has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]
Quoted 8 lines · On 06/01/2019 22:56, [email protected] wrote:
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
The files being touched have lots of coding style problems already. I'm avoiding i) fixing these in the same diff for clarity and ii) in the case of IH_TYPE_KERNEL_NOLOAD, following existing formatting.
I'll send v5 with the loadaddr api documentation formatting fix.
Nick
Quoted 7 lines · Nick Hudson
Quoted 2 lines · On 06/01/2019 22:56, [email protected] wrote:
This series seems to have some coding style problems. See output below for more information:
The files being touched have lots of coding style problems already. I'm avoiding i) fixing these in the same diff for clarity and ii) in the case of
IH_TYPE_KERNEL_NOLOAD, following existing formatting.
Our usual rule of thumb is "keep checkpatch happy", ie don't introduce new style issues, even if the code being modified is a bit messy. In this case it's no big deal -- if you've already sent v5 I can just wrap the long lines when I apply the patch to my tree.
thanks
-- PMM
Quoted 55 lines · Nick Hudson
noload kernels are loaded with the u-boot image header and as a result the header size needs adding to the entry point. Fake up a hdr so the kernel image is loaded at the right address and the entry point is adjusted appropriately.
The default location for the uboot file is 32MiB above bottom of DRAM. This matches the recommendation in
Documentation/arm/Booting.Clarify the
load_uimageAPI to state the passing of a load address when an image doesn't specify one, or when loading a ramdisk is expected.Adjust callers of
load_uimage, etc.
---hw/arm/boot.c | 8 +++++--- hw/core/loader.c | 19 ++++++++++++++++--- hw/core/uboot_image.h | 1 + hw/microblaze/boot.c | 2 +- hw/nios2/boot.c | 2 +- hw/ppc/e500.c | 1 + hw/ppc/ppc440_bamboo.c | 2 +- hw/ppc/sam460ex.c | 2 +- include/hw/loader.h | 7 ++++++- 9 files changed, 33 insertions(+), 11 deletions(-)hw/arm/boot.c +5
-3@@ -30,8 +30,9 @@* Documentation/arm/Booting and Documentation/arm64/booting.txt * They have different preferred image load offsets from system RAM base. */ -#define KERNEL_ARGS_ADDR 0x100 -#define KERNEL_LOAD_ADDR 0x00010000 +#define KERNEL_ARGS_ADDR 0x100 +#define KERNEL_NOLOAD_ADDR 0x02000000 +#define KERNEL_LOAD_ADDR 0x00010000#define KERNEL64_LOAD_ADDR 0x00080000#define ARM64_TEXT_OFFSET_OFFSET 8@@ -1082,7 +1083,8 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) } entry = elf_entry;if (kernel_size <0 ) { - kernel_size =load_uimage_as (info->kernel_filename, &entry,NULL , +uint64_t loadaddr = info->loader_start +KERNEL_NOLOAD_ADDR ; + kernel_size =load_uimage_as (info->kernel_filename, &entry, &loadaddr, &is_linux,NULL ,NULL , as); }if (arm_feature (&cpu->env,ARM_FEATURE_AARCH64 ) && kernel_size <0 ) {hw/core/loader.c +0
-0
hw/core/loader.c static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr, · line 617
Quoted 8 lines
hw/core/loader.c +2
-3@@ -613,13 +613,26 @@ static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr, goto out;if (hdr->ih_type != image_type) { -fprintf (stderr,"Wrong image type %d, expected %d\n" , hdr->ih_type, - image_type); - goto out; +if (!(image_type ==IH_TYPE_KERNEL && + hdr->ih_type ==IH_TYPE_KERNEL_NOLOAD )) {
So this is now effectively
(hdr->ih_type != image_type && !(image_type == IH_TYPE_KERNEL && hdr->ih_type == IH_TYPE_KERNEL_NOLOAD))
Maybe you don't need two if-s just one with this condition?
Quoted 26 lines
hw/core/loader.c +14
-0+fprintf (stderr,"Wrong image type %d, expected %d\n" , hdr->ih_type, + image_type); + goto out; + } }/* TODO: Implement other image types. */ switch (hdr->ih_type) { +case IH_TYPE_KERNEL_NOLOAD : +if (!loadaddr || *loadaddr ==LOAD_UIMAGE_LOADADDR_INVALID ) { +fprintf (stderr,"this image format (kernel_noload) cannot be " +"loaded on this machine type" ); + goto out; + } + + hdr->ih_load = *loadaddr +sizeof (*hdr); + hdr->ih_ep += hdr->ih_load; +/* fall through */ case IH_TYPE_KERNEL : address = hdr->ih_load;if (translate_fn) {hw/core/uboot_image.h +0
-0
hw/core/uboot_image.h line 127
Quoted 4 lines
hw/core/uboot_image.h +1
-0@@ -124,6 +124,7 @@#define IH_TYPE_SCRIPT 6/* Script file */ #define IH_TYPE_FILESYSTEM 7/* Filesystem Image (any type) */ #define IH_TYPE_FLATDT 8/* Binary Flat Device Tree Blob */ +#define IH_TYPE_KERNEL_NOLOAD 14/* OS Kernel Image (noload) */
Do we want to make this an enum like in recent U-Boot? (Not suggesting we should just asking if you're touching this anyway.)
Quoted 71 lines
hw/core/uboot_image.h +0
-0/* * Compression Types hw/microblaze/boot.c +1
-1@@ -156,7 +156,7 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,/* If it wasn't an ELF image, try an u-boot image. */ if (kernel_size <0 ) { -hwaddr uentry, loadaddr; +hwaddr uentry, loadaddr =LOAD_UIMAGE_LOADADDR_INVALID ; kernel_size =load_uimage (kernel_filename, &uentry, &loadaddr,0 ,NULL ,NULL );hw/nios2/boot.c +1
-1@@ -161,7 +161,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base,/* If it wasn't an ELF image, try an u-boot image. */ if (kernel_size <0 ) { -hwaddr uentry, loadaddr; +hwaddr uentry, loadaddr =LOAD_UIMAGE_LOADADDR_INVALID ; kernel_size =load_uimage (kernel_filename, &uentry, &loadaddr,0 ,NULL ,NULL );hw/ppc/e500.c +1
-0@@ -995,6 +995,7 @@ void ppce500_init(MachineState *machine)* Hrm. No ELF image? Try a uImage, maybe someone is giving us an * ePAPR compliant kernel */ + loadaddr =LOAD_UIMAGE_LOADADDR_INVALID ; payload_size =load_uimage (filename, &bios_entry, &loadaddr,NULL ,NULL ,NULL );if (payload_size <0 ) {hw/ppc/ppc440_bamboo.c +1
-1@@ -179,7 +179,7 @@ static void bamboo_init(MachineState *machine)CPUPPCState *env;uint64_t elf_entry;uint64_t elf_lowaddr; -hwaddr loadaddr =0 ; +hwaddr loadaddr =LOAD_UIMAGE_LOADADDR_INVALID ;target_long initrd_size =0 ;DeviceState *dev;int success;hw/ppc/sam460ex.c +1
-1@@ -402,7 +402,7 @@ static void sam460ex_init(MachineState *machine)CPUPPCState *env;PPC4xxI2CState *i2c[2 ];hwaddr entry =UBOOT_ENTRY ; -hwaddr loadaddr =0 ; +hwaddr loadaddr =LOAD_UIMAGE_LOADADDR_INVALID ;target_long initrd_size =0 ;DeviceState *dev;SysBusDevice *sbdev;include/hw/loader.h +0
-0
include/hw/loader.h void load_elf_hdr(const char *filename, void *hdr, bool *is64, Error **errp); · line 178
Quoted 4 lines
include/hw/loader.h +1
-0@@ -175,10 +175,15 @@ void load_elf_hdr(const char *filename, void *hdr, bool *is64, Error **errp);int load_aout (const char *filename,hwaddr addr,int max_sz,int bswap_needed,hwaddr target_page_size); +#define LOAD_UIMAGE_LOADADDR_INVALID (-1)
hwadrr is uint64_t, an unsigned type so maybe -1 is not the best value for invalid address. Doesn't this give you a warning?
include/hw/loader.h void load_elf_hdr(const char *filename, void *hdr, bool *is64, Error **errp); · line 184
Quoted 7 lines
include/hw/loader.h +3
-1+/** load_uimage_as: * @filename: Path of uimage file * @ep: Populated with program entry point. Ignored if NULL. -* @loadaddr: Populated with the load address. Ignored if NULL. +* @loadaddr: load address if none specified in the image or when loading a ramdisk. +* Populated with the the load address. Ignored if NULL or
You have "the the" typo here ---^^^^^^^
Quoted 6 lines
include/hw/loader.h +2
-0+* LOAD_UIMAGE_LOADADDR_INVALID (images which do not specify a load address +* will not be loadable). * @is_linux: Is set to true if the image loaded is Linux. Ignored if NULL. * @translate_fn: optional function to translate load addresses * @translate_opaque: opaque data passed to @translate_fn
Thanks for the comments.
Quoted 72 lines · BALATON Zoltan
Quoted 58 lines · Nick Hudson
noload kernels are loaded with the u-boot image header and as a result the header size needs adding to the entry point. Fake up a hdr so the kernel image is loaded at the right address and the entry point is adjusted appropriately.
The default location for the uboot file is 32MiB above bottom of DRAM. This matches the recommendation in
Documentation/arm/Booting.Clarify the
load_uimageAPI to state the passing of a load address when an image doesn't specify one, or when loading a ramdisk is expected.Adjust callers of
load_uimage, etc.
---
hw/arm/boot.c | 8 +++++---
hw/core/loader.c | 19 ++++++++++++++++---
hw/core/uboot_image.h | 1 +
hw/microblaze/boot.c | 2 +-
hw/nios2/boot.c | 2 +-
hw/ppc/e500.c | 1 +hw/ppc/ppc440_bamboo.c| 2 +-
hw/ppc/sam460ex.c | 2 +-
include/hw/loader.h | 7 ++++++-9 files changed, 33 insertions(+), 11 deletions(-)hw/arm/boot.c +5
-3@@ -30,8 +30,9 @@* Documentation/arm/Booting and Documentation/arm64/booting.txt * They have different preferred image load offsets from system RAM base. */ -#define KERNEL_ARGS_ADDR 0x100 -#define KERNEL_LOAD_ADDR 0x00010000 +#define KERNEL_ARGS_ADDR 0x100 +#define KERNEL_NOLOAD_ADDR 0x02000000 +#define KERNEL_LOAD_ADDR 0x00010000#define KERNEL64_LOAD_ADDR 0x00080000#define ARM64_TEXT_OFFSET_OFFSET 8@@ -1082,7 +1083,8 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) } entry = elf_entry; if (kernel_size < 0) { - kernel_size = load_uimage_as(info->kernel_filename, &entry,NULL , + uint64_t loadaddr = info->loader_start + KERNEL_NOLOAD_ADDR; + kernel_size = load_uimage_as(info->kernel_filename, &entry, &loadaddr,
&is_linux, NULL, NULL, as); }
if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)&&kernel_size< 0) {hw/core/loader.c +0
-0hw/core/loader.c static int load_uboot_image(const char · line 619
Quoted 10 lines
hw/core/loader.c +2
-3@@ -613,13 +613,26 @@ static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr, goto out; if (hdr->ih_type != image_type) { - fprintf(stderr, "Wrong image type %d, expected %d\n", hdr->ih_type, - image_type); - goto out; + if (!(image_type == IH_TYPE_KERNEL && + hdr->ih_type == IH_TYPE_KERNEL_NOLOAD)) {So this is now effectively
Quoted 3 lines
(
hdr->ih_type!=image_type&& !(image_type ==IH_TYPE_KERNEL&&hdr->ih_type==IH_TYPE_KERNEL_NOLOAD))Maybe you don't need two if-s just one with this condition?
I didn't see anything in the style guide that stipulated I couldn't keep the two ifs. I've left it as is.
Quoted 27 lines
Quoted 27 lines
hw/core/loader.c +7
-0+ fprintf(stderr, "Wrong image type %d, expected %d\n", hdr->ih_type, + image_type); + goto out; + } } /* TODO: Implement other image types. */ switch (hdr->ih_type) { + case IH_TYPE_KERNEL_NOLOAD: + if (!loadaddr || *loadaddr == LOAD_UIMAGE_LOADADDR_INVALID) { + fprintf(stderr, "this image format (kernel_noload) cannotbe "
+ "loaded on this machine type"); + goto out;
+ }
+
+hdr->ih_load= *loadaddr +sizeof(*hdr); +hdr->ih_ep+=hdr->ih_load;
+ /* fall through */
caseIH_TYPE_KERNEL:
address =hdr->ih_load;
if (translate_fn) {hw/core/uboot_image.h +0
-1--- a/hw/core/uboot_image.h
Quoted 8 lines
hw/core/uboot_image.h line 127
Quoted 6 lines
+++
b/hw/core/uboot_image.hhw/core/uboot_image.h +1
-0@@ -124,6 +124,7 @@#define IH_TYPE_SCRIPT 6/* Script file */ #define IH_TYPE_FILESYSTEM 7/* Filesystem Image (any type) */ #define IH_TYPE_FLATDT 8/* Binary Flat Device Tree Blob */ +#define IH_TYPE_KERNEL_NOLOAD 14/* OS Kernel Image (noload) */ Do we want to make this an enum like in recent U-Boot? (Not suggesting we should just asking if you're touching this anyway.)
I guess this is for someone else to answer. I wanted to provide a minimal diff.
Quoted 78 lines
Quoted 78 lines
hw/core/uboot_image.h +0
-0/* * Compression Types hw/microblaze/boot.c +1
-1@@ -156,7 +156,7 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu,hwaddr ddr_base, /* If it wasn't an ELF image, try an u-boot image. */ if (kernel_size < 0) { - hwaddr uentry, loadaddr; + hwaddr uentry, loadaddr = LOAD_UIMAGE_LOADADDR_INVALID; kernel_size = load_uimage(kernel_filename, &uentry, &loadaddr, 0,NULL, NULL);
hw/nios2/boot.c +1
-1@@ -161,7 +161,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base, /* If it wasn't an ELF image, try an u-boot image. */ if (kernel_size < 0) { - hwaddr uentry, loadaddr; + hwaddr uentry, loadaddr = LOAD_UIMAGE_LOADADDR_INVALID; kernel_size = load_uimage(kernel_filename, &uentry, &loadaddr, 0,NULL, NULL);
hw/ppc/e500.c +1
-0@@ -995,6 +995,7 @@ void ppce500_init(MachineState *machine)* Hrm. No ELF image? Try a uImage, maybe someone is giving us an * ePAPR compliant kernel */ + loadaddr = LOAD_UIMAGE_LOADADDR_INVALID; payload_size = load_uimage(filename, &bios_entry, &loadaddr, NULL, NULL, NULL); if (payload_size < 0) {hw/ppc/ppc440_bamboo.c +1
-1@@ -179,7 +179,7 @@ static void bamboo_init(MachineState *machine) CPUPPCState *env; uint64_t elf_entry; uint64_t elf_lowaddr; - hwaddr loadaddr = 0; + hwaddr loadaddr = LOAD_UIMAGE_LOADADDR_INVALID; target_long initrd_size = 0; DeviceState *dev; int success;hw/ppc/sam460ex.c +1
-1@@ -402,7 +402,7 @@ static void sam460ex_init(MachineState *machine) CPUPPCState *env; PPC4xxI2CState *i2c[2]; hwaddr entry = UBOOT_ENTRY; - hwaddr loadaddr = 0; + hwaddr loadaddr = LOAD_UIMAGE_LOADADDR_INVALID; target_long initrd_size = 0; DeviceState *dev; SysBusDevice *sbdev;include/hw/loader.h +0
-0@@ -175,10 +175,15 @@ void load_elf_hdr(const char *filename, void *hdr, bool *is64, Error **errp);int load_aout (const char *filename,hwaddr addr,int max_sz, int bswap_needed, hwaddr target_page_size);
Quoted 3 lines
include/hw/loader.h void load_elf_hdr(const char *filename, void *hdr, bool *is64, Error **errp); · line 178
Quoted 1 line
include/hw/loader.h +1
-0+#define LOAD_UIMAGE_LOADADDR_INVALID (-1)hwadrr is
uint64_t, an unsigned type so maybe -1 is not the best value for invalid address. Doesn't this give you a warning?
I don't see a problem here and no warning is issued in my build.
Quoted 11 lines
Quoted 9 lines
include/hw/loader.h +2
-1+/** load_uimage_as: * @filename: Path of uimage file * @ep: Populated with program entry point. Ignored if NULL. -* @loadaddr: Populated with the load address. Ignored if NULL. +* @loadaddr: load address if none specified in the image or when loading a ramdisk.
+ * Populated with the the load address. Ignored if NULL orYou have "the the" typo here ---^^^^^^^
fixed in v5.
Quoted 8 lines
Quoted 8 lines
+ *
LOAD_UIMAGE_LOADADDR_INVALID(images which do not specify a load address
+ * will not be loadable).
* @is_linux: Is set to true if the image loaded is Linux. Ignored if NULL.
* @translate_fn: optional function to translate load addresses
* @translate_opaque: opaque data passed to @translate_fn
Thanks,
Nick