Re: ARM branch

[Leif Lindholm]

On Fri, Apr 12, 2013 at 07:33:21PM +0200, Vladimir 'φ-coder/phcoder' Serbinenko 
wrote:
> Hello, all. I've uploaded Leif's and my ARM code to
> http://bzr.savannah.gnu.org/lh/grub/branches/arm/changes. Francesco's
> code will be added as well once his papers are done. The only dirty part
> for Raspberry pi that I didn't upload is:

I have attached a patch (against this branch) that contains build
system fixes and changes to the assembly files in order to permit the 
same target-platform combination to build correctly on both ARMv6 and
ARMv7, with no special options required.

It does also revert the removal of uboot_get_real_bss_start, since
this causes GRUB to fail even reaching "Welcome to GRUB!" on my
Trimslice. It may not be the best solution, but it is in there for a
reason.

There are also some "collateral" changes in this patch, holding other
fixes I have in my launchpad branch. Sorry about those.

This _should_ make your out-of-tree patch unnecessary.

> === modified file 'conf/Makefile.common'
> --- conf/Makefile.common      2013-04-07 00:41:07 +0000
> +++ conf/Makefile.common      2013-04-12 14:55:49 +0000
> @@ -40,8 +40,7 @@
>  if COND_arm
>  # Image entry point always in ARM (A32) state - ensure proper
> functionality if
>  # the rest is built for the Thumb (T32) state.
> -  CFLAGS_PLATFORM += -mthumb-interwork -mno-unaligned-access -mlong-calls
> -  CCASFLAGS_PLATFORM = -Wa,-mimplicit-it=thumb
> +  CFLAGS_PLATFORM += -mthumb-interwork -march=armv6 -mlong-calls
>    LDFLAGS_PLATFORM = -Wl,--wrap=__clear_cache
>  endif
> 
> 
> === modified file 'grub-core/kern/dl.c'
> --- grub-core/kern/dl.c       2013-03-19 19:25:09 +0000
> +++ grub-core/kern/dl.c       2013-04-12 14:55:49 +0000
> @@ -588,7 +588,7 @@
>  {
>    grub_dprintf ("modules", "flushing 0x%lx bytes at %p\n",
>               (unsigned long) mod->sz, mod->base);
> -  grub_arch_sync_caches (mod->base, mod->sz);
> +  //  grub_arch_sync_caches (mod->base, mod->sz);
>  }
> 
>  /* Load a module from core memory.  */
> 
> 



> _______________________________________________
> Grub-devel mailing list
> address@hidden
> https://lists.gnu.org/mailman/listinfo/grub-devel

build-fixes.patch
Description: Text Data