From 5d32e4d247ad633ec968e7a7c20ca9ebedc56167 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 15 Jan 2016 13:26:13 -0300 Subject: grub: fix addresses for ARMv7 SoCs --- libre/grub/PKGBUILD | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 5865ab712..32e22695c 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -873,11 +873,15 @@ _build_grub-uboot_am335x-bone() { msg 'Patch to detect am335x-bone device tree blob file (dtb)' patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch" - msg 'change memory adapted for am335x-bone support' - sed -i '\|arm_uboot_ldflags| s|0x08000000|0x82000000| + msg 'change memory adapted for am335x-bone support' + sed -i '\|arm_uboot_ldflags| s|0x08000000|0x82000000| \|GRUB_KERNEL_ARM_UBOOT_LINK_ADDR| s|0x08000000|0x82000000| - ' grub-core/Makefile.core.def \ - include/grub/offsets.h + ' grub-core/Makefile.core.def \ + include/grub/offsets.h + sed -i '\|LINUX_ADDRESS| s|start_of_ram [+] 0x8000|0x82000000| + \|LINUX_INITRD_ADDRESS| s|start_of_ram [+] 0x02000000|0x88080000| + \|LINUX_FDT_ADDRESS| s|LINUX_INITRD_ADDRESS [-] 0x10000|0x88000000| + ' include/grub/arm/linux.h msg 'Unset all compiler FLAGS for U-Boot (am335x-bone) build' unset CFLAGS @@ -933,6 +937,10 @@ _build_grub-uboot_omap3_beagle() { \|GRUB_KERNEL_ARM_UBOOT_LINK_ADDR| s|0x08000000|0x82000000| ' grub-core/Makefile.core.def \ include/grub/offsets.h + sed -i '\|LINUX_ADDRESS| s|start_of_ram [+] 0x8000|0x82000000| + \|LINUX_INITRD_ADDRESS| s|start_of_ram [+] 0x02000000|0x88080000| + \|LINUX_FDT_ADDRESS| s|LINUX_INITRD_ADDRESS [-] 0x10000|0x88000000| + ' include/grub/arm/linux.h msg 'Unset all compiler FLAGS for U-Boot (omap3_beagle) build' unset CFLAGS @@ -988,6 +996,10 @@ _build_grub-uboot_omap3_beagle_xm() { \|GRUB_KERNEL_ARM_UBOOT_LINK_ADDR| s|0x08000000|0x82000000| ' grub-core/Makefile.core.def \ include/grub/offsets.h + sed -i '\|LINUX_ADDRESS| s|start_of_ram [+] 0x8000|0x82000000| + \|LINUX_INITRD_ADDRESS| s|start_of_ram [+] 0x02000000|0x88080000| + \|LINUX_FDT_ADDRESS| s|LINUX_INITRD_ADDRESS [-] 0x10000|0x88000000| + ' include/grub/arm/linux.h msg 'Unset all compiler FLAGS for U-Boot (omap3_beagle_xm) build' unset CFLAGS @@ -1043,6 +1055,10 @@ _build_grub-uboot_omap3_beagle_xm_ab() { \|GRUB_KERNEL_ARM_UBOOT_LINK_ADDR| s|0x08000000|0x82000000| ' grub-core/Makefile.core.def \ include/grub/offsets.h + sed -i '\|LINUX_ADDRESS| s|start_of_ram [+] 0x8000|0x82000000| + \|LINUX_INITRD_ADDRESS| s|start_of_ram [+] 0x02000000|0x88080000| + \|LINUX_FDT_ADDRESS| s|LINUX_INITRD_ADDRESS [-] 0x10000|0x88000000| + ' include/grub/arm/linux.h msg 'Unset all compiler FLAGS for U-Boot (omap3_beagle_xm_ab) build' unset CFLAGS @@ -1098,6 +1114,10 @@ _build_grub-uboot_udoo() { \|GRUB_KERNEL_ARM_UBOOT_LINK_ADDR| s|0x08000000|0x12000000| ' grub-core/Makefile.core.def \ include/grub/offsets.h + sed -i '\|LINUX_ADDRESS| s|start_of_ram [+] 0x8000|0x12000000| + \|LINUX_INITRD_ADDRESS| s|start_of_ram [+] 0x02000000|0x12A00000| + \|LINUX_FDT_ADDRESS| s|LINUX_INITRD_ADDRESS [-] 0x10000|0x18000000| + ' include/grub/arm/linux.h msg 'Unset all compiler FLAGS for U-Boot (udoo) build' unset CFLAGS -- cgit v1.2.3