overo: add SPL support
Subsystems (2)
v2 cover overo: add SPL support
V1 -> V2
* cleanups: replace printf with one argument by puts [1-2]
* cleanups: remove unused macros and macro values / tabbing / remove FSF address [3]
* i2c: move all local variables to SRAM [4]
* OMAP SPL: call timer_init in s_init to make udelay work earlier [5]
* hint CONFIG_SYS_TEXT_BASE changed in commit message [6]
* remove log 'Texas Instruments Revision detection unimplemented' for overo [6]
* remove unintended whitespaces [6]
* send 'shut up' to TWL4030 to avoid corruption when reading board revision [6]
* use macros for overo revisions [6]
* don't separate SPL specific configurations [6]
Andreas M?ller (6):
drivers/i2c/omap24xx_i2c.c: replace printf with one argument by puts board/overo/overo.c: replace printf with one argument by puts include/configs/omap3_overo.h: several cleanups drivers/i2c/omap24xx_i2c.c: move all local variables to SRAM OMAP SPL: call timer_init in s_init to make udelay work earlier
overo: add SPL support / CONFIG_SYS_TEXT_BASE changed to 0x80100000
arch/arm/cpu/armv7/omap-common/spl.c | 6 +- arch/arm/cpu/armv7/omap3/board.c | 2 + arch/arm/include/asm/arch-omap3/mem.h | 26 +++++++ board/overo/config.mk | 28 -------- board/overo/overo.c | 69 ++++++++++++++++-- board/overo/overo.h | 5 ++ drivers/i2c/omap24xx_i2c.c | 25 ++++--- include/configs/omap3_overo.h | 122 ++++++++++++++++++++++---------- 8 files changed, 197 insertions(+), 86 deletions(-) delete mode 100644 board/overo/config.mk
Signature · 1 line
1.7.6.4
PATCH v2 1/6 drivers/i2c/omap24xx_i2c.c: replace printf with one argument by puts
--- drivers/i2c/omap24xx_i2c.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
drivers/i2c/omap24xx_i2c.c +6 -6
@@ -73,7 +73,7 @@ void i2c_init(int speed, int slaveadd) fssclh -=I2C_HIGHSPEED_PHASE_ONE_SCLH_TRIM ;if (((fsscll <0 ) || (fssclh <0 )) || ((fsscll >255 ) || (fssclh >255 ))) { -printf ("Error : I2C initializing first phase clock\n" ); +puts ("Error : I2C initializing first phase clock\n" );return ; }
@@ -84,7 +84,7 @@ void i2c_init(int speed, int slaveadd) hssclh -=I2C_HIGHSPEED_PHASE_TWO_SCLH_TRIM ;if (((fsscll <0 ) || (fssclh <0 )) || ((fsscll >255 ) || (fssclh >255 ))) { -printf ("Error : I2C initializing second phase clock\n" ); +puts ("Error : I2C initializing second phase clock\n" );return ; }
@@ -99,7 +99,7 @@ void i2c_init(int speed, int slaveadd) fssclh -=I2C_FASTSPEED_SCLH_TRIM ;if (((fsscll <0 ) || (fssclh <0 )) || ((fsscll >255 ) || (fssclh >255 ))) { -printf ("Error : I2C initializing clock\n" ); +puts ("Error : I2C initializing clock\n" );return ; }
@@ -118,7 +118,7 @@ void i2c_init(int speed, int slaveadd)writew (I2C_CON_EN , &i2c_base->con);while (!(readw (&i2c_base->syss) &I2C_SYSS_RDONE ) && timeout--) {if (timeout <=0 ) { -printf ("ERROR: Timeout in soft-reset\n" ); +puts ("ERROR: Timeout in soft-reset\n" );return ; }udelay (1000 );
@@ -284,13 +284,13 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len) }if (addr + len >256 ) { -printf ("I2C read: address out of range\n" ); +puts ("I2C read: address out of range\n" );return 1 ; }for (i =0 ; i < len; i++) {if (i2c_read_byte (chip, addr + i, &buffer[i])) { -printf ("I2C read: I/O error\n" ); +puts ("I2C read: I/O error\n" );i2c_init (CONFIG_SYS_I2C_SPEED ,CONFIG_SYS_I2C_SLAVE );return 1 ; }
Signature · 1 line
1.7.6.4
PATCH v2 2/6 board/overo/overo.c: replace printf with one argument by puts
In reply to Andreas Müller--- board/overo/overo.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
board/overo/overo.c +7 -7
@@ -119,7 +119,7 @@ int get_board_revision(void)gpio_get_value (113 ) <<1 |gpio_get_value (112 ); }else { -printf ("Error: unable to acquire board revision GPIOs\n" ); +puts ("Error: unable to acquire board revision GPIOs\n" ); revision =-1 ; }
@@ -151,7 +151,7 @@ int get_sdio2_config(void)gpio_direction_input (130 ); }else { -printf ("Error: unable to acquire sdio2 clk GPIOs\n" ); +puts ("Error: unable to acquire sdio2 clk GPIOs\n" ); sdio_direct =-1 ; }
@@ -200,15 +200,15 @@ int misc_init_r(void)switch (get_sdio2_config ()) {case 0 : -printf ("Tranceiver detected on mmc2\n" ); +puts ("Tranceiver detected on mmc2\n" );MUX_OVERO_SDIO2_TRANSCEIVER ();break ;case 1 : -printf ("Direct connection on mmc2\n" ); +puts ("Direct connection on mmc2\n" );MUX_OVERO_SDIO2_DIRECT ();break ;default : -printf ("Unable to detect mmc2 connection type\n" ); +puts ("Unable to detect mmc2 connection type\n" ); }switch (get_expansion_id ()) {
@@ -269,10 +269,10 @@ int misc_init_r(void)setenv ("defaultdisplay" ,"dvi" );break ;case GUMSTIX_NO_EEPROM : -printf ("No EEPROM on expansion board\n" ); +puts ("No EEPROM on expansion board\n" );break ;default : -printf ("Unrecognized expansion board\n" ); +puts ("Unrecognized expansion board\n" ); }if (expansion_config.content ==1 )
Signature · 1 line
1.7.6.4
PATCH v2 3/6 include/configs/omap3_overo.h: several cleanups
In reply to Andreas Müller* remove unused macros
* remove unused macro values
* align tabs
* remove Free Software Foundation address
--- include/configs/omap3_overo.h | 69 ++++++++++++++++++---------------------- 1 files changed, 31 insertions(+), 38 deletions(-)
include/configs/omap3_overo.h +31 -38
@@ -13,8 +13,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, -* MA 02111-1307 USA +* Foundation, Inc. */ #ifndef __CONFIG_H
@@ -23,41 +22,41 @@/* * High Level Configuration Options */ -#define CONFIG_OMAP 1/* in a TI OMAP core */ -#define CONFIG_OMAP34XX 1/* which is a 34XX */ -#define CONFIG_OMAP3_OVERO 1/* working with overo */ +#define CONFIG_OMAP /* in a TI OMAP core */ +#define CONFIG_OMAP34XX /* which is a 34XX */ +#define CONFIG_OMAP3_OVERO /* working with overo */ -#define CONFIG_SDRC /* The chip has SDRC controller */ +#define CONFIG_SDRC /* The chip has SDRC controller */ -#include <asm/arch/cpu.h> /* get chip and board defs */ +#include <asm/arch/cpu.h> /* get chip and board defs */ #include <asm/arch/omap3.h> /* * Display CPU and Board information */ -#define CONFIG_DISPLAY_CPUINFO 1 -#define CONFIG_DISPLAY_BOARDINFO 1 +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_DISPLAY_BOARDINFO /* Clock Defines */ #define V_OSCK 26000000/* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1) -#undef CONFIG_USE_IRQ/* no support for IRQs */ +#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 -#define CONFIG_REVISION_TAG 1 +#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG +#define CONFIG_REVISION_TAG -#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_LIBFDT /* * Size of malloc() pool */ -#define CONFIG_ENV_SIZE (128 << 10)/* 128 KiB */ +#define CONFIG_ENV_SIZE (128 << 10)/* 128 KiB */ /* Sector */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10)) +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10))/* * Hardware drivers
@@ -66,7 +65,7 @@/* * NS16550 Configuration */ -#define V_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ +#define V_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL
@@ -85,13 +84,10 @@#define CONFIG_BAUDRATE 115200#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \ 115200} -#define CONFIG_GENERIC_MMC 1 -#define CONFIG_MMC 1 -#define CONFIG_OMAP_HSMMC 1 -#define CONFIG_DOS_PARTITION 1 - -/* DDR - I use Micron DDR */ -#define CONFIG_OMAP3_MICRON_DDR 1 +#define CONFIG_GENERIC_MMC +#define CONFIG_MMC +#define CONFIG_OMAP_HSMMC +#define CONFIG_DOS_PARTITION /* commands to include */ #include <config_cmd_default.h>
@@ -113,31 +109,29 @@#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_HARD_I2C 1 +#define CONFIG_HARD_I2C #define CONFIG_SYS_I2C_SPEED 100000#define CONFIG_SYS_I2C_SLAVE 1 -#define CONFIG_SYS_I2C_BUS 0 -#define CONFIG_SYS_I2C_BUS_SELECT 1 -#define CONFIG_I2C_MULTI_BUS 1 -#define CONFIG_DRIVER_OMAP34XX_I2C 1 +#define CONFIG_I2C_MULTI_BUS +#define CONFIG_DRIVER_OMAP34XX_I2C /* * TWL4030 */ -#define CONFIG_TWL4030_POWER 1 -#define CONFIG_TWL4030_LED 1 +#define CONFIG_TWL4030_POWER +#define CONFIG_TWL4030_LED /* * Board NAND Info. */ -#define CONFIG_SYS_NAND_QUIET_TEST 1 +#define CONFIG_SYS_NAND_QUIET_TEST #define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_NAND_ADDR NAND_BASE/* physical address */ /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE/* physical address */ /* to access nand */ /* at CS0 */ -#define GPMC_NAND_ECC_LP_x16_LAYOUT 1 +#define GPMC_NAND_ECC_LP_x16_LAYOUT#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of NAND */ /* devices */
@@ -249,7 +243,6 @@*/ #define CONFIG_NR_DRAM_BANKS 2/* CS1 may or may not be populated */ #define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0 -#define PHYS_SDRAM_1_SIZE (32 << 20)/*@least 32 MiB */ #define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1/*-----------------------------------------------------------------------
@@ -272,7 +265,7 @@#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP -#define CONFIG_ENV_IS_IN_NAND 1 +#define CONFIG_ENV_IS_IN_NAND #define ONENAND_ENV_OFFSET 0x240000/* environment starts here */ #define SMNAND_ENV_OFFSET 0x240000/* environment starts here */
@@ -286,9 +279,9 @@*---------------------------------------------------------------------------- */ -#define CONFIG_SMC911X 1 +#define CONFIG_SMC911X #define CONFIG_SMC911X_32_BIT -#define CONFIG_SMC911X_BASE 0x2C000000 +#define CONFIG_SMC911X_BASE 0x2C000000#endif /* (CONFIG_CMD_NET) */
Signature · 1 line
1.7.6.4
PATCH v2 4/6 drivers/i2c/omap24xx_i2c.c: move all local variables to SRAM
In reply to Andreas MüllerAt old overo boards TWL4030 RTC irq is connected to gpio112. Unfortunately this pin is also used for revision detection. Therefore we need to send shut-up to TWL4030 to avoid reading wrong revision. In SPL this must be done before SDRAM is set up because the type of SDRAM is revision dependent. By this patch it is ensured that all variables used by omap24xx_i2c.c are located in SRAM.
--- drivers/i2c/omap24xx_i2c.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-)
drivers/i2c/omap24xx_i2c.c +9 -4
@@ -35,10 +35,15 @@ static void wait_for_bb(void);static u16 wait_for_pin (void );static void flush_fifo (void ); -static struct i2c *i2c_base = (struct i2c *)I2C_DEFAULT_BASE ; - -static unsigned int bus_initialized[I2C_BUS_MAX ]; -static unsigned int current_bus; +/* +* For SPL boot some boards need i2c before SDRAM is initialised so force +* variables to live in SRAM +*/ +static struct i2c __attribute__ ((section (".data" ))) *i2c_base = + (struct i2c *)I2C_DEFAULT_BASE ; +static unsigned int __attribute__ ((section (".data" ))) bus_initialized[I2C_BUS_MAX ] = + { [0 ... (I2C_BUS_MAX -1 )] =0 }; +static unsigned int __attribute__ ((section (".data" ))) current_bus =0 ;void i2c_init (int speed,int slaveadd) {
Signature · 1 line
1.7.6.4
PATCH v2 5/6 OMAP SPL: call timer_init in s_init to make udelay work earlier
In reply to Andreas Müller--- arch/arm/cpu/armv7/omap-common/spl.c | 2 -- arch/arm/cpu/armv7/omap3/board.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/cpu/armv7/omap-common/spl.c +0 -2
@@ -115,8 +115,6 @@ void board_init_r(gd_t *id, ulong dummy)mem_malloc_init (CONFIG_SYS_SPL_MALLOC_START ,CONFIG_SYS_SPL_MALLOC_SIZE ); -timer_init (); -#ifdef CONFIG_SPL_BOARD_INIT spl_board_init ();#endif
arch/arm/cpu/armv7/omap3/board.c +2 -0
@@ -230,6 +230,8 @@ void s_init(void)#ifdef CONFIG_SPL_BUILD preloader_console_init (); + +timer_init ();#endif if (!in_sdram)
Signature · 1 line
1.7.6.4
PATCH v2 6/6 overo: add SPL support / CONFIG_SYS_TEXT_BASE changed to 0x80100000
In reply to Andreas Müller* implementation based on ti beagleboard/omap3evm
* timing data and i2c workaround for revision 0 boards taken from x-loader
* run-tested with overo revision 0 and 1 / boot from NAND and SDcard
--- arch/arm/cpu/armv7/omap-common/spl.c | 4 ++ arch/arm/include/asm/arch-omap3/mem.h | 26 +++++++++++++++ board/overo/config.mk | 28 ----------------- board/overo/overo.c | 55 ++++++++++++++++++++++++++++++++- board/overo/overo.h | 5 +++ include/configs/omap3_overo.h | 53 +++++++++++++++++++++++++++++++ 6 files changed, 142 insertions(+), 29 deletions(-) delete mode 100644 board/overo/config.mk
arch/arm/cpu/armv7/omap-common/spl.c +4 -0
@@ -170,10 +170,13 @@ void preloader_console_init(void)printf ("\nU-Boot SPL %s (%s - %s)\n" , u_boot_rev,U_BOOT_DATE ,U_BOOT_TIME ); +#if !defined(CONFIG_OMAP3_OVERO )omap_rev_string (rev_string_buffer);printf ("Texas Instruments %s\n" , rev_string_buffer); +#endif } +#if !defined(CONFIG_OMAP3_OVERO )void __omap_rev_string (char *str) {sprintf (str,"Revision detection unimplemented" );
@@ -181,3 +184,4 @@ void __omap_rev_string(char *str)void omap_rev_string (char *str) __attribute__((weak,alias ("__omap_rev_string" ))); +#endif
arch/arm/include/asm/arch-omap3/mem.h +26 -0
@@ -123,6 +123,32 @@ enum {V_MCFG_BANKALLOCATION_RBC | \V_MCFG_B32NOT16_32 |V_MCFG_DEEPPD_EN |V_MCFG_RAMTYPE_DDR +/* Hynix part of Overo (165MHz optimized) 6.06ns */ +#define HYNIX_TDAL_165 6 +#define HYNIX_TDPL_165 3 +#define HYNIX_TRRD_165 2 +#define HYNIX_TRCD_165 3 +#define HYNIX_TRP_165 3 +#define HYNIX_TRAS_165 7 +#define HYNIX_TRC_165 10 +#define HYNIX_TRFC_165 21 +#define HYNIX_V_ACTIMA_165 \ + ACTIM_CTRLA(HYNIX_TRFC_165, HYNIX_TRC_165, \ + HYNIX_TRAS_165, HYNIX_TRP_165, \ + HYNIX_TRCD_165, HYNIX_TRRD_165, \ + HYNIX_TDPL_165, HYNIX_TDAL_165) + +#define HYNIX_TWTR_165 1 +#define HYNIX_TCKE_165 1 +#define HYNIX_TXP_165 2 +#define HYNIX_XSR_165 24 +#define HYNIX_V_ACTIMB_165 \ + ACTIM_CTRLB(HYNIX_TWTR_165, HYNIX_TCKE_165, \ + HYNIX_TXP_165, HYNIX_XSR_165) + +#define HYNIX_RASWIDTH_165 0x2 +#define HYNIX_V_MCFG_165 (size) MCFG((size), HYNIX_RASWIDTH_165) +/* Hynix part of AM/DM37xEVM (200MHz optimized) */ #define HYNIX_TDAL_200 6#define HYNIX_TDPL_200 3
board/overo/config.mk deleted +0 -28
@@ -1,28 +0,0 @@ -# -# Overo uses OMAP3 (ARM-CortexA8) cpu -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# -# Physical Address: -# 8000'0000 (bank0) -# A000/0000 (bank1) -# Linux-Kernel is expected to be at 8000'8000, entry 8000'8000 -# (mem base + reserved) - -CONFIG_SYS_TEXT_BASE = 0x80008000
board/overo/overo.c +54 -1
79 lines not on this page · raw message
board/overo/overo.h +5 -0
@@ -33,6 +33,11 @@ const omap3_sysinfo sysinfo = {#endif }; +/* overo revisions */ +#define REVISION_0 0x0 +#define REVISION_1 0x1 +#define REVISION_2 0x2 +/* * IEN - Input Enable * IDIS - Input Disable
include/configs/omap3_overo.h +53 -0
63 lines not on this page · raw message
Signature · 1 line
1.7.6.4
PATCH v2 6/6 overo: add SPL support / CONFIG_SYS_TEXT_BASE changed to 0x80100000
Quoted 5 lines · Andreas M?ller
* implementation based on ti beagleboard/omap3evm
* timing data and i2c workaround for revision 0 boards taken from x-loader
* run-tested with overo revision 0 and 1 / boot from NAND and SDcardSigned-off-by Andreas M?ller <[email protected]>
Two big changes requested:
1) Please move the 'Texas Instruments' part of the preloader_console_init print to the default weak omap_rev_parse and then just provide an Overo version of the function.
2) Please see http://patchwork.ozlabs.org/patch/131431/ for how to configure SPL (and CONFIG_SYS_TEXT_BASE) so that SPL or x-loader can be used as the first stage. Since we're punting on some of the early revs of the boards (if I follow your emails right) this is important.
Thanks!
Signature · 1 line
Tom
v2 cover overo: add SPL support
In reply to Andreas MüllerI manually sent this series to Steve as suggested in review by Tom
Andreas
v2 cover overo: add SPL support
Quoted 1 line · Andreas M?ller
I manually sent this series to Steve as suggested in review by Tom
Parts 1 to 5 are fine and I've sent my comments on 6, thanks!
Signature · 1 line
Tom
v2 cover overo: add SPL support
Quoted 4 lines · Tom Rini
Quoted 1 line · Andreas M?ller
I manually sent this series to Steve as suggested in review by Tom
Parts 1 to 5 are fine and I've sent my comments on 6, thanks!
Tom,
1-5: Can you take them in - or is there meanwhile a rebase required?
6. What do you think of the modification for omap_rev_string()?
7. (was 6. in V1 - your response). Needs rework: For boards revision 1 the SDRAM timing seems to cause trouble when running GUI @ 720MHz! I tested only boot into console. I will check this during weekend.
Andreas