From 16a22c3851e726f687e7119e914e2d11c244e4aa Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 13 Nov 2013 06:28:15 +0100 Subject: [PATCH] * grub-core/kern/uboot/init.c: Move grub_uboot_machine_type and grub_uboot_boot_data to asm part. --- ChangeLog | 5 +++++ grub-core/kern/uboot/init.c | 9 +++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d3a75828c..9970ac89e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-11-13 Vladimir Serbinenko + + * grub-core/kern/uboot/init.c: Move grub_uboot_machine_type and + grub_uboot_boot_data to asm part. + 2013-11-13 Vladimir Serbinenko * grub-core/kern/arm/uboot/startup.S: Remove = by replacing with diff --git a/grub-core/kern/uboot/init.c b/grub-core/kern/uboot/init.c index b80535d11..9d7924c04 100644 --- a/grub-core/kern/uboot/init.c +++ b/grub-core/kern/uboot/init.c @@ -35,14 +35,11 @@ extern char __bss_start[]; extern char _end[]; extern grub_size_t grub_total_module_size; extern int (*grub_uboot_syscall_ptr) (int, int *, ...); - -/* Set to anything other than zero so it lands in .data and not .bss. */ -grub_addr_t grub_modbase = 0x55aa55aa; -grub_uint32_t grub_uboot_machine_type = 0x55aa55aa; -grub_addr_t grub_uboot_boot_data = 0x55aa55aa; - static unsigned long timer_start; +extern grub_uint32_t grub_uboot_machine_type; +extern grub_addr_t grub_uboot_boot_data; + void grub_exit (void) { -- 2.47.2