Skip to contentSkip to conversation

TI:armv7: Switch to CONFIG_SYS_BOARD_GENERIC

PATCH New Tom Rini 1 participant 4 messages Apr 3, 2014 – Apr 18, 2014

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/2 TI:armv7: Switch to CONFIG_SYS_BOARD_GENERIC

Tested on AM335x GP EVM, AM335x EVM SK, Beaglebone White, Beaglebone Black, AM437xx GP EVM, OMAP5 uEVM, OMAP4 Pandaboard

---
 include/configs/ti_armv7_common.h |    1 +
 1 file changed, 1 insertion(+)
include/configs/ti_armv7_common.h +1 -0
index 69d69a5..abfaa76 100644
@@ -20,6 +20,7 @@
 /* Common define for many platforms. */
 #define CONFIG_OMAP
 #define CONFIG_OMAP_COMMON
+#define CONFIG_SYS_GENERIC_BOARD
 
 /*
  * We typically do not contain NOR flash.  In the cases where we do, we
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/2 TI:armv7: Switch to CONFIG_SYS_BOARD_GENERIC

Quoted 4 lines · Tom Rini

Tested on AM335x GP EVM, AM335x EVM SK, Beaglebone White, Beaglebone Black, AM437xx GP EVM, OMAP5 uEVM, OMAP4 Pandaboard

Applied to u-boot-ti/master, thanks!

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/20140418/f8048b15/attachment.pgp>
author
#2 lore raw

PATCH 2/2 TI:omap3: Convert omap3_beagle to ti_omap3_common.h

In reply to Tom Rini

Convert to using the common config files. This requires a little more flexibility in the common files than we had been using before.

---
 boards.cfg                        |    2 +-
 include/configs/omap3_beagle.h    |  184 +++----------------------------------
 include/configs/ti_armv7_common.h |    8 ++
 include/configs/ti_omap3_common.h |    1 +
 4 files changed, 25 insertions(+), 170 deletions(-)
boards.cfg +1 -1
index 69c8936..cab6b59 100644
@@ -346,7 +346,7 @@ Active  arm         armv7          omap3       technexion      tao3530
 Active  arm         armv7          omap3       technexion      twister             twister                              -                                                                                                                                 Stefano Babic <[email protected]>
 Active  arm         armv7          omap3       teejet          mt_ventoux          mt_ventoux                           -                                                                                                                                 Stefano Babic <[email protected]>
 Active  arm         armv7          omap3       ti              am3517crane         am3517_crane                         -                                                                                                                                 Nagendra T S  <[email protected]>
-Active  arm         armv7          omap3       ti              beagle              omap3_beagle                         -                                                                                                                                 Tom Rini <[email protected]>
+Active  arm         armv7          omap3       ti              beagle              omap3_beagle                         omap3_beagle:NAND                                                                                                                 Tom Rini <[email protected]>
 Active  arm         armv7          omap3       ti              evm                 omap3_evm                            -                                                                                                                                 Tom Rini <[email protected]>
 Active  arm         armv7          omap3       ti              evm                 omap3_evm_quick_mmc                  -                                                                                                                                 -
 Active  arm         armv7          omap3       ti              evm                 omap3_evm_quick_nand                 -                                                                                                                                 -
include/configs/omap3_beagle.h +15 -169

278 lines not on this page · raw message

include/configs/ti_armv7_common.h +8 -0
index abfaa76..147daf9 100644
@@ -91,7 +91,9 @@
  */
 #ifdef CONFIG_NAND
 #define CONFIG_NAND_OMAP_GPMC
+#ifndef CONFIG_SYS_NAND_BASE
 #define CONFIG_SYS_NAND_BASE		0x8000000
+#endif
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 #define CONFIG_CMD_NAND
 #endif
@@ -189,12 +191,18 @@
  * We have the SPL malloc pool@the end of the BSS area.
  */
 #define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR
+#ifndef CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_TEXT_BASE		0x80800000
+#endif
+#ifndef CONFIG_SPL_BSS_START_ADDR
 #define CONFIG_SPL_BSS_START_ADDR	0x80a00000
 #define CONFIG_SPL_BSS_MAX_SIZE		0x80000		/* 512 KB */
+#endif
+#ifndef CONFIG_SYS_SPL_MALLOC_START
 #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
+#endif
 
 /* RAW SD card / eMMC locations. */
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR	0x300 /* address 0x60000 */
include/configs/ti_omap3_common.h +1 -0
index 854cb78..26d3743 100644
@@ -65,6 +65,7 @@
 #ifdef CONFIG_NAND
 #define CONFIG_SPL_NAND_SUPPORT
 #define CONFIG_SPL_NAND_SIMPLE
+#define CONFIG_SYS_NAND_BASE		0x30000000
 #endif
 
 /* Now bring in the rest of the common code. */
Signature · 1 line
1.7.9.5
author
#3 lore raw

PATCH 2/2 TI:omap3: Convert omap3_beagle to ti_omap3_common.h

Quoted 4 lines · Tom Rini

Convert to using the common config files. This requires a little more flexibility in the common files than we had been using before.

Applied to u-boot-ti/master, thanks!

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/20140418/21dba37c/attachment.pgp>