| Message ID | 1296742749-25917-1-git-send-email-loic.minier@linaro.org |
|---|---|
| State | Accepted |
| Delegated to: | Stefano Babic |
| Headers | show |
On 02/03/2011 03:19 PM, Loïc Minier wrote: > Upstream linux moved from MACH_TYPE_MX51_LANGE51 to > MACH_TYPE_MX51_EFIKAMX. > > Signed-off-by: Loïc Minier <loic.minier@linaro.org> > --- > Changes for V2: > * Add Signed-off-by Applied to u-boot-imx, as this is a fix, thanks. Best regards, Stefano Babic
Hi Stefano, Le 04/02/2011 16:30, Stefano Babic a écrit : > On 02/03/2011 03:19 PM, Loïc Minier wrote: >> Upstream linux moved from MACH_TYPE_MX51_LANGE51 to >> MACH_TYPE_MX51_EFIKAMX. >> >> Signed-off-by: Loïc Minier<loic.minier@linaro.org> >> --- >> Changes for V2: >> * Add Signed-off-by > > Applied to u-boot-imx, as this is a fix, thanks. > > Best regards, > Stefano Babic Do you intend to send out a new pull request for -rc2? -- not hurrying you, just asking. Amicalement,
On 02/05/2011 10:48 AM, Albert ARIBAUD wrote: Hi Albert, > Do you intend to send out a new pull request for -rc2? -- not hurrying > you, just asking. Yes. At the moment, I have only this patch on my list, so I am waiting a couple of days more to check if I had to merge some other patches. Then I will send you the pull-request. Stefano
diff --git a/board/efikamx/efikamx.c b/board/efikamx/efikamx.c index 4efbeaf..f735260 100644 --- a/board/efikamx/efikamx.c +++ b/board/efikamx/efikamx.c @@ -621,7 +621,7 @@ int board_early_init_f(void) int board_init(void) { - gd->bd->bi_arch_number = MACH_TYPE_MX51_LANGE51; + gd->bd->bi_arch_number = MACH_TYPE_MX51_EFIKAMX; gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; return 0;
Upstream linux moved from MACH_TYPE_MX51_LANGE51 to MACH_TYPE_MX51_EFIKAMX. Signed-off-by: Loïc Minier <loic.minier@linaro.org> --- Changes for V2: * Add Signed-off-by board/efikamx/efikamx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)