Introduce common config file for TI ARMv7 platforms

PATCH New Tom Rini 5 participants 35 messages Aug 2, 2013 – Aug 6, 2013 Arm (32-bit)

lore

Share & tools

lore

Tom Rini

author

2013-08-02 20:26 UTC #0 lore raw

cover Introduce common config file for TI ARMv7 platforms

Hey all,

The following series cleans up am335x a bit, and then uses that to introduce a common config file that can be used on all of the ARMv7 platforms from TI. This series converts am335x_evm, omap5_uevm and dra7xx_evm to use the new structure. There is room for further cleanup and consolidation but as they are invasive patches I don't want to hold these for too long. This is on top of u-boot-arm/master.

Signature · 1 line

Tom

Tom Rini

author

2013-08-02 20:26 UTC #1 lore raw

PATCH 1/10 am33xx: Move V_OSCK/V_SCLK to <asm/arch-am33xx/clocks_am33xx.h>

This detail belongs in the arch header file, given how we are structured today at least.

Signed-off-by Tom Rini <[email protected]>

---
 arch/arm/include/asm/arch-am33xx/clocks_am33xx.h |    4 ++++
 include/configs/igep0033.h                       |    4 ----
 include/configs/pcm051.h                         |    4 ----
 include/configs/ti814x_evm.h                     |    4 ----
 4 files changed, 4 insertions(+), 12 deletions(-)

arch/arm/include/asm/arch-am33xx/clocks_am33xx.h +4 -0

index 80e1899..3becb98 100644
@@ -11,6 +11,10 @@
 #ifndef _CLOCKS_AM33XX_H_
 #define _CLOCKS_AM33XX_H_
 
+/* Clock Defines */
+#define V_OSCK				24000000  /* Clock output from T2 */
+#define V_SCLK				(V_OSCK)
+
 /* MAIN PLL Fdll = 550 MHz, by default */
 #ifndef CONFIG_SYS_MPUCLK
 #define CONFIG_SYS_MPUCLK	550

include/configs/igep0033.h +0 -4

index 12f28f8..28c7ae9 100644
@@ -23,10 +23,6 @@
 #define MACH_TYPE_IGEP0033		4521	/* Until the next sync */
 #define CONFIG_MACH_TYPE		MACH_TYPE_IGEP0033
 
-/* Clock defines */
-#define V_OSCK				24000000  /* Clock output from T2 */
-#define V_SCLK				(V_OSCK)
-
 /* DMA defines */
 #define CONFIG_DMA_COHERENT
 #define CONFIG_DMA_COHERENT_SIZE	(1 << 20)

include/configs/pcm051.h +0 -4

index 9b16c47..7073501 100644
@@ -102,10 +102,6 @@
 		"fi;" \
 	"fi;" \
 
-/* Clock Defines */
-#define V_OSCK				25000000  /* Clock output from T2 */
-#define V_SCLK				(V_OSCK)
-
 #define CONFIG_CMD_ECHO
 
 /* max number of command args */

include/configs/ti814x_evm.h +0 -4

index eac5ad0..ceee43b 100644
@@ -100,10 +100,6 @@
 		"fi;" \
 	"fi;" \
 
-/* Clock Defines */
-#define V_OSCK			24000000	/* Clock output from T2 */
-#define V_SCLK			(V_OSCK >> 1)
-
 #define CONFIG_CMD_ECHO
 
 /* max number of command args */

Signature · 1 line

1.7.9.5

Heiko Schocher

2013-08-03 04:41 UTC #2 lore raw

PATCH 1/10 am33xx: Move V_OSCK/V_SCLK to <asm/arch-am33xx/clocks_am33xx.h>

Hello Tom,

Am 02.08.2013 22:26, schrieb Tom Rini:

Quoted 16 lines

This detail belongs in the arch header file, given how we are structured today at least.
Signed-off-by Tom Rini<[email protected]>
---
  arch/arm/include/asm/arch-am33xx/clocks_am33xx.h |    4 ++++
  include/configs/igep0033.h                       |    4 ----
  include/configs/pcm051.h                         |    4 ----
  include/configs/ti814x_evm.h                     |    4 ----
  4 files changed, 4 insertions(+), 12 deletions(-)
arch/arm/include/asm/arch-am33xx/clocks_am33xx.h +0 -0
index 80e1899..3becb98 100644

arch/arm/include/asm/arch-am33xx/clocks_am33xx.h line 17

Quoted 7 lines

arch/arm/include/asm/arch-am33xx/clocks_am33xx.h +4 -0

@@ -11,6 +11,10 @@
  #ifndef _CLOCKS_AM33XX_H_
  #define _CLOCKS_AM33XX_H_
 
+/* Clock Defines */
+#define V_OSCK				24000000  /* Clock output from T2 */
+#define V_SCLK				(V_OSCK)
+

Hmm.. look at the chunk for the pcm051 board ...

Quoted 3 lines

arch/arm/include/asm/arch-am33xx/clocks_am33xx.h +0 -0

  /* MAIN PLL Fdll = 550 MHz, by default */
  #ifndef CONFIG_SYS_MPUCLK
  #define CONFIG_SYS_MPUCLK	550

[...]

include/configs/pcm051.h line 108

Quoted 12 lines

include/configs/pcm051.h +0 -4

index 9b16c47..7073501 100644
@@ -102,10 +102,6 @@
  		"fi;" \
  	"fi;" \
 
-/* Clock Defines */
-#define V_OSCK				25000000  /* Clock output from T2 */
-#define V_SCLK				(V_OSCK)
-

... this defines 25000000 not 24000000 for V_OSCK ...

Quoted 8 lines

include/configs/pcm051.h +0 -0
  #define CONFIG_CMD_ECHO
 
  /* max number of command args */
include/configs/ti814x_evm.h +0 -0
index eac5ad0..ceee43b 100644

include/configs/ti814x_evm.h line 105

Quoted 10 lines

include/configs/ti814x_evm.h +0 -4

@@ -100,10 +100,6 @@
  		"fi;" \
  	"fi;" \
 
-/* Clock Defines */
-#define V_OSCK			24000000	/* Clock output from T2 */
-#define V_SCLK			(V_OSCK>>  1)
-
  #define CONFIG_CMD_ECHO
 
  /* max number of command args */

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Tom Rini

author

2013-08-05 15:17 UTC #3 lore raw

PATCH 1/10 am33xx: Move V_OSCK/V_SCLK to <asm/arch-am33xx/clocks_am33xx.h>

Quoted 41 lines · Heiko Schocher

Hello Tom,
Am 02.08.2013 22:26, schrieb Tom Rini:
Quoted 16 lines
This detail belongs in the arch header file, given how we are structured today at least.
Signed-off-by Tom Rini<[email protected]>
---
 arch/arm/include/asm/arch-am33xx/clocks_am33xx.h |    4 ++++
 include/configs/igep0033.h                       |    4 ----
 include/configs/pcm051.h                         |    4 ----
 include/configs/ti814x_evm.h                     |    4 ----
 4 files changed, 4 insertions(+), 12 deletions(-)
arch/arm/include/asm/arch-am33xx/clocks_am33xx.h +0 -0
index 80e1899..3becb98 100644
arch/arm/include/asm/arch-am33xx/clocks_am33xx.h line 17
Quoted 7 lines
arch/arm/include/asm/arch-am33xx/clocks_am33xx.h +4 -0
@@ -11,6 +11,10 @@
 #ifndef _CLOCKS_AM33XX_H_
 #define _CLOCKS_AM33XX_H_
 
+/* Clock Defines */
+#define V_OSCK				24000000  /* Clock output from T2 */
+#define V_SCLK				(V_OSCK)
+
Hmm.. look at the chunk for the pcm051 board ...
Quoted 3 lines
arch/arm/include/asm/arch-am33xx/clocks_am33xx.h +0 -0
 /* MAIN PLL Fdll = 550 MHz, by default */
 #ifndef CONFIG_SYS_MPUCLK
 #define CONFIG_SYS_MPUCLK	550
[...]
Quoted 8 lines
include/configs/pcm051.h +0 -0
index 9b16c47..7073501 100644
@@ -102,10 +102,6 @@
 		"fi;" \
 	"fi;" \
 

Quoted 6 lines

include/configs/pcm051.h line 108
Quoted 4 lines
include/configs/pcm051.h +0 -4
-/* Clock Defines */
-#define V_OSCK				25000000  /* Clock output from T2 */
-#define V_SCLK				(V_OSCK)
-
... this defines 25000000 not 24000000 for V_OSCK ...

Oh hell, Lars, is that right and you guys have a different clock frequency than the reference platforms?

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130805/b9367a27/attachment.pgp>

Lars Poeschel

2013-08-05 15:26 UTC #4 lore raw

PATCH 1/10 am33xx: Move V_OSCK/V_SCLK to <asm/arch-am33xx/clocks_am33xx.h>

Am Montag, 5. August 2013, 17:17:32 schrieb Tom Rini:

Quoted 56 lines · Heiko Schocher

Quoted 46 lines
Hello Tom,
Am 02.08.2013 22:26, schrieb Tom Rini:
Quoted 18 lines
This detail belongs in the arch header file, given how we are structured today at least.
Signed-off-by Tom Rini<[email protected]>
---
 arch/arm/include/asm/arch-am33xx/clocks_am33xx.h |    4 ++++
 include/configs/igep0033.h                       |    4 ----
 include/configs/pcm051.h                         |    4 ----
 include/configs/ti814x_evm.h                     |    4 ----
 4 files changed, 4 insertions(+), 12 deletions(-)
(quoted diff) +0 -0
b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h index 80e1899..3becb98 100644
arch/arm/include/asm/arch-am33xx/clocks_am33xx.h line 18
Quoted 8 lines
arch/arm/include/asm/arch-am33xx/clocks_am33xx.h +4 -0
@@ -11,6 +11,10 @@
 
 #ifndef _CLOCKS_AM33XX_H_
 #define _CLOCKS_AM33XX_H_
 
+/* Clock Defines */
+#define V_OSCK				24000000  /* Clock output from T2 */
+#define V_SCLK				(V_OSCK)
+
Hmm.. look at the chunk for the pcm051 board ...
Quoted 3 lines
arch/arm/include/asm/arch-am33xx/clocks_am33xx.h +0 -0
 /* MAIN PLL Fdll = 550 MHz, by default */
 #ifndef CONFIG_SYS_MPUCLK
#define CONFIG_SYS_MPUCLK 550
[...]
Quoted 8 lines
include/configs/pcm051.h +0 -0
index 9b16c47..7073501 100644
@@ -102,10 +102,6 @@
 
 		"fi;" \
 
Quoted 8 lines
include/configs/pcm051.h line 108
Quoted 6 lines
include/configs/pcm051.h +0 -4
 	"fi;" \
 
-/* Clock Defines */
-#define V_OSCK				25000000  /* Clock output from T2 */
-#define V_SCLK				(V_OSCK)
-
... this defines 25000000 not 24000000 for V_OSCK ...

Quoted 2 lines

Oh hell, Lars, is that right and you guys have a different clock frequency than the reference platforms?

Sorry, but yes, thats right. pcm051 is delivered with 25000000hz crystal. Main reason was to be able to boot from ethernet right from the ROM bootloader.

Lars

Tom Rini

author

2013-08-05 15:40 UTC #5 lore raw

PATCH 1/10 am33xx: Move V_OSCK/V_SCLK to <asm/arch-am33xx/clocks_am33xx.h>

Quoted 57 lines · Lars Poeschel

Am Montag, 5. August 2013, 17:17:32 schrieb Tom Rini:
Quoted 56 lines · Heiko Schocher
Quoted 54 lines
Hello Tom,
Am 02.08.2013 22:26, schrieb Tom Rini:
Quoted 18 lines
This detail belongs in the arch header file, given how we are structured today at least.
Signed-off-by Tom Rini<[email protected]>
---
 arch/arm/include/asm/arch-am33xx/clocks_am33xx.h |    4 ++++
 include/configs/igep0033.h                       |    4 ----
 include/configs/pcm051.h                         |    4 ----
 include/configs/ti814x_evm.h                     |    4 ----
 4 files changed, 4 insertions(+), 12 deletions(-)
(quoted diff) +0 -0
b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h index 80e1899..3becb98 100644
arch/arm/include/asm/arch-am33xx/clocks_am33xx.h line 18
Quoted 8 lines
arch/arm/include/asm/arch-am33xx/clocks_am33xx.h +4 -0
@@ -11,6 +11,10 @@
 
 #ifndef _CLOCKS_AM33XX_H_
 #define _CLOCKS_AM33XX_H_
 
+/* Clock Defines */
+#define V_OSCK				24000000  /* Clock output from T2 */
+#define V_SCLK				(V_OSCK)
+
Hmm.. look at the chunk for the pcm051 board ...
Quoted 3 lines
arch/arm/include/asm/arch-am33xx/clocks_am33xx.h +0 -0
 /* MAIN PLL Fdll = 550 MHz, by default */
 #ifndef CONFIG_SYS_MPUCLK
#define CONFIG_SYS_MPUCLK 550
[...]
Quoted 5 lines
include/configs/pcm051.h +0 -0
index 9b16c47..7073501 100644
include/configs/pcm051.h line 110
Quoted 9 lines
include/configs/pcm051.h +0 -4
@@ -102,10 +102,6 @@
 
 		"fi;" \
 
 	"fi;" \
 
-/* Clock Defines */
-#define V_OSCK				25000000  /* Clock output from T2 */
-#define V_SCLK				(V_OSCK)
-
... this defines 25000000 not 24000000 for V_OSCK ...

Quoted 6 lines

Quoted 2 lines
Oh hell, Lars, is that right and you guys have a different clock frequency than the reference platforms?
Sorry, but yes, thats right. pcm051 is delivered with 25000000hz crystal. Main reason was to be able to boot from ethernet right from the ROM bootloader.

Alright thanks, I'll go re-work that part of the series.

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130805/44ab94ff/attachment.pgp>

Tom Rini

author

2013-08-05 15:53 UTC #6 lore raw

PATCH 1/10 am33xx: Move V_OSCK/V_SCLK to <asm/arch-am33xx/clocks_am33xx.h>

Quoted 58 lines · Tom Rini

Quoted 57 lines · Lars Poeschel
Am Montag, 5. August 2013, 17:17:32 schrieb Tom Rini:
Quoted 56 lines · Heiko Schocher
Quoted 54 lines
Hello Tom,
Am 02.08.2013 22:26, schrieb Tom Rini:
Quoted 18 lines
This detail belongs in the arch header file, given how we are structured today at least.
Signed-off-by Tom Rini<[email protected]>
---
 arch/arm/include/asm/arch-am33xx/clocks_am33xx.h |    4 ++++
 include/configs/igep0033.h                       |    4 ----
 include/configs/pcm051.h                         |    4 ----
 include/configs/ti814x_evm.h                     |    4 ----
 4 files changed, 4 insertions(+), 12 deletions(-)
(quoted diff) +0 -0
b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h index 80e1899..3becb98 100644
arch/arm/include/asm/arch-am33xx/clocks_am33xx.h line 18
Quoted 8 lines
arch/arm/include/asm/arch-am33xx/clocks_am33xx.h +4 -0
@@ -11,6 +11,10 @@
 
 #ifndef _CLOCKS_AM33XX_H_
 #define _CLOCKS_AM33XX_H_
 
+/* Clock Defines */
+#define V_OSCK				24000000  /* Clock output from T2 */
+#define V_SCLK				(V_OSCK)
+
Hmm.. look at the chunk for the pcm051 board ...
Quoted 3 lines
arch/arm/include/asm/arch-am33xx/clocks_am33xx.h +0 -0
 /* MAIN PLL Fdll = 550 MHz, by default */
 #ifndef CONFIG_SYS_MPUCLK
#define CONFIG_SYS_MPUCLK 550
[...]
Quoted 5 lines
include/configs/pcm051.h +0 -0
index 9b16c47..7073501 100644
include/configs/pcm051.h line 110
Quoted 9 lines
include/configs/pcm051.h +0 -4
@@ -102,10 +102,6 @@
 
 		"fi;" \
 
 	"fi;" \
 
-/* Clock Defines */
-#define V_OSCK				25000000  /* Clock output from T2 */
-#define V_SCLK				(V_OSCK)
-
... this defines 25000000 not 24000000 for V_OSCK ...

Quoted 8 lines

Quoted 6 lines
Quoted 2 lines
Oh hell, Lars, is that right and you guys have a different clock frequency than the reference platforms?
Sorry, but yes, thats right. pcm051 is delivered with 25000000hz crystal. Main reason was to be able to boot from ethernet right from the ROM bootloader.
Alright thanks, I'll go re-work that part of the series.

Dropped from v2.

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130805/b6c6e249/attachment.pgp>

Tom Rini

author

2013-08-02 20:26 UTC #7 lore raw

PATCH 2/10 am33xx: CONFIG_DMA_COHERENT defines are unused, remove

In reply to Tom Rini

Signed-off-by Tom Rini <[email protected]>

---
 include/configs/igep0033.h   |    4 ----
 include/configs/pcm051.h     |    3 ---
 include/configs/ti814x_evm.h |    3 ---
 3 files changed, 10 deletions(-)

include/configs/igep0033.h +0 -4

index 28c7ae9..e318c74 100644
@@ -23,10 +23,6 @@
 #define MACH_TYPE_IGEP0033		4521	/* Until the next sync */
 #define CONFIG_MACH_TYPE		MACH_TYPE_IGEP0033
 
-/* DMA defines */
-#define CONFIG_DMA_COHERENT
-#define CONFIG_DMA_COHERENT_SIZE	(1 << 20)
-
 #define CONFIG_ENV_SIZE			(128 << 10)	/* 128 KiB */
 #define CONFIG_SYS_MALLOC_LEN		(1024 << 10)
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */

include/configs/pcm051.h +0 -3

index 7073501..62ffc67 100644
@@ -24,9 +24,6 @@
 
 #include <asm/arch/omap.h>
 
-#define CONFIG_DMA_COHERENT
-#define CONFIG_DMA_COHERENT_SIZE	(1 << 20)
-
 #define CONFIG_ENV_SIZE			(128 << 10)	/* 128 KiB */
 #define CONFIG_SYS_MALLOC_LEN		(1024 << 10)
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */

include/configs/ti814x_evm.h +0 -3

index ceee43b..2428f9d 100644
@@ -23,9 +23,6 @@
 
 #include <asm/arch/omap.h>
 
-#define CONFIG_DMA_COHERENT
-#define CONFIG_DMA_COHERENT_SIZE	(1 << 20)
-
 #define CONFIG_ENV_SIZE			(128 << 10)	/* 128 KiB */
 #define CONFIG_SYS_MALLOC_LEN		(1024 << 10)
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */

Signature · 1 line

1.7.9.5

Dan Murphy

2013-08-06 18:25 UTC #8 lore raw

PATCH 2/10 am33xx: CONFIG_DMA_COHERENT defines are unused, remove

Quoted 41 lines · Tom Rini

Signed-off-by Tom Rini <[email protected]>

---
 include/configs/igep0033.h   |    4 ----
 include/configs/pcm051.h     |    3 ---
 include/configs/ti814x_evm.h |    3 ---
 3 files changed, 10 deletions(-)

include/configs/igep0033.h +0 -4

index 28c7ae9..e318c74 100644
@@ -23,10 +23,6 @@
 #define MACH_TYPE_IGEP0033		4521	/* Until the next sync */
 #define CONFIG_MACH_TYPE		MACH_TYPE_IGEP0033
 
-/* DMA defines */
-#define CONFIG_DMA_COHERENT
-#define CONFIG_DMA_COHERENT_SIZE	(1 << 20)
-
 #define CONFIG_ENV_SIZE			(128 << 10)	/* 128 KiB */
 #define CONFIG_SYS_MALLOC_LEN		(1024 << 10)
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */

include/configs/pcm051.h +0 -3

index 7073501..62ffc67 100644
@@ -24,9 +24,6 @@
 
 #include <asm/arch/omap.h>
 
-#define CONFIG_DMA_COHERENT
-#define CONFIG_DMA_COHERENT_SIZE	(1 << 20)
-
 #define CONFIG_ENV_SIZE			(128 << 10)	/* 128 KiB */
 #define CONFIG_SYS_MALLOC_LEN		(1024 << 10)
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */

include/configs/ti814x_evm.h +0 -0

index ceee43b..2428f9d 100644

include/configs/ti814x_evm.h line 28

Quoted 9 lines

include/configs/ti814x_evm.h +0 -3

@@ -23,9 +23,6 @@
 
 #include <asm/arch/omap.h>
 
-#define CONFIG_DMA_COHERENT
-#define CONFIG_DMA_COHERENT_SIZE	(1 << 20)
-
 #define CONFIG_ENV_SIZE			(128 << 10)	/* 128 KiB */
 #define CONFIG_SYS_MALLOC_LEN		(1024 << 10)
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */

Acked-by Dan Murphy <[email protected]>

Signature · 2 lines

------------------
Dan Murphy

Tom Rini

author

2013-08-02 20:26 UTC #9 lore raw

PATCH 3/10 am33xx: Stop using PHYS_DRAM_1 define

In reply to Tom Rini

We defined PHYS_DRAM_1 to 0x80000000 (start of DRAM) and then used this for CONFIG_SYS_SDRAM_BASE. But then we kept on referencing PHYS_DRAM_1 in other places. Change to directly setting CONFIG_SYS_DRAM_BASE and then using that name in code.

Signed-off-by Tom Rini <[email protected]>

---
 board/isee/igep0033/board.c  |    2 +-
 board/phytec/pcm051/board.c  |    2 +-
 board/ti/am335x/board.c      |    2 +-
 board/ti/ti814x/evm.c        |    2 +-
 include/configs/igep0033.h   |    3 +--
 include/configs/pcm051.h     |    5 ++---
 include/configs/ti814x_evm.h |    5 ++---
 7 files changed, 9 insertions(+), 12 deletions(-)

board/isee/igep0033/board.c +1 -1

index c0f0c0d..7a66e33 100644
@@ -119,7 +119,7 @@ void s_init(void)
  */
 int board_init(void)
 {
-	gd->bd->bi_boot_params = PHYS_DRAM_1 + 0x100;
+	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
 
 	gpmc_init();

board/phytec/pcm051/board.c +1 -1

index 6291d03..77202f7 100644
@@ -135,7 +135,7 @@ int board_init(void)
 {
 	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
 
-	gd->bd->bi_boot_params = PHYS_DRAM_1 + 0x100;
+	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
 
 	return 0;
 }

board/ti/am335x/board.c +1 -1

index 728afc2..88663ea 100644
@@ -371,7 +371,7 @@ int board_init(void)
 		STNOR_GPMC_CONFIG5, STNOR_GPMC_CONFIG6, STNOR_GPMC_CONFIG7 };
 #endif
 
-	gd->bd->bi_boot_params = PHYS_DRAM_1 + 0x100;
+	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
 
 	gpmc_init();

board/ti/ti814x/evm.c +1 -1

index c469645..26d2f9b 100644
@@ -161,7 +161,7 @@ void s_init(void)
  */
 int board_init(void)
 {
-	gd->bd->bi_boot_params = PHYS_DRAM_1 + 0x100;
+	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
 	return 0;
 }

include/configs/igep0033.h +1 -2

index e318c74..f520ef8 100644
@@ -127,10 +127,9 @@
 
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS		1		/*  1 bank of DRAM */
-#define PHYS_DRAM_1			0x80000000	/* DRAM Bank #1 */
 #define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
 
-#define CONFIG_SYS_SDRAM_BASE		PHYS_DRAM_1
+#define CONFIG_SYS_SDRAM_BASE		0x80000000
 #define CONFIG_SYS_INIT_SP_ADDR         (NON_SECURE_SRAM_END - \
 						GENERATED_GBL_DATA_SIZE)
 /* Platform/Board specific defs */

include/configs/pcm051.h +2 -3

index 62ffc67..b182d50 100644
@@ -118,7 +118,7 @@
  * memtest works on 8 MB in DRAM after skipping 32MB from
  * start addr of ram disk
  */
-#define CONFIG_SYS_MEMTEST_START	(PHYS_DRAM_1 + (64 * 1024 * 1024))
+#define CONFIG_SYS_MEMTEST_START	(CONFIG_SYS_SDRAM_BASE + (64 << 20))
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START \
 					+ (8 * 1024 * 1024))

@@ -142,10 +142,9 @@
 
  /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS		1		/*  1 bank of DRAM */
-#define PHYS_DRAM_1			0x80000000	/* DRAM Bank #1 */
 #define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 19)	/* 512MiB */
 
-#define CONFIG_SYS_SDRAM_BASE		PHYS_DRAM_1
+#define CONFIG_SYS_SDRAM_BASE		0x80000000
 #define CONFIG_SYS_INIT_SP_ADDR         (NON_SECURE_SRAM_END - \
 						GENERATED_GBL_DATA_SIZE)
  /* Platform/Board specific defs */

include/configs/ti814x_evm.h +2 -3

index 2428f9d..daad14c 100644
@@ -112,7 +112,7 @@
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
-#define CONFIG_SYS_MEMTEST_START	PHYS_DRAM_1
+#define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START \
 					+ PHYS_DRAM_1_SIZE - (8 << 12))

@@ -132,11 +132,10 @@
  * Physical Memory Map
  */
 #define CONFIG_NR_DRAM_BANKS		1		/* 1 banks of DRAM */
-#define PHYS_DRAM_1			0x80000000	/* DRAM Bank #1 */
 #define PHYS_DRAM_1_SIZE		0x20000000	/* 512MB */
 #define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1024MB */
 
-#define CONFIG_SYS_SDRAM_BASE		PHYS_DRAM_1
+#define CONFIG_SYS_SDRAM_BASE		0x80000000
 #define CONFIG_SYS_INIT_SP_ADDR		(NON_SECURE_SRAM_END - \
 					 GENERATED_GBL_DATA_SIZE)

Signature · 1 line

1.7.9.5

Tom Rini

author

2013-08-02 20:26 UTC #10 lore raw

PATCH 4/10 am335x_evm: Use default baud rate table

In reply to Tom Rini

Signed-off-by Tom Rini <[email protected]>

---
 include/configs/am335x_evm.h |    2 --
 1 file changed, 2 deletions(-)

include/configs/am335x_evm.h +0 -2

index e32066d..7d755f1 100644
@@ -314,8 +314,6 @@
 #define CONFIG_OMAP_GPIO
 
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 110, 300, 600, 1200, 2400, \
-4800, 9600, 14400, 19200, 28800, 38400, 56000, 57600, 115200 }
 
 /* CPU */
 #define CONFIG_ARCH_CPU_INIT

Signature · 1 line

1.7.9.5

Tom Rini

author

2013-08-02 20:26 UTC #11 lore raw

PATCH 5/10 arm: spl: For Falcon Mode, set a default machid of ~0

In reply to Tom Rini

With device trees, boards do not always set CONFIG_MACH_TYPE now, so we must not rely on this define being set. The kernel uses ~0 to see if we have a valid machine number or not, so set that as the default, invalid machine, id and only fix if CONFIG_MACH_TYPE is set.

Cc Albert ARIBAUD <[email protected]>

Signed-off-by Tom Rini <[email protected]>

---
 arch/arm/lib/spl.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

arch/arm/lib/spl.c +6 -1

index 583bdb3..26d0be4 100644
@@ -45,12 +45,17 @@ void __weak board_init_f(ulong dummy)
 #ifdef CONFIG_SPL_OS_BOOT
 void __noreturn jump_to_image_linux(void *arg)
 {
+	unsigned long machid = 0xffffffff;
+#ifdef CONFIG_MACH_TYPE
+	machid = CONFIG_MACH_TYPE;
+#endif
+
 	debug("Entering kernel arg pointer: 0x%p\n", arg);
 	typedef void (*image_entry_arg_t)(int, int, void *)
 		__attribute__ ((noreturn));
 	image_entry_arg_t image_entry =
 		(image_entry_arg_t) spl_image.entry_point;
 	cleanup_before_linux();
-	image_entry(0, CONFIG_MACH_TYPE, arg);
+	image_entry(0, machid, arg);
 }
 #endif

Signature · 1 line

1.7.9.5

Heiko Schocher

2013-08-05 03:53 UTC #12 lore raw

PATCH 5/10 arm: spl: For Falcon Mode, set a default machid of ~0

Hello Tom,

Am 02.08.2013 22:26, schrieb Tom Rini:

Quoted 10 lines

With device trees, boards do not always set CONFIG_MACH_TYPE now, so we must not rely on this define being set. The kernel uses ~0 to see if we have a valid machine number or not, so set that as the default, invalid machine, id and only fix if CONFIG_MACH_TYPE is set.
Cc Albert ARIBAUD<[email protected]>
Signed-off-by Tom Rini<[email protected]>
---
  arch/arm/lib/spl.c |    7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)

Tested on an upcoming am1808 based board support.

Tested-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Dan Murphy

2013-08-06 18:28 UTC #13 lore raw

PATCH 5/10 arm: spl: For Falcon Mode, set a default machid of ~0

In reply to Tom Rini

Quoted 24 lines · Tom Rini

With device trees, boards do not always set CONFIG_MACH_TYPE now, so we must not rely on this define being set. The kernel uses ~0 to see if we have a valid machine number or not, so set that as the default, invalid machine, id and only fix if CONFIG_MACH_TYPE is set.
Cc Albert ARIBAUD <[email protected]>
Signed-off-by Tom Rini <[email protected]>
---
 arch/arm/lib/spl.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
arch/arm/lib/spl.c +5 -0
index 583bdb3..26d0be4 100644
@@ -45,12 +45,17 @@ void __weak board_init_f(ulong dummy)
 #ifdef CONFIG_SPL_OS_BOOT
 void __noreturn jump_to_image_linux(void *arg)
 {
+	unsigned long machid = 0xffffffff;
+#ifdef CONFIG_MACH_TYPE
+	machid = CONFIG_MACH_TYPE;
+#endif
+

arch/arm/lib/spl.c void __weak board_init_f(ulong dummy) · line 61

Quoted 10 lines

arch/arm/lib/spl.c +1 -1

 	debug("Entering kernel arg pointer: 0x%p\n", arg);
 	typedef void (*image_entry_arg_t)(int, int, void *)
 		__attribute__ ((noreturn));
 	image_entry_arg_t image_entry =
 		(image_entry_arg_t) spl_image.entry_point;
 	cleanup_before_linux();
-	image_entry(0, CONFIG_MACH_TYPE, arg);
+	image_entry(0, machid, arg);
 }
 #endif

The code looks fine just don't see how it is part of the "common" patch set series

otherwise

Acked-by Dan Murphy <[email protected]>

Signature · 2 lines

------------------
Dan Murphy

Tom Rini

author

2013-08-06 19:10 UTC #14 lore raw

PATCH 5/10 arm: spl: For Falcon Mode, set a default machid of ~0

Quoted 29 lines · Dan Murphy

Quoted 28 lines · Tom Rini
With device trees, boards do not always set CONFIG_MACH_TYPE now, so we must not rely on this define being set. The kernel uses ~0 to see if we have a valid machine number or not, so set that as the default, invalid machine, id and only fix if CONFIG_MACH_TYPE is set.
Cc Albert ARIBAUD <[email protected]>
Signed-off-by Tom Rini <[email protected]>
---
 arch/arm/lib/spl.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
arch/arm/lib/spl.c +5 -0
index 583bdb3..26d0be4 100644
@@ -45,12 +45,17 @@ void __weak board_init_f(ulong dummy)
 #ifdef CONFIG_SPL_OS_BOOT
 void __noreturn jump_to_image_linux(void *arg)
 {
+	unsigned long machid = 0xffffffff;
+#ifdef CONFIG_MACH_TYPE
+	machid = CONFIG_MACH_TYPE;
+#endif
+
 	debug("Entering kernel arg pointer: 0x%p\n", arg);
 	typedef void (*image_entry_arg_t)(int, int, void *)
 		__attribute__ ((noreturn));
 	image_entry_arg_t image_entry =

Quoted 8 lines

arch/arm/lib/spl.c void __weak board_init_f(ulong dummy) · line 61
Quoted 6 lines
arch/arm/lib/spl.c +1 -1
 		(image_entry_arg_t) spl_image.entry_point;
 	cleanup_before_linux();
-	image_entry(0, CONFIG_MACH_TYPE, arg);
+	image_entry(0, machid, arg);
 }
 #endif
The code looks fine just don't see how it is part of the "common" patch set series

Uncovered porting omap5 platforms over as they do not set CONFIG_MACH_TYPE (and no need to start).

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130806/fe364279/attachment.pgp>

Dan Murphy

2013-08-06 20:03 UTC #15 lore raw

PATCH 5/10 arm: spl: For Falcon Mode, set a default machid of ~0

Tom

Quoted 38 lines · Tom Rini

Quoted 29 lines · Dan Murphy
Quoted 28 lines · Tom Rini
With device trees, boards do not always set CONFIG_MACH_TYPE now, so we must not rely on this define being set. The kernel uses ~0 to see if we have a valid machine number or not, so set that as the default, invalid machine, id and only fix if CONFIG_MACH_TYPE is set.
Cc Albert ARIBAUD <[email protected]>
Signed-off-by Tom Rini <[email protected]>
---
 arch/arm/lib/spl.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
arch/arm/lib/spl.c +5 -0
index 583bdb3..26d0be4 100644
@@ -45,12 +45,17 @@ void __weak board_init_f(ulong dummy)
 #ifdef CONFIG_SPL_OS_BOOT
 void __noreturn jump_to_image_linux(void *arg)
 {
+	unsigned long machid = 0xffffffff;
+#ifdef CONFIG_MACH_TYPE
+	machid = CONFIG_MACH_TYPE;
+#endif
+
 	debug("Entering kernel arg pointer: 0x%p\n", arg);
 	typedef void (*image_entry_arg_t)(int, int, void *)
 		__attribute__ ((noreturn));
 	image_entry_arg_t image_entry =
Quoted 8 lines
arch/arm/lib/spl.c void __weak board_init_f(ulong dummy) · line 61
Quoted 6 lines
arch/arm/lib/spl.c +1 -1
 		(image_entry_arg_t) spl_image.entry_point;
 	cleanup_before_linux();
-	image_entry(0, CONFIG_MACH_TYPE, arg);
+	image_entry(0, machid, arg);
 }
 #endif
The code looks fine just don't see how it is part of the "common" patch set series

Quoted 3 lines

Uncovered porting omap5 platforms over as they do not set CONFIG_MACH_TYPE (and no need to start).

Good find.

Reviewed-by Dan Murphy <[email protected]>

Signature · 2 lines

------------------
Dan Murphy

Tom Rini

author

2013-08-02 20:26 UTC #16 lore raw

PATCH 6/10 am335x_evm: Bring in 'boot_fdt' logic from i.MX

In reply to Tom Rini

Bring in the 'boot_fdt' environment variable that i.MX boards use to try and load a device tree when booting.

Signed-off-by Tom Rini <[email protected]>

---
 include/configs/am335x_evm.h |   21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

include/configs/am335x_evm.h +16 -5

index 7d755f1..85c4632 100644
@@ -84,6 +84,7 @@
 	"loadaddr=0x80200000\0" \
 	"fdtaddr=0x80F80000\0" \
 	"fdt_high=0xffffffff\0" \
+	"boot_fdt=try\0" \
 	"rdaddr=0x81000000\0" \
 	"bootdir=/boot\0" \
 	"bootfile=uImage\0" \

@@ -131,6 +132,20 @@
 	"loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
 	"loaduimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
 	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
+	"mmcloados=run mmcargs; " \
+		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+			"if run loadfdt; then " \
+				"bootm ${loadaddr} - ${fdtaddr}; " \
+			"else " \
+				"if test ${boot_fdt} = try; then " \
+					"bootm; " \
+				"else " \
+					"echo WARN: Cannot load the DT; " \
+				"fi; " \
+			"fi; " \
+		"else " \
+			"bootm; " \
+		"fi;\0" \
 	"mmcboot=mmc dev ${mmcdev}; " \
 		"if mmc rescan; then " \
 			"echo SD/MMC found on device ${mmcdev};" \

@@ -142,11 +157,7 @@
 				"echo Running uenvcmd ...;" \
 				"run uenvcmd;" \
 			"fi;" \
-			"if run loaduimage; then " \
-				"run loadfdt;" \
-				"run mmcargs; " \
-				"bootm ${loadaddr} - ${fdtaddr};" \
-			"fi;" \
+			"run mmcloados;" \
 		"fi;\0" \
 	"spiboot=echo Booting from spi ...; " \
 		"run spiargs; " \

Signature · 1 line

1.7.9.5

Tom Rini

author

2013-08-02 20:26 UTC #17 lore raw

PATCH 7/10 TI:am33xx: Create common config files for TI ARMv7 platforms, and AM33xx

In reply to Tom Rini

We create two new files, include/configs/ti_armv7_common.h for all of the common IP blocks and related features / commands we share in virtually all of our platforms. We then create include/configs/ti_am335x_common.h for everything common to the am335x SoC leaving just the board specific parts to include/configs/ti_am335x_common.h.

Signed-off-by Tom Rini <[email protected]>

---
 include/configs/am335x_evm.h       |  233 +++-------------------------------
 include/configs/ti_am335x_common.h |   57 +++++++++
 include/configs/ti_armv7_common.h  |  247 ++++++++++++++++++++++++++++++++++++
 3 files changed, 319 insertions(+), 218 deletions(-)
 create mode 100644 include/configs/ti_am335x_common.h
 create mode 100644 include/configs/ti_armv7_common.h

include/configs/am335x_evm.h +15 ~~-218~~

index 85c4632..e8f48ba 100644
@@ -16,43 +16,16 @@
 #ifndef __CONFIG_AM335X_EVM_H
 #define __CONFIG_AM335X_EVM_H
 
-#define CONFIG_AM33XX
-#define CONFIG_OMAP
+#include <configs/ti_am335x_common.h>
 
-#include <asm/arch/omap.h>
-
-#define CONFIG_DMA_COHERENT
-#define CONFIG_DMA_COHERENT_SIZE	(1 << 20)
-
-#define CONFIG_ENV_SIZE			(128 << 10)	/* 128 KiB */
-#define CONFIG_SYS_MALLOC_LEN		(1024 << 10)
-#define CONFIG_SYS_LONGHELP		/* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
-#define CONFIG_SYS_PROMPT		"U-Boot# "
-#define CONFIG_BOARD_LATE_INIT
-#define CONFIG_SYS_NO_FLASH
 #define MACH_TYPE_TIAM335EVM		3589	/* Until the next sync */
 #define CONFIG_MACH_TYPE		MACH_TYPE_TIAM335EVM
 
-#define CONFIG_OF_LIBFDT
-#define CONFIG_CMD_BOOTZ
-#define CONFIG_CMDLINE_TAG		/* enable passing of ATAGs */
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_STACKSIZE		(128 * 1024)
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-
 /* Custom script for NOR */
 #define CONFIG_SYS_LDSCRIPT		"board/ti/am335x/u-boot.lds"
 
-#define CONFIG_SYS_CACHELINE_SIZE       64
-
-/* commands to include */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_ASKENV
-#define CONFIG_VERSION_VARIABLE
+/* Always 128 KiB env size */
+#define CONFIG_ENV_SIZE			(128 << 10)
 
 #ifdef CONFIG_NAND
 #define NANDARGS \

@@ -75,10 +48,8 @@
 #define NANDARGS ""
 #endif
 
-/* set to negative value for no autoboot */
-#define CONFIG_BOOTDELAY		1
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80200000\0" \

@@ -196,60 +167,11 @@
 	"run mmcboot;" \
 	"run nandboot;"
 
-/* Clock Defines */
-#define V_OSCK				24000000  /* Clock output from T2 */
-#define V_SCLK				(V_OSCK)
-
-#define CONFIG_CMD_ECHO
-
-/* We set the max number of command args high to avoid HUSH bugs. */
-#define CONFIG_SYS_MAXARGS		64
-
-/* Console I/O Buffer Size */
-#define CONFIG_SYS_CBSIZE		512
-
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE \
-					+ sizeof(CONFIG_SYS_PROMPT) + 16)
-
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
-/*
- * memtest works on 8 MB in DRAM after skipping 32MB from
- * start addr of ram disk
- */
-#define CONFIG_SYS_MEMTEST_START	(PHYS_DRAM_1 + (64 * 1024 * 1024))
-#define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START \
-					+ (8 * 1024 * 1024))
-
-#define CONFIG_SYS_LOAD_ADDR		0x81000000 /* Default load address */
-
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_OMAP_HSMMC
-#define CONFIG_CMD_MMC
-#define CONFIG_DOS_PARTITION
-#define CONFIG_CMD_FAT
-#define CONFIG_FAT_WRITE
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_EXT4
-#define CONFIG_CMD_FS_GENERIC
-
-#define CONFIG_SPI
-#define CONFIG_OMAP3_SPI
-#define CONFIG_MTD_DEVICE
-#define CONFIG_SPI_FLASH
-#define CONFIG_SPI_FLASH_WINBOND
-#define CONFIG_CMD_SF
-#define CONFIG_SF_DEFAULT_SPEED		(24000000)
-
 /* USB Composite download gadget - g_dnl */
 #define CONFIG_USB_GADGET
 #define CONFIG_USBDOWNLOAD_GADGET
 
 /* USB TI's IDs */
-#define CONFIG_USBD_HS
 #define CONFIG_G_DNL_VENDOR_NUM 0x0403
 #define CONFIG_G_DNL_PRODUCT_NUM 0xBD00
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"

@@ -283,109 +205,24 @@
 	"rootfs part 0 9"
 #endif
 
- /* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS		1		/*  1 bank of DRAM */
-#define PHYS_DRAM_1			0x80000000	/* DRAM Bank #1 */
-#define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
-
-#define CONFIG_SYS_SDRAM_BASE		PHYS_DRAM_1
-#define CONFIG_SYS_INIT_SP_ADDR         (NON_SECURE_SRAM_END - \
-						GENERATED_GBL_DATA_SIZE)
- /* Platform/Board specific defs */
-#define CONFIG_SYS_TIMERBASE		0x48040000	/* Use Timer2 */
-#define CONFIG_SYS_PTV			2	/* Divisor: 2^(PTV+1) => 8 */
-#define CONFIG_SYS_HZ			1000	/* 1ms clock */
-
 /* NS16550 Configuration */
-#define CONFIG_SYS_NS16550
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
-#define CONFIG_SYS_NS16550_CLK		(48000000)
 #define CONFIG_SYS_NS16550_COM1		0x44e09000	/* Base EVM has UART0 */
 #define CONFIG_SYS_NS16550_COM2		0x48022000	/* UART1 */
 #define CONFIG_SYS_NS16550_COM3		0x48024000	/* UART2 */
 #define CONFIG_SYS_NS16550_COM4		0x481a6000	/* UART3 */
 #define CONFIG_SYS_NS16550_COM5		0x481a8000	/* UART4 */
 #define CONFIG_SYS_NS16550_COM6		0x481aa000	/* UART5 */
+#define CONFIG_BAUDRATE			115200
 
 /* I2C Configuration */
-#define CONFIG_I2C
-#define CONFIG_CMD_I2C
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_I2C_MULTI_BUS
-#define CONFIG_DRIVER_OMAP24XX_I2C
 #define CONFIG_CMD_EEPROM
 #define CONFIG_ENV_EEPROM_IS_ON_I2C
 #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* Main EEPROM */
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	2
 #define CONFIG_SYS_I2C_MULTI_EEPROMS
 
-#define CONFIG_OMAP_GPIO
-
-#define CONFIG_BAUDRATE		115200
-
-/* CPU */
-#define CONFIG_ARCH_CPU_INIT
-
-#define CONFIG_ENV_OVERWRITE		1
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
-
+/* SPL */
 #ifndef CONFIG_NOR_BOOT
-/* Defines for SPL */
-#define CONFIG_SPL
-#define CONFIG_SPL_FRAMEWORK
-/*
- * Place the image at the start of the ROM defined image space.
- * We limit our size to the ROM-defined downloaded image area, and use the
- * rest of the space for stack.
- */
-#define CONFIG_SPL_TEXT_BASE		0x402F0400
-#define CONFIG_SPL_MAX_SIZE		(0x4030C000 - CONFIG_SPL_TEXT_BASE)
-#define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR
-
-#define CONFIG_SPL_OS_BOOT
-
-#define CONFIG_SPL_BSS_START_ADDR	0x80a00000
-#define CONFIG_SPL_BSS_MAX_SIZE		0x80000		/* 512 KB */
-
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR	0x300 /* address 0x60000 */
-#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS	0x200 /* 256 KB */
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION	1
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME	"u-boot.img"
-
-#ifdef CONFIG_SPL_OS_BOOT
-/* fat */
-#define CONFIG_SPL_FAT_LOAD_KERNEL_NAME		"uImage"
-#define CONFIG_SPL_FAT_LOAD_ARGS_NAME		"args"
-#define CONFIG_SYS_SPL_ARGS_ADDR		(PHYS_DRAM_1 + 0x100)
-
-/* raw mmc */
-#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR	0x900	/* address 0x120000 */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR	0x80	/* address 0x10000 */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS	0x80	/* 64KiB */
-
-/* nand */
-#ifdef CONFIG_NAND
-#define CONFIG_CMD_SPL_NAND_OFS			0x240000 /* end of u-boot */
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS		0x280000
-#define CONFIG_CMD_SPL_WRITE_SIZE		0x2000
-#endif
-
-/* spl export command */
-#define CONFIG_CMD_SPL
-#endif
-
-#define CONFIG_SPL_MMC_SUPPORT
-#define CONFIG_SPL_FAT_SUPPORT
-#define CONFIG_SPL_I2C_SUPPORT
-
-#define CONFIG_SPL_LIBCOMMON_SUPPORT
-#define CONFIG_SPL_LIBDISK_SUPPORT
-#define CONFIG_SPL_LIBGENERIC_SUPPORT
-#define CONFIG_SPL_SERIAL_SUPPORT
-#define CONFIG_SPL_GPIO_SUPPORT
 #define CONFIG_SPL_YMODEM_SUPPORT
 #define CONFIG_SPL_NET_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT

@@ -400,14 +237,7 @@
 #define CONFIG_SPL_MUSB_NEW_SUPPORT
 #define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
 
-#define CONFIG_SPL_BOARD_INIT
-
 #ifdef CONFIG_NAND
-#define CONFIG_SPL_NAND_AM33XX_BCH
-#define CONFIG_SPL_NAND_SUPPORT
-#define CONFIG_SPL_NAND_BASE
-#define CONFIG_SPL_NAND_DRIVERS
-#define CONFIG_SPL_NAND_ECC
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_PAGE_COUNT	(CONFIG_SYS_NAND_BLOCK_SIZE / \
 					 CONFIG_SYS_NAND_PAGE_SIZE)

@@ -427,30 +257,16 @@
 #define CONFIG_SYS_NAND_ECCBYTES	14
 
 #define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
-
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x80000
 #endif
 #endif
 
 /*
- * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM
- * 64 bytes before this address should be set aside for u-boot.img's
- * header. That is 0x800FFFC0--0x80100000 should not be used for any
- * other needs.
+ * For NOR boot, we must set this to the start of where NOR is mapped
+ * in memory.
  */
 #ifdef CONFIG_NOR_BOOT
 #define CONFIG_SYS_TEXT_BASE		0x08000000
-#else
-#define CONFIG_SYS_TEXT_BASE		0x80800000
-#endif
-#define CONFIG_SYS_SPL_MALLOC_START	0x80a08000
-#define CONFIG_SYS_SPL_MALLOC_SIZE	0x100000
-
-/* Since SPL did pll and ddr initialization for us,
- * we don't need to do it twice.
- */
-#if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_NOR_BOOT)
-#define CONFIG_SKIP_LOWLEVEL_INIT
 #endif
 
 /*

@@ -505,7 +321,6 @@
 #define CONFIG_ENV_SECT_SIZE		(4 << 10) /* 4 KB sectors */
 #define CONFIG_ENV_OFFSET		(768 << 10) /* 768 KiB in */
 #define CONFIG_ENV_OFFSET_REDUND	(896 << 10) /* 896 KiB in */
-#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT			"nor0=m25p80-flash.0"
 #define MTDPARTS_DEFAULT		"mtdparts=m25p80-flash.0:128k(SPL)," \
 					"512k(u-boot),128k(u-boot-env1)," \

@@ -518,22 +333,13 @@
 #define CONFIG_SYS_MMC_ENV_PART		2
 #endif
 
-/* Unsupported features */
-#undef CONFIG_USE_IRQ
+/* SPI flash. */
+#define CONFIG_CMD_SF
+#define CONFIG_SPI_FLASH
+#define CONFIG_SPI_FLASH_WINBOND
+#define CONFIG_SF_DEFAULT_SPEED		24000000
 
-#define CONFIG_CMD_NET
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_PING
-#define CONFIG_DRIVER_TI_CPSW
-#define CONFIG_MII
-#define CONFIG_BOOTP_DEFAULT
-#define CONFIG_BOOTP_DNS
-#define CONFIG_BOOTP_DNS2
-#define CONFIG_BOOTP_SEND_HOSTNAME
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_SUBNETMASK
-#define CONFIG_NET_RETRY_COUNT         10
-#define CONFIG_NET_MULTI
+/* Network. */
 #define CONFIG_PHY_GIGE
 #define CONFIG_PHYLIB
 #define CONFIG_PHY_ADDR			0

@@ -542,14 +348,7 @@
 /* NAND support */
 #ifdef CONFIG_NAND
 #define CONFIG_CMD_NAND
-#define CONFIG_CMD_MTDPARTS
-#define CONFIG_NAND_OMAP_GPMC
 #define GPMC_NAND_ECC_LP_x16_LAYOUT	1
-#define CONFIG_SYS_NAND_BASE		(0x08000000)	/* physical address */
-							/* to access nand@*/
-							/* CS0 */
-#define CONFIG_SYS_MAX_NAND_DEVICE	1		/* Max number of NAND
-							   devices */
 #if !defined(CONFIG_SPI_BOOT) && !defined(CONFIG_NOR_BOOT)
 #define MTDIDS_DEFAULT			"nand0=omap2-nand.0"
 #define MTDPARTS_DEFAULT		"mtdparts=omap2-nand.0:128k(SPL)," \

@@ -578,6 +377,7 @@
  */
 #if defined(CONFIG_NOR)
 #undef CONFIG_SYS_NO_FLASH
+#define CONFIG_CMD_FLASH
 #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 #define CONFIG_SYS_FLASH_PROTECTION
 #define CONFIG_SYS_FLASH_CFI

@@ -593,7 +393,6 @@
 #define CONFIG_ENV_SECT_SIZE		(128 << 10)	/* 128 KiB */
 #define CONFIG_ENV_OFFSET		(512 << 10)	/* 512 KiB */
 #define CONFIG_ENV_OFFSET_REDUND	(768 << 10)	/* 768 KiB */
-#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT			"nor0=physmap-flash.0"
 #define MTDPARTS_DEFAULT		"mtdparts=physmap-flash.0:" \
 					"512k(u-boot)," \

@@ -601,8 +400,6 @@
 					"128k(u-boot-env2)," \
 					"4m(kernel),-(rootfs)"
 #endif
-#define CONFIG_MTD_DEVICE
-#define CONFIG_CMD_FLASH
 #endif  /* NOR support */
 
 #endif	/* ! __CONFIG_AM335X_EVM_H */

include/configs/ti_am335x_common.h new file +57 -0

57 lines not on this page · raw message

include/configs/ti_armv7_common.h new file +247 -0

247 lines not on this page · raw message

Signature · 1 line

1.7.9.5

Dan Murphy

2013-08-06 18:33 UTC #18 lore raw

PATCH 7/10 TI:am33xx: Create common config files for TI ARMv7 platforms, and AM33xx

Quoted 681 lines · Tom Rini

Signed-off-by Tom Rini <[email protected]>

---
 include/configs/am335x_evm.h       |  233 +++-------------------------------
 include/configs/ti_am335x_common.h |   57 +++++++++
 include/configs/ti_armv7_common.h  |  247 ++++++++++++++++++++++++++++++++++++
 3 files changed, 319 insertions(+), 218 deletions(-)
 create mode 100644 include/configs/ti_am335x_common.h
 create mode 100644 include/configs/ti_armv7_common.h

include/configs/am335x_evm.h +15 ~~-218~~

index 85c4632..e8f48ba 100644
@@ -16,43 +16,16 @@
 #ifndef __CONFIG_AM335X_EVM_H
 #define __CONFIG_AM335X_EVM_H
 
-#define CONFIG_AM33XX
-#define CONFIG_OMAP
+#include <configs/ti_am335x_common.h>
 
-#include <asm/arch/omap.h>
-
-#define CONFIG_DMA_COHERENT
-#define CONFIG_DMA_COHERENT_SIZE	(1 << 20)
-
-#define CONFIG_ENV_SIZE			(128 << 10)	/* 128 KiB */
-#define CONFIG_SYS_MALLOC_LEN		(1024 << 10)
-#define CONFIG_SYS_LONGHELP		/* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
-#define CONFIG_SYS_PROMPT		"U-Boot# "
-#define CONFIG_BOARD_LATE_INIT
-#define CONFIG_SYS_NO_FLASH
 #define MACH_TYPE_TIAM335EVM		3589	/* Until the next sync */
 #define CONFIG_MACH_TYPE		MACH_TYPE_TIAM335EVM
 
-#define CONFIG_OF_LIBFDT
-#define CONFIG_CMD_BOOTZ
-#define CONFIG_CMDLINE_TAG		/* enable passing of ATAGs */
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_STACKSIZE		(128 * 1024)
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-
 /* Custom script for NOR */
 #define CONFIG_SYS_LDSCRIPT		"board/ti/am335x/u-boot.lds"
 
-#define CONFIG_SYS_CACHELINE_SIZE       64
-
-/* commands to include */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_ASKENV
-#define CONFIG_VERSION_VARIABLE
+/* Always 128 KiB env size */
+#define CONFIG_ENV_SIZE			(128 << 10)
 
 #ifdef CONFIG_NAND
 #define NANDARGS \

@@ -75,10 +48,8 @@
 #define NANDARGS ""
 #endif
 
-/* set to negative value for no autoboot */
-#define CONFIG_BOOTDELAY		1
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80200000\0" \

@@ -196,60 +167,11 @@
 	"run mmcboot;" \
 	"run nandboot;"
 
-/* Clock Defines */
-#define V_OSCK				24000000  /* Clock output from T2 */
-#define V_SCLK				(V_OSCK)
-
-#define CONFIG_CMD_ECHO
-
-/* We set the max number of command args high to avoid HUSH bugs. */
-#define CONFIG_SYS_MAXARGS		64
-
-/* Console I/O Buffer Size */
-#define CONFIG_SYS_CBSIZE		512
-
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE \
-					+ sizeof(CONFIG_SYS_PROMPT) + 16)
-
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
-/*
- * memtest works on 8 MB in DRAM after skipping 32MB from
- * start addr of ram disk
- */
-#define CONFIG_SYS_MEMTEST_START	(PHYS_DRAM_1 + (64 * 1024 * 1024))
-#define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START \
-					+ (8 * 1024 * 1024))
-
-#define CONFIG_SYS_LOAD_ADDR		0x81000000 /* Default load address */
-
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_OMAP_HSMMC
-#define CONFIG_CMD_MMC
-#define CONFIG_DOS_PARTITION
-#define CONFIG_CMD_FAT
-#define CONFIG_FAT_WRITE
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_EXT4
-#define CONFIG_CMD_FS_GENERIC
-
-#define CONFIG_SPI
-#define CONFIG_OMAP3_SPI
-#define CONFIG_MTD_DEVICE
-#define CONFIG_SPI_FLASH
-#define CONFIG_SPI_FLASH_WINBOND
-#define CONFIG_CMD_SF
-#define CONFIG_SF_DEFAULT_SPEED		(24000000)
-
 /* USB Composite download gadget - g_dnl */
 #define CONFIG_USB_GADGET
 #define CONFIG_USBDOWNLOAD_GADGET
 
 /* USB TI's IDs */
-#define CONFIG_USBD_HS
 #define CONFIG_G_DNL_VENDOR_NUM 0x0403
 #define CONFIG_G_DNL_PRODUCT_NUM 0xBD00
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"

@@ -283,109 +205,24 @@
 	"rootfs part 0 9"
 #endif
 
- /* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS		1		/*  1 bank of DRAM */
-#define PHYS_DRAM_1			0x80000000	/* DRAM Bank #1 */
-#define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
-
-#define CONFIG_SYS_SDRAM_BASE		PHYS_DRAM_1
-#define CONFIG_SYS_INIT_SP_ADDR         (NON_SECURE_SRAM_END - \
-						GENERATED_GBL_DATA_SIZE)
- /* Platform/Board specific defs */
-#define CONFIG_SYS_TIMERBASE		0x48040000	/* Use Timer2 */
-#define CONFIG_SYS_PTV			2	/* Divisor: 2^(PTV+1) => 8 */
-#define CONFIG_SYS_HZ			1000	/* 1ms clock */
-
 /* NS16550 Configuration */
-#define CONFIG_SYS_NS16550
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
-#define CONFIG_SYS_NS16550_CLK		(48000000)
 #define CONFIG_SYS_NS16550_COM1		0x44e09000	/* Base EVM has UART0 */
 #define CONFIG_SYS_NS16550_COM2		0x48022000	/* UART1 */
 #define CONFIG_SYS_NS16550_COM3		0x48024000	/* UART2 */
 #define CONFIG_SYS_NS16550_COM4		0x481a6000	/* UART3 */
 #define CONFIG_SYS_NS16550_COM5		0x481a8000	/* UART4 */
 #define CONFIG_SYS_NS16550_COM6		0x481aa000	/* UART5 */
+#define CONFIG_BAUDRATE			115200
 
 /* I2C Configuration */
-#define CONFIG_I2C
-#define CONFIG_CMD_I2C
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_I2C_MULTI_BUS
-#define CONFIG_DRIVER_OMAP24XX_I2C
 #define CONFIG_CMD_EEPROM
 #define CONFIG_ENV_EEPROM_IS_ON_I2C
 #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* Main EEPROM */
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	2
 #define CONFIG_SYS_I2C_MULTI_EEPROMS
 
-#define CONFIG_OMAP_GPIO
-
-#define CONFIG_BAUDRATE		115200
-
-/* CPU */
-#define CONFIG_ARCH_CPU_INIT
-
-#define CONFIG_ENV_OVERWRITE		1
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
-
+/* SPL */
 #ifndef CONFIG_NOR_BOOT
-/* Defines for SPL */
-#define CONFIG_SPL
-#define CONFIG_SPL_FRAMEWORK
-/*
- * Place the image at the start of the ROM defined image space.
- * We limit our size to the ROM-defined downloaded image area, and use the
- * rest of the space for stack.
- */
-#define CONFIG_SPL_TEXT_BASE		0x402F0400
-#define CONFIG_SPL_MAX_SIZE		(0x4030C000 - CONFIG_SPL_TEXT_BASE)
-#define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR
-
-#define CONFIG_SPL_OS_BOOT
-
-#define CONFIG_SPL_BSS_START_ADDR	0x80a00000
-#define CONFIG_SPL_BSS_MAX_SIZE		0x80000		/* 512 KB */
-
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR	0x300 /* address 0x60000 */
-#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS	0x200 /* 256 KB */
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION	1
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME	"u-boot.img"
-
-#ifdef CONFIG_SPL_OS_BOOT
-/* fat */
-#define CONFIG_SPL_FAT_LOAD_KERNEL_NAME		"uImage"
-#define CONFIG_SPL_FAT_LOAD_ARGS_NAME		"args"
-#define CONFIG_SYS_SPL_ARGS_ADDR		(PHYS_DRAM_1 + 0x100)
-
-/* raw mmc */
-#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR	0x900	/* address 0x120000 */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR	0x80	/* address 0x10000 */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS	0x80	/* 64KiB */
-
-/* nand */
-#ifdef CONFIG_NAND
-#define CONFIG_CMD_SPL_NAND_OFS			0x240000 /* end of u-boot */
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS		0x280000
-#define CONFIG_CMD_SPL_WRITE_SIZE		0x2000
-#endif
-
-/* spl export command */
-#define CONFIG_CMD_SPL
-#endif
-
-#define CONFIG_SPL_MMC_SUPPORT
-#define CONFIG_SPL_FAT_SUPPORT
-#define CONFIG_SPL_I2C_SUPPORT
-
-#define CONFIG_SPL_LIBCOMMON_SUPPORT
-#define CONFIG_SPL_LIBDISK_SUPPORT
-#define CONFIG_SPL_LIBGENERIC_SUPPORT
-#define CONFIG_SPL_SERIAL_SUPPORT
-#define CONFIG_SPL_GPIO_SUPPORT
 #define CONFIG_SPL_YMODEM_SUPPORT
 #define CONFIG_SPL_NET_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT

@@ -400,14 +237,7 @@
 #define CONFIG_SPL_MUSB_NEW_SUPPORT
 #define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
 
-#define CONFIG_SPL_BOARD_INIT
-
 #ifdef CONFIG_NAND
-#define CONFIG_SPL_NAND_AM33XX_BCH
-#define CONFIG_SPL_NAND_SUPPORT
-#define CONFIG_SPL_NAND_BASE
-#define CONFIG_SPL_NAND_DRIVERS
-#define CONFIG_SPL_NAND_ECC
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_PAGE_COUNT	(CONFIG_SYS_NAND_BLOCK_SIZE / \
 					 CONFIG_SYS_NAND_PAGE_SIZE)

@@ -427,30 +257,16 @@
 #define CONFIG_SYS_NAND_ECCBYTES	14
 
 #define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
-
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x80000
 #endif
 #endif
 
 /*
- * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM
- * 64 bytes before this address should be set aside for u-boot.img's
- * header. That is 0x800FFFC0--0x80100000 should not be used for any
- * other needs.
+ * For NOR boot, we must set this to the start of where NOR is mapped
+ * in memory.
  */
 #ifdef CONFIG_NOR_BOOT
 #define CONFIG_SYS_TEXT_BASE		0x08000000
-#else
-#define CONFIG_SYS_TEXT_BASE		0x80800000
-#endif
-#define CONFIG_SYS_SPL_MALLOC_START	0x80a08000
-#define CONFIG_SYS_SPL_MALLOC_SIZE	0x100000
-
-/* Since SPL did pll and ddr initialization for us,
- * we don't need to do it twice.
- */
-#if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_NOR_BOOT)
-#define CONFIG_SKIP_LOWLEVEL_INIT
 #endif
 
 /*

@@ -505,7 +321,6 @@
 #define CONFIG_ENV_SECT_SIZE		(4 << 10) /* 4 KB sectors */
 #define CONFIG_ENV_OFFSET		(768 << 10) /* 768 KiB in */
 #define CONFIG_ENV_OFFSET_REDUND	(896 << 10) /* 896 KiB in */
-#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT			"nor0=m25p80-flash.0"
 #define MTDPARTS_DEFAULT		"mtdparts=m25p80-flash.0:128k(SPL)," \
 					"512k(u-boot),128k(u-boot-env1)," \

@@ -518,22 +333,13 @@
 #define CONFIG_SYS_MMC_ENV_PART		2
 #endif
 
-/* Unsupported features */
-#undef CONFIG_USE_IRQ
+/* SPI flash. */
+#define CONFIG_CMD_SF
+#define CONFIG_SPI_FLASH
+#define CONFIG_SPI_FLASH_WINBOND
+#define CONFIG_SF_DEFAULT_SPEED		24000000
 
-#define CONFIG_CMD_NET
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_PING
-#define CONFIG_DRIVER_TI_CPSW
-#define CONFIG_MII
-#define CONFIG_BOOTP_DEFAULT
-#define CONFIG_BOOTP_DNS
-#define CONFIG_BOOTP_DNS2
-#define CONFIG_BOOTP_SEND_HOSTNAME
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_SUBNETMASK
-#define CONFIG_NET_RETRY_COUNT         10
-#define CONFIG_NET_MULTI
+/* Network. */
 #define CONFIG_PHY_GIGE
 #define CONFIG_PHYLIB
 #define CONFIG_PHY_ADDR			0

@@ -542,14 +348,7 @@
 /* NAND support */
 #ifdef CONFIG_NAND
 #define CONFIG_CMD_NAND
-#define CONFIG_CMD_MTDPARTS
-#define CONFIG_NAND_OMAP_GPMC
 #define GPMC_NAND_ECC_LP_x16_LAYOUT	1
-#define CONFIG_SYS_NAND_BASE		(0x08000000)	/* physical address */
-							/* to access nand at */
-							/* CS0 */
-#define CONFIG_SYS_MAX_NAND_DEVICE	1		/* Max number of NAND
-							   devices */
 #if !defined(CONFIG_SPI_BOOT) && !defined(CONFIG_NOR_BOOT)
 #define MTDIDS_DEFAULT			"nand0=omap2-nand.0"
 #define MTDPARTS_DEFAULT		"mtdparts=omap2-nand.0:128k(SPL)," \

@@ -578,6 +377,7 @@
  */
 #if defined(CONFIG_NOR)
 #undef CONFIG_SYS_NO_FLASH
+#define CONFIG_CMD_FLASH
 #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 #define CONFIG_SYS_FLASH_PROTECTION
 #define CONFIG_SYS_FLASH_CFI

@@ -593,7 +393,6 @@
 #define CONFIG_ENV_SECT_SIZE		(128 << 10)	/* 128 KiB */
 #define CONFIG_ENV_OFFSET		(512 << 10)	/* 512 KiB */
 #define CONFIG_ENV_OFFSET_REDUND	(768 << 10)	/* 768 KiB */
-#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT			"nor0=physmap-flash.0"
 #define MTDPARTS_DEFAULT		"mtdparts=physmap-flash.0:" \
 					"512k(u-boot)," \

@@ -601,8 +400,6 @@
 					"128k(u-boot-env2)," \
 					"4m(kernel),-(rootfs)"
 #endif
-#define CONFIG_MTD_DEVICE
-#define CONFIG_CMD_FLASH
 #endif  /* NOR support */
 
 #endif	/* ! __CONFIG_AM335X_EVM_H */

include/configs/ti_am335x_common.h new file +57 -0

new file mode 100644
index 0000000..a493684
@@ -0,0 +1,57 @@
+/*
+ * ti_am335x_common.h
+ *
+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __CONFIG_TI_AM335X_COMMON_H__
+#define __CONFIG_TI_AM335X_COMMON_H__
+
+#define CONFIG_AM33XX
+#define CONFIG_BOARD_LATE_INIT
+#define CONFIG_ARCH_CPU_INIT
+#define CONFIG_SYS_CACHELINE_SIZE       64
+#define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
+#define CONFIG_SYS_TIMERBASE		0x48040000	/* Use Timer2 */
+
+#include <asm/arch/omap.h>
+
+/* NS16550 Configuration */
+#define CONFIG_SYS_NS16550
+#define CONFIG_SYS_NS16550_SERIAL
+#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
+#define CONFIG_SYS_NS16550_CLK		48000000
+
+/* Network defines. */
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_PING
+#define CONFIG_DRIVER_TI_CPSW
+#define CONFIG_MII
+#define CONFIG_BOOTP_DEFAULT
+#define CONFIG_BOOTP_DNS
+#define CONFIG_BOOTP_DNS2
+#define CONFIG_BOOTP_SEND_HOSTNAME
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_NET_RETRY_COUNT         10
+
+/* SPL defines. */
+#define CONFIG_SPL_TEXT_BASE		0x402F0400
+#define CONFIG_SPL_MAX_SIZE		(0x4030C000 - CONFIG_SPL_TEXT_BASE)
+#define CONFIG_SPL_YMODEM_SUPPORT
+
+/*
+ * Since SPL did pll and ddr initialization for us,
+ * we don't need to do it twice.
+ */
+#if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_NOR_BOOT)
+#define CONFIG_SKIP_LOWLEVEL_INIT
+#endif
+
+/* Now bring in the rest of the common code. */
+#include <configs/ti_armv7_common.h>
+
+#endif	/* __CONFIG_TI_AM335X_COMMON_H__ */

include/configs/ti_armv7_common.h new file +235 -0

new file mode 100644
index 0000000..0734598
@@ -0,0 +1,247 @@
+/*
+ * ti_armv7_common.h
+ *
+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ *
+ * The various ARMv7 SoCs from TI all share a number of IP blocks when
+ * implementing a given feature.  Rather than define these in every
+ * board or even SoC common file, we define a common file to be re-used
+ * in all cases.  While technically true that some of these details are
+ * configurable at the board design, they are common throughout SoC
+ * reference platforms as well as custom designs and become de facto
+ * standards.
+ */
+
+#ifndef __CONFIG_TI_ARMV7_COMMON_H__
+#define __CONFIG_TI_ARMV7_COMMON_H__
+
+/* Common define for many platforms. */
+#define CONFIG_OMAP
+
+/*
+ * We typically do not contain NOR flash.  In the cases where we do, we
+ * undefine this later.
+ */
+#define CONFIG_SYS_NO_FLASH
+
+/* Support both device trees and ATAGs. */
+#define CONFIG_OF_LIBFDT
+#define CONFIG_CMDLINE_TAG
+#define CONFIG_SETUP_MEMORY_TAGS
+#define CONFIG_INITRD_TAG
+
+/*
+ * Our DDR memory always starts at 0x80000000 and U-Boot shall have
+ * relocated itself to higher in memory by the time this value is used.
+ */
+#define CONFIG_SYS_LOAD_ADDR		0x80000000
+
+/*
+ * Default to a quick boot delay.
+ */
+#define CONFIG_BOOTDELAY		1
+
+/*
+ * DDR information.  We say (for simplicity) that we have 1 bank,
+ * always, even when we have more.  We always start at 0x80000000,
+ * and we place the initial stack pointer in our SRAM.
+ */
+#define CONFIG_NR_DRAM_BANKS		1
+#define CONFIG_SYS_SDRAM_BASE		0x80000000
+#define CONFIG_SYS_INIT_SP_ADDR         (NON_SECURE_SRAM_END - \
+						GENERATED_GBL_DATA_SIZE)
+
+/* Timer information. */
+#define CONFIG_SYS_PTV			2	/* Divisor: 2^(PTV+1) => 8 */
+#define CONFIG_SYS_HZ			1000	/* 1ms clock */
+
+/* I2C IP block */
+#define CONFIG_I2C
+#define CONFIG_CMD_I2C
+#define CONFIG_HARD_I2C
+#define CONFIG_SYS_I2C_SPEED		100000
+#define CONFIG_SYS_I2C_SLAVE		1
+#define CONFIG_I2C_MULTI_BUS
+#define CONFIG_DRIVER_OMAP24XX_I2C
+
+/* MMC/SD IP block */
+#define CONFIG_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_OMAP_HSMMC
+#define CONFIG_CMD_MMC
+
+/* McSPI IP block */
+#define CONFIG_SPI
+#define CONFIG_OMAP3_SPI
+
+/* GPIO block */
+#define CONFIG_OMAP_GPIO
+
+/*
+ * GPMC NAND block.  We support 1 device and the physical address to
+ * access CS0 at is 0x8000000.
+ */
+#ifdef CONFIG_NAND
+#define CONFIG_CMD_NAND
+#define CONFIG_NAND_OMAP_GPMC
+#define CONFIG_SYS_NAND_BASE		0x8000000
+#define CONFIG_SYS_MAX_NAND_DEVICE	1
+#endif
+
+/*
+ * The following are general good-enough settings for U-Boot.  We set a
+ * large malloc pool as we generally have a lot of DDR, and we opt for
+ * function over binary size in the main portion of U-Boot as this is
+ * generally easily constrained later if needed.  We enable the config
+ * options that give us information in the environment about what board
+ * we are on so we do not need to rely on the command prompt.  We set a
+ * console baudrate of 115200 and use the default baud rate table.
+ */
+#define CONFIG_SYS_MALLOC_LEN		(1024 << 10)
+#define CONFIG_SYS_LONGHELP
+#define CONFIG_SYS_HUSH_PARSER
+#define CONFIG_AUTO_COMPLETE
+#define CONFIG_CMDLINE_EDITING
+#define CONFIG_SYS_PROMPT		"U-Boot# "
+#define CONFIG_VERSION_VARIABLE
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_BAUDRATE			115200
+
+/* We set the max number of command args high to avoid HUSH bugs. */
+#define CONFIG_SYS_MAXARGS		64
+
+/* Console I/O Buffer Size */
+#define CONFIG_SYS_CBSIZE		512
+/* Print Buffer Size */
+#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE \
+					+ sizeof(CONFIG_SYS_PROMPT) + 16)
+/* Boot Argument Buffer Size */
+#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
+
+#define CONFIG_ENV_OVERWRITE
+#define CONFIG_SYS_CONSOLE_INFO_QUIET
+
+/*
+ * When we have SPI, NOR or NAND flash we expect to be making use of
+ * mtdparts, both for ease of use in U-Boot and for passing information
+ * on to the Linux kernel.
+ */
+#if defined(CONFIG_SPI_BOOT) || defined(CONFIG_NOR) || defined(CONFIG_NAND)
+#define CONFIG_MTD_DEVICE		/* Required for mtdparts */
+#define CONFIG_CMD_MTDPARTS
+#endif
+
+/*
+ * For commands to use, we take the default list and add a few other
+ * useful commands.  Note that we must have set CONFIG_SYS_NO_FLASH
+ * prior to this include, in order to skip a few commands.  When we do
+ * have flash, if we expect these commands they must be enabled in that
+ * config.
+ */
+#include <config_cmd_default.h>
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_ECHO
+#define CONFIG_CMD_BOOTZ
+
+/*
+ * Common filesystems support.  When we have removable storage we
+ * enabled a number of useful commands and support.
+ */
+#if defined(CONFIG_MMC) || defined(CONFIG_USB_STORAGE)
+#define CONFIG_DOS_PARTITION
+#define CONFIG_CMD_FAT
+#define CONFIG_FAT_WRITE
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_EXT4
+#define CONFIG_CMD_FS_GENERIC
+#endif
+
+/*
+ * Our platforms make use of SPL to initalize the hardware (primarily
+ * memory) enough for full U-Boot to be loaded.  We also support Falcon
+ * Mode so that the Linux kernel can be booted directly from SPL
+ * instead, if desired.  We make use of the general SPL framework found
+ * under common/spl/.  Given our generally common memory map, we set a
+ * number of related defaults and sizes here.
+ */
+#ifndef CONFIG_NOR_BOOT
+#define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
+#define CONFIG_SPL_OS_BOOT
+
+/*
+ * Place the image at the start of the ROM defined image space.
+ * We limit our size to the ROM-defined downloaded image area, and use the
+ * rest of the space for stack.  We load U-Boot itself into memory at
+ * 0x80800000 for legacy reasons (to not conflict with older SPLs).  We
+ * have our BSS be placed 1MiB after this, to allow for the default
+ * Linux kernel address of 0x80008000 to work, in the Falcon Mode case.
+ * We have the SPL malloc pool at the end of the BSS area.
+ */
+#define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR
+#define CONFIG_SYS_TEXT_BASE		0x80800000
+#define CONFIG_SPL_BSS_START_ADDR	0x80a00000
+#define CONFIG_SPL_BSS_MAX_SIZE		0x80000		/* 512 KB */
+#define CONFIG_SYS_SPL_MALLOC_START	(CONFIG_SPL_BSS_START_ADDR + \
+					 CONFIG_SPL_BSS_MAX_SIZE)
+#define CONFIG_SYS_SPL_MALLOC_SIZE	CONFIG_SYS_MALLOC_LEN
+
+/* RAW SD card / eMMC locations. */
+#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR	0x300 /* address 0x60000 */
+#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS	0x200 /* 256 KB */
+
+/* FAT sd card locations. */
+#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION	1
+#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME	"u-boot.img"
+
+#ifdef CONFIG_SPL_OS_BOOT
+#define CONFIG_SYS_SPL_ARGS_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x100)
+
+/* FAT */
+#define CONFIG_SPL_FAT_LOAD_KERNEL_NAME		"uImage"
+#define CONFIG_SPL_FAT_LOAD_ARGS_NAME		"args"
+
+/* RAW SD card / eMMC */
+#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR	0x900	/* address 0x120000 */
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR	0x80	/* address 0x10000 */
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS	0x80	/* 64KiB */
+
+/* NAND */
+#ifdef CONFIG_NAND
+#define CONFIG_CMD_SPL_NAND_OFS			0x240000 /* end of u-boot */
+#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS		0x280000
+#define CONFIG_CMD_SPL_WRITE_SIZE		0x2000
+#endif
+
+/* spl export command */
+#define CONFIG_CMD_SPL
+#endif
+
+#ifdef CONFIG_MMC
+#define CONFIG_SPL_MMC_SUPPORT
+#define CONFIG_SPL_FAT_SUPPORT
+#endif
+
+/* General parts of the framework. */
+#define CONFIG_SPL_I2C_SUPPORT
+#define CONFIG_SPL_LIBCOMMON_SUPPORT
+#define CONFIG_SPL_LIBDISK_SUPPORT
+#define CONFIG_SPL_LIBGENERIC_SUPPORT
+#define CONFIG_SPL_SERIAL_SUPPORT
+#define CONFIG_SPL_GPIO_SUPPORT
+#define CONFIG_SPL_BOARD_INIT
+

include/configs/ti_armv7_common.h line 245

Quoted 10 lines

include/configs/ti_armv7_common.h new file +10 -0

+#ifdef CONFIG_NAND
+#define CONFIG_SPL_NAND_AM33XX_BCH	/* OMAP4 and later ELM support */
+#define CONFIG_SPL_NAND_SUPPORT
+#define CONFIG_SPL_NAND_BASE
+#define CONFIG_SPL_NAND_DRIVERS
+#define CONFIG_SPL_NAND_ECC
+#define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_NAND_U_BOOT_OFFS	0x80000
+#endif
+#endif

Nit pick can you add the /* CONFIG_NOR_BOOT */ so we know what this endif is for?

Quoted 2 lines

include/configs/ti_armv7_common.h new file +2 -0
+
+#endif	/* __CONFIG_TI_ARMV7_COMMON_H__ */

Signature · 2 lines

------------------
Dan Murphy

Tom Rini

author

2013-08-06 19:11 UTC #19 lore raw

PATCH 7/10 TI:am33xx: Create common config files for TI ARMv7 platforms, and AM33xx

Quoted 7 lines · Dan Murphy

Quoted 6 lines · Tom Rini
We create two new files, include/configs/ti_armv7_common.h for all of the common IP blocks and related features / commands we share in virtually all of our platforms. We then create include/configs/ti_am335x_common.h for everything common to the am335x SoC leaving just the board specific parts to include/configs/ti_am335x_common.h.

[snip]

Quoted 5 lines

include/configs/ti_armv7_common.h new file +5 -0

+#ifdef CONFIG_NAND
+#define CONFIG_SPL_NAND_AM33XX_BCH	/* OMAP4 and later ELM support */
+#define CONFIG_SPL_NAND_SUPPORT
+#define CONFIG_SPL_NAND_BASE
+#define CONFIG_SPL_NAND_DRIVERS

Quoted 8 lines

include/configs/ti_armv7_common.h line 245
Quoted 5 lines
include/configs/ti_armv7_common.h new file +5 -0
+#define CONFIG_SPL_NAND_ECC
+#define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_NAND_U_BOOT_OFFS	0x80000
+#endif
+#endif
Nit pick can you add the /* CONFIG_NOR_BOOT */ so we know what this endif is for?

Done.

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130806/34512cb1/attachment.pgp>

Tom Rini

author

2013-08-02 20:26 UTC #20 lore raw

PATCH 8/10 TI:omap5: Convert to ti_armv7_common.h

In reply to Tom Rini

Update omap5_common.h to use ti_armv7_common.h, and in turn update dra7xx_evm.h and omap5_uevm.h slightly. The biggest changes here are that IP blocks which exist on the platform, and had clocks enabled, now have the drivers being built as well.

Signed-off-by Tom Rini <[email protected]>

---
 include/configs/dra7xx_evm.h   |   11 +--
 include/configs/omap5_common.h |  188 +++++-----------------------------------
 include/configs/omap5_uevm.h   |    8 +-
 3 files changed, 31 insertions(+), 176 deletions(-)

include/configs/dra7xx_evm.h +4 -7

index 51be73d..58786ff 100644
@@ -12,21 +12,18 @@
 #ifndef __CONFIG_DRA7XX_EVM_H
 #define __CONFIG_DRA7XX_EVM_H
 
-/* High Level Configuration Options */
-#define CONFIG_DRA7XX		/* in a TI DRA7XX core */
-#define CONFIG_ENV_IS_NOWHERE		/* For now. */
-
-#include <configs/omap5_common.h>
+#define CONFIG_DRA7XX
 
-#define CONFIG_SYS_PROMPT		"DRA752 EVM # "
+#define CONFIG_ENV_IS_NOWHERE		/* For now. */
 
+#define CONSOLEDEV			"ttyO0"
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_SYS_NS16550_COM1		UART1_BASE
 #define CONFIG_BAUDRATE			115200
 
 #define CONFIG_SYS_OMAP_ABE_SYSCK
 
-#define CONSOLEDEV		"ttyO0"
+#include <configs/omap5_common.h>
 
 /* CPSW Ethernet */
 #define CONFIG_CMD_NET

include/configs/omap5_common.h +24 ~~-164~~

226 lines not on this page · raw message

include/configs/omap5_uevm.h +3 -5

index 47568e9..d10c2b5 100644
@@ -17,8 +17,6 @@
 	"uuid_disk=${uuid_gpt_disk};" \
 	"name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}"
 
-#include <configs/omap5_common.h>
-
 #define CONFIG_CONS_INDEX		3
 #define CONFIG_SYS_NS16550_COM3		UART3_BASE
 #define CONFIG_BAUDRATE			115200

@@ -42,9 +40,9 @@
 #define CONFIG_SYS_I2C_TCA642X_BUS_NUM 4
 #define CONFIG_SYS_I2C_TCA642X_ADDR 0x22
 
-#define CONFIG_SYS_PROMPT		"OMAP5432 uEVM # "
-
 #define CONSOLEDEV		"ttyO2"
-
 #define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC	16296
+
+#include <configs/omap5_common.h>
+
 #endif /* __CONFIG_OMAP5_EVM_H */

Signature · 1 line

1.7.9.5

Dan Murphy

2013-08-06 18:37 UTC #21 lore raw

PATCH 8/10 TI:omap5: Convert to ti_armv7_common.h

Quoted 2 lines · Tom Rini

Update omap5_common.h to use ti_armv7_common.h, and in turn update dra7xx_evm.h and omap5_uevm.h slightly. The biggest changes here are

The commit headline does not indicate anything about dra7xx. So dra7xx dev's might over look this change.

Quoted 288 lines

that IP blocks which exist on the platform, and had clocks enabled, now have the drivers being built as well.

Signed-off-by Tom Rini <[email protected]>

---
 include/configs/dra7xx_evm.h   |   11 +--
 include/configs/omap5_common.h |  188 +++++-----------------------------------
 include/configs/omap5_uevm.h   |    8 +-
 3 files changed, 31 insertions(+), 176 deletions(-)

include/configs/dra7xx_evm.h +4 -7

index 51be73d..58786ff 100644
@@ -12,21 +12,18 @@
 #ifndef __CONFIG_DRA7XX_EVM_H
 #define __CONFIG_DRA7XX_EVM_H
 
-/* High Level Configuration Options */
-#define CONFIG_DRA7XX		/* in a TI DRA7XX core */
-#define CONFIG_ENV_IS_NOWHERE		/* For now. */
-
-#include <configs/omap5_common.h>
+#define CONFIG_DRA7XX
 
-#define CONFIG_SYS_PROMPT		"DRA752 EVM # "
+#define CONFIG_ENV_IS_NOWHERE		/* For now. */
 
+#define CONSOLEDEV			"ttyO0"
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_SYS_NS16550_COM1		UART1_BASE
 #define CONFIG_BAUDRATE			115200
 
 #define CONFIG_SYS_OMAP_ABE_SYSCK
 
-#define CONSOLEDEV		"ttyO0"
+#include <configs/omap5_common.h>
 
 /* CPSW Ethernet */
 #define CONFIG_CMD_NET

include/configs/omap5_common.h +24 ~~-164~~

index 7dd56cf..469a081 100644
@@ -14,106 +14,51 @@
 #ifndef __CONFIG_OMAP5_COMMON_H
 #define __CONFIG_OMAP5_COMMON_H
 
-/*
- * High Level Configuration Options
- */
-#define CONFIG_OMAP	/* in a TI OMAP core */
-#define CONFIG_OMAP54XX	/* which is a 54XX */
-#define CONFIG_OMAP_GPIO
-
-/* Get CPU defs */
-#include <asm/arch/cpu.h>
-#include <asm/arch/omap.h>
-
-/* Display CPU and Board Info */
+#define CONFIG_OMAP54XX
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_MISC_INIT_R
+#define CONFIG_ARCH_CPU_INIT
 
-#define CONFIG_OF_LIBFDT
-#define CONFIG_CMD_BOOTZ
+#define CONFIG_SYS_CACHELINE_SIZE	64
 
-#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
+/* Use General purpose timer 1 */
+#define CONFIG_SYS_TIMERBASE		GPT2_BASE
+
+#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
+
+/* Defines for SDRAM init */
+#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
+#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
+#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
+#endif
+
+#ifndef CONFIG_SPL_BUILD
+#define CONFIG_PALMAS_POWER
+#endif
+
+#include <asm/arch/cpu.h>
+#include <asm/arch/omap.h>
 
-/*
- * Size of malloc() pool
- * Total Size Environment - 128k
- * Malloc - add 256k
- */
 #define CONFIG_ENV_SIZE			(128 << 10)
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (256 << 10))
-/* Vector Base */
-#define CONFIG_SYS_CA9_VECTOR_BASE	SRAM_ROM_VECT_BASE
 
-/*
- * Hardware drivers
- */
+#include <configs/ti_armv7_common.h>
 
 /*
- * serial port - NS16550 compatible
+ * Hardware drivers
  */
-#define V_NS16550_CLK			48000000
-
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE	(-4)
-#define CONFIG_SYS_NS16550_CLK		V_NS16550_CLK
-
-/* CPU */
-#define CONFIG_ARCH_CPU_INIT
-
-/* I2C  */
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C
-#define CONFIG_I2C_MULTI_BUS
-
-/* MMC */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_OMAP_HSMMC
-#define CONFIG_DOS_PARTITION
-
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-
-/* Flash */
-#define CONFIG_SYS_NO_FLASH
-
-/* Cache */
-#define CONFIG_SYS_CACHELINE_SIZE	64
-#define CONFIG_SYS_CACHELINE_SHIFT	6
+#define CONFIG_SYS_NS16550_CLK		48000000
 
-/* commands to include */
-#include <config_cmd_default.h>
-
-/* Enabled commands */
-#define CONFIG_CMD_EXT2		/* EXT2 Support                 */
-#define CONFIG_CMD_FAT		/* FAT support                  */
-#define CONFIG_CMD_I2C		/* I2C serial bus support	*/
-#define CONFIG_CMD_MMC		/* MMC support                  */
-
-/* Disabled commands */
+/* Per-SoC commands */
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_FPGA		/* FPGA configuration Support   */
-#undef CONFIG_CMD_IMLS		/* List all found images        */
 
 /*
  * Environment setup
  */
-
-#define CONFIG_BOOTDELAY	3
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
-#define CONFIG_CMD_FS_GENERIC
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_EXT4
-
-#define CONFIG_ENV_OVERWRITE
-
 #ifndef PARTS_DEFAULT
 #define PARTS_DEFAULT
 #endif

@@ -178,96 +123,11 @@
 		"fi; " \
 	"fi"
 
-#define CONFIG_AUTO_COMPLETE		1
-
-/*
- * Miscellaneous configurable options
- */
-
-#define CONFIG_SYS_LONGHELP	/* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER	/* use "hush" command parser */
-#define CONFIG_SYS_CBSIZE		256
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
-					sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS		16
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE		(CONFIG_SYS_CBSIZE)
-
-/*
- * memtest setup
- */
-#define CONFIG_SYS_MEMTEST_START	0x80000000
-#define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + (32 << 20))
-
-/* Default load address */
-#define CONFIG_SYS_LOAD_ADDR		0x80000000
-
-/* Use General purpose timer 1 */
-#define CONFIG_SYS_TIMERBASE		GPT2_BASE
-#define CONFIG_SYS_PTV			2	/* Divisor: 2^(PTV+1) => 8 */
-#define CONFIG_SYS_HZ			1000
-
-/*
- * SDRAM Memory Map
- * Even though we use two CS all the memory
- * is mapped to one contiguous block
- */
-#define CONFIG_NR_DRAM_BANKS	1
-
-#define CONFIG_SYS_SDRAM_BASE		0x80000000
-#define CONFIG_SYS_INIT_SP_ADDR         (NON_SECURE_SRAM_END - \
-					 GENERATED_GBL_DATA_SIZE)
-
-#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
-
-/* Defines for SDRAM init */
-#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
-#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
-#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
-#endif
-
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_PALMAS_POWER
-#endif
 
 /* Defines for SPL */
-#define CONFIG_SPL
-#define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE		0x40300350
 #define CONFIG_SPL_MAX_SIZE		0x19000	/* 100K */
-#define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR
 #define CONFIG_SPL_DISPLAY_PRINT
-
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR	0x300 /* address 0x60000 */
-#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS	0x200 /* 256 KB */
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION	1
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME	"u-boot.img"
-
-#define CONFIG_SPL_LIBCOMMON_SUPPORT
-#define CONFIG_SPL_LIBDISK_SUPPORT
-#define CONFIG_SPL_I2C_SUPPORT
-#define CONFIG_SPL_MMC_SUPPORT
-#define CONFIG_SPL_FAT_SUPPORT
-#define CONFIG_SPL_LIBGENERIC_SUPPORT
-#define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
 
-/*
- * 64 bytes before this address should be set aside for u-boot.img's
- * header. That is 80E7FFC0--0x80E80000 should not be used for any
- * other needs.
- */
-#define CONFIG_SYS_TEXT_BASE		0x80E80000
-
-/*
- * BSS and malloc area 64MB into memory to allow enough
- * space for the kernel at the beginning of memory
- */
-#define CONFIG_SPL_BSS_START_ADDR	0x84000000
-#define CONFIG_SPL_BSS_MAX_SIZE		0x100000	/* 1 MB */
-#define CONFIG_SYS_SPL_MALLOC_START	0x84100000
-#define CONFIG_SYS_SPL_MALLOC_SIZE	0x100000	/* 1 MB */
-#define CONFIG_SPL_GPIO_SUPPORT
-
 #endif /* __CONFIG_OMAP5_COMMON_H */

include/configs/omap5_uevm.h +0 -2

index 47568e9..d10c2b5 100644
@@ -17,8 +17,6 @@
 	"uuid_disk=${uuid_gpt_disk};" \
 	"name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}"
 
-#include <configs/omap5_common.h>
-
 #define CONFIG_CONS_INDEX		3
 #define CONFIG_SYS_NS16550_COM3		UART3_BASE
 #define CONFIG_BAUDRATE			115200

@@ -42,9 +40,9 @@
 #define CONFIG_SYS_I2C_TCA642X_BUS_NUM 4
 #define CONFIG_SYS_I2C_TCA642X_ADDR 0x22

include/configs/omap5_uevm.h line 48

Quoted 10 lines

include/configs/omap5_uevm.h +3 -3

 
-#define CONFIG_SYS_PROMPT		"OMAP5432 uEVM # "
-
 #define CONSOLEDEV		"ttyO2"
-
 #define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC	16296
+
+#include <configs/omap5_common.h>
+
 #endif /* __CONFIG_OMAP5_EVM_H */

Would it be better to split this into two patches? one for OMAP5 and one for dra7xx?

Dan

Signature · 2 lines

------------------
Dan Murphy

Tom Rini

author

2013-08-06 19:13 UTC #22 lore raw

PATCH 8/10 TI:omap5: Convert to ti_armv7_common.h

Quoted 6 lines · Dan Murphy

Quoted 2 lines · Tom Rini
Update omap5_common.h to use ti_armv7_common.h, and in turn update dra7xx_evm.h and omap5_uevm.h slightly. The biggest changes here are
The commit headline does not indicate anything about dra7xx. So dra7xx dev's might over look this change.

Re-worded.

[snip]

Quoted 2 lines

Would it be better to split this into two patches? one for OMAP5 and one for dra7xx?

Can't, would break bisectability (both use omap5_common.h and that's where the changes really are, the board changes are largely consistency with am335x_evm.h ordering).

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130806/9ec7274a/attachment.pgp>

Dan Murphy

2013-08-06 19:24 UTC #23 lore raw

PATCH 8/10 TI:omap5: Convert to ti_armv7_common.h

Tom

Quoted 6 lines · Tom Rini

Quoted 5 lines · Dan Murphy
Quoted 2 lines · Tom Rini
Update omap5_common.h to use ti_armv7_common.h, and in turn update dra7xx_evm.h and omap5_uevm.h slightly. The biggest changes here are
The commit headline does not indicate anything about dra7xx. So dra7xx dev's might over look this change.

Quoted 9 lines

Re-worded.
[snip]
Quoted 2 lines
Would it be better to split this into two patches? one for OMAP5 and one for dra7xx?
Can't, would break bisectability (both use omap5_common.h and that's where the changes really are, the board changes are largely consistency with am335x_evm.h ordering).

I am good with the re-word then.

Reviewed-by Dan Murphy <[email protected]>

Signature · 2 lines

------------------
Dan Murphy

Dan Murphy

2013-08-06 18:38 UTC #24 lore raw

PATCH 8/10 TI:omap5: Convert to ti_armv7_common.h

In reply to Tom Rini

Quoted 2 lines · Tom Rini

Update omap5_common.h to use ti_armv7_common.h, and in turn update dra7xx_evm.h and omap5_uevm.h slightly. The biggest changes here are

The commit headline does not indicate anything about dra7xx. So dra7xx dev's might over look this change.

Quoted 288 lines

that IP blocks which exist on the platform, and had clocks enabled, now have the drivers being built as well.

Signed-off-by Tom Rini <[email protected]>

---
 include/configs/dra7xx_evm.h   |   11 +--
 include/configs/omap5_common.h |  188 +++++-----------------------------------
 include/configs/omap5_uevm.h   |    8 +-
 3 files changed, 31 insertions(+), 176 deletions(-)

include/configs/dra7xx_evm.h +4 -7

index 51be73d..58786ff 100644
@@ -12,21 +12,18 @@
 #ifndef __CONFIG_DRA7XX_EVM_H
 #define __CONFIG_DRA7XX_EVM_H
 
-/* High Level Configuration Options */
-#define CONFIG_DRA7XX		/* in a TI DRA7XX core */
-#define CONFIG_ENV_IS_NOWHERE		/* For now. */
-
-#include <configs/omap5_common.h>
+#define CONFIG_DRA7XX
 
-#define CONFIG_SYS_PROMPT		"DRA752 EVM # "
+#define CONFIG_ENV_IS_NOWHERE		/* For now. */
 
+#define CONSOLEDEV			"ttyO0"
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_SYS_NS16550_COM1		UART1_BASE
 #define CONFIG_BAUDRATE			115200
 
 #define CONFIG_SYS_OMAP_ABE_SYSCK
 
-#define CONSOLEDEV		"ttyO0"
+#include <configs/omap5_common.h>
 
 /* CPSW Ethernet */
 #define CONFIG_CMD_NET

include/configs/omap5_common.h +24 ~~-164~~

index 7dd56cf..469a081 100644
@@ -14,106 +14,51 @@
 #ifndef __CONFIG_OMAP5_COMMON_H
 #define __CONFIG_OMAP5_COMMON_H
 
-/*
- * High Level Configuration Options
- */
-#define CONFIG_OMAP	/* in a TI OMAP core */
-#define CONFIG_OMAP54XX	/* which is a 54XX */
-#define CONFIG_OMAP_GPIO
-
-/* Get CPU defs */
-#include <asm/arch/cpu.h>
-#include <asm/arch/omap.h>
-
-/* Display CPU and Board Info */
+#define CONFIG_OMAP54XX
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_MISC_INIT_R
+#define CONFIG_ARCH_CPU_INIT
 
-#define CONFIG_OF_LIBFDT
-#define CONFIG_CMD_BOOTZ
+#define CONFIG_SYS_CACHELINE_SIZE	64
 
-#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
+/* Use General purpose timer 1 */
+#define CONFIG_SYS_TIMERBASE		GPT2_BASE
+
+#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
+
+/* Defines for SDRAM init */
+#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
+#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
+#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
+#endif
+
+#ifndef CONFIG_SPL_BUILD
+#define CONFIG_PALMAS_POWER
+#endif
+
+#include <asm/arch/cpu.h>
+#include <asm/arch/omap.h>
 
-/*
- * Size of malloc() pool
- * Total Size Environment - 128k
- * Malloc - add 256k
- */
 #define CONFIG_ENV_SIZE			(128 << 10)
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (256 << 10))
-/* Vector Base */
-#define CONFIG_SYS_CA9_VECTOR_BASE	SRAM_ROM_VECT_BASE
 
-/*
- * Hardware drivers
- */
+#include <configs/ti_armv7_common.h>
 
 /*
- * serial port - NS16550 compatible
+ * Hardware drivers
  */
-#define V_NS16550_CLK			48000000
-
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE	(-4)
-#define CONFIG_SYS_NS16550_CLK		V_NS16550_CLK
-
-/* CPU */
-#define CONFIG_ARCH_CPU_INIT
-
-/* I2C  */
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C
-#define CONFIG_I2C_MULTI_BUS
-
-/* MMC */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_OMAP_HSMMC
-#define CONFIG_DOS_PARTITION
-
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-
-/* Flash */
-#define CONFIG_SYS_NO_FLASH
-
-/* Cache */
-#define CONFIG_SYS_CACHELINE_SIZE	64
-#define CONFIG_SYS_CACHELINE_SHIFT	6
+#define CONFIG_SYS_NS16550_CLK		48000000
 
-/* commands to include */
-#include <config_cmd_default.h>
-
-/* Enabled commands */
-#define CONFIG_CMD_EXT2		/* EXT2 Support                 */
-#define CONFIG_CMD_FAT		/* FAT support                  */
-#define CONFIG_CMD_I2C		/* I2C serial bus support	*/
-#define CONFIG_CMD_MMC		/* MMC support                  */
-
-/* Disabled commands */
+/* Per-SoC commands */
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_FPGA		/* FPGA configuration Support   */
-#undef CONFIG_CMD_IMLS		/* List all found images        */
 
 /*
  * Environment setup
  */
-
-#define CONFIG_BOOTDELAY	3
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
-#define CONFIG_CMD_FS_GENERIC
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_EXT4
-
-#define CONFIG_ENV_OVERWRITE
-
 #ifndef PARTS_DEFAULT
 #define PARTS_DEFAULT
 #endif

@@ -178,96 +123,11 @@
 		"fi; " \
 	"fi"
 
-#define CONFIG_AUTO_COMPLETE		1
-
-/*
- * Miscellaneous configurable options
- */
-
-#define CONFIG_SYS_LONGHELP	/* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER	/* use "hush" command parser */
-#define CONFIG_SYS_CBSIZE		256
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
-					sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS		16
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE		(CONFIG_SYS_CBSIZE)
-
-/*
- * memtest setup
- */
-#define CONFIG_SYS_MEMTEST_START	0x80000000
-#define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + (32 << 20))
-
-/* Default load address */
-#define CONFIG_SYS_LOAD_ADDR		0x80000000
-
-/* Use General purpose timer 1 */
-#define CONFIG_SYS_TIMERBASE		GPT2_BASE
-#define CONFIG_SYS_PTV			2	/* Divisor: 2^(PTV+1) => 8 */
-#define CONFIG_SYS_HZ			1000
-
-/*
- * SDRAM Memory Map
- * Even though we use two CS all the memory
- * is mapped to one contiguous block
- */
-#define CONFIG_NR_DRAM_BANKS	1
-
-#define CONFIG_SYS_SDRAM_BASE		0x80000000
-#define CONFIG_SYS_INIT_SP_ADDR         (NON_SECURE_SRAM_END - \
-					 GENERATED_GBL_DATA_SIZE)
-
-#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
-
-/* Defines for SDRAM init */
-#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
-#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
-#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
-#endif
-
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_PALMAS_POWER
-#endif
 
 /* Defines for SPL */
-#define CONFIG_SPL
-#define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE		0x40300350
 #define CONFIG_SPL_MAX_SIZE		0x19000	/* 100K */
-#define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR
 #define CONFIG_SPL_DISPLAY_PRINT
-
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR	0x300 /* address 0x60000 */
-#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS	0x200 /* 256 KB */
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION	1
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME	"u-boot.img"
-
-#define CONFIG_SPL_LIBCOMMON_SUPPORT
-#define CONFIG_SPL_LIBDISK_SUPPORT
-#define CONFIG_SPL_I2C_SUPPORT
-#define CONFIG_SPL_MMC_SUPPORT
-#define CONFIG_SPL_FAT_SUPPORT
-#define CONFIG_SPL_LIBGENERIC_SUPPORT
-#define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
 
-/*
- * 64 bytes before this address should be set aside for u-boot.img's
- * header. That is 80E7FFC0--0x80E80000 should not be used for any
- * other needs.
- */
-#define CONFIG_SYS_TEXT_BASE		0x80E80000
-
-/*
- * BSS and malloc area 64MB into memory to allow enough
- * space for the kernel at the beginning of memory
- */
-#define CONFIG_SPL_BSS_START_ADDR	0x84000000
-#define CONFIG_SPL_BSS_MAX_SIZE		0x100000	/* 1 MB */
-#define CONFIG_SYS_SPL_MALLOC_START	0x84100000
-#define CONFIG_SYS_SPL_MALLOC_SIZE	0x100000	/* 1 MB */
-#define CONFIG_SPL_GPIO_SUPPORT
-
 #endif /* __CONFIG_OMAP5_COMMON_H */

include/configs/omap5_uevm.h +0 -2

index 47568e9..d10c2b5 100644
@@ -17,8 +17,6 @@
 	"uuid_disk=${uuid_gpt_disk};" \
 	"name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}"
 
-#include <configs/omap5_common.h>
-
 #define CONFIG_CONS_INDEX		3
 #define CONFIG_SYS_NS16550_COM3		UART3_BASE
 #define CONFIG_BAUDRATE			115200

@@ -42,9 +40,9 @@
 #define CONFIG_SYS_I2C_TCA642X_BUS_NUM 4
 #define CONFIG_SYS_I2C_TCA642X_ADDR 0x22

include/configs/omap5_uevm.h line 48

Quoted 10 lines

include/configs/omap5_uevm.h +3 -3

 
-#define CONFIG_SYS_PROMPT		"OMAP5432 uEVM # "
-
 #define CONSOLEDEV		"ttyO2"
-
 #define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC	16296
+
+#include <configs/omap5_common.h>
+
 #endif /* __CONFIG_OMAP5_EVM_H */

Would it be better to split this into two patches? one for OMAP5 and one for dra7xx?

Dan

Signature · 2 lines

------------------
Dan Murphy

Tom Rini

author

2013-08-02 20:26 UTC #25 lore raw

PATCH 9/10 TI:armv7: Enable CONFIG_CMD_SPI

In reply to Tom Rini

Add the generic "poke the SPI bus" command, with the SPI related defines.

Signed-off-by Tom Rini <[email protected]>

---
 include/configs/ti_armv7_common.h |    1 +
 1 file changed, 1 insertion(+)

include/configs/ti_armv7_common.h +1 -0

index 0734598..88ed85c 100644
@@ -75,6 +75,7 @@
 /* McSPI IP block */
 #define CONFIG_SPI
 #define CONFIG_OMAP3_SPI
+#define CONFIG_CMD_SPI
 
 /* GPIO block */
 #define CONFIG_OMAP_GPIO

Signature · 1 line

1.7.9.5

Dan Murphy

2013-08-06 18:34 UTC #26 lore raw

PATCH 9/10 TI:armv7: Enable CONFIG_CMD_SPI

Quoted 13 lines · Tom Rini

Add the generic "poke the SPI bus" command, with the SPI related defines.
Signed-off-by Tom Rini <[email protected]>
---
 include/configs/ti_armv7_common.h |    1 +
 1 file changed, 1 insertion(+)
include/configs/ti_armv7_common.h +0 -0
index 0734598..88ed85c 100644

include/configs/ti_armv7_common.h line 81

Quoted 7 lines

include/configs/ti_armv7_common.h +1 -0

@@ -75,6 +75,7 @@
 /* McSPI IP block */
 #define CONFIG_SPI
 #define CONFIG_OMAP3_SPI
+#define CONFIG_CMD_SPI
 
 /* GPIO block */
 #define CONFIG_OMAP_GPIO

Acked-by Dan Murphy <[email protected]>

Signature · 2 lines

------------------
Dan Murphy

Jagan Teki

2013-08-06 18:50 UTC #27 lore raw

PATCH 9/10 TI:armv7: Enable CONFIG_CMD_SPI

Quoted 19 lines · Dan Murphy

Quoted 18 lines · Tom Rini
Add the generic "poke the SPI bus" command, with the SPI related defines.
Signed-off-by Tom Rini <[email protected]>
---
  include/configs/ti_armv7_common.h |    1 +
  1 file changed, 1 insertion(+)
include/configs/ti_armv7_common.h +1 -0
index 0734598..88ed85c 100644
@@ -75,6 +75,7 @@
  /* McSPI IP block */
  #define CONFIG_SPI
  #define CONFIG_OMAP3_SPI
+#define CONFIG_CMD_SPI
 

Quoted 4 lines

include/configs/ti_armv7_common.h line 81
Quoted 2 lines
include/configs/ti_armv7_common.h +0 -0
  /* GPIO block */
  #define CONFIG_OMAP_GPIO
Acked-by Dan Murphy <[email protected]>

Reviewed-by Jagannadha Sutradharudu Teki <[email protected]>

--
Thanks,
Jagan.

Jagan Teki

2013-08-06 18:55 UTC #28 lore raw

PATCH 9/10 TI:armv7: Enable CONFIG_CMD_SPI

Quoted 26 lines · Jagan Teki

Quoted 20 lines · Dan Murphy
Quoted 19 lines · Tom Rini
Add the generic "poke the SPI bus" command, with the SPI related defines.
Signed-off-by Tom Rini <[email protected]>
---
  include/configs/ti_armv7_common.h |    1 +
  1 file changed, 1 insertion(+)
include/configs/ti_armv7_common.h +1 -0
index 0734598..88ed85c 100644
@@ -75,6 +75,7 @@
  /* McSPI IP block */
  #define CONFIG_SPI
  #define CONFIG_OMAP3_SPI
+#define CONFIG_CMD_SPI
 
Quoted 4 lines
include/configs/ti_armv7_common.h line 81
Quoted 2 lines
include/configs/ti_armv7_common.h +0 -0
  /* GPIO block */
  #define CONFIG_OMAP_GPIO
Acked-by Dan Murphy <[email protected]>

Quoted 5 lines

Reviewed-by Jagannadha Sutradharudu Teki <[email protected]>
--
Thanks,
Jagan.

Applied to u-boot-spi/master

--
Thanks,
Jagan.

Tom Rini

author

2013-08-06 19:03 UTC #29 lore raw

PATCH 9/10 TI:armv7: Enable CONFIG_CMD_SPI

Quoted 22 lines · Jagan Teki

Quoted 21 lines · Jagan Teki
Quoted 20 lines · Dan Murphy
Quoted 19 lines · Tom Rini
Add the generic "poke the SPI bus" command, with the SPI related defines.
Signed-off-by Tom Rini <[email protected]>
---
 include/configs/ti_armv7_common.h |    1 +
 1 file changed, 1 insertion(+)
include/configs/ti_armv7_common.h +1 -0
index 0734598..88ed85c 100644
@@ -75,6 +75,7 @@
 /* McSPI IP block */
 #define CONFIG_SPI
 #define CONFIG_OMAP3_SPI
+#define CONFIG_CMD_SPI
 

Quoted 8 lines

Quoted 6 lines
Quoted 4 lines
include/configs/ti_armv7_common.h line 81
Quoted 2 lines
include/configs/ti_armv7_common.h +0 -0
 /* GPIO block */
 #define CONFIG_OMAP_GPIO
Acked-by Dan Murphy <[email protected]>
Reviewed-by Jagannadha Sutradharudu Teki <[email protected]>
Applied to u-boot-spi/master

Eh? It's mostly a TI series, I'll bring it all in via u-boot-ti :) Thanks for the Reviewed-by tag.

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130806/16b6d276/attachment.pgp>

Jagan Teki

2013-08-06 19:10 UTC #30 lore raw

PATCH 9/10 TI:armv7: Enable CONFIG_CMD_SPI

Quoted 28 lines · Tom Rini

Quoted 27 lines · Jagan Teki
Quoted 26 lines · Jagan Teki
Quoted 24 lines · Dan Murphy
Quoted 14 lines · Tom Rini
Add the generic "poke the SPI bus" command, with the SPI related defines.
Signed-off-by Tom Rini <[email protected]>
---
 include/configs/ti_armv7_common.h |    1 +
 1 file changed, 1 insertion(+)
include/configs/ti_armv7_common.h +0 -0
index 0734598..88ed85c 100644
include/configs/ti_armv7_common.h line 81
Quoted 7 lines
include/configs/ti_armv7_common.h +1 -0
@@ -75,6 +75,7 @@
 /* McSPI IP block */
 #define CONFIG_SPI
 #define CONFIG_OMAP3_SPI
+#define CONFIG_CMD_SPI
 
 /* GPIO block */
 #define CONFIG_OMAP_GPIO
Acked-by Dan Murphy <[email protected]>

Quoted 6 lines

Quoted 3 lines
Quoted 1 line
Reviewed-by Jagannadha Sutradharudu Teki <[email protected]>
Applied to u-boot-spi/master
Eh? It's mostly a TI series, I'll bring it all in via u-boot-ti :) Thanks for the Reviewed-by tag.

Sure.!

--
Thanks,
Jagan.

Tom Rini

author

2013-08-02 20:26 UTC #31 lore raw

PATCH 10/10 TI:armv7: Enable CONFIG_CMD_GPIO

In reply to Tom Rini

Add the generic "poke a GPIO" command, with the GPIO related defines.

Signed-off-by Tom Rini <[email protected]>

---
 include/configs/ti_armv7_common.h |    1 +
 1 file changed, 1 insertion(+)

include/configs/ti_armv7_common.h +1 -0

index 88ed85c..dc3ff7c 100644
@@ -79,6 +79,7 @@
 
 /* GPIO block */
 #define CONFIG_OMAP_GPIO
+#define CONFIG_CMD_GPIO
 
 /*
  * GPMC NAND block.  We support 1 device and the physical address to

Signature · 1 line

1.7.9.5

Dan Murphy

2013-08-06 18:34 UTC #32 lore raw

PATCH 10/10 TI:armv7: Enable CONFIG_CMD_GPIO

Quoted 12 lines · Tom Rini

Add the generic "poke a GPIO" command, with the GPIO related defines.
Signed-off-by Tom Rini <[email protected]>
---
 include/configs/ti_armv7_common.h |    1 +
 1 file changed, 1 insertion(+)
include/configs/ti_armv7_common.h +0 -0
index 88ed85c..dc3ff7c 100644

include/configs/ti_armv7_common.h line 85

Quoted 7 lines

include/configs/ti_armv7_common.h +1 -0

@@ -79,6 +79,7 @@
 
 /* GPIO block */
 #define CONFIG_OMAP_GPIO
+#define CONFIG_CMD_GPIO
 
 /*
  * GPMC NAND block.  We support 1 device and the physical address to

Acked-by Dan Murphy <[email protected]>

Signature · 2 lines

------------------
Dan Murphy

Heiko Schocher

2013-08-03 04:51 UTC #33 lore raw

cover Introduce common config file for TI ARMv7 platforms

In reply to Tom Rini

Hello Tom,

Am 02.08.2013 22:26, schrieb Tom Rini:

Quoted 8 lines

Hey all,
The following series cleans up am335x a bit, and then uses that to introduce a common config file that can be used on all of the ARMv7 platforms from TI. This series converts am335x_evm, omap5_uevm and dra7xx_evm to use the new structure. There is room for further cleanup and consolidation but as they are invasive patches I don't want to hold these for too long. This is on top of u-boot-arm/master.

I posted support for three am335x based boards from siemens, see here:

http://patchwork.ozlabs.org/patch/263211/

The adaptions you made in your patchset are missing there now ... How to proceed?

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Tom Rini

author

2013-08-05 15:39 UTC #34 lore raw

cover Introduce common config file for TI ARMv7 platforms

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 13 lines · Heiko Schocher

Hello Tom,
Am 02.08.2013 22:26, schrieb Tom Rini:
Quoted 9 lines
Hey all,
The following series cleans up am335x a bit, and then uses that to introduce a common config file that can be used on all of the ARMv7 platforms from TI. This series converts am335x_evm, omap5_uevm and dra7xx_evm to use the new structure. There is room for further cleanup and consolidation but as they are invasive patches I don't want to hold these for too long. This is on top of u-boot-arm/master.

Quoted 7 lines

I posted support for three am335x based boards from siemens, see here:
http://patchwork.ozlabs.org/patch/263211/
The adaptions you made in your patchset are missing there now ... How to proceed?

I intentionally didn't convert the non-am335x_evm platforms as doing this does require a few sanity boots (and/or a lot of time looking at map files). I think a lot of siemens-common.h could go in favor of ti_am335x_common.h, and if there's stuff that's not in fact common (clock stuff like you already found), that'd be good to know.

- --
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJR/8coAAoJENk4IS6UOR1WODAP/2Y6sPMn0r40BlWbpFwMPmR7 K3H9hOoXoffjJhySLMNC4smXzjRAK0DIl1xPJAENL2bNT0yZRAg0Iom5RngadRmb ouXiE02SewYSDyOBCQdWBTLbV+4ONAYXmbJ9RD4zjCuVUHyfzcLSAemqAElYhyxb K9E8djPbexIwfmSZbVDmhnRMqEXCKUAdqWRhOfnFjbi/EYPRYUOpAWd+8nxZ2I7A EN2TVwcJb0V2B02QuPZh0AtLfj15ocBVCZ0MiPdV6xiOw/XHLMXiTWNmk+kOUcQh jDqr9dyl8T8pHwiHaFMyksqB5HF13AYlKQwWpT2KXv8UyIC7/iwBNWiCN1Mff8FU PbCOuA/yIVWLNSRjSa1KVkef/hpsz+gLSa3so5oG6DB5SZeOcL+44abTJ64/NT14 r0uwcJ2r3VGizzjiA+m46uHE0HOLUMCPrbTCRp6BV1mwW3PR3b6PDmadrc/LSnZF nCobIIyivic6SFxIm09Pq3aT10dW/moEFdyI4s0b6uU7mzHV+86JB90YkqjQdw4e DyFtdDApuf17wToDLCRabuMiVGr/QwA9sVtAjo36HDJPsWyaBN0wjyKlthrHDS6x 6lBMsz7XAPiNhwa+QDbz4+WTPCpInJWln7uUQfAGlMy1zzRmpVWFF6QTBJdFG6Uw GZ2rsfuIldC31TDy/oE+
=K0hu
-----END PGP SIGNATURE-----