rpm/grub2
SHA256
1
0
Fork 0
forked from pool/grub2
Code Pull Requests Activity

Accepting request 669146 from home:Guillaume_G:branches:openSUSE:Factory:ARM

Browse Source 
- Add patch to fix ARM boot, when kernel become too big:
  * grub2-move-initrd-upper.patch (boo#1123350)

OBS-URL: https://build.opensuse.org/request/show/669146
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=324
This commit is contained in:
Michael Chang 2019-01-29 07:27:11 +00:00 committed by Git OBS Bridge
parent 7ca2efb407
commit 2db2e060f1
3 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
grub2-move-initrd-upper.patch Normal file
View File

@ -0,0 +1,33 @@
diff -pruN grub-2.02.orig/grub-core/loader/arm/linux.c grub-2.02/grub-core/loader/arm/linux.c
--- grub-2.02.orig/grub-core/loader/arm/linux.c 2016-02-22 20:04:35.000000000 +0100
+++ grub-2.02/grub-core/loader/arm/linux.c 2019-01-28 15:08:48.814415179 +0100
@@ -50,7 +50,7 @@ typedef void (*kernel_entry_t) (int, uns
#define LINUX_ZIMAGE_MAGIC 0x016f2818
#define LINUX_PHYS_OFFSET (0x00008000)
-#define LINUX_INITRD_PHYS_OFFSET (LINUX_PHYS_OFFSET + 0x02000000)
+#define LINUX_INITRD_PHYS_OFFSET (LINUX_PHYS_OFFSET + 0x03000000)
#define LINUX_FDT_PHYS_OFFSET (LINUX_INITRD_PHYS_OFFSET - 0x10000)
static grub_size_t
diff -pruN grub-2.02.orig/include/grub/arm/linux.h grub-2.02/include/grub/arm/linux.h
--- grub-2.02.orig/include/grub/arm/linux.h 2017-04-24 11:15:49.000000000 +0200
+++ grub-2.02/include/grub/arm/linux.h 2019-01-28 15:08:31.122275854 +0100
@@ -28,7 +28,7 @@
#if defined GRUB_MACHINE_UBOOT
# include <grub/uboot/uboot.h>
# define LINUX_ADDRESS (start_of_ram + 0x8000)
-# define LINUX_INITRD_ADDRESS (start_of_ram + 0x02000000)
+# define LINUX_INITRD_ADDRESS (start_of_ram + 0x03000000)
# define LINUX_FDT_ADDRESS (LINUX_INITRD_ADDRESS - 0x10000)
# define grub_arm_firmware_get_boot_data grub_uboot_get_boot_data
# define grub_arm_firmware_get_machine_type grub_uboot_get_machine_type
@@ -38,7 +38,7 @@
/* On UEFI platforms - load the images at the lowest available address not
less than *_PHYS_OFFSET from the first available memory location. */
# define LINUX_PHYS_OFFSET (0x00008000)
-# define LINUX_INITRD_PHYS_OFFSET (LINUX_PHYS_OFFSET + 0x02000000)
+# define LINUX_INITRD_PHYS_OFFSET (LINUX_PHYS_OFFSET + 0x03000000)
# define LINUX_FDT_PHYS_OFFSET (LINUX_INITRD_PHYS_OFFSET - 0x10000)
# define grub_arm_firmware_get_boot_data (grub_addr_t)grub_efi_get_firmware_fdt
static inline grub_uint32_t

6
grub2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jan 28 14:12:05 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Add patch to fix ARM boot, when kernel become too big:
* grub2-move-initrd-upper.patch (boo#1123350)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 25 07:08:32 UTC 2019 - mchang@suse.com Fri Jan 25 07:08:32 UTC 2019 - mchang@suse.com

5
grub2.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
# needssslcertforbuild # needssslcertforbuild
@ -255,6 +255,8 @@ Patch151: grub2-efi-Free-malloc-regions-on-exit.patch
# Linux root device related patches # Linux root device related patches
Patch163: grub2-zipl-setup-fix-btrfs-multipledev.patch Patch163: grub2-zipl-setup-fix-btrfs-multipledev.patch
Patch164: grub2-suse-remove-linux-root-param.patch Patch164: grub2-suse-remove-linux-root-param.patch
# ARM patches - boo#1123350
Patch180: grub2-move-initrd-upper.patch
# PPC64 LE support # PPC64 LE support
Patch205: grub2-ppc64le-disable-video.patch Patch205: grub2-ppc64le-disable-video.patch
Patch207: grub2-ppc64le-memory-map.patch Patch207: grub2-ppc64le-memory-map.patch
@ -567,6 +569,7 @@ swap partition while in resuming
%patch151 -p1 %patch151 -p1
%patch163 -p1 %patch163 -p1
%patch164 -p1 %patch164 -p1
%patch180 -p1
%patch205 -p1 %patch205 -p1
%patch207 -p1 %patch207 -p1
%patch210 -p1 %patch210 -p1