| Message ID | 1488573213-11586-2-git-send-email-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | 48dce3bfd93f1cd9766bc6afe3c403bef0254bbc |
| Delegated to: | Tom Rini |
| Headers | show |
Hi Tom, > These particular SPL options are part of what the ROM provides, but > for compatibility with how we have previously used them, move them to > being implied by the board being selected. > > Signed-off-by: Tom Rini <trini@konsulko.com> > --- > arch/arm/mach-omap2/am33xx/Kconfig | 3 +++ > board/ti/am335x/Kconfig | 9 --------- > 2 files changed, 3 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/mach-omap2/am33xx/Kconfig > b/arch/arm/mach-omap2/am33xx/Kconfig index 5b5d3f8cec29..5adcead185de > 100644 --- a/arch/arm/mach-omap2/am33xx/Kconfig > +++ b/arch/arm/mach-omap2/am33xx/Kconfig > @@ -15,6 +15,9 @@ config TARGET_AM335X_EVM > select DM_SERIAL > select DM_GPIO > select TI_I2C_BOARD_DETECT > + imply SPL_YMODEM_SUPPORT > + imply SPL_ENV_SUPPORT > + imply SPL_WATCHDOG_SUPPORT Are you sure that WDT is enabled by ROM by default? IIRC we must enable it explicitly in the SPL. > help > This option specifies support for the AM335x > GP and HS EVM development platforms. The AM335x > diff --git a/board/ti/am335x/Kconfig b/board/ti/am335x/Kconfig > index a84e91b3dc56..97374bdc12ae 100644 > --- a/board/ti/am335x/Kconfig > +++ b/board/ti/am335x/Kconfig > @@ -1,14 +1,5 @@ > if TARGET_AM335X_EVM > > -config SPL_ENV_SUPPORT > - default y > - > -config SPL_WATCHDOG_SUPPORT > - default y > - > -config SPL_YMODEM_SUPPORT > - default y > - > config SYS_BOARD > default "am335x" > Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
On Sun, Mar 05, 2017 at 11:53:43PM +0100, Lukasz Majewski wrote: > Hi Tom, > > > These particular SPL options are part of what the ROM provides, but > > for compatibility with how we have previously used them, move them to > > being implied by the board being selected. > > > > Signed-off-by: Tom Rini <trini@konsulko.com> > > --- > > arch/arm/mach-omap2/am33xx/Kconfig | 3 +++ > > board/ti/am335x/Kconfig | 9 --------- > > 2 files changed, 3 insertions(+), 9 deletions(-) > > > > diff --git a/arch/arm/mach-omap2/am33xx/Kconfig > > b/arch/arm/mach-omap2/am33xx/Kconfig index 5b5d3f8cec29..5adcead185de > > 100644 --- a/arch/arm/mach-omap2/am33xx/Kconfig > > +++ b/arch/arm/mach-omap2/am33xx/Kconfig > > @@ -15,6 +15,9 @@ config TARGET_AM335X_EVM > > select DM_SERIAL > > select DM_GPIO > > select TI_I2C_BOARD_DETECT > > + imply SPL_YMODEM_SUPPORT > > + imply SPL_ENV_SUPPORT > > + imply SPL_WATCHDOG_SUPPORT > > Are you sure that WDT is enabled by ROM by default? OK, good point, my wording was slightly unclear. What I meant was that these are SPL-usable features that are part of the SoC, rather than something board-centric. That said, yes, a quick re-read of the initialization section of the AM335x TRM says that ROM sets up WDT1, which matches up with my recollections from TI days and board bring up. It's likely this should become a 'select' as if we don't twiddle it in time, we will trigger it. > IIRC we must enable it explicitly in the SPL. We can reconfigure it to be more "precise" perhaps is the answer. I have a recollection of a bring up issue where in the problem was "Oh, we got somewhat far, but hadn't touched the WDT and reset".
On Fri, Mar 03, 2017 at 03:33:30PM -0500, Tom Rini wrote: > These particular SPL options are part of what the ROM provides, but for > compatibility with how we have previously used them, move them to being > implied by the board being selected. > > Signed-off-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig index 5b5d3f8cec29..5adcead185de 100644 --- a/arch/arm/mach-omap2/am33xx/Kconfig +++ b/arch/arm/mach-omap2/am33xx/Kconfig @@ -15,6 +15,9 @@ config TARGET_AM335X_EVM select DM_SERIAL select DM_GPIO select TI_I2C_BOARD_DETECT + imply SPL_YMODEM_SUPPORT + imply SPL_ENV_SUPPORT + imply SPL_WATCHDOG_SUPPORT help This option specifies support for the AM335x GP and HS EVM development platforms. The AM335x diff --git a/board/ti/am335x/Kconfig b/board/ti/am335x/Kconfig index a84e91b3dc56..97374bdc12ae 100644 --- a/board/ti/am335x/Kconfig +++ b/board/ti/am335x/Kconfig @@ -1,14 +1,5 @@ if TARGET_AM335X_EVM -config SPL_ENV_SUPPORT - default y - -config SPL_WATCHDOG_SUPPORT - default y - -config SPL_YMODEM_SUPPORT - default y - config SYS_BOARD default "am335x"
These particular SPL options are part of what the ROM provides, but for compatibility with how we have previously used them, move them to being implied by the board being selected. Signed-off-by: Tom Rini <trini@konsulko.com> --- arch/arm/mach-omap2/am33xx/Kconfig | 3 +++ board/ti/am335x/Kconfig | 9 --------- 2 files changed, 3 insertions(+), 9 deletions(-)