| Message ID | 20200225115140.10023-1-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/nios2/boot: Remove dead code (big endian check) | expand |
Le 25/02/2020 à 12:51, Philippe Mathieu-Daudé a écrit : > We only build the little-endian softmmu configuration (all > Nios II processors are only little endian). Checking for > big endian is pointless, remove the unused code. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/nios2/boot.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c > index 88224aa84c..000f8205d6 100644 > --- a/hw/nios2/boot.c > +++ b/hw/nios2/boot.c > @@ -140,16 +140,11 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base, > if (kernel_filename) { > int kernel_size, fdt_size; > uint64_t entry, low, high; > - int big_endian = 0; > - > -#ifdef TARGET_WORDS_BIGENDIAN > - big_endian = 1; > -#endif > > /* Boots a kernel elf binary. */ > kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, > &entry, &low, &high, NULL, > - big_endian, EM_ALTERA_NIOS2, 0, 0); > + 0, EM_ALTERA_NIOS2, 0, 0); > if ((uint32_t)entry == 0xc0000000) { > /* > * The Nios II processor reference guide documents that the > @@ -160,7 +155,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base, > kernel_size = load_elf(kernel_filename, NULL, > translate_kernel_address, NULL, > &entry, NULL, NULL, NULL, > - big_endian, EM_ALTERA_NIOS2, 0, 0); > + 0, EM_ALTERA_NIOS2, 0, 0); > boot_info.bootstrap_pc = ddr_base + 0xc0000000 + > (entry & 0x07ffffff); > } else { > Reviewed-by: Laurent Vivier <laurent@vivier.eu>
diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c index 88224aa84c..000f8205d6 100644 --- a/hw/nios2/boot.c +++ b/hw/nios2/boot.c @@ -140,16 +140,11 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base, if (kernel_filename) { int kernel_size, fdt_size; uint64_t entry, low, high; - int big_endian = 0; - -#ifdef TARGET_WORDS_BIGENDIAN - big_endian = 1; -#endif /* Boots a kernel elf binary. */ kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, &entry, &low, &high, NULL, - big_endian, EM_ALTERA_NIOS2, 0, 0); + 0, EM_ALTERA_NIOS2, 0, 0); if ((uint32_t)entry == 0xc0000000) { /* * The Nios II processor reference guide documents that the @@ -160,7 +155,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base, kernel_size = load_elf(kernel_filename, NULL, translate_kernel_address, NULL, &entry, NULL, NULL, NULL, - big_endian, EM_ALTERA_NIOS2, 0, 0); + 0, EM_ALTERA_NIOS2, 0, 0); boot_info.bootstrap_pc = ddr_base + 0xc0000000 + (entry & 0x07ffffff); } else {
We only build the little-endian softmmu configuration (all Nios II processors are only little endian). Checking for big endian is pointless, remove the unused code. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/nios2/boot.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)