Skip to contentSkip to conversation

ARM:OMAP3:SDP3430 initial support

PATCH Superseded Nishanth Menon 5 participants 19 messages Oct 7, 2009 – Oct 20, 2009 Kbuild

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover ARM:OMAP3:SDP3430 initial support

This series of patch provides minimal support for
OMAP3430 based SDP3430 platform

Ref: http://focus.ti.com/general/docs/wtbu/wtbugencontent.tsp?templateId=6123&navigationId=12013&contentId=28741

Rev 1 of this patch series was discussed in:
http://www.nabble.com/forum/Permalink.jtp?root=25518020&post=25518020&page=y

1 patch was removed from the series and 2 patches were reworked but the entire series is being send out after being rebased to:
http://git.denx.de/?p=u-boot/u-boot-ti.git;a=summary
This is to ensure continuity of discussion.

David Brownell (1):
ARM:OMAP3:SDP3430: initial support (v2)

Nishanth Menon (4):
OMAP3: Fix SDRC init (v2)
OMAP3: export enable_gpmc_cs_config to board files
OMAP3: make gpmc_config as const
OMAP3: fix warnings when NAND/ONENAND is not used

 MAINTAINERS                            |    1 +
 MAKEALL                                |    1 +
 Makefile                               |    3 +
 board/ti/sdp3430/Makefile              |   49 ++++
 board/ti/sdp3430/config.mk             |   33 +++
 board/ti/sdp3430/sdp.c                 |  204 ++++++++++++++++
 board/ti/sdp3430/sdp.h                 |  417 ++++++++++++++++++++++++++++++++
 cpu/arm_cortexa8/omap3/mem.c           |   15 +-
 include/asm-arm/arch-omap3/cpu.h       |    1 +
 include/asm-arm/arch-omap3/mem.h       |    8 +-
 include/asm-arm/arch-omap3/sys_proto.h |    2 +
 include/configs/omap3_sdp3430.h        |  366 ++++++++++++++++++++++++++++
 12 files changed, 1091 insertions(+), 9 deletions(-)
 create mode 100644 board/ti/sdp3430/Makefile
 create mode 100644 board/ti/sdp3430/config.mk
 create mode 100644 board/ti/sdp3430/sdp.c
 create mode 100644 board/ti/sdp3430/sdp.h
 create mode 100644 include/configs/omap3_sdp3430.h

Regards,
Nishanth Menon

#1 lore raw

PATCH v2 1/5 OMAP3: Fix SDRC init

Defaults are for Infineon DDR timings. Since none of the supported boards currently do XIP boot, these seem to be faulty. fix the values as per the calculations(ACTIMA,B), conf the sdrc power with pwdnen and wakeupproc bits

Cc David B <[email protected]>
Cc Vikram Pandita <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Tom Rix <[email protected]>
Cc Dirk Behme <[email protected]>
---
 cpu/arm_cortexa8/omap3/mem.c     |    3 ++-
 include/asm-arm/arch-omap3/cpu.h |    1 +
 include/asm-arm/arch-omap3/mem.h |    8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)
cpu/arm_cortexa8/omap3/mem.c +2 -1
index 079c848..8731c9d 100644
@@ -164,7 +164,8 @@ void do_sdrc_init(u32 cs, u32 early)
 		writel(SDP_SDRC_SHARING, &sdrc_base->sharing);
 
 		/* Disable Power Down of CKE cuz of 1 CKE on combo part */
-		writel(SRFRONRESET | PAGEPOLICY_HIGH, &sdrc_base->power);
+		writel(WAKEUPPROC | PWDNEN | SRFRONRESET | PAGEPOLICY_HIGH,
+				&sdrc_base->power);
 
 		writel(ENADLL | DLLPHASE_90, &sdrc_base->dlla_ctrl);
 		sdelay(0x20000);
include/asm-arm/arch-omap3/cpu.h +1 -0
index 8ab2e39..e51c4f3 100644
@@ -222,6 +222,7 @@ struct sdrc {
 
 #define PAGEPOLICY_HIGH		(0x1 << 0)
 #define SRFRONRESET		(0x1 << 7)
+#define PWDNEN			(0x1 << 2)
 #define WAKEUPPROC		(0x1 << 26)
 
 #define DDR_SDRAM		(0x1 << 0)
include/asm-arm/arch-omap3/mem.h +4 -4
index 5b9ac75..31cbdef 100644
@@ -78,16 +78,16 @@ enum {
 #define TRP_165		3
 #define TRAS_165	7
 #define TRC_165		10
-#define TRFC_165	21
+#define TRFC_165	12
 #define V_ACTIMA_165	((TRFC_165 << 27) | (TRC_165 << 22) | \
 			(TRAS_165 << 18) | (TRP_165 << 15) |  \
 			(TRCD_165 << 12) | (TRRD_165 << 9) |  \
 			(TDPL_165 << 6) | (TDAL_165))
 
 #define TWTR_165	1
-#define TCKE_165	1
-#define TXP_165		5
-#define XSR_165		23
+#define TCKE_165	2
+#define TXP_165		2
+#define XSR_165		20
 #define V_ACTIMB_165	(((TCKE_165 << 12) | (XSR_165 << 0)) |	\
 			(TXP_165 << 8) | (TWTR_165 << 16))
 
Signature · 1 line
1.6.0.4
#2 lore raw

PATCH v2 2/5 OMAP3: export enable_gpmc_cs_config to board files

Export enable_gpmc_cs_config into common header to prevent warning:
warning: implicit declaration of function 'enable_gpmc_cs_config'

Cc David B <[email protected]>
Cc Vikram Pandita <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Tom Rix <[email protected]>
Cc Dirk Behme <[email protected]>
---
 include/asm-arm/arch-omap3/sys_proto.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
include/asm-arm/arch-omap3/sys_proto.h +2 -0
index 2246f80..e59021e 100644
@@ -34,6 +34,8 @@ void memif_init(void);
 void sdrc_init(void);
 void do_sdrc_init(u32, u32);
 void gpmc_init(void);
+void enable_gpmc_cs_config(u32 *gpmc_config, struct gpmc_cs *cs, u32 base,
+			u32 size);
 
 void watchdog_init(void);
 void set_muxconf_regs(void);
Signature · 1 line
1.6.0.4
#3 lore raw

PATCH v2 3/5 OMAP3: make gpmc_config as const

gpmc_config should not be a variant as it is board specific hence make it a const parameter

Cc David B <[email protected]>
Cc Vikram Pandita <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Tom Rix <[email protected]>
Cc Dirk Behme <[email protected]>
---
 cpu/arm_cortexa8/omap3/mem.c           |    6 +++---
 include/asm-arm/arch-omap3/sys_proto.h |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
cpu/arm_cortexa8/omap3/mem.c +3 -3
index 8731c9d..8d64478 100644
@@ -44,7 +44,7 @@ volatile unsigned int boot_flash_env_addr;
 struct gpmc *gpmc_cfg;
 
 #if defined(CONFIG_CMD_NAND)
-static u32 gpmc_m_nand[GPMC_MAX_REG] = {
+static const u32 gpmc_m_nand[GPMC_MAX_REG] = {
 	M_NAND_GPMC_CONFIG1,
 	M_NAND_GPMC_CONFIG2,
 	M_NAND_GPMC_CONFIG3,
@@ -62,7 +62,7 @@ static u32 gpmc_m_nand[GPMC_MAX_REG] = {
 #endif
 
 #if defined(CONFIG_CMD_ONENAND)
-static u32 gpmc_onenand[GPMC_MAX_REG] = {
+static const u32 gpmc_onenand[GPMC_MAX_REG] = {
 	ONENAND_GPMC_CONFIG1,
 	ONENAND_GPMC_CONFIG2,
 	ONENAND_GPMC_CONFIG3,
@@ -193,7 +193,7 @@ void do_sdrc_init(u32 cs, u32 early)
 		writel(0, &sdrc_base->cs[cs].mcfg);
 }
 
-void enable_gpmc_cs_config(u32 *gpmc_config, struct gpmc_cs *cs, u32 base,
+void enable_gpmc_cs_config(const u32 *gpmc_config, struct gpmc_cs *cs, u32 base,
 			u32 size)
 {
 	writel(0, &cs->config7);
include/asm-arm/arch-omap3/sys_proto.h +1 -1
index e59021e..34bd515 100644
@@ -34,7 +34,7 @@ void memif_init(void);
 void sdrc_init(void);
 void do_sdrc_init(u32, u32);
 void gpmc_init(void);
-void enable_gpmc_cs_config(u32 *gpmc_config, struct gpmc_cs *cs, u32 base,
+void enable_gpmc_cs_config(const u32 *gpmc_config, struct gpmc_cs *cs, u32 base,
 			u32 size);
 
 void watchdog_init(void);
Signature · 1 line
1.6.0.4
#4 lore raw

PATCH v2 4/5 OMAP3: fix warnings when NAND/ONENAND is not used

Fix build warnings by putting specific used variables under required #ifdefs for removing:
mem.c:227: warning: unused variable 'f_sec' mem.c:226: warning: unused variable 'f_off' mem.c:225: warning: unused variable 'size' mem.c:224: warning: unused variable 'base' mem.c:222: warning: unused variable 'gpmc_config'

Cc David B <[email protected]>
Cc Vikram Pandita <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Tom Rix <[email protected]>
Cc Dirk Behme <[email protected]>
---
 cpu/arm_cortexa8/omap3/mem.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
cpu/arm_cortexa8/omap3/mem.c +5 -1
index 8d64478..e93343c 100644
@@ -219,12 +219,16 @@ void enable_gpmc_cs_config(const u32 *gpmc_config, struct gpmc_cs *cs, u32 base,
 void gpmc_init(void)
 {
 	/* putting a blanket check on GPMC based on ZeBu for now */
-	u32 *gpmc_config = NULL;
 	gpmc_cfg = (struct gpmc *)GPMC_BASE;
+#if defined(CONFIG_CMD_NAND) || defined(CONFIG_CMD_ONENAND)
+	u32 *gpmc_config = NULL;
 	u32 base = 0;
 	u32 size = 0;
+#if defined(CONFIG_ENV_IS_IN_NAND) || defined(CONFIG_ENV_IS_IN_ONENAND)
 	u32 f_off = CONFIG_SYS_MONITOR_LEN;
 	u32 f_sec = 0;
+#endif
+#endif
 	u32 config = 0;
 
 	/* global settings */
Signature · 1 line
1.6.0.4
#5 lore raw

PATCH v2 5/5 ARM:OMAP3:SDP3430: initial support

From: David Brownell <[email protected]>

Start of support of
Texas Instruments Software Development Platform(SDP) for OMAP3430 - SDP3430

Highlights of this platform are:
Flash Memory devices:
Sibley NOR, Micron 8bit NAND and OneNAND
Connectivity:
3 UARTs and expanded 4 UART ports + IrDA Ethernet, USB
Other peripherals:
TWL5030 PMIC+Audio+Keypad
VGA display
Expansion ports:
Memory devices plugin boards (PISMO) Connectivity board for GPS,WLAN etc..
Completely configurable boot sequence and device mapping etc..
For more details, please refer:
http://focus.ti.com/general/docs/wtbu/wtbugencontent.tsp?templateId=6123&navigationId=12013&contentId=28741

U-boot support introduced for:
Support default jumpering and:
- UART1/ttyS0 console(legacy sdp3430 u-boot)
- UART3/ttyS2 console (matching other boards,
and SDP HW docs)
- Ethernet
- mmc0
- NOR boot

TODO:
- mmc1
- NAND (boot or 128M storage)
- OneNAND (boot or 256M storage)
- Fix NOR env variable load
- Review SDRC timing configuration/DPLL
configuration
- Dynamically read FPGA dip switch settings and
map NOR/NAND/ONENAND devices to right
chipselects

Currently the UART1 is enabled by default. for
compatibility with other OMAP3 u-boot platforms,
enable the #define of CONSOLE_J9.

Cc Vikram Pandita <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Tom Rix <[email protected]>
Cc Dirk Behme <[email protected]>
---
 MAINTAINERS                     |    1 +
 MAKEALL                         |    1 +
 Makefile                        |    3 +
 board/ti/sdp3430/Makefile       |   49 +++++
 board/ti/sdp3430/config.mk      |   33 +++
 board/ti/sdp3430/sdp.c          |  204 +++++++++++++++++++
 board/ti/sdp3430/sdp.h          |  417 +++++++++++++++++++++++++++++++++++++++
 include/configs/omap3_sdp3430.h |  366 ++++++++++++++++++++++++++++++++++
 8 files changed, 1074 insertions(+), 0 deletions(-)
 create mode 100644 board/ti/sdp3430/Makefile
 create mode 100644 board/ti/sdp3430/config.mk
 create mode 100644 board/ti/sdp3430/sdp.c
 create mode 100644 board/ti/sdp3430/sdp.h
 create mode 100644 include/configs/omap3_sdp3430.h
MAINTAINERS +1 -0
index 2297651..5742782 100644
@@ -628,6 +628,7 @@ Guennadi Liakhovetski <[email protected]>
 
 Nishanth Menon <[email protected]>
 
+	omap3_sdp3430	ARM CORTEX-A8 (OMAP3xx SoC)
 	omap3_zoom1	ARM CORTEX-A8 (OMAP3xx SoC)
 
 David M?ller <[email protected]>
MAKEALL +1 -0
index 38cd076..9bf75e8 100755
@@ -603,6 +603,7 @@ LIST_ARM_CORTEX_A8="		\
 	omap3_overo		\
 	omap3_evm		\
 	omap3_pandora		\
+	omap3_sdp3430		\
 	omap3_zoom1		\
 	omap3_zoom2		\
 "
Makefile +3 -0
index 9637643..8dbe552 100644
@@ -3144,6 +3144,9 @@ omap3_zoom1_config :	unconfig
 omap3_zoom2_config :	unconfig
 	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom2 logicpd omap3
 
+omap3_sdp3430_config :	unconfig
+	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 sdp3430 ti omap3
+
 #########################################################################
 ## XScale Systems
 #########################################################################
board/ti/sdp3430/Makefile new file +49 -0

49 lines not on this page · raw message

board/ti/sdp3430/config.mk new file +33 -0
new file mode 100644
index 0000000..3726634
@@ -0,0 +1,33 @@
+#
+# (C) Copyright 2006-2009
+# Texas Instruments, <www.ti.com>
+#
+# OMAP 3430 SDP uses OMAP3 (ARM-CortexA8) cpu
+# see http://www.ti.com/ for more information on Texas Instruments
+#
+# 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)
+
+# For use with external or internal boots.
+TEXT_BASE = 0x80e80000
board/ti/sdp3430/sdp.c new file +204 -0

204 lines not on this page · raw message

board/ti/sdp3430/sdp.h new file +417 -0

417 lines not on this page · raw message

include/configs/omap3_sdp3430.h new file +366 -0

366 lines not on this page · raw message

Signature · 1 line
1.6.0.4
#6 lore raw

PATCH 4/5 OMAP3: fix warnings when NAND/ONENAND is not used

In reply to Nishanth Menon
Quoted 18 lines

Fix build warnings by putting specific used variables under required #ifdefs for removing:
mem.c:227: warning: unused variable 'f_sec' mem.c:226: warning: unused variable 'f_off' mem.c:225: warning: unused variable 'size' mem.c:224: warning: unused variable 'base' mem.c:222: warning: unused variable 'gpmc_config'

Cc David B <[email protected]>
Cc Vikram Pandita <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Tom Rix <[email protected]>
Cc Dirk Behme <[email protected]>
Quoted 3 lines
---
 cpu/arm_cortexa8/omap3/mem.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

Pushed to u-boot-ti next

http://git.denx.de/?p=u-boot/u-boot-ti.git;a=commitdiff;h=9a6856e54708598902eba30bb030b917778bbb8b

Thanks,
Sandeep

#7 lore raw

PATCH 3/5 OMAP3: make gpmc_config as const

In reply to Nishanth Menon
Quoted 13 lines

gpmc_config should not be a variant as it is board specific hence make it a const parameter

Cc David B <[email protected]>
Cc Vikram Pandita <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Tom Rix <[email protected]>
Cc Dirk Behme <[email protected]>
Quoted 5 lines
---
 cpu/arm_cortexa8/omap3/mem.c           |    6 +++---
 include/asm-arm/arch-omap3/sys_proto.h |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

Pushed to u-boot-ti next

http://git.denx.de/?p=u-boot/u-boot-ti.git;a=commitdiff;h=c27339b41e49cd89c2ea802a490b175ac7ad89ff

Thanks,
Sandeep

#8 lore raw

PATCH 3/5 OMAP3: make gpmc_config as const

In reply to Nishanth Menon
Quoted 2 lines · Nishanth Menon

gpmc_config should not be a variant as it is board specific hence make it a const parameter

Having this in u-boot-ti/next results in

- All non-SDP3430 boards have

mem.c: In function 'gpmc_init':
mem.c:250: warning: assignment discards qualifiers from pointer target type

- Zoom2 fails to build with

zoom2.c:54: error: conflicting types for 'enable_gpmc_cs_config' /include/asm/arch/sys_proto.h:38: error: previous declaration of 'enable_gpmc_cs_config' was here

Reverting this patch makes both go away.

Then we get

sdp.c: In function 'board_init':
sdp.c:109: warning: passing argument 1 of 'enable_gpmc_cs_config' discards qualifiers from pointer target type
sdp.c:111: warning: passing argument 1 of 'enable_gpmc_cs_config' discards qualifiers from pointer target type
sdp.c:113: warning: passing argument 1 of 'enable_gpmc_cs_config' discards qualifiers from pointer target type
sdp.c:115: warning: passing argument 1 of 'enable_gpmc_cs_config' discards qualifiers from pointer target type

for SDP3430 only, though.

So I'd like to have this patch reverted in u-boot-ti/next and then

a) Fix sdp.c only

or

b) test the other boards, too, before applying this patch.

Best regards

Dirk

Quoted 56 lines
Cc David B <[email protected]>
Cc Vikram Pandita <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Tom Rix <[email protected]>
Cc Dirk Behme <[email protected]>
---
 cpu/arm_cortexa8/omap3/mem.c           |    6 +++---
 include/asm-arm/arch-omap3/sys_proto.h |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
cpu/arm_cortexa8/omap3/mem.c +3 -3
index 8731c9d..8d64478 100644
@@ -44,7 +44,7 @@ volatile unsigned int boot_flash_env_addr;
 struct gpmc *gpmc_cfg;
 
 #if defined(CONFIG_CMD_NAND)
-static u32 gpmc_m_nand[GPMC_MAX_REG] = {
+static const u32 gpmc_m_nand[GPMC_MAX_REG] = {
 	M_NAND_GPMC_CONFIG1,
 	M_NAND_GPMC_CONFIG2,
 	M_NAND_GPMC_CONFIG3,
@@ -62,7 +62,7 @@ static u32 gpmc_m_nand[GPMC_MAX_REG] = {
 #endif
 
 #if defined(CONFIG_CMD_ONENAND)
-static u32 gpmc_onenand[GPMC_MAX_REG] = {
+static const u32 gpmc_onenand[GPMC_MAX_REG] = {
 	ONENAND_GPMC_CONFIG1,
 	ONENAND_GPMC_CONFIG2,
 	ONENAND_GPMC_CONFIG3,
@@ -193,7 +193,7 @@ void do_sdrc_init(u32 cs, u32 early)
 		writel(0, &sdrc_base->cs[cs].mcfg);
 }
 
-void enable_gpmc_cs_config(u32 *gpmc_config, struct gpmc_cs *cs, u32 base,
+void enable_gpmc_cs_config(const u32 *gpmc_config, struct gpmc_cs *cs, u32 base,
 			u32 size)
 {
 	writel(0, &cs->config7);
include/asm-arm/arch-omap3/sys_proto.h +1 -1
index e59021e..34bd515 100644
@@ -34,7 +34,7 @@ void memif_init(void);
 void sdrc_init(void);
 void do_sdrc_init(u32, u32);
 void gpmc_init(void);
-void enable_gpmc_cs_config(u32 *gpmc_config, struct gpmc_cs *cs, u32 base,
+void enable_gpmc_cs_config(const u32 *gpmc_config, struct gpmc_cs *cs, u32 base,
 			u32 size);
 
 void watchdog_init(void);
#9 lore raw

PATCH 3/5 OMAP3: make gpmc_config as const

Quoted 39 lines
Quoted 2 lines · Nishanth Menon

gpmc_config should not be a variant as it is board specific hence make it a const parameter

Having this in u-boot-ti/next results in

- All non-SDP3430 boards have

mem.c: In function 'gpmc_init':
mem.c:250: warning: assignment discards qualifiers from pointer target type

- Zoom2 fails to build with

zoom2.c:54: error: conflicting types for 'enable_gpmc_cs_config' /include/asm/arch/sys_proto.h:38: error: previous declaration of 'enable_gpmc_cs_config' was here

Reverting this patch makes both go away.

Then we get

sdp.c: In function 'board_init':
sdp.c:109: warning: passing argument 1 of 'enable_gpmc_cs_config' discards qualifiers from pointer target type
sdp.c:111: warning: passing argument 1 of 'enable_gpmc_cs_config' discards qualifiers from pointer target type
sdp.c:113: warning: passing argument 1 of 'enable_gpmc_cs_config' discards qualifiers from pointer target type
sdp.c:115: warning: passing argument 1 of 'enable_gpmc_cs_config' discards qualifiers from pointer target type

for SDP3430 only, though.

So I'd like to have this patch reverted in u-boot-ti/next and then

a) Fix sdp.c only

Quoted 8 lines

or

b) test the other boards, too, before applying this patch.

Best regards

Dirk

My bad, should have compiled all other boards as well.

I have reverted.

Thanks,
Sandeep

#10 lore raw

PATCH 3/5 OMAP3: make gpmc_config as const

In reply to Dirk Behme

Dirk Behme said the following on 10/11/2009 02:54 AM:

Quoted 14 lines
Quoted 3 lines · Nishanth Menon

gpmc_config should not be a variant as it is board specific hence make it a const parameter

Having this in u-boot-ti/next results in

- All non-SDP3430 boards have

mem.c: In function 'gpmc_init':
mem.c:250: warning: assignment discards qualifiers from pointer target type

Quoted 7 lines

- Zoom2 fails to build with

zoom2.c:54: error: conflicting types for 'enable_gpmc_cs_config' /include/asm/arch/sys_proto.h:38: error: previous declaration of 'enable_gpmc_cs_config' was here

Reverting this patch makes both go away

Redone patch attached - MAKEALL tested ONLY. apologies on the noise.

ethernet still pending..
Regards,
Nishanth Menon
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-OMAP3-make-gpmc_config-as-const.patch
Type: text/x-diff
Size: 0 bytes
Desc: not available
Url : http://lists.denx.de/pipermail/u-boot/attachments/20091011/596310bb/attachment.patch

#11 lore raw

PATCH 3/5 OMAP3: make gpmc_config as const

Quoted 18 lines

Dirk Behme said the following on 10/11/2009 02:54 AM:

Quoted 14 lines
Quoted 3 lines · Nishanth Menon

gpmc_config should not be a variant as it is board specific hence make it a const parameter

Having this in u-boot-ti/next results in

- All non-SDP3430 boards have

mem.c: In function 'gpmc_init':
mem.c:250: warning: assignment discards qualifiers from pointer target type

Quoted 8 lines
Quoted 7 lines

- Zoom2 fails to build with

zoom2.c:54: error: conflicting types for 'enable_gpmc_cs_config' /include/asm/arch/sys_proto.h:38: error: previous declaration of 'enable_gpmc_cs_config' was here

Reverting this patch makes both go away

Redone patch attached - MAKEALL tested ONLY. apologies on the noise.

Pushed to u-boot-ti next

http://git.denx.de/?p=u-boot/u-boot-ti.git;a=commit;h=78c38ce87f7423eedba844e8594cfc5a4fa6051b

Quoted 4 lines

ethernet still pending..
Regards,
Nishanth Menon

Thanks,
Sandeep

#12 lore raw

PATCH 3/5 OMAP3: make gpmc_config as const

Paulraj, Sandeep said the following on 10/11/2009 09:48 AM:

Quoted 24 lines
Quoted 24 lines

Dirk Behme said the following on 10/11/2009 02:54 AM:

Quoted 21 lines
Quoted 4 lines · Nishanth Menon

gpmc_config should not be a variant as it is board specific hence make it a const parameter

Having this in u-boot-ti/next results in

- All non-SDP3430 boards have

mem.c: In function 'gpmc_init':
mem.c:250: warning: assignment discards qualifiers from pointer target type

- Zoom2 fails to build with

zoom2.c:54: error: conflicting types for 'enable_gpmc_cs_config' /include/asm/arch/sys_proto.h:38: error: previous declaration of 'enable_gpmc_cs_config' was here

Quoted 10 lines
Quoted 4 lines
Quoted 2 lines

Reverting this patch makes both go away

Redone patch attached - MAKEALL tested ONLY. apologies on the noise.

Pushed to u-boot-ti next

http://git.denx.de/?p=u-boot/u-boot-ti.git;a=commit;h=78c38ce87f7423eedba844e8594cfc5a4fa6051b

thanks. i have an ethernet patch.. but i need to reach office later today to test it..
Regards,
Nishanth Menon

#13 lore raw

PATCH 2/5 OMAP3: export enable_gpmc_cs_config to board files

In reply to Nishanth Menon
Quoted 13 lines

Export enable_gpmc_cs_config into common header to prevent warning:
warning: implicit declaration of function 'enable_gpmc_cs_config'

Cc David B <[email protected]>
Cc Vikram Pandita <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Tom Rix <[email protected]>
Cc Dirk Behme <[email protected]>
Quoted 4 lines
---
 include/asm-arm/arch-omap3/sys_proto.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

Pushed to u-boot-ti next

http://git.denx.de/?p=u-boot/u-boot-ti.git;a=commitdiff;h=79d072ada0eb7ecfbe49cfc2b0c249a7d705f086

Sandeep

#14 lore raw

PATCH v2 1/5 OMAP3: Fix SDRC init

In reply to Nishanth Menon
Quoted 15 lines

Defaults are for Infineon DDR timings. Since none of the supported boards currently do XIP boot, these seem to be faulty. fix the values as per the calculations(ACTIMA,B), conf the sdrc power with pwdnen and wakeupproc bits

Cc David B <[email protected]>
Cc Vikram Pandita <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Tom Rix <[email protected]>
Cc Dirk Behme <[email protected]>
Quoted 6 lines
---
 cpu/arm_cortexa8/omap3/mem.c     |    3 ++-
 include/asm-arm/arch-omap3/cpu.h |    1 +
 include/asm-arm/arch-omap3/mem.h |    8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

Pushed to u-boot-ti next

http://git.denx.de/?p=u-boot/u-boot-ti.git;a=commitdiff;h=f714f3a12c09260c500e0f7c5ff40f15d66ab579

Thanks,
Sandeep

#15 lore raw

PATCH v2 1/5 OMAP3: Fix SDRC init

In reply to Nishanth Menon
Quoted 70 lines · Nishanth Menon

Defaults are for Infineon DDR timings. Since none of the supported boards currently do XIP boot, these seem to be faulty. fix the values as per the calculations(ACTIMA,B), conf the sdrc power with pwdnen and wakeupproc bits

Cc David B <[email protected]>
Cc Vikram Pandita <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Tom Rix <[email protected]>
Cc Dirk Behme <[email protected]>

---

?cpu/arm_cortexa8/omap3/mem.c ? ? | ? ?3 ++-
?include/asm-arm/arch-omap3/cpu.h | ? ?1 +
?include/asm-arm/arch-omap3/mem.h | ? ?8 ++++----

?3 files changed, 7 insertions(+), 5 deletions(-)

cpu/arm_cortexa8/omap3/mem.c +0 -0
index 079c848..8731c9d 100644
@@ -164,7 +164,8 @@ void do_sdrc_init(u32 cs, u32 early)
 ? ? ? ? ? ? ? ?writel(SDP_SDRC_SHARING, &sdrc_base->sharing);
 

? ? ? ? ? ? ? ?/* Disable Power Down of CKE cuz of 1 CKE on combo part */
- ? ? ? ? ? ? ? writel(SRFRONRESET | PAGEPOLICY_HIGH, &sdrc_base->power);
+ ? ? ? ? ? ? ? writel(WAKEUPPROC | PWDNEN | SRFRONRESET | PAGEPOLICY_HIGH,
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? &sdrc_base->power);

? ? ? ? ? ? ? ?writel(ENADLL | DLLPHASE_90, &sdrc_base->dlla_ctrl); ? ? ? ? ? ? ? ?sdelay(0x20000);

include/asm-arm/arch-omap3/cpu.h +1 -0
index 8ab2e39..e51c4f3 100644
@@ -222,6 +222,7 @@ struct sdrc {
 
 ?#define PAGEPOLICY_HIGH ? ? ? ? ? ? ? ?(0x1 << 0)
 ?#define SRFRONRESET ? ? ? ? ? ?(0x1 << 7)
+#define PWDNEN ? ? ? ? ? ? ? ? (0x1 << 2)
 ?#define WAKEUPPROC ? ? ? ? ? ? (0x1 << 26)
 
 ?#define DDR_SDRAM ? ? ? ? ? ? ?(0x1 << 0)
include/asm-arm/arch-omap3/mem.h +0 -0
index 5b9ac75..31cbdef 100644
@@ -78,16 +78,16 @@ enum {

?#define TRP_165 ? ? ? ? ? ? ? ?3
?#define TRAS_165 ? ? ? 7
?#define TRC_165 ? ? ? ? ? ? ? ?10

include/asm-arm/arch-omap3/mem.h +1 -1
-#define TRFC_165 ? ? ? 21
+#define TRFC_165 ? ? ? 12

?#define V_ACTIMA_165 ? ((TRFC_165 << 27) | (TRC_165 << 22) | \

? ? ? ? ? ? ? ? ? ? ? ?(TRAS_165 << 18) | (TRP_165 << 15) | ?\
? ? ? ? ? ? ? ? ? ? ? ?(TRCD_165 << 12) | (TRRD_165 << 9) | ?\

? ? ? ? ? ? ? ? ? ? ? ?(TDPL_165 << 6) | (TDAL_165))

?#define TWTR_165 ? ? ? 1

include/asm-arm/arch-omap3/mem.h +3 -3
-#define TCKE_165 ? ? ? 1
-#define TXP_165 ? ? ? ? ? ? ? ?5
-#define XSR_165 ? ? ? ? ? ? ? ?23
+#define TCKE_165 ? ? ? 2
+#define TXP_165 ? ? ? ? ? ? ? ?2
+#define XSR_165 ? ? ? ? ? ? ? ?20

?#define V_ACTIMB_165 ? (((TCKE_165 << 12) | (XSR_165 << 0)) | ?\
? ? ? ? ? ? ? ? ? ? ? ?(TXP_165 << 8) | (TWTR_165 << 16))

Quoted 2 lines

--
1.6.0.4

I see issues after applying this patch (Overo/Beagle).

In about half of my boot attempts I get a hang after Uncompressing Linux....

In the other half I get many many errors of this type:

SLAB: cache with size 192 has lost its name

Reverting the patch restores normal operation.

So it seems that the Infineon timings do not work on systems with Micron memory.

Steve

#16 lore raw

PATCH v2 1/5 OMAP3: Fix SDRC init

Quoted 76 lines · Steve Sakoman
Quoted 71 lines · Nishanth Menon

Defaults are for Infineon DDR timings. Since none of the supported boards currently do XIP boot, these seem to be faulty. fix the values as per the calculations(ACTIMA,B), conf the sdrc power with pwdnen and wakeupproc bits

Cc David B <[email protected]>
Cc Vikram Pandita <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Tom Rix <[email protected]>
Cc Dirk Behme <[email protected]>
---
 cpu/arm_cortexa8/omap3/mem.c     |    3 ++-
 include/asm-arm/arch-omap3/cpu.h |    1 +
 include/asm-arm/arch-omap3/mem.h |    8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)
cpu/arm_cortexa8/omap3/mem.c +2 -1
index 079c848..8731c9d 100644
@@ -164,7 +164,8 @@ void do_sdrc_init(u32 cs, u32 early)
               writel(SDP_SDRC_SHARING, &sdrc_base->sharing);
 
               /* Disable Power Down of CKE cuz of 1 CKE on combo part */
-               writel(SRFRONRESET | PAGEPOLICY_HIGH, &sdrc_base->power);
+               writel(WAKEUPPROC | PWDNEN | SRFRONRESET | PAGEPOLICY_HIGH,
+                               &sdrc_base->power);
 
               writel(ENADLL | DLLPHASE_90, &sdrc_base->dlla_ctrl);
               sdelay(0x20000);
include/asm-arm/arch-omap3/cpu.h +1 -0
index 8ab2e39..e51c4f3 100644
@@ -222,6 +222,7 @@ struct sdrc {
 
 #define PAGEPOLICY_HIGH                (0x1 << 0)
 #define SRFRONRESET            (0x1 << 7)
+#define PWDNEN                 (0x1 << 2)
 #define WAKEUPPROC             (0x1 << 26)
 
 #define DDR_SDRAM              (0x1 << 0)
include/asm-arm/arch-omap3/mem.h +4 -5
index 5b9ac75..31cbdef 100644
@@ -78,16 +78,16 @@ enum {
 #define TRP_165                3
 #define TRAS_165       7
 #define TRC_165                10
-#define TRFC_165       21
+#define TRFC_165       12
 #define V_ACTIMA_165   ((TRFC_165 << 27) | (TRC_165 << 22) | \
                       (TRAS_165 << 18) | (TRP_165 << 15) |  \
                       (TRCD_165 << 12) | (TRRD_165 << 9) |  \
                       (TDPL_165 << 6) | (TDAL_165))
 
 #define TWTR_165       1
-#define TCKE_165       1
-#define TXP_165                5
-#define XSR_165                23
+#define TCKE_165       2
+#define TXP_165                2
+#define XSR_165                20
 #define V_ACTIMB_165   (((TCKE_165 << 12) | (XSR_165 << 0)) |  \
                       (TXP_165 << 8) | (TWTR_165 << 16))
 
--
Quoted 1 line

1.6.0.4

I see issues after applying this patch (Overo/Beagle).

Quoted 7 lines

In about half of my boot attempts I get a hang after Uncompressing Linux....

In the other half I get many many errors of this type:

SLAB: cache with size 192 has lost its name

Reverting the patch restores normal operation.

What's about removing it from recent ARM pull request than and do some further testing?

Thanks for testing

Dirk

#17 lore raw

PATCH v2 1/5 OMAP3: Fix SDRC init

Quoted 85 lines · Dirk Behme
Quoted 84 lines · Steve Sakoman
Quoted 74 lines · Nishanth Menon

Defaults are for Infineon DDR timings. Since none of the supported boards currently do XIP boot, these seem to be faulty. fix the values as per the calculations(ACTIMA,B), conf the sdrc power with pwdnen and wakeupproc bits

Cc David B <[email protected]>
Cc Vikram Pandita <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Tom Rix <[email protected]>
Cc Dirk Behme <[email protected]>

---

?cpu/arm_cortexa8/omap3/mem.c ? ? | ? ?3 ++-
?include/asm-arm/arch-omap3/cpu.h | ? ?1 +
?include/asm-arm/arch-omap3/mem.h | ? ?8 ++++----

?3 files changed, 7 insertions(+), 5 deletions(-)

cpu/arm_cortexa8/omap3/mem.c +0 -0
index 079c848..8731c9d 100644
@@ -164,7 +164,8 @@ void do_sdrc_init(u32 cs, u32 early)
 ? ? ? ? ? ? ? writel(SDP_SDRC_SHARING, &sdrc_base->sharing);
 

? ? ? ? ? ? ? /* Disable Power Down of CKE cuz of 1 CKE on combo part */
- ? ? ? ? ? ? ? writel(SRFRONRESET | PAGEPOLICY_HIGH, &sdrc_base->power);
+ ? ? ? ? ? ? ? writel(WAKEUPPROC | PWDNEN | SRFRONRESET | PAGEPOLICY_HIGH,
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? &sdrc_base->power);

? ? ? ? ? ? ? writel(ENADLL | DLLPHASE_90, &sdrc_base->dlla_ctrl); ? ? ? ? ? ? ? sdelay(0x20000);

include/asm-arm/arch-omap3/cpu.h +1 -0
index 8ab2e39..e51c4f3 100644
@@ -222,6 +222,7 @@ struct sdrc {
 
 ?#define PAGEPOLICY_HIGH ? ? ? ? ? ? ? ?(0x1 << 0)
 ?#define SRFRONRESET ? ? ? ? ? ?(0x1 << 7)
+#define PWDNEN ? ? ? ? ? ? ? ? (0x1 << 2)
 ?#define WAKEUPPROC ? ? ? ? ? ? (0x1 << 26)
 
 ?#define DDR_SDRAM ? ? ? ? ? ? ?(0x1 << 0)
include/asm-arm/arch-omap3/mem.h +0 -0
index 5b9ac75..31cbdef 100644
@@ -78,16 +78,16 @@ enum {

?#define TRP_165 ? ? ? ? ? ? ? ?3
?#define TRAS_165 ? ? ? 7
?#define TRC_165 ? ? ? ? ? ? ? ?10

include/asm-arm/arch-omap3/mem.h +1 -1
-#define TRFC_165 ? ? ? 21
+#define TRFC_165 ? ? ? 12

?#define V_ACTIMA_165 ? ((TRFC_165 << 27) | (TRC_165 << 22) | \

? ? ? ? ? ? ? ? ? ? ? (TRAS_165 << 18) | (TRP_165 << 15) | ?\
? ? ? ? ? ? ? ? ? ? ? (TRCD_165 << 12) | (TRRD_165 << 9) | ?\

? ? ? ? ? ? ? ? ? ? ? (TDPL_165 << 6) | (TDAL_165))

?#define TWTR_165 ? ? ? 1

include/asm-arm/arch-omap3/mem.h +3 -3
-#define TCKE_165 ? ? ? 1
-#define TXP_165 ? ? ? ? ? ? ? ?5
-#define XSR_165 ? ? ? ? ? ? ? ?23
+#define TCKE_165 ? ? ? 2
+#define TXP_165 ? ? ? ? ? ? ? ?2
+#define XSR_165 ? ? ? ? ? ? ? ?20

?#define V_ACTIMB_165 ? (((TCKE_165 << 12) | (XSR_165 << 0)) | ?\
? ? ? ? ? ? ? ? ? ? ? (TXP_165 << 8) | (TWTR_165 << 16))

Quoted 2 lines

--
1.6.0.4

I see issues after applying this patch (Overo/Beagle).

In about half of my boot attempts I get a hang after Uncompressing Linux....

Quoted 8 lines
Quoted 5 lines

In the other half I get many many errors of this type:

SLAB: cache with size 192 has lost its name

Reverting the patch restores normal operation.

What's about removing it from recent ARM pull request than and do some further testing?

That sounds like a good plan to me.

Steve

#18 lore raw

[U-Boot] OMAP3 DDR Fix patches (was Re: [PATCH 1/5 v2] OMAP3: Fix SDRC init)

Steve Sakoman had written, on 10/19/2009 10:06 AM, the following:

Quoted 85 lines · Dirk Behme
Quoted 84 lines
Quoted 83 lines · Steve Sakoman
Quoted 74 lines · Nishanth Menon

Defaults are for Infineon DDR timings. Since none of the supported boards currently do XIP boot, these seem to be faulty. fix the values as per the calculations(ACTIMA,B), conf the sdrc power with pwdnen and wakeupproc bits

Cc David B <[email protected]>
Cc Vikram Pandita <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Tom Rix <[email protected]>
Cc Dirk Behme <[email protected]>
---
 cpu/arm_cortexa8/omap3/mem.c     |    3 ++-
 include/asm-arm/arch-omap3/cpu.h |    1 +
 include/asm-arm/arch-omap3/mem.h |    8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)
cpu/arm_cortexa8/omap3/mem.c +2 -1
index 079c848..8731c9d 100644
@@ -164,7 +164,8 @@ void do_sdrc_init(u32 cs, u32 early)
              writel(SDP_SDRC_SHARING, &sdrc_base->sharing);
 
              /* Disable Power Down of CKE cuz of 1 CKE on combo part */
-               writel(SRFRONRESET | PAGEPOLICY_HIGH, &sdrc_base->power);
+               writel(WAKEUPPROC | PWDNEN | SRFRONRESET |
 PAGEPOLICY_HIGH,
+                               &sdrc_base->power);
 
              writel(ENADLL | DLLPHASE_90, &sdrc_base->dlla_ctrl);
              sdelay(0x20000);
include/asm-arm/arch-omap3/cpu.h +1 -0
index 8ab2e39..e51c4f3 100644
@@ -222,6 +222,7 @@ struct sdrc {
 
 #define PAGEPOLICY_HIGH                (0x1 << 0)
 #define SRFRONRESET            (0x1 << 7)
+#define PWDNEN                 (0x1 << 2)
 #define WAKEUPPROC             (0x1 << 26)
 
 #define DDR_SDRAM              (0x1 << 0)
include/asm-arm/arch-omap3/mem.h +4 -5
index 5b9ac75..31cbdef 100644
@@ -78,16 +78,16 @@ enum {
 #define TRP_165                3
 #define TRAS_165       7
 #define TRC_165                10
-#define TRFC_165       21
+#define TRFC_165       12
 #define V_ACTIMA_165   ((TRFC_165 << 27) | (TRC_165 << 22) | \
                      (TRAS_165 << 18) | (TRP_165 << 15) |  \
                      (TRCD_165 << 12) | (TRRD_165 << 9) |  \
                      (TDPL_165 << 6) | (TDAL_165))
 
 #define TWTR_165       1
-#define TCKE_165       1
-#define TXP_165                5
-#define XSR_165                23
+#define TCKE_165       2
+#define TXP_165                2
+#define XSR_165                20
 #define V_ACTIMB_165   (((TCKE_165 << 12) | (XSR_165 << 0)) |  \
                      (TXP_165 << 8) | (TWTR_165 << 16))
 
--
Quoted 1 line

1.6.0.4

I see issues after applying this patch (Overo/Beagle).

In about half of my boot attempts I get a hang after Uncompressing Linux....

In the other half I get many many errors of this type:

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines

SLAB: cache with size 192 has lost its name

Reverting the patch restores normal operation.

What's about removing it from recent ARM pull request than and do some further testing?

That sounds like a good plan to me.

Original patch was send on 6th Oct. sad that we will need to break complete SDP3430 boot support.. How about fixing it properly once for all-> looks like a previous commit hacked the timings meant for INFINEON DDR with MICRON values for few of them causing this mess. attached is a patchset to fix it.

Tested on SDP3430, buildtested for others - Steve do try it on your platform to confirm. more testing invited..

Signature · 9 lines
Regards,
Nishanth Menon
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-OMAP3-SDRC-Cleanup-references-to-SDP.patch
Type: text/x-patch
Size: 0 bytes
Desc: not available
Url : http://lists.denx.de/pipermail/u-boot/attachments/20091019/9b5f8671/attachment.bin