| Message ID | 1306849945-26418-1-git-send-email-thomas.abraham@linaro.org |
|---|---|
| State | Accepted |
| Commit | cd3af8b56749b3200cd858b5a9424c6661958e5f |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
On 31 May 2011 22:52, Thomas Abraham <thomas.abraham@linaro.org> wrote: > Fix the incorrect macro check for MIU linear mapping conditional compilation. > > Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> > --- > board/samsung/smdkv310/mem_setup.S | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > Acked-by: Minkyu Kang <mk7.kang@samsung.com> Dear Albert ARIBAUD, This patch is for bugfix. Please apply it to arm tree directly. Thanks Minkyu Kang
Hi Thomas, Le 31/05/2011 15:52, Thomas Abraham a écrit : > Fix the incorrect macro check for MIU linear mapping conditional compilation. > > Signed-off-by: Thomas Abraham<thomas.abraham@linaro.org> > --- > board/samsung/smdkv310/mem_setup.S | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) Upon Minkyu's request: applied to u-boot-arm/master, thanks! Amicalement,
diff --git a/board/samsung/smdkv310/mem_setup.S b/board/samsung/smdkv310/mem_setup.S index d8c3ed4..73aebe3 100644 --- a/board/samsung/smdkv310/mem_setup.S +++ b/board/samsung/smdkv310/mem_setup.S @@ -123,7 +123,7 @@ mem_ctrl_asm_init: ldr r1, =0x00312640 str r1, [r0, #0x04] @DMC_MEMCONTROL] -#ifdef MIU_LINEAR +#ifdef CONFIG_MIU_LINEAR ldr r1, =0x40e01323 str r1, [r0, #0x08] @DMC_MEMCONFIG0 ldr r1, =0x60e01323 @@ -255,7 +255,7 @@ mem_ctrl_asm_init: ldr r1, =0x00312640 str r1, [r0, #0x04] @DMC_MEMCONTROL] -#ifdef MIU_LINEAR +#ifdef CONFIG_MIU_LINEAR ldr r1, =0x40e01323 str r1, [r0, #0x08] @DMC_MEMCONFIG0 ldr r1, =0x60e01323
Fix the incorrect macro check for MIU linear mapping conditional compilation. Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> --- board/samsung/smdkv310/mem_setup.S | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)