| Message ID | 1474968207-25343-6-git-send-email-peng.fan@nxp.com |
|---|---|
| State | Accepted |
| Commit | 204d1f60c1dc15ed6ffcf7c38f25997c8bda3dd1 |
| Delegated to: | Stefano Babic |
| Headers | show |
On Tue, Sep 27, 2016 at 05:23:25PM +0800, Peng Fan wrote: > Add plugin code for mx6ullevk. > Define CONFIG_USE_PLUGIN in include/configs/mx6ullevk.h to use plugin code. This isn't the correct thing to say now that it's in Kconfig. > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > Cc: Stefano Babic <sbabic@denx.de> > --- > > V2: > Drop the makefile changes, because we have plugin supported in arch/arm/imx-common/Makefile. > > board/freescale/mx6ullevk/imximage.cfg | 2 +- > board/freescale/mx6ullevk/plugin.S | 139 +++++++++++++++++++++++++++++++++ > 2 files changed, 140 insertions(+), 1 deletion(-) > create mode 100644 board/freescale/mx6ullevk/plugin.S > > diff --git a/board/freescale/mx6ullevk/imximage.cfg b/board/freescale/mx6ullevk/imximage.cfg > index 4604b62..1a21b49 100644 > --- a/board/freescale/mx6ullevk/imximage.cfg > +++ b/board/freescale/mx6ullevk/imximage.cfg > @@ -29,7 +29,7 @@ BOOT_FROM nor > BOOT_FROM sd > #endif > > -#ifdef CONFIG_USE_PLUGIN > +#ifdef CONFIG_USE_IMXIMG_PLUGIN We don't have this file yet, and shouldn't introduce it with a new CONFIG symbol. So the imx6ullevk series needs to be re-worked to just not have this hunk, and we introduce it in this series here. Looks good otherwise tho.
Hi Tom, On Tue, Sep 27, 2016 at 08:46:32PM -0400, Tom Rini wrote: >On Tue, Sep 27, 2016 at 05:23:25PM +0800, Peng Fan wrote: > >> Add plugin code for mx6ullevk. >> Define CONFIG_USE_PLUGIN in include/configs/mx6ullevk.h to use plugin code. > >This isn't the correct thing to say now that it's in Kconfig. Thanks, I missed to change this. Stefano, would you mind help change the commit log to "Define CONFIG_USE_IMXIMG_PLUGIN in defconfig file to use plugin code" when you commit this patch? do you need me to resend a V3? > >> >> Signed-off-by: Peng Fan <peng.fan@nxp.com> >> Cc: Stefano Babic <sbabic@denx.de> >> --- >> >> V2: >> Drop the makefile changes, because we have plugin supported in arch/arm/imx-common/Makefile. >> >> board/freescale/mx6ullevk/imximage.cfg | 2 +- >> board/freescale/mx6ullevk/plugin.S | 139 +++++++++++++++++++++++++++++++++ >> 2 files changed, 140 insertions(+), 1 deletion(-) >> create mode 100644 board/freescale/mx6ullevk/plugin.S >> >> diff --git a/board/freescale/mx6ullevk/imximage.cfg b/board/freescale/mx6ullevk/imximage.cfg >> index 4604b62..1a21b49 100644 >> --- a/board/freescale/mx6ullevk/imximage.cfg >> +++ b/board/freescale/mx6ullevk/imximage.cfg >> @@ -29,7 +29,7 @@ BOOT_FROM nor >> BOOT_FROM sd >> #endif >> >> -#ifdef CONFIG_USE_PLUGIN >> +#ifdef CONFIG_USE_IMXIMG_PLUGIN > >We don't have this file yet, and shouldn't introduce it with a new >CONFIG symbol. So the imx6ullevk series needs to be re-worked to just >not have this hunk, and we introduce it in this series here. I missed to drop this when posting out the mx6ull patches, since they are already in imx next tree, so I worked out this patch set based on imx-next tree. Thanks, Peng. > >Looks good otherwise tho. > >-- >Tom >_______________________________________________ >U-Boot mailing list >U-Boot@lists.denx.de >http://lists.denx.de/mailman/listinfo/u-boot
On Wed, Sep 28, 2016 at 09:31:23AM +0800, Peng Fan wrote: > Hi Tom, > On Tue, Sep 27, 2016 at 08:46:32PM -0400, Tom Rini wrote: > >On Tue, Sep 27, 2016 at 05:23:25PM +0800, Peng Fan wrote: > > > >> Add plugin code for mx6ullevk. > >> Define CONFIG_USE_PLUGIN in include/configs/mx6ullevk.h to use plugin code. > > > >This isn't the correct thing to say now that it's in Kconfig. > > Thanks, I missed to change this. > > Stefano, would you mind help change the commit log > to "Define CONFIG_USE_IMXIMG_PLUGIN in defconfig file to use plugin code" > when you commit this patch? do you need me to resend a V3? > > > > >> > >> Signed-off-by: Peng Fan <peng.fan@nxp.com> > >> Cc: Stefano Babic <sbabic@denx.de> > >> --- > >> > >> V2: > >> Drop the makefile changes, because we have plugin supported in arch/arm/imx-common/Makefile. > >> > >> board/freescale/mx6ullevk/imximage.cfg | 2 +- > >> board/freescale/mx6ullevk/plugin.S | 139 +++++++++++++++++++++++++++++++++ > >> 2 files changed, 140 insertions(+), 1 deletion(-) > >> create mode 100644 board/freescale/mx6ullevk/plugin.S > >> > >> diff --git a/board/freescale/mx6ullevk/imximage.cfg b/board/freescale/mx6ullevk/imximage.cfg > >> index 4604b62..1a21b49 100644 > >> --- a/board/freescale/mx6ullevk/imximage.cfg > >> +++ b/board/freescale/mx6ullevk/imximage.cfg > >> @@ -29,7 +29,7 @@ BOOT_FROM nor > >> BOOT_FROM sd > >> #endif > >> > >> -#ifdef CONFIG_USE_PLUGIN > >> +#ifdef CONFIG_USE_IMXIMG_PLUGIN > > > >We don't have this file yet, and shouldn't introduce it with a new > >CONFIG symbol. So the imx6ullevk series needs to be re-worked to just > >not have this hunk, and we introduce it in this series here. > > I missed to drop this when posting out the mx6ull patches, > since they are already in imx next tree, so I worked out this patch set > based on imx-next tree. Ah, OK. If Stefano is OK with re-wording the commit, I'm otherwise OK.
diff --git a/board/freescale/mx6ullevk/imximage.cfg b/board/freescale/mx6ullevk/imximage.cfg index 4604b62..1a21b49 100644 --- a/board/freescale/mx6ullevk/imximage.cfg +++ b/board/freescale/mx6ullevk/imximage.cfg @@ -29,7 +29,7 @@ BOOT_FROM nor BOOT_FROM sd #endif -#ifdef CONFIG_USE_PLUGIN +#ifdef CONFIG_USE_IMXIMG_PLUGIN /*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/ PLUGIN board/freescale/mx6ullevk/plugin.bin 0x00907000 #else diff --git a/board/freescale/mx6ullevk/plugin.S b/board/freescale/mx6ullevk/plugin.S new file mode 100644 index 0000000..65a3c45 --- /dev/null +++ b/board/freescale/mx6ullevk/plugin.S @@ -0,0 +1,139 @@ +/* + * Copyright (C) 2016 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <config.h> + +/* DDR script */ +.macro imx6ull_ddr3_evk_setting + ldr r0, =IOMUXC_BASE_ADDR + ldr r1, =0x000C0000 + str r1, [r0, #0x4B4] + ldr r1, =0x00000000 + str r1, [r0, #0x4AC] + ldr r1, =0x00000030 + str r1, [r0, #0x27C] + ldr r1, =0x00000030 + str r1, [r0, #0x250] + str r1, [r0, #0x24C] + str r1, [r0, #0x490] + ldr r1, =0x000C0030 + str r1, [r0, #0x288] + + ldr r1, =0x00000000 + str r1, [r0, #0x270] + + ldr r1, =0x00000030 + str r1, [r0, #0x260] + str r1, [r0, #0x264] + str r1, [r0, #0x4A0] + + ldr r1, =0x00020000 + str r1, [r0, #0x494] + + ldr r1, =0x00000030 + str r1, [r0, #0x280] + ldr r1, =0x00000030 + str r1, [r0, #0x284] + + ldr r1, =0x00020000 + str r1, [r0, #0x4B0] + + ldr r1, =0x00000030 + str r1, [r0, #0x498] + str r1, [r0, #0x4A4] + str r1, [r0, #0x244] + str r1, [r0, #0x248] + + ldr r0, =MMDC_P0_BASE_ADDR + ldr r1, =0x00008000 + str r1, [r0, #0x1C] + ldr r1, =0xA1390003 + str r1, [r0, #0x800] + ldr r1, =0x00000004 + str r1, [r0, #0x80C] + ldr r1, =0x41640158 + str r1, [r0, #0x83C] + ldr r1, =0x40403237 + str r1, [r0, #0x848] + ldr r1, =0x40403C33 + str r1, [r0, #0x850] + ldr r1, =0x33333333 + str r1, [r0, #0x81C] + str r1, [r0, #0x820] + ldr r1, =0xF3333333 + str r1, [r0, #0x82C] + str r1, [r0, #0x830] + ldr r1, =0x00944009 + str r1, [r0, #0x8C0] + ldr r1, =0x00000800 + str r1, [r0, #0x8B8] + ldr r1, =0x0002002D + str r1, [r0, #0x004] + ldr r1, =0x1B333030 + str r1, [r0, #0x008] + ldr r1, =0x676B52F3 + str r1, [r0, #0x00C] + ldr r1, =0xB66D0B63 + str r1, [r0, #0x010] + ldr r1, =0x01FF00DB + str r1, [r0, #0x014] + ldr r1, =0x00201740 + str r1, [r0, #0x018] + ldr r1, =0x00008000 + str r1, [r0, #0x01C] + ldr r1, =0x000026D2 + str r1, [r0, #0x02C] + ldr r1, =0x006B1023 + str r1, [r0, #0x030] + ldr r1, =0x0000004F + str r1, [r0, #0x040] + ldr r1, =0x84180000 + str r1, [r0, #0x000] + ldr r1, =0x00400000 + str r1, [r0, #0x890] + ldr r1, =0x02008032 + str r1, [r0, #0x01C] + ldr r1, =0x00008033 + str r1, [r0, #0x01C] + ldr r1, =0x00048031 + str r1, [r0, #0x01C] + ldr r1, =0x15208030 + str r1, [r0, #0x01C] + ldr r1, =0x04008040 + str r1, [r0, #0x01C] + ldr r1, =0x00000800 + str r1, [r0, #0x020] + ldr r1, =0x00000227 + str r1, [r0, #0x818] + ldr r1, =0x0002552D + str r1, [r0, #0x004] + ldr r1, =0x00011006 + str r1, [r0, #0x404] + ldr r1, =0x00000000 + str r1, [r0, #0x01C] +.endm + +.macro imx6_clock_gating + ldr r0, =CCM_BASE_ADDR + ldr r1, =0xFFFFFFFF + str r1, [r0, #0x68] + str r1, [r0, #0x6C] + str r1, [r0, #0x70] + str r1, [r0, #0x74] + str r1, [r0, #0x78] + str r1, [r0, #0x7C] + str r1, [r0, #0x80] +.endm + +.macro imx6_qos_setting +.endm + +.macro imx6_ddr_setting + imx6ull_ddr3_evk_setting +.endm + +/* include the common plugin code here */ +#include <asm/arch/mx6_plugin.S>
Add plugin code for mx6ullevk. Define CONFIG_USE_PLUGIN in include/configs/mx6ullevk.h to use plugin code. Signed-off-by: Peng Fan <peng.fan@nxp.com> Cc: Stefano Babic <sbabic@denx.de> --- V2: Drop the makefile changes, because we have plugin supported in arch/arm/imx-common/Makefile. board/freescale/mx6ullevk/imximage.cfg | 2 +- board/freescale/mx6ullevk/plugin.S | 139 +++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 board/freescale/mx6ullevk/plugin.S