forked from pool/grub2
34d48ebe82
- Build GRUB2 for ppc64le as LittleEndian and 64bit - Fix timeout issue on ppc64le (bnc#869166) - Add powerpc-utils requires to grub2-powerpc-ieee1275 - added patches: * grub2-ppc64-build-ppc64-32bit.patch * grub2-ppc64-qemu.patch * grub2-ppc64le-01-Add-Little-Endian-support-for-Power64-to-the-build.patch * grub2-ppc64le-02-Build-grub-as-O1-until-we-add-savegpr-and-restgpr-ro.patch * grub2-ppc64le-03-disable-creation-of-vsx-and-altivec-instructions.patch * grub2-ppc64le-04-powerpc64-LE-s-linker-knows-how-to-handle-the-undefi.patch * grub2-ppc64le-05-grub-install-can-now-recognize-and-install-a-LE-grub.patch * grub2-ppc64le-06-set-the-ABI-version-to-0x02-in-the-e_flag-of-the-PPC.patch * grub2-ppc64le-07-Add-IEEE1275_ADDR-helper.patch * grub2-ppc64le-08-Fix-some-more-warnings-when-casting.patch * grub2-ppc64le-09-Add-powerpc64-types.patch * grub2-ppc64le-10-powerpc64-is-not-necessarily-BigEndian-anymore.patch * grub2-ppc64le-11-Fix-warnings-when-building-powerpc-linux-loader-64bi.patch * grub2-ppc64le-12-GRUB_ELF_R_PPC_-processing-is-applicable-only-for-32.patch * grub2-ppc64le-13-Fix-powerpc-setjmp-longjmp-64bit-issues.patch * grub2-ppc64le-14-Add-powerpc64-ieee1275-trampoline.patch * grub2-ppc64le-15-Add-64bit-support-to-powerpc-startup-code.patch * grub2-ppc64le-16-Add-grub_dl_find_section_addr.patch * grub2-ppc64le-17-Add-ppc64-relocations.patch * grub2-ppc64le-18-ppc64-doesn-t-need-libgcc-routines.patch * grub2-ppc64le-19-Use-FUNC_START-FUNC_END-for-powerpc-function-definit.patch * grub2-ppc64le-20-.TOC.-symbol-is-special-in-ppc64le-.-It-maps-to-the-.patch * grub2-ppc64le-21-the-.toc-section-in-powerpc64le-modules-are-sometime.patch * grub2-ppc64le-22-all-parameter-to-firmware-calls-should-to-be-BigEndi.patch * grub2-ppc64le-23-grub-segfaults-if-initrd-is-specified-before-specify.patch * grub2-ppc64le-timeout.patch (forwarded request 229655 from k0da) OBS-URL: https://build.opensuse.org/request/show/229673 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=89
68 lines
2.7 KiB
Diff
68 lines
2.7 KiB
Diff
From ab7a0d7323fd2f6eb4f55da50386378d6a7a7af0 Mon Sep 17 00:00:00 2001
|
|
From: Anton Blanchard <anton@samba.org>
|
|
Date: Wed, 29 Jan 2014 10:36:41 +1100
|
|
Subject: [PATCH 08/23] Fix some more warnings when casting.
|
|
|
|
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
|
|
From: Anton Blanchard <anton@samba.org>
|
|
---
|
|
grub-core/disk/ieee1275/ofdisk.c | 2 +-
|
|
grub-core/lib/powerpc/relocator.c | 8 ++++----
|
|
grub-core/net/drivers/ieee1275/ofnet.c | 2 +-
|
|
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c
|
|
index 1b72f06..d785d6a 100644
|
|
--- a/grub-core/disk/ieee1275/ofdisk.c
|
|
+++ b/grub-core/disk/ieee1275/ofdisk.c
|
|
@@ -244,7 +244,7 @@ dev_iterate (const struct grub_ieee1275_devalias *alias)
|
|
{
|
|
grub_uint64_t *ptr;
|
|
|
|
- ptr = *(grub_uint64_t **) (args.table + 4 + 8 * i);
|
|
+ ptr = *(grub_uint64_t **) ((grub_addr_t)args.table + 4 + 8 * i);
|
|
while (*ptr)
|
|
{
|
|
grub_snprintf (bufptr, 32, "/disk@%" PRIxGRUB_UINT64_T, *ptr++);
|
|
diff --git a/grub-core/lib/powerpc/relocator.c b/grub-core/lib/powerpc/relocator.c
|
|
index bdf2b11..4bac96f 100644
|
|
--- a/grub-core/lib/powerpc/relocator.c
|
|
+++ b/grub-core/lib/powerpc/relocator.c
|
|
@@ -84,8 +84,8 @@ grub_cpu_relocator_backward (void *ptr0, void *src, void *dest,
|
|
grub_size_t size)
|
|
{
|
|
void *ptr = ptr0;
|
|
- write_reg (8, (grub_uint32_t) src, &ptr);
|
|
- write_reg (9, (grub_uint32_t) dest, &ptr);
|
|
+ write_reg (8, (grub_uint32_t) (grub_addr_t) src, &ptr);
|
|
+ write_reg (9, (grub_uint32_t) (grub_addr_t) dest, &ptr);
|
|
write_reg (10, (grub_uint32_t) size, &ptr);
|
|
grub_memcpy (ptr, &grub_relocator_backward_start,
|
|
RELOCATOR_SRC_SIZEOF (backward));
|
|
@@ -96,8 +96,8 @@ grub_cpu_relocator_forward (void *ptr0, void *src, void *dest,
|
|
grub_size_t size)
|
|
{
|
|
void *ptr = ptr0;
|
|
- write_reg (8, (grub_uint32_t) src, &ptr);
|
|
- write_reg (9, (grub_uint32_t) dest, &ptr);
|
|
+ write_reg (8, (grub_uint32_t) (grub_addr_t) src, &ptr);
|
|
+ write_reg (9, (grub_uint32_t) (grub_addr_t) dest, &ptr);
|
|
write_reg (10, (grub_uint32_t) size, &ptr);
|
|
grub_memcpy (ptr, &grub_relocator_forward_start,
|
|
RELOCATOR_SRC_SIZEOF (forward));
|
|
diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c
|
|
index ea6456f..07c8446 100644
|
|
--- a/grub-core/net/drivers/ieee1275/ofnet.c
|
|
+++ b/grub-core/net/drivers/ieee1275/ofnet.c
|
|
@@ -395,7 +395,7 @@ search_net_devices (struct grub_ieee1275_devalias *alias)
|
|
grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
|
|
}
|
|
else
|
|
- card->txbuf = (void *) args.result;
|
|
+ card->txbuf = (void *) (grub_addr_t) args.result;
|
|
}
|
|
else
|
|
card->txbuf = grub_zalloc (card->txbufsize);
|
|
--
|
|
1.8.3.1
|