From: Vladimir Serbinenko Date: Wed, 13 Nov 2013 00:06:30 +0000 (+0100) Subject: * grub-core/kern/arm/uboot/startup.S: Use .org rather than assigning X-Git-Tag: grub-2.02-beta1~361 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc379c1aa15b7864f58569ebbf174f4896a2334b;p=thirdparty%2Fgrub.git * grub-core/kern/arm/uboot/startup.S: Use .org rather than assigning ".". --- diff --git a/ChangeLog b/ChangeLog index 35e498487..48b5d6f94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ -2013-11-12 Vladimir Serbinenko +2013-11-13 Vladimir Serbinenko + + * grub-core/kern/arm/uboot/startup.S: Use .org rather than assigning + ".". + +2013-11-13 Vladimir Serbinenko * include/grub/symbol.h (ADDR): New macro. Replace all occurences of =x with ADDR(x) in arm assembly. diff --git a/grub-core/kern/arm/uboot/startup.S b/grub-core/kern/arm/uboot/startup.S index 8920c2add..4b710a119 100644 --- a/grub-core/kern/arm/uboot/startup.S +++ b/grub-core/kern/arm/uboot/startup.S @@ -51,7 +51,7 @@ FUNCTION(_start) b codestart @ Size of final image integrated module blob - set by grub-mkimage - . = _start + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE + .org _start + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE VARIABLE(grub_total_module_size) .long 0