Message ID | 1329480333-18353-12-git-send-email-r.sricharan@ti.com |
---|---|
State | Changes Requested |
Delegated to: | Tom Rini |
Headers | show |
On Fri, Feb 17, 2012 at 05:35:27PM +0530, R Sricharan wrote: > Adding the nessecary changes for OMAP5430 ES1.0 silicon. > > Signed-off-by: R Sricharan <r.sricharan@ti.com> [snip] > +/* OPP SETTING */ > +#define OPP_NOM Where is this used? [snip] > /* Defines for SPL */ > #define CONFIG_SPL > -#define CONFIG_SPL_TEXT_BASE 0x40304350 > -#define CONFIG_SPL_MAX_SIZE 0x1E000 /* 120K */ > +#define CONFIG_SPL_TEXT_BASE 0x40300350 > +#define CONFIG_SPL_MAX_SIZE 0x20000 /* 128K */ > #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK This is wrong, you have to account for stack within SPL_MAX_SIZE.
Hi Tom, On Mon, Feb 20, 2012 at 11:15 PM, Tom Rini <trini@ti.com> wrote: > On Fri, Feb 17, 2012 at 05:35:27PM +0530, R Sricharan wrote: > > > Adding the nessecary changes for OMAP5430 ES1.0 silicon. > > > > Signed-off-by: R Sricharan <r.sricharan@ti.com> > [snip] > > +/* OPP SETTING */ > > +#define OPP_NOM > > Where is this used? > Right. This is unused. Will remove this. We were having > OPP_LOW and OPP_HIGH settings in the clocks table, for internal testing. But that being eventually removed, this is not required. > [snip] > > /* Defines for SPL */ > > #define CONFIG_SPL > > -#define CONFIG_SPL_TEXT_BASE 0x40304350 > > -#define CONFIG_SPL_MAX_SIZE 0x1E000 /* 120K */ > > +#define CONFIG_SPL_TEXT_BASE 0x40300350 > > +#define CONFIG_SPL_MAX_SIZE 0x20000 /* 128K */ > > #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK > > This is wrong, you have to account for stack within SPL_MAX_SIZE. > > To understand, So now, LOW_LEVEL_SRAM_STACK points to SRAM base + 128KB address (which is the SRAM size), pointed to by NON_SECURE_SRAM_END Should this be changed ? Also CONFIG_SYS_INIT_SP_ADDR should be adjusted. Will change this > -- > Tom >
On Tue, Feb 21, 2012 at 01:16:58PM +0530, R, Sricharan wrote: > Hi Tom, > > On Mon, Feb 20, 2012 at 11:15 PM, Tom Rini <trini@ti.com> wrote: > > > On Fri, Feb 17, 2012 at 05:35:27PM +0530, R Sricharan wrote: > > > > > Adding the nessecary changes for OMAP5430 ES1.0 silicon. > > > > > > Signed-off-by: R Sricharan <r.sricharan@ti.com> > > [snip] > > > +/* OPP SETTING */ > > > +#define OPP_NOM > > > > Where is this used? > > Right. This is unused. Will remove this. We were having > > > OPP_LOW and OPP_HIGH settings in the clocks table, for internal testing. > But that being eventually removed, this is not required. > > > > [snip] > > > /* Defines for SPL */ > > > #define CONFIG_SPL > > > -#define CONFIG_SPL_TEXT_BASE 0x40304350 > > > -#define CONFIG_SPL_MAX_SIZE 0x1E000 /* 120K */ > > > +#define CONFIG_SPL_TEXT_BASE 0x40300350 > > > +#define CONFIG_SPL_MAX_SIZE 0x20000 /* 128K */ > > > #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK > > > > This is wrong, you have to account for stack within SPL_MAX_SIZE. > > > > To understand, > So now, LOW_LEVEL_SRAM_STACK points to SRAM base + 128KB address (which > is the SRAM size), > pointed to by NON_SECURE_SRAM_END > Should this be changed ? > Also CONFIG_SYS_INIT_SP_ADDR should be adjusted. Will change this So, the issue (see http://patchwork.ozlabs.org/patch/142211/ as I believe omap4/5 are similar in method) is that both SPL text/data/rodata and stack reside in SRAM. So we use CONFIG_SPL_MAX_SIZE as a way of ensuring that at least some portion of SRAM will be available for stack). You need to pick how much will be available for each part. For example, on am335x we also have 128KB of SRAM but do an arbitrary split at 46KB for SPL (since we haven't needed more than that). All you need to do is pick SPL_MAX_SIZE less than 128KB. And prepare to write a README.omap45 or so similar to the README.omap3 I wrote :)
Hi Tom, On Tue, Feb 21, 2012 at 8:19 PM, Tom Rini <trini@ti.com> wrote: > > On Tue, Feb 21, 2012 at 01:16:58PM +0530, R, Sricharan wrote: > > Hi Tom, > > > > On Mon, Feb 20, 2012 at 11:15 PM, Tom Rini <trini@ti.com> wrote: > > > > > On Fri, Feb 17, 2012 at 05:35:27PM +0530, R Sricharan wrote: > > > > > > > Adding the nessecary changes for OMAP5430 ES1.0 silicon. > > > > > > > > Signed-off-by: R Sricharan <r.sricharan@ti.com> > > > [snip] > > > > +/* OPP SETTING */ > > > > +#define OPP_NOM > > > > > > Where is this used? > > > Right. This is unused. Will remove this. We were having > > > > > OPP_LOW and OPP_HIGH settings in the clocks table, for internal testing. > > But that being eventually removed, this is not required. > > > > > > > [snip] > > > > /* Defines for SPL */ > > > > #define CONFIG_SPL > > > > -#define CONFIG_SPL_TEXT_BASE 0x40304350 > > > > -#define CONFIG_SPL_MAX_SIZE 0x1E000 /* 120K */ > > > > +#define CONFIG_SPL_TEXT_BASE 0x40300350 > > > > +#define CONFIG_SPL_MAX_SIZE 0x20000 /* 128K */ > > > > #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK > > > > > > This is wrong, you have to account for stack within SPL_MAX_SIZE. > > > > > > To understand, > > So now, LOW_LEVEL_SRAM_STACK points to SRAM base + 128KB address (which > > is the SRAM size), > > pointed to by NON_SECURE_SRAM_END > > Should this be changed ? > > Also CONFIG_SYS_INIT_SP_ADDR should be adjusted. Will change this > > So, the issue (see http://patchwork.ozlabs.org/patch/142211/ as I > believe omap4/5 are similar in method) is that both SPL text/data/rodata > and stack reside in SRAM. So we use CONFIG_SPL_MAX_SIZE as a way of > ensuring that at least some portion of SRAM will be available for > stack). You need to pick how much will be available for each part. For > example, on am335x we also have 128KB of SRAM but do an arbitrary split > at 46KB for SPL (since we haven't needed more than that). All you need > to do is pick SPL_MAX_SIZE less than 128KB. And prepare to write a > README.omap45 or so similar to the README.omap3 I wrote :) > Thanks. I understand it now. I will change in both OMAP5 and OMAP4 as well. > > -- > Tom
diff --git a/include/configs/omap5_evm.h b/include/configs/omap5_evm.h index d3d5263..23d1b3d 100644 --- a/include/configs/omap5_evm.h +++ b/include/configs/omap5_evm.h @@ -49,8 +49,10 @@ #define CONFIG_DISPLAY_BOARDINFO /* Clock Defines */ -#define V_OSCK 38400000 /* Clock output from T2 */ +#define V_OSCK 19200000 /* Clock output from T2 */ #define V_SCLK V_OSCK +#define CONFIG_SYS_CLOCKS_ENABLE_ALL 1 /* Enable all clocks */ +#define CONFIG_SYS_ENABLE_PADS_ALL 1 /* Enable all PADS for now */ #undef CONFIG_USE_IRQ /* no support for IRQs */ #define CONFIG_MISC_INIT_R @@ -90,6 +92,9 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} +/* OPP SETTING */ +#define OPP_NOM + /* I2C */ #define CONFIG_HARD_I2C #define CONFIG_SYS_I2C_SPEED 100000 @@ -97,10 +102,6 @@ #define CONFIG_DRIVER_OMAP34XX_I2C #define CONFIG_I2C_MULTI_BUS -/* TWL6030 */ -#define CONFIG_TWL6030_POWER -#define CONFIG_CMD_BAT - /* MMC */ #define CONFIG_GENERIC_MMC #define CONFIG_MMC @@ -112,13 +113,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 1 /* SLOT2: eMMC(1) */ #define CONFIG_ENV_OFFSET 0xE0000 -/* USB */ -#define CONFIG_MUSB_UDC -#define CONFIG_USB_OMAP3 - -/* USB device configuration */ -#define CONFIG_USB_DEVICE -#define CONFIG_USB_TTY #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* Flash */ @@ -154,7 +148,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x82000000\0" \ - "console=ttyS2,115200n8\0" \ + "console=ttyO2,115200n8\0" \ "usbtty=cdc_acm\0" \ "vram=16M\0" \ "mmcdev=0\0" \ @@ -250,8 +244,8 @@ /* Defines for SPL */ #define CONFIG_SPL -#define CONFIG_SPL_TEXT_BASE 0x40304350 -#define CONFIG_SPL_MAX_SIZE 0x1E000 /* 120K */ +#define CONFIG_SPL_TEXT_BASE 0x40300350 +#define CONFIG_SPL_MAX_SIZE 0x20000 /* 128K */ #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
Adding the nessecary changes for OMAP5430 ES1.0 silicon. Signed-off-by: R Sricharan <r.sricharan@ti.com> --- include/configs/omap5_evm.h | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-)