| Message ID | 1562774310-32105-1-git-send-email-hancock@sedsystems.ca |
|---|---|
| State | Superseded |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [U-Boot] ARM: imx: Support larger SPL size on IMX6DQ | expand |
On Wed, Jul 10, 2019 at 10:59 AM Robert Hancock <hancock@sedsystems.ca> wrote: > > Previously the SPL size on all iMX6 platforms was restricted to 68KB > because the OCRAM size on iMX6SL/DL parts is only 128KB. However, the > other iMX6 variants have 256KB of OCRAM. Add an option > CONFIG_MX6_OCRAM_256KB which allows using the full size on boards which > don't need to support the SL/DL variants. This allows for an SPL size of > 196KB, which makes it much easier to use configurations such as SPL with > driver model and FDT control. > I am not sure if you CC'd Stefano, but you might want to include him to get his attention. I added him to the list. > Signed-off-by: Robert Hancock <hancock@sedsystems.ca> > --- > arch/arm/mach-imx/mx6/Kconfig | 10 ++++++++++ > common/spl/Kconfig | 3 ++- > include/configs/imx6_spl.h | 28 ++++++++++++++++++++++++++-- > 3 files changed, 38 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig > index fe5991e..0613616 100644 > --- a/arch/arm/mach-imx/mx6/Kconfig > +++ b/arch/arm/mach-imx/mx6/Kconfig > @@ -87,6 +87,16 @@ config MX6ULL > select SYSCOUNTER_TIMER > select SYS_L2CACHE_OFF > > +config MX6_OCRAM_256KB > + bool "Support 256KB OCRAM" > + depends on MX6D || MX6Q > + default n Out of curiosity, if you're going to create a new bool, why not make the default y if MX6D and MX6Q can both do this? I have another thought, see below... > + help > + Allows using the full 256KB size of the OCRAM on the MX6Q/MX6D series > + of chips, such as for SPL. The OCRAM of the Lite series of chips is > + only 128KB, so using this option will prevent the resulting code from > + working on those chips. > + > config MX6_DDRCAL > bool "Include dynamic DDR calibration routines" > depends on SPL > diff --git a/common/spl/Kconfig b/common/spl/Kconfig > index 142753f..d709781 100644 > --- a/common/spl/Kconfig > +++ b/common/spl/Kconfig > @@ -28,7 +28,8 @@ config SPL_FRAMEWORK > config SPL_SIZE_LIMIT > int "Maximum size of SPL image" > depends on SPL > - default 69632 if ARCH_MX6 > + default 69632 if ARCH_MX6 && !MX6_OCRAM_256KB > + default 200704 if ARCH_MX6 && MX6_OCRAM_256KB You could also just check to see if ARCH_MX6 && (MX6Q or MX6Q) instead of creating a separate bool. > default 0 > help > Specifies the maximum length of the U-Boot SPL image. > diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h > index 212dee7..a223930 100644 > --- a/include/configs/imx6_spl.h > +++ b/include/configs/imx6_spl.h > @@ -7,10 +7,32 @@ > #define __IMX6_SPL_CONFIG_H > > #ifdef CONFIG_SPL > + Instead of checking the bool, just check #defined (MX6Q) || defined (MX6D) or something similar. It seems like having all the resources available during SPL would be a good thing. > +#ifdef CONFIG_MX6_OCRAM_256KB > /* > - * see Figure 8-3 in IMX6DQ/IMX6SDL Reference manuals: > + * see Figure 8.4.1 in IMX6DQ Reference manuals: > + * - IMX6DQ OCRAM (IRAM) is from 0x00907000 to 0x0093FFFF > + * - BOOT ROM stack is at 0x0093FFB8 > + * - if icache/dcache is enabled (eFuse/strapping controlled) then the > + * IMX BOOT ROM will setup MMU table at 0x00938000, therefore we need to > + * fit between 0x00907000 and 0x00938000. > + * - Additionally the BOOT ROM loads what they consider the firmware image > + * which consists of a 4K header in front of us that contains the IVT, DCD > + * and some padding thus 'our' max size is really 0x00908000 - 0x00938000 > + * or 192KB > + */ > +#define CONFIG_SPL_MAX_SIZE 0x30000 > +#define CONFIG_SPL_STACK 0x0093FFB8 > +/* > + * Pad SPL to 196KB (4KB header + 192KB max size). This allows to write the > + * SPL/U-Boot combination generated with u-boot-with-spl.imx directly to a > + * boot media (given that boot media specific offset is configured properly). > + */ > +#define CONFIG_SPL_PAD_TO 0x31000 > +#else > +/* > + * see Figure 8-3 in IMX6SDL Reference manuals: > * - IMX6SDL OCRAM (IRAM) is from 0x00907000 to 0x0091FFFF > - * - IMX6DQ has 2x IRAM of IMX6SDL but we intend to support IMX6SDL as well > * - BOOT ROM stack is at 0x0091FFB8 > * - if icache/dcache is enabled (eFuse/strapping controlled) then the > * IMX BOOT ROM will setup MMU table at 0x00918000, therefore we need to > @@ -29,6 +51,8 @@ > */ > #define CONFIG_SPL_PAD_TO 0x11000 > > +#endif > + > /* MMC support */ > #if defined(CONFIG_SPL_MMC_SUPPORT) > #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 > -- > 1.8.3.1 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot
On 07/08/19 15:03, Adam Ford wrote: > On Wed, Jul 10, 2019 at 10:59 AM Robert Hancock <hancock@sedsystems.ca> wrote: >> >> Previously the SPL size on all iMX6 platforms was restricted to 68KB >> because the OCRAM size on iMX6SL/DL parts is only 128KB. However, the >> other iMX6 variants have 256KB of OCRAM. Add an option >> CONFIG_MX6_OCRAM_256KB which allows using the full size on boards which >> don't need to support the SL/DL variants. This allows for an SPL size of >> 196KB, which makes it much easier to use configurations such as SPL with >> driver model and FDT control. >> > > I am not sure if you CC'd Stefano, but you might want to include him > to get his attention. I added him to the list. He did, I was just thinking about if this could be automatically set. > >> Signed-off-by: Robert Hancock <hancock@sedsystems.ca> >> --- >> arch/arm/mach-imx/mx6/Kconfig | 10 ++++++++++ >> common/spl/Kconfig | 3 ++- >> include/configs/imx6_spl.h | 28 ++++++++++++++++++++++++++-- >> 3 files changed, 38 insertions(+), 3 deletions(-) >> >> diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig >> index fe5991e..0613616 100644 >> --- a/arch/arm/mach-imx/mx6/Kconfig >> +++ b/arch/arm/mach-imx/mx6/Kconfig >> @@ -87,6 +87,16 @@ config MX6ULL >> select SYSCOUNTER_TIMER >> select SYS_L2CACHE_OFF >> >> +config MX6_OCRAM_256KB >> + bool "Support 256KB OCRAM" >> + depends on MX6D || MX6Q >> + default n > > Out of curiosity, if you're going to create a new bool, why not make > the default y if MX6D and MX6Q can both do this? I have another > thought, see below... Because we have binaries running on all variants of i.MX6 (Solo/Dual/Quad). The processor is detected at runtime - just the OCRAM must be set to be enough for all variants. If this is turned on, it breaks all this boards. > >> + help >> + Allows using the full 256KB size of the OCRAM on the MX6Q/MX6D series >> + of chips, such as for SPL. The OCRAM of the Lite series of chips is >> + only 128KB, so using this option will prevent the resulting code from >> + working on those chips. >> + >> config MX6_DDRCAL >> bool "Include dynamic DDR calibration routines" >> depends on SPL >> diff --git a/common/spl/Kconfig b/common/spl/Kconfig >> index 142753f..d709781 100644 >> --- a/common/spl/Kconfig >> +++ b/common/spl/Kconfig >> @@ -28,7 +28,8 @@ config SPL_FRAMEWORK >> config SPL_SIZE_LIMIT >> int "Maximum size of SPL image" >> depends on SPL >> - default 69632 if ARCH_MX6 >> + default 69632 if ARCH_MX6 && !MX6_OCRAM_256KB >> + default 200704 if ARCH_MX6 && MX6_OCRAM_256KB > > You could also just check to see if ARCH_MX6 && (MX6Q or MX6Q) instead > of creating a separate bool. > >> default 0 >> help >> Specifies the maximum length of the U-Boot SPL image. >> diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h >> index 212dee7..a223930 100644 >> --- a/include/configs/imx6_spl.h >> +++ b/include/configs/imx6_spl.h >> @@ -7,10 +7,32 @@ >> #define __IMX6_SPL_CONFIG_H >> >> #ifdef CONFIG_SPL >> + > Instead of checking the bool, just check #defined (MX6Q) || defined > (MX6D) or something similar. It seems like having all the resources > available during SPL would be a good thing. > >> +#ifdef CONFIG_MX6_OCRAM_256KB >> /* >> - * see Figure 8-3 in IMX6DQ/IMX6SDL Reference manuals: >> + * see Figure 8.4.1 in IMX6DQ Reference manuals: >> + * - IMX6DQ OCRAM (IRAM) is from 0x00907000 to 0x0093FFFF >> + * - BOOT ROM stack is at 0x0093FFB8 >> + * - if icache/dcache is enabled (eFuse/strapping controlled) then the >> + * IMX BOOT ROM will setup MMU table at 0x00938000, therefore we need to >> + * fit between 0x00907000 and 0x00938000. >> + * - Additionally the BOOT ROM loads what they consider the firmware image >> + * which consists of a 4K header in front of us that contains the IVT, DCD >> + * and some padding thus 'our' max size is really 0x00908000 - 0x00938000 >> + * or 192KB >> + */ >> +#define CONFIG_SPL_MAX_SIZE 0x30000 >> +#define CONFIG_SPL_STACK 0x0093FFB8 >> +/* >> + * Pad SPL to 196KB (4KB header + 192KB max size). This allows to write the >> + * SPL/U-Boot combination generated with u-boot-with-spl.imx directly to a >> + * boot media (given that boot media specific offset is configured properly). >> + */ >> +#define CONFIG_SPL_PAD_TO 0x31000 >> +#else >> +/* >> + * see Figure 8-3 in IMX6SDL Reference manuals: >> * - IMX6SDL OCRAM (IRAM) is from 0x00907000 to 0x0091FFFF >> - * - IMX6DQ has 2x IRAM of IMX6SDL but we intend to support IMX6SDL as well >> * - BOOT ROM stack is at 0x0091FFB8 >> * - if icache/dcache is enabled (eFuse/strapping controlled) then the >> * IMX BOOT ROM will setup MMU table at 0x00918000, therefore we need to >> @@ -29,6 +51,8 @@ >> */ >> #define CONFIG_SPL_PAD_TO 0x11000 >> >> +#endif >> + >> /* MMC support */ >> #if defined(CONFIG_SPL_MMC_SUPPORT) >> #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 >> -- >> 1.8.3.1 >> Best regards, Stefano
On Wed, Aug 7, 2019 at 8:11 AM Stefano Babic <sbabic@denx.de> wrote: > > On 07/08/19 15:03, Adam Ford wrote: > > On Wed, Jul 10, 2019 at 10:59 AM Robert Hancock <hancock@sedsystems.ca> wrote: > >> > >> Previously the SPL size on all iMX6 platforms was restricted to 68KB > >> because the OCRAM size on iMX6SL/DL parts is only 128KB. However, the > >> other iMX6 variants have 256KB of OCRAM. Add an option > >> CONFIG_MX6_OCRAM_256KB which allows using the full size on boards which > >> don't need to support the SL/DL variants. This allows for an SPL size of > >> 196KB, which makes it much easier to use configurations such as SPL with > >> driver model and FDT control. > >> > > > > I am not sure if you CC'd Stefano, but you might want to include him > > to get his attention. I added him to the list. > > He did, I was just thinking about if this could be automatically set. > > > > >> Signed-off-by: Robert Hancock <hancock@sedsystems.ca> > >> --- > >> arch/arm/mach-imx/mx6/Kconfig | 10 ++++++++++ > >> common/spl/Kconfig | 3 ++- > >> include/configs/imx6_spl.h | 28 ++++++++++++++++++++++++++-- > >> 3 files changed, 38 insertions(+), 3 deletions(-) > >> > >> diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig > >> index fe5991e..0613616 100644 > >> --- a/arch/arm/mach-imx/mx6/Kconfig > >> +++ b/arch/arm/mach-imx/mx6/Kconfig > >> @@ -87,6 +87,16 @@ config MX6ULL > >> select SYSCOUNTER_TIMER > >> select SYS_L2CACHE_OFF > >> > >> +config MX6_OCRAM_256KB > >> + bool "Support 256KB OCRAM" > >> + depends on MX6D || MX6Q > >> + default n > > > > Out of curiosity, if you're going to create a new bool, why not make > > the default y if MX6D and MX6Q can both do this? I have another > > thought, see below... > > Because we have binaries running on all variants of i.MX6 > (Solo/Dual/Quad). The processor is detected at runtime - just the OCRAM > must be set to be enough for all variants. If this is turned on, it > breaks all this boards. That makes sense. I only support a board that is either MX6D or MX6Q, so I don't need to worry about other boards. I didn't think about that use case. If we leave his implementation to enable people like me who only have one or two supported boards, would you entertain accepting his patch? I would like to run some experiments with enabling the pin controller enabled during SPL and having the extra space should help facilitate this. As of right now, my board manually pin-muxes while also use SPL_OF_CONTROL, so if I can use this new flag, I 'think' I'll have enough room to remove the manual muxing and enable pinctrl and the various nodes that I need for SPL. adam > > > > >> + help > >> + Allows using the full 256KB size of the OCRAM on the MX6Q/MX6D series > >> + of chips, such as for SPL. The OCRAM of the Lite series of chips is > >> + only 128KB, so using this option will prevent the resulting code from > >> + working on those chips. > >> + > >> config MX6_DDRCAL > >> bool "Include dynamic DDR calibration routines" > >> depends on SPL > >> diff --git a/common/spl/Kconfig b/common/spl/Kconfig > >> index 142753f..d709781 100644 > >> --- a/common/spl/Kconfig > >> +++ b/common/spl/Kconfig > >> @@ -28,7 +28,8 @@ config SPL_FRAMEWORK > >> config SPL_SIZE_LIMIT > >> int "Maximum size of SPL image" > >> depends on SPL > >> - default 69632 if ARCH_MX6 > >> + default 69632 if ARCH_MX6 && !MX6_OCRAM_256KB > >> + default 200704 if ARCH_MX6 && MX6_OCRAM_256KB > > > > You could also just check to see if ARCH_MX6 && (MX6Q or MX6Q) instead > > of creating a separate bool. > > > >> default 0 > >> help > >> Specifies the maximum length of the U-Boot SPL image. > >> diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h > >> index 212dee7..a223930 100644 > >> --- a/include/configs/imx6_spl.h > >> +++ b/include/configs/imx6_spl.h > >> @@ -7,10 +7,32 @@ > >> #define __IMX6_SPL_CONFIG_H > >> > >> #ifdef CONFIG_SPL > >> + > > Instead of checking the bool, just check #defined (MX6Q) || defined > > (MX6D) or something similar. It seems like having all the resources > > available during SPL would be a good thing. > > > >> +#ifdef CONFIG_MX6_OCRAM_256KB > >> /* > >> - * see Figure 8-3 in IMX6DQ/IMX6SDL Reference manuals: > >> + * see Figure 8.4.1 in IMX6DQ Reference manuals: > >> + * - IMX6DQ OCRAM (IRAM) is from 0x00907000 to 0x0093FFFF > >> + * - BOOT ROM stack is at 0x0093FFB8 > >> + * - if icache/dcache is enabled (eFuse/strapping controlled) then the > >> + * IMX BOOT ROM will setup MMU table at 0x00938000, therefore we need to > >> + * fit between 0x00907000 and 0x00938000. > >> + * - Additionally the BOOT ROM loads what they consider the firmware image > >> + * which consists of a 4K header in front of us that contains the IVT, DCD > >> + * and some padding thus 'our' max size is really 0x00908000 - 0x00938000 > >> + * or 192KB > >> + */ > >> +#define CONFIG_SPL_MAX_SIZE 0x30000 > >> +#define CONFIG_SPL_STACK 0x0093FFB8 > >> +/* > >> + * Pad SPL to 196KB (4KB header + 192KB max size). This allows to write the > >> + * SPL/U-Boot combination generated with u-boot-with-spl.imx directly to a > >> + * boot media (given that boot media specific offset is configured properly). > >> + */ > >> +#define CONFIG_SPL_PAD_TO 0x31000 > >> +#else > >> +/* > >> + * see Figure 8-3 in IMX6SDL Reference manuals: > >> * - IMX6SDL OCRAM (IRAM) is from 0x00907000 to 0x0091FFFF > >> - * - IMX6DQ has 2x IRAM of IMX6SDL but we intend to support IMX6SDL as well > >> * - BOOT ROM stack is at 0x0091FFB8 > >> * - if icache/dcache is enabled (eFuse/strapping controlled) then the > >> * IMX BOOT ROM will setup MMU table at 0x00918000, therefore we need to > >> @@ -29,6 +51,8 @@ > >> */ > >> #define CONFIG_SPL_PAD_TO 0x11000 > >> > >> +#endif > >> + > >> /* MMC support */ > >> #if defined(CONFIG_SPL_MMC_SUPPORT) > >> #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 > >> -- > >> 1.8.3.1 > >> > > Best regards, > Stefano > > > -- > ===================================================================== > DENX Software Engineering GmbH, Managing Director: Wolfgang Denk > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany > Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de > =====================================================================
On Wed, Jul 10, 2019 at 10:59 AM Robert Hancock <hancock@sedsystems.ca> wrote: > > Previously the SPL size on all iMX6 platforms was restricted to 68KB > because the OCRAM size on iMX6SL/DL parts is only 128KB. However, the > other iMX6 variants have 256KB of OCRAM. Add an option > CONFIG_MX6_OCRAM_256KB which allows using the full size on boards which > don't need to support the SL/DL variants. This allows for an SPL size of > 196KB, which makes it much easier to use configurations such as SPL with > driver model and FDT control. Thank you very much! This patch gave me the ability to enable the pinctrl in SPL and remove a bunch of manual/legacy pin muxing due to SPL_OF_CONTROL support. > > Signed-off-by: Robert Hancock <hancock@sedsystems.ca> Tested-by: Adam Ford <aford173@gmail.com> #imx6q_logic > --- > arch/arm/mach-imx/mx6/Kconfig | 10 ++++++++++ > common/spl/Kconfig | 3 ++- > include/configs/imx6_spl.h | 28 ++++++++++++++++++++++++++-- > 3 files changed, 38 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig > index fe5991e..0613616 100644 > --- a/arch/arm/mach-imx/mx6/Kconfig > +++ b/arch/arm/mach-imx/mx6/Kconfig > @@ -87,6 +87,16 @@ config MX6ULL > select SYSCOUNTER_TIMER > select SYS_L2CACHE_OFF > > +config MX6_OCRAM_256KB > + bool "Support 256KB OCRAM" > + depends on MX6D || MX6Q > + default n > + help > + Allows using the full 256KB size of the OCRAM on the MX6Q/MX6D series > + of chips, such as for SPL. The OCRAM of the Lite series of chips is > + only 128KB, so using this option will prevent the resulting code from > + working on those chips. > + > config MX6_DDRCAL > bool "Include dynamic DDR calibration routines" > depends on SPL > diff --git a/common/spl/Kconfig b/common/spl/Kconfig > index 142753f..d709781 100644 > --- a/common/spl/Kconfig > +++ b/common/spl/Kconfig > @@ -28,7 +28,8 @@ config SPL_FRAMEWORK > config SPL_SIZE_LIMIT > int "Maximum size of SPL image" > depends on SPL > - default 69632 if ARCH_MX6 > + default 69632 if ARCH_MX6 && !MX6_OCRAM_256KB > + default 200704 if ARCH_MX6 && MX6_OCRAM_256KB > default 0 > help > Specifies the maximum length of the U-Boot SPL image. > diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h > index 212dee7..a223930 100644 > --- a/include/configs/imx6_spl.h > +++ b/include/configs/imx6_spl.h > @@ -7,10 +7,32 @@ > #define __IMX6_SPL_CONFIG_H > > #ifdef CONFIG_SPL > + > +#ifdef CONFIG_MX6_OCRAM_256KB > /* > - * see Figure 8-3 in IMX6DQ/IMX6SDL Reference manuals: > + * see Figure 8.4.1 in IMX6DQ Reference manuals: > + * - IMX6DQ OCRAM (IRAM) is from 0x00907000 to 0x0093FFFF > + * - BOOT ROM stack is at 0x0093FFB8 > + * - if icache/dcache is enabled (eFuse/strapping controlled) then the > + * IMX BOOT ROM will setup MMU table at 0x00938000, therefore we need to > + * fit between 0x00907000 and 0x00938000. > + * - Additionally the BOOT ROM loads what they consider the firmware image > + * which consists of a 4K header in front of us that contains the IVT, DCD > + * and some padding thus 'our' max size is really 0x00908000 - 0x00938000 > + * or 192KB > + */ > +#define CONFIG_SPL_MAX_SIZE 0x30000 > +#define CONFIG_SPL_STACK 0x0093FFB8 > +/* > + * Pad SPL to 196KB (4KB header + 192KB max size). This allows to write the > + * SPL/U-Boot combination generated with u-boot-with-spl.imx directly to a > + * boot media (given that boot media specific offset is configured properly). > + */ > +#define CONFIG_SPL_PAD_TO 0x31000 > +#else > +/* > + * see Figure 8-3 in IMX6SDL Reference manuals: > * - IMX6SDL OCRAM (IRAM) is from 0x00907000 to 0x0091FFFF > - * - IMX6DQ has 2x IRAM of IMX6SDL but we intend to support IMX6SDL as well > * - BOOT ROM stack is at 0x0091FFB8 > * - if icache/dcache is enabled (eFuse/strapping controlled) then the > * IMX BOOT ROM will setup MMU table at 0x00918000, therefore we need to > @@ -29,6 +51,8 @@ > */ > #define CONFIG_SPL_PAD_TO 0x11000 > > +#endif > + > /* MMC support */ > #if defined(CONFIG_SPL_MMC_SUPPORT) > #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 > -- > 1.8.3.1 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot
On 07/08/19 15:18, Adam Ford wrote: > On Wed, Aug 7, 2019 at 8:11 AM Stefano Babic <sbabic@denx.de> wrote: >> >> On 07/08/19 15:03, Adam Ford wrote: >>> On Wed, Jul 10, 2019 at 10:59 AM Robert Hancock <hancock@sedsystems.ca> wrote: >>>> >>>> Previously the SPL size on all iMX6 platforms was restricted to 68KB >>>> because the OCRAM size on iMX6SL/DL parts is only 128KB. However, the >>>> other iMX6 variants have 256KB of OCRAM. Add an option >>>> CONFIG_MX6_OCRAM_256KB which allows using the full size on boards which >>>> don't need to support the SL/DL variants. This allows for an SPL size of >>>> 196KB, which makes it much easier to use configurations such as SPL with >>>> driver model and FDT control. >>>> >>> >>> I am not sure if you CC'd Stefano, but you might want to include him >>> to get his attention. I added him to the list. >> >> He did, I was just thinking about if this could be automatically set. >> >>> >>>> Signed-off-by: Robert Hancock <hancock@sedsystems.ca> >>>> --- >>>> arch/arm/mach-imx/mx6/Kconfig | 10 ++++++++++ >>>> common/spl/Kconfig | 3 ++- >>>> include/configs/imx6_spl.h | 28 ++++++++++++++++++++++++++-- >>>> 3 files changed, 38 insertions(+), 3 deletions(-) >>>> >>>> diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig >>>> index fe5991e..0613616 100644 >>>> --- a/arch/arm/mach-imx/mx6/Kconfig >>>> +++ b/arch/arm/mach-imx/mx6/Kconfig >>>> @@ -87,6 +87,16 @@ config MX6ULL >>>> select SYSCOUNTER_TIMER >>>> select SYS_L2CACHE_OFF >>>> >>>> +config MX6_OCRAM_256KB >>>> + bool "Support 256KB OCRAM" >>>> + depends on MX6D || MX6Q >>>> + default n >>> >>> Out of curiosity, if you're going to create a new bool, why not make >>> the default y if MX6D and MX6Q can both do this? I have another >>> thought, see below... >> >> Because we have binaries running on all variants of i.MX6 >> (Solo/Dual/Quad). The processor is detected at runtime - just the OCRAM >> must be set to be enough for all variants. If this is turned on, it >> breaks all this boards. > > That makes sense. I only support a board that is either MX6D or MX6Q, > so I don't need to worry about other boards. I didn't think about > that use case. > If we leave his implementation to enable people like me who only have > one or two supported boards, would you entertain accepting his patch? I do not see issue with the patch - default is "n", and this do not break existing boards. I will merge this. > I would like to run some experiments with enabling the pin controller > enabled during SPL and having the extra space should help facilitate > this. As of right now, my board manually pin-muxes while also use > SPL_OF_CONTROL, so if I can use this new flag, I 'think' I'll have > enough room to remove the manual muxing and enable pinctrl and the > various nodes that I need for SPL. > Regards, Stefano > adam >> >>> >>>> + help >>>> + Allows using the full 256KB size of the OCRAM on the MX6Q/MX6D series >>>> + of chips, such as for SPL. The OCRAM of the Lite series of chips is >>>> + only 128KB, so using this option will prevent the resulting code from >>>> + working on those chips. >>>> + >>>> config MX6_DDRCAL >>>> bool "Include dynamic DDR calibration routines" >>>> depends on SPL >>>> diff --git a/common/spl/Kconfig b/common/spl/Kconfig >>>> index 142753f..d709781 100644 >>>> --- a/common/spl/Kconfig >>>> +++ b/common/spl/Kconfig >>>> @@ -28,7 +28,8 @@ config SPL_FRAMEWORK >>>> config SPL_SIZE_LIMIT >>>> int "Maximum size of SPL image" >>>> depends on SPL >>>> - default 69632 if ARCH_MX6 >>>> + default 69632 if ARCH_MX6 && !MX6_OCRAM_256KB >>>> + default 200704 if ARCH_MX6 && MX6_OCRAM_256KB >>> >>> You could also just check to see if ARCH_MX6 && (MX6Q or MX6Q) instead >>> of creating a separate bool. >>> >>>> default 0 >>>> help >>>> Specifies the maximum length of the U-Boot SPL image. >>>> diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h >>>> index 212dee7..a223930 100644 >>>> --- a/include/configs/imx6_spl.h >>>> +++ b/include/configs/imx6_spl.h >>>> @@ -7,10 +7,32 @@ >>>> #define __IMX6_SPL_CONFIG_H >>>> >>>> #ifdef CONFIG_SPL >>>> + >>> Instead of checking the bool, just check #defined (MX6Q) || defined >>> (MX6D) or something similar. It seems like having all the resources >>> available during SPL would be a good thing. >>> >>>> +#ifdef CONFIG_MX6_OCRAM_256KB >>>> /* >>>> - * see Figure 8-3 in IMX6DQ/IMX6SDL Reference manuals: >>>> + * see Figure 8.4.1 in IMX6DQ Reference manuals: >>>> + * - IMX6DQ OCRAM (IRAM) is from 0x00907000 to 0x0093FFFF >>>> + * - BOOT ROM stack is at 0x0093FFB8 >>>> + * - if icache/dcache is enabled (eFuse/strapping controlled) then the >>>> + * IMX BOOT ROM will setup MMU table at 0x00938000, therefore we need to >>>> + * fit between 0x00907000 and 0x00938000. >>>> + * - Additionally the BOOT ROM loads what they consider the firmware image >>>> + * which consists of a 4K header in front of us that contains the IVT, DCD >>>> + * and some padding thus 'our' max size is really 0x00908000 - 0x00938000 >>>> + * or 192KB >>>> + */ >>>> +#define CONFIG_SPL_MAX_SIZE 0x30000 >>>> +#define CONFIG_SPL_STACK 0x0093FFB8 >>>> +/* >>>> + * Pad SPL to 196KB (4KB header + 192KB max size). This allows to write the >>>> + * SPL/U-Boot combination generated with u-boot-with-spl.imx directly to a >>>> + * boot media (given that boot media specific offset is configured properly). >>>> + */ >>>> +#define CONFIG_SPL_PAD_TO 0x31000 >>>> +#else >>>> +/* >>>> + * see Figure 8-3 in IMX6SDL Reference manuals: >>>> * - IMX6SDL OCRAM (IRAM) is from 0x00907000 to 0x0091FFFF >>>> - * - IMX6DQ has 2x IRAM of IMX6SDL but we intend to support IMX6SDL as well >>>> * - BOOT ROM stack is at 0x0091FFB8 >>>> * - if icache/dcache is enabled (eFuse/strapping controlled) then the >>>> * IMX BOOT ROM will setup MMU table at 0x00918000, therefore we need to >>>> @@ -29,6 +51,8 @@ >>>> */ >>>> #define CONFIG_SPL_PAD_TO 0x11000 >>>> >>>> +#endif >>>> + >>>> /* MMC support */ >>>> #if defined(CONFIG_SPL_MMC_SUPPORT) >>>> #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 >>>> -- >>>> 1.8.3.1 >>>> >> >> Best regards, >> Stefano >> >> >> -- >> ===================================================================== >> DENX Software Engineering GmbH, Managing Director: Wolfgang Denk >> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany >> Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de >> =====================================================================
Hi Stefano, On Wed, Aug 7, 2019 at 5:02 PM Stefano Babic <sbabic@denx.de> wrote: > I do not see issue with the patch - default is "n", and this do not > break existing boards. I will merge this. Yes, it looks good. Only suggestion I have is to remove the "default n" because it is already disabled by default. Thanks
diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index fe5991e..0613616 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -87,6 +87,16 @@ config MX6ULL select SYSCOUNTER_TIMER select SYS_L2CACHE_OFF +config MX6_OCRAM_256KB + bool "Support 256KB OCRAM" + depends on MX6D || MX6Q + default n + help + Allows using the full 256KB size of the OCRAM on the MX6Q/MX6D series + of chips, such as for SPL. The OCRAM of the Lite series of chips is + only 128KB, so using this option will prevent the resulting code from + working on those chips. + config MX6_DDRCAL bool "Include dynamic DDR calibration routines" depends on SPL diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 142753f..d709781 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -28,7 +28,8 @@ config SPL_FRAMEWORK config SPL_SIZE_LIMIT int "Maximum size of SPL image" depends on SPL - default 69632 if ARCH_MX6 + default 69632 if ARCH_MX6 && !MX6_OCRAM_256KB + default 200704 if ARCH_MX6 && MX6_OCRAM_256KB default 0 help Specifies the maximum length of the U-Boot SPL image. diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h index 212dee7..a223930 100644 --- a/include/configs/imx6_spl.h +++ b/include/configs/imx6_spl.h @@ -7,10 +7,32 @@ #define __IMX6_SPL_CONFIG_H #ifdef CONFIG_SPL + +#ifdef CONFIG_MX6_OCRAM_256KB /* - * see Figure 8-3 in IMX6DQ/IMX6SDL Reference manuals: + * see Figure 8.4.1 in IMX6DQ Reference manuals: + * - IMX6DQ OCRAM (IRAM) is from 0x00907000 to 0x0093FFFF + * - BOOT ROM stack is at 0x0093FFB8 + * - if icache/dcache is enabled (eFuse/strapping controlled) then the + * IMX BOOT ROM will setup MMU table at 0x00938000, therefore we need to + * fit between 0x00907000 and 0x00938000. + * - Additionally the BOOT ROM loads what they consider the firmware image + * which consists of a 4K header in front of us that contains the IVT, DCD + * and some padding thus 'our' max size is really 0x00908000 - 0x00938000 + * or 192KB + */ +#define CONFIG_SPL_MAX_SIZE 0x30000 +#define CONFIG_SPL_STACK 0x0093FFB8 +/* + * Pad SPL to 196KB (4KB header + 192KB max size). This allows to write the + * SPL/U-Boot combination generated with u-boot-with-spl.imx directly to a + * boot media (given that boot media specific offset is configured properly). + */ +#define CONFIG_SPL_PAD_TO 0x31000 +#else +/* + * see Figure 8-3 in IMX6SDL Reference manuals: * - IMX6SDL OCRAM (IRAM) is from 0x00907000 to 0x0091FFFF - * - IMX6DQ has 2x IRAM of IMX6SDL but we intend to support IMX6SDL as well * - BOOT ROM stack is at 0x0091FFB8 * - if icache/dcache is enabled (eFuse/strapping controlled) then the * IMX BOOT ROM will setup MMU table at 0x00918000, therefore we need to @@ -29,6 +51,8 @@ */ #define CONFIG_SPL_PAD_TO 0x11000 +#endif + /* MMC support */ #if defined(CONFIG_SPL_MMC_SUPPORT) #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
Previously the SPL size on all iMX6 platforms was restricted to 68KB because the OCRAM size on iMX6SL/DL parts is only 128KB. However, the other iMX6 variants have 256KB of OCRAM. Add an option CONFIG_MX6_OCRAM_256KB which allows using the full size on boards which don't need to support the SL/DL variants. This allows for an SPL size of 196KB, which makes it much easier to use configurations such as SPL with driver model and FDT control. Signed-off-by: Robert Hancock <hancock@sedsystems.ca> --- arch/arm/mach-imx/mx6/Kconfig | 10 ++++++++++ common/spl/Kconfig | 3 ++- include/configs/imx6_spl.h | 28 ++++++++++++++++++++++++++-- 3 files changed, 38 insertions(+), 3 deletions(-)