Skip to contentSkip to conversation

davinci: omapl138_lcdk: align mmcboot with rest of TI boards

PATCH New Sekhar Nori 3 participants 22 messages Apr 6, 2017 – Apr 10, 2017

lore
Share & tools
lore

Sekhar Nori

author
#0 lore raw

cover davinci: omapl138_lcdk: align mmcboot with rest of TI boards

Hi,

This patch series aligns OMAP-L138 LCDK board to use same MMC/SD boot related environment variables as rest of TI platforms.

This helps the board use uEnv.txt and creates similar look and feel as rest of TI platforms.

Tested on OMAP-L138 LCKD and AM437x GP EVM. Build tested using buildman on all OMAP, AMx, DaVinci and Keystone boards.

Sekhar Nori (5):
davinci: omapl138_lcdk: remove spiboot
davinci: omapl138_lcdk: enable some filesystem related commands
davinci: omapl138_lcdk: use environment variables for memory addresses
ARM: ti: consolidate mmc environment variables
davinci: omapl138_lcdk: switch to using common mmc args

 configs/omapl138_lcdk_defconfig   |  2 ++
 include/configs/am335x_evm.h      |  4 ++-
 include/configs/am43xx_evm.h      |  4 ++-
 include/configs/k2g_evm.h         |  2 ++
 include/configs/omapl138_lcdk.h   | 39 +++++++++++-----------
 include/configs/ti_armv7_common.h | 61 -----------------------------------
 include/configs/ti_omap4_common.h |  1 +
 include/configs/ti_omap5_common.h |  2 ++
 include/environment/ti/mmc.h      | 68 +++++++++++++++++++++++++++++++++++++++
 9 files changed, 99 insertions(+), 84 deletions(-)
 create mode 100644 include/environment/ti/mmc.h
Signature · 1 line
2.9.0
author
#1 lore raw

PATCH 1/5 davinci: omapl138_lcdk: remove spiboot

OMAP-L138 LCDK board does not have a SPI flash.
Remove spiboot related environment variable
definitions.

Signed-off-by Sekhar Nori <[email protected]>
---
 include/configs/omapl138_lcdk.h | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
include/configs/omapl138_lcdk.h +2 -8
index 6700073aa203..f6aca0482527 100644
@@ -264,9 +264,7 @@
 #define CONFIG_BOOTARGS		"console=ttyS2,115200n8 root=/dev/mmcblk0p2 rw rootwait ip=off"
 #define CONFIG_BOOTCOMMAND \
 	"if mmc rescan; then " \
-		"run mmcboot; " \
-	"else " \
-		"run spiboot; " \
+		"run mmcboot; "
 	"fi"
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"fdtaddr=0xc0600000\0" \

@@ -280,11 +278,7 @@
 				__stringify(CONFIG_BOOTFILE) "; " \
 			"fatload mmc 0 ${fdtaddr} ${fdtfile}; " \
 			"run fdtboot; " \
-		"fi;\0" \
-	"spiboot=" \
-		"sf probe 0; " \
-		"sf read 0xc0700000 0x80000 0x220000; " \
-		"bootz 0xc0700000;\0"
+		"fi;\0"
 
 /*
  * U-Boot commands
Signature · 1 line
2.9.0
#2 lore raw

PATCH 1/5 davinci: omapl138_lcdk: remove spiboot

Quoted 27 lines · On Thu, 6 Apr 2017 14:52:53 +0530 Sekhar Nori <[email protected]> wrote:

OMAP-L138 LCDK board does not have a SPI flash.
Remove spiboot related environment variable
definitions.

Signed-off-by Sekhar Nori <[email protected]>
---
 include/configs/omapl138_lcdk.h | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
(quoted diff) +0 -0

b/include/configs/omapl138_lcdk.h index 6700073aa203..f6aca0482527 100644 --- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h

include/configs/omapl138_lcdk.h +1 -3
@@ -264,9 +264,7 @@
 #define CONFIG_BOOTARGS		"console=ttyS2,115200n8
 root=/dev/mmcblk0p2 rw rootwait ip=off" #define CONFIG_BOOTCOMMAND \
 	"if mmc rescan; then " \
-		"run mmcboot; " \
-	"else " \
-		"run spiboot; " \
+		"run mmcboot; "
 	"fi"
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"fdtaddr=0xc0600000\0" \

@@ -280,11 +278,7 @@
 				__stringify(CONFIG_BOOTFILE) "; " \
 			"fatload mmc 0 ${fdtaddr} ${fdtfile}; " \

include/configs/omapl138_lcdk.h line 284

Quoted 10 lines
include/configs/omapl138_lcdk.h +1 -5
 			"run fdtboot; " \
-		"fi;\0" \
-	"spiboot=" \
-		"sf probe 0; " \
-		"sf read 0xc0700000 0x80000 0x220000; " \
-		"bootz 0xc0700000;\0"
+		"fi;\0"
 
 /*
  * U-Boot commands
Reviewed-by Lukasz Majewski <[email protected]>

Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de

#3 lore raw

PATCH 1/5 davinci: omapl138_lcdk: remove spiboot

In reply to Sekhar Nori
Quoted 5 lines · Sekhar Nori

OMAP-L138 LCDK board does not have a SPI flash.
Remove spiboot related environment variable
definitions.

Signed-off-by Sekhar Nori <[email protected]>
Reviewed-by Tom Rini <[email protected]>
Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170406/8f1611be/attachment.sig>
#4 lore raw

PATCH 1/5 davinci: omapl138_lcdk: remove spiboot

In reply to Sekhar Nori
Quoted 7 lines · Sekhar Nori

OMAP-L138 LCDK board does not have a SPI flash. Remove spiboot related environment variable definitions.

Signed-off-by Sekhar Nori <[email protected]>
Reviewed-by Lukasz Majewski <[email protected]>
Reviewed-by Tom Rini <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170410/3b4a5299/attachment.sig>
author
#5 lore raw

PATCH 2/5 davinci: omapl138_lcdk: enable some filesystem related commands

In reply to Sekhar Nori

Enable some generic filesystem commands as
well as disk partition related commands for
OMAP-L138 LCDK board.

These help in booting Linux from MMC/SD, for
example.

Signed-off-by Sekhar Nori <[email protected]>
---
 configs/omapl138_lcdk_defconfig | 2 ++
 1 file changed, 2 insertions(+)
configs/omapl138_lcdk_defconfig +2 -0
index 352c9b462544..7c8228bf5bcb 100644
@@ -27,6 +27,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
+CONFIG_CMD_FS_GENERIC=y
+CONFIG_CMD_PART=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x28000
 CONFIG_SPI_FLASH=y
Signature · 1 line
2.9.0
#6 lore raw

PATCH 2/5 davinci: omapl138_lcdk: enable some filesystem related commands

Quoted 17 lines · On Thu, 6 Apr 2017 14:52:54 +0530 Sekhar Nori <[email protected]> wrote:

Enable some generic filesystem commands as
well as disk partition related commands for
OMAP-L138 LCDK board.

These help in booting Linux from MMC/SD, for
example.

Signed-off-by Sekhar Nori <[email protected]>
---
 configs/omapl138_lcdk_defconfig | 2 ++
 1 file changed, 2 insertions(+)
(quoted diff) +0 -0

b/configs/omapl138_lcdk_defconfig index 352c9b462544..7c8228bf5bcb 100644 --- a/configs/omapl138_lcdk_defconfig
+++ b/configs/omapl138_lcdk_defconfig

configs/omapl138_lcdk_defconfig CONFIG_CMD_PING=y · line 34

Quoted 8 lines
configs/omapl138_lcdk_defconfig +2 -0
@@ -27,6 +27,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
+CONFIG_CMD_FS_GENERIC=y
+CONFIG_CMD_PART=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x28000
 CONFIG_SPI_FLASH=y
Reviewed-by Lukasz Majewski <[email protected]>

Just one question -> was this generated with make savedefconfig or added by hand?

Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de

author
#7 lore raw

PATCH 2/5 davinci: omapl138_lcdk: enable some filesystem related commands

Hi Lukasz,

Quoted 31 lines · Lukasz Majewski
Quoted 17 lines · On Thu, 6 Apr 2017 14:52:54 +0530 Sekhar Nori <[email protected]> wrote:

Enable some generic filesystem commands as
well as disk partition related commands for
OMAP-L138 LCDK board.

These help in booting Linux from MMC/SD, for
example.

Signed-off-by Sekhar Nori <[email protected]>
---
 configs/omapl138_lcdk_defconfig | 2 ++
 1 file changed, 2 insertions(+)
(quoted diff) +0 -0

b/configs/omapl138_lcdk_defconfig index 352c9b462544..7c8228bf5bcb 100644 --- a/configs/omapl138_lcdk_defconfig
+++ b/configs/omapl138_lcdk_defconfig

configs/omapl138_lcdk_defconfig CONFIG_CMD_PING=y · line 34

Quoted 8 lines
configs/omapl138_lcdk_defconfig +2 -0
@@ -27,6 +27,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
+CONFIG_CMD_FS_GENERIC=y
+CONFIG_CMD_PART=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x28000
 CONFIG_SPI_FLASH=y
Reviewed-by Lukasz Majewski <[email protected]>
Quoted 2 lines

Just one question -> was this generated with make savedefconfig or added by hand?

Thanks for the review! This was added by hand.

Thanks,
Sekhar

#8 lore raw

PATCH 2/5 davinci: omapl138_lcdk: enable some filesystem related commands

In reply to Sekhar Nori
Quoted 8 lines · Sekhar Nori

Enable some generic filesystem commands as
well as disk partition related commands for
OMAP-L138 LCDK board.

These help in booting Linux from MMC/SD, for
example.

Signed-off-by Sekhar Nori <[email protected]>
Reviewed-by Tom Rini <[email protected]>
Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170406/fe7a7178/attachment.sig>
#9 lore raw

PATCH 2/5 davinci: omapl138_lcdk: enable some filesystem related commands

In reply to Sekhar Nori
Quoted 10 lines · Sekhar Nori

Enable some generic filesystem commands as well as disk partition related commands for OMAP-L138 LCDK board.

These help in booting Linux from MMC/SD, for example.

Signed-off-by Sekhar Nori <[email protected]>
Reviewed-by Lukasz Majewski <[email protected]>
Reviewed-by Tom Rini <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170410/d39f882e/attachment.sig>
author
#10 lore raw

PATCH 3/5 davinci: omapl138_lcdk: use environment variables for memory addresses

In reply to Sekhar Nori

Use environment variables for various memory addresses used on OMAP-L138 LCDK board. This makes it easy to customize the boot process.

Signed-off-by Sekhar Nori <[email protected]>
---
 include/configs/omapl138_lcdk.h | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
include/configs/omapl138_lcdk.h +11 -5
index f6aca0482527..599fd5b7a874 100644
@@ -266,15 +266,21 @@
 	"if mmc rescan; then " \
 		"run mmcboot; "
 	"fi"
-#define CONFIG_EXTRA_ENV_SETTINGS \
+
+#define DEFAULT_LINUX_BOOT_ENV \
+	"loadaddr=0xc0700000\0" \
 	"fdtaddr=0xc0600000\0" \
+	"scriptaddr=0xc0600000\0"
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	DEFAULT_LINUX_BOOT_ENV \
 	"fdtfile=da850-lcdk.dtb\0" \
-	"fdtboot=bootz 0xc0700000 - ${fdtaddr};\0" \
+	"fdtboot=bootz ${loadaddr} - ${fdtaddr};\0" \
 	"mmcboot=" \
-		"if fatload mmc 0 0xc0600000 boot.scr; then " \
-			"source 0xc0600000; " \
+		"if fatload mmc 0 ${scriptaddr} boot.scr; then " \
+			"source ${scriptaddr}; " \
 		"else " \
-			"fatload mmc 0 0xc0700000 " \
+			"fatload mmc 0 ${loadaddr} " \
 				__stringify(CONFIG_BOOTFILE) "; " \
 			"fatload mmc 0 ${fdtaddr} ${fdtfile}; " \
 			"run fdtboot; " \
Signature · 1 line
2.9.0
#11 lore raw

PATCH 3/5 davinci: omapl138_lcdk: use environment variables for memory addresses

Quoted 30 lines · On Thu, 6 Apr 2017 14:52:55 +0530 Sekhar Nori <[email protected]> wrote:

Use environment variables for various memory addresses used on OMAP-L138 LCDK board. This makes it easy to customize the boot process.

Signed-off-by Sekhar Nori <[email protected]>
---
 include/configs/omapl138_lcdk.h | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
(quoted diff) +0 -0

b/include/configs/omapl138_lcdk.h index f6aca0482527..599fd5b7a874 100644 --- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h

include/configs/omapl138_lcdk.h +8 -2
@@ -266,15 +266,21 @@
 	"if mmc rescan; then " \
 		"run mmcboot; "
 	"fi"
-#define CONFIG_EXTRA_ENV_SETTINGS \
+
+#define DEFAULT_LINUX_BOOT_ENV \
+	"loadaddr=0xc0700000\0" \
 	"fdtaddr=0xc0600000\0" \
+	"scriptaddr=0xc0600000\0"
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	DEFAULT_LINUX_BOOT_ENV \
 	"fdtfile=da850-lcdk.dtb\0" \
-	"fdtboot=bootz 0xc0700000 - ${fdtaddr};\0" \
+	"fdtboot=bootz ${loadaddr} - ${fdtaddr};\0" \
 	"mmcboot=" \

include/configs/omapl138_lcdk.h line 286

Quoted 10 lines
include/configs/omapl138_lcdk.h +3 -3
-		"if fatload mmc 0 0xc0600000 boot.scr; then " \
-			"source 0xc0600000; " \
+		"if fatload mmc 0 ${scriptaddr} boot.scr; then " \
+			"source ${scriptaddr}; " \
 		"else " \
-			"fatload mmc 0 0xc0700000 " \
+			"fatload mmc 0 ${loadaddr} " \
 				__stringify(CONFIG_BOOTFILE) "; " \
 			"fatload mmc 0 ${fdtaddr} ${fdtfile}; " \
 			"run fdtboot; " \
Reviewed-by Lukasz Majewski <[email protected]>

Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de

#12 lore raw

PATCH 3/5 davinci: omapl138_lcdk: use environment variables for memory addresses

In reply to Sekhar Nori
Quoted 5 lines · Sekhar Nori

Use environment variables for various memory addresses used on OMAP-L138 LCDK board. This makes it easy to customize the boot process.

Signed-off-by Sekhar Nori <[email protected]>
Reviewed-by Tom Rini <[email protected]>
Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170406/d68d3d89/attachment.sig>
#13 lore raw

PATCH 3/5 davinci: omapl138_lcdk: use environment variables for memory addresses

In reply to Sekhar Nori
Quoted 7 lines · Sekhar Nori

Use environment variables for various memory addresses used on OMAP-L138 LCDK board. This makes it easy to customize the boot process.

Signed-off-by Sekhar Nori <[email protected]>
Reviewed-by Lukasz Majewski <[email protected]>
Reviewed-by Tom Rini <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170410/64ada479/attachment.sig>
author
#14 lore raw

PATCH 4/5 ARM: ti: consolidate mmc environment variables

In reply to Sekhar Nori

Introduce include/environment/ti/mmc.h that
consolidates environment variable definitions
for various TI boards that support MMC/SD.

This allows reuse of same environment variables
on non-ARMv7 TI platforms like OMAP-L138 for
example.

While at it, move DFU-related environment variable includes to only non-SPL builds for AM335x and AM437x since they are not really used for SPL today.

Signed-off-by Sekhar Nori <[email protected]>
---
 include/configs/am335x_evm.h      |  4 ++-
 include/configs/am43xx_evm.h      |  4 ++-
 include/configs/k2g_evm.h         |  2 ++
 include/configs/ti_armv7_common.h | 61 -----------------------------------
 include/configs/ti_omap4_common.h |  1 +
 include/configs/ti_omap5_common.h |  2 ++
 include/environment/ti/mmc.h      | 68 +++++++++++++++++++++++++++++++++++++++
 7 files changed, 79 insertions(+), 63 deletions(-)
 create mode 100644 include/environment/ti/mmc.h
include/configs/am335x_evm.h +3 -1
index 27126871f731..d16b33f6da46 100644
@@ -17,7 +17,6 @@
 #define __CONFIG_AM335X_EVM_H
 
 #include <configs/ti_am335x_common.h>
-#include <environment/ti/dfu.h>
 
 #ifndef CONFIG_SPL_BUILD
 # define CONFIG_TIMESTAMP

@@ -96,6 +95,9 @@
 #include <config_distro_bootcmd.h>
 
 #ifndef CONFIG_SPL_BUILD
+#include <environment/ti/dfu.h>
+#include <environment/ti/mmc.h>
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	DEFAULT_MMC_TI_ARGS \
include/configs/am43xx_evm.h +3 -1
index ec99958fcd50..1feb94683435 100644
@@ -13,7 +13,6 @@
 #define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 21)	/* 2GB */
 #define CONFIG_SYS_TIMERBASE		0x48040000	/* Use Timer2 */
 
-#include <environment/ti/dfu.h>
 #include <asm/arch/omap.h>
 
 /* NS16550 Configuration */

@@ -162,6 +161,9 @@
 #define CONFIG_TI_EDMA3
 
 #ifndef CONFIG_SPL_BUILD
+#include <environment/ti/dfu.h>
+#include <environment/ti/mmc.h>
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	DEFAULT_MMC_TI_ARGS \
include/configs/k2g_evm.h +2 -0
index bd252312a20b..cb63bef6fcea 100644
@@ -10,6 +10,8 @@
 #ifndef __CONFIG_K2G_EVM_H
 #define __CONFIG_K2G_EVM_H
 
+#include <environment/ti/mmc.h>
+
 /* Platform type */
 #define CONFIG_SOC_K2G
include/configs/ti_armv7_common.h +0 -61

67 lines not on this page · raw message

include/configs/ti_omap4_common.h +1 -0
index d07cb9ffb4b3..b85db500b574 100644
@@ -104,6 +104,7 @@
 	"run distro_bootcmd"
 
 #include <config_distro_bootcmd.h>
+#include <environment/ti/mmc.h>
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
include/configs/ti_omap5_common.h +2 -0
index 97bd874e6cdd..d45baabf0b60 100644
@@ -58,6 +58,8 @@
 #define DFUARGS
 #endif
 
+#include <environment/ti/mmc.h>
+
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
include/environment/ti/mmc.h new file +68 -0

68 lines not on this page · raw message

Signature · 1 line
2.9.0
#15 lore raw

PATCH 4/5 ARM: ti: consolidate mmc environment variables

Quoted 261 lines · On Thu, 6 Apr 2017 14:52:56 +0530 Sekhar Nori <[email protected]> wrote:

Introduce include/environment/ti/mmc.h that consolidates environment variable definitions for various TI boards that support MMC/SD.

This allows reuse of same environment variables on non-ARMv7 TI platforms like OMAP-L138 for example.

While at it, move DFU-related environment variable includes to only non-SPL builds for AM335x and AM437x since they are not really used for SPL today.

Signed-off-by Sekhar Nori <[email protected]>
---
 include/configs/am335x_evm.h      |  4 ++-
 include/configs/am43xx_evm.h      |  4 ++-
 include/configs/k2g_evm.h         |  2 ++
 include/configs/ti_armv7_common.h | 61
----------------------------------- include/configs/ti_omap4_common.h
|  1 + include/configs/ti_omap5_common.h |  2 ++
 include/environment/ti/mmc.h      | 68

+++++++++++++++++++++++++++++++++++++++ 7 files changed, 79 insertions(+), 63 deletions(-) create mode 100644 include/environment/ti/mmc.h

(quoted diff) +0 -0

b/include/configs/am335x_evm.h index 27126871f731..d16b33f6da46 100644

include/configs/am335x_evm.h +3 -1
@@ -17,7 +17,6 @@
 #define __CONFIG_AM335X_EVM_H
 
 #include <configs/ti_am335x_common.h>
-#include <environment/ti/dfu.h>
 
 #ifndef CONFIG_SPL_BUILD
 # define CONFIG_TIMESTAMP

@@ -96,6 +95,9 @@
 #include <config_distro_bootcmd.h>
 
 #ifndef CONFIG_SPL_BUILD
+#include <environment/ti/dfu.h>
+#include <environment/ti/mmc.h>
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	DEFAULT_MMC_TI_ARGS \
(quoted diff) +0 -0

b/include/configs/am43xx_evm.h index ec99958fcd50..1feb94683435 100644

include/configs/am43xx_evm.h +0 -0
@@ -13,7 +13,6 @@
 #define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 21)	/* 2GB */
 #define CONFIG_SYS_TIMERBASE		0x48040000	/* Use

Timer2 */

include/configs/am43xx_evm.h +3 -1
-#include <environment/ti/dfu.h>
 #include <asm/arch/omap.h>
 
 /* NS16550 Configuration */

@@ -162,6 +161,9 @@
 #define CONFIG_TI_EDMA3
 
 #ifndef CONFIG_SPL_BUILD
+#include <environment/ti/dfu.h>
+#include <environment/ti/mmc.h>
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	DEFAULT_MMC_TI_ARGS \
include/configs/k2g_evm.h +2 -0
index bd252312a20b..cb63bef6fcea 100644
@@ -10,6 +10,8 @@
 #ifndef __CONFIG_K2G_EVM_H
 #define __CONFIG_K2G_EVM_H
 
+#include <environment/ti/mmc.h>
+
 /* Platform type */
 #define CONFIG_SOC_K2G
(quoted diff) +0 -0

b/include/configs/ti_armv7_common.h index a4ec4ce00a88..c0cf35e5342a 100644 --- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h

include/configs/ti_armv7_common.h +0 -16
@@ -51,67 +51,6 @@
 	"bootm_size=0x10000000\0" \
 	"boot_fdt=try\0"
 
-#define DEFAULT_MMC_TI_ARGS \
-	"mmcdev=0\0" \
-	"mmcrootfstype=ext4 rootwait\0" \
-	"finduuid=part uuid mmc ${bootpart} uuid\0" \
-	"args_mmc=run finduuid;setenv bootargs console=${console} " \
-		"${optargs} " \
-		"root=PARTUUID=${uuid} rw " \
-		"rootfstype=${mmcrootfstype}\0" \
-	"loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
-	"bootscript=echo Running bootscript from mmc${mmcdev} ...; "
 \
-		"source ${loadaddr}\0" \
-	"bootenvfile=uEnv.txt\0" \
-	"importbootenv=echo Importing environment from
 mmc${mmcdev} ...; " \
-		"env import -t ${loadaddr} ${filesize}\0" \
-	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr}
 ${bootenvfile}\0" \
-	"loadimage=load ${devtype} ${bootpart} ${loadaddr}

${bootdir}/${bootfile}\0" \

(quoted diff) +0 -1
-	"loadfdt=load ${devtype} ${bootpart} ${fdtaddr}

${bootdir}/${fdtfile}\0" \

include/configs/ti_armv7_common.h +0 -8
-	"envboot=mmc dev ${mmcdev}; " \
-		"if mmc rescan; then " \
-			"echo SD/MMC found on device ${mmcdev};" \
-			"if run loadbootscript; then " \
-				"run bootscript;" \
-			"else " \
-				"if run loadbootenv; then " \
-					"echo Loaded env from

${bootenvfile};" \

include/configs/ti_armv7_common.h +0 -10
-					"run importbootenv;" \
-				"fi;" \
-				"if test -n $uenvcmd; then " \
-					"echo Running uenvcmd ...;" \
-					"run uenvcmd;" \
-				"fi;" \
-			"fi;" \
-		"fi;\0" \
-	"mmcloados=run args_mmc; " \
-		"if test ${boot_fdt} = yes || test ${boot_fdt} =

try; then " \

include/configs/ti_armv7_common.h +0 -7
-			"if run loadfdt; then " \
-				"bootz ${loadaddr} - ${fdtaddr}; " \
-			"else " \
-				"if test ${boot_fdt} = try; then " \
-					"bootz; " \
-				"else " \
-					"echo WARN: Cannot load the

DT; " \

include/configs/ti_armv7_common.h +0 -19
-				"fi; " \
-			"fi; " \
-		"else " \
-			"bootz; " \
-		"fi;\0" \
-	"mmcboot=mmc dev ${mmcdev}; " \
-		"setenv devnum ${mmcdev}; " \
-		"setenv devtype mmc; " \
-		"if mmc rescan; then " \
-			"echo SD/MMC found on device ${mmcdev};" \
-			"if run loadimage; then " \
-				"if test ${boot_fit} -eq 1; then " \
-					"run loadfit; " \
-				"else " \
-					"run mmcloados;" \
-				"fi;" \
-			"fi;" \
-		"fi;\0" \
-
 #define DEFAULT_FIT_TI_ARGS \
 	"boot_fit=0\0" \
 	"fit_loadaddr=0x88000000\0" \
(quoted diff) +0 -0

b/include/configs/ti_omap4_common.h index d07cb9ffb4b3..b85db500b574 100644 --- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h

include/configs/ti_omap4_common.h +1 -0
@@ -104,6 +104,7 @@
 	"run distro_bootcmd"
 
 #include <config_distro_bootcmd.h>
+#include <environment/ti/mmc.h>
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
(quoted diff) +0 -0

b/include/configs/ti_omap5_common.h index 97bd874e6cdd..d45baabf0b60 100644 --- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h

include/configs/ti_omap5_common.h +2 -0
@@ -58,6 +58,8 @@
 #define DFUARGS
 #endif
 
+#include <environment/ti/mmc.h>
+
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
(quoted diff) +0 -0

b/include/environment/ti/mmc.h new file mode 100644 index 000000000000..b987f71516db

include/environment/ti/mmc.h new file +2 -0
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2017 Texas Instruments Incorporated -

http://www.ti.com
+ *
+ * Environment variable definitions for MMC/SD on TI boards.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */

include/environment/ti/mmc.h new file +11 -0
+
+#define DEFAULT_MMC_TI_ARGS \
+	"mmcdev=0\0" \
+	"mmcrootfstype=ext4 rootwait\0" \
+	"finduuid=part uuid mmc ${bootpart} uuid\0" \
+	"args_mmc=run finduuid;setenv bootargs console=${console} " \
+		"${optargs} " \
+		"root=PARTUUID=${uuid} rw " \
+		"rootfstype=${mmcrootfstype}\0" \
+	"loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
+	"bootscript=echo Running bootscript from mmc${mmcdev} ...; "

\

include/environment/ti/mmc.h new file +3 -0
+		"source ${loadaddr}\0" \
+	"bootenvfile=uEnv.txt\0" \
+	"importbootenv=echo Importing environment from

mmc${mmcdev} ...; " \

include/environment/ti/mmc.h new file +2 -0
+		"env import -t ${loadaddr} ${filesize}\0" \
+	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr}

${bootenvfile}\0" \

include/environment/ti/mmc.h new file +1 -0
+	"loadimage=load ${devtype} ${bootpart} ${loadaddr}

${bootdir}/${bootfile}\0" \

include/environment/ti/mmc.h new file +1 -0
+	"loadfdt=load ${devtype} ${bootpart} ${fdtaddr}

${bootdir}/${fdtfile}\0" \

include/environment/ti/mmc.h new file +8 -0
+	"envboot=mmc dev ${mmcdev}; " \
+		"if mmc rescan; then " \
+			"echo SD/MMC found on device ${mmcdev};" \
+			"if run loadbootscript; then " \
+				"run bootscript;" \
+			"else " \
+				"if run loadbootenv; then " \
+					"echo Loaded env from

${bootenvfile};" \

include/environment/ti/mmc.h new file +10 -0
+					"run importbootenv;" \
+				"fi;" \
+				"if test -n $uenvcmd; then " \
+					"echo Running uenvcmd ...;" \
+					"run uenvcmd;" \
+				"fi;" \
+			"fi;" \
+		"fi;\0" \
+	"mmcloados=run args_mmc; " \
+		"if test ${boot_fdt} = yes || test ${boot_fdt} =

try; then " \

include/environment/ti/mmc.h new file +7 -0
+			"if run loadfdt; then " \
+				"bootz ${loadaddr} - ${fdtaddr}; " \
+			"else " \
+				"if test ${boot_fdt} = try; then " \
+					"bootz; " \
+				"else " \
+					"echo WARN: Cannot load the

DT; " \

include/environment/ti/mmc.h new file +8 -0
+				"fi; " \
+			"fi; " \
+		"else " \
+			"bootz; " \
+		"fi;\0" \
+	"mmcboot=mmc dev ${mmcdev}; " \
+		"setenv devnum ${mmcdev}; " \
+		"setenv devtype mmc; " \

include/environment/ti/mmc.h line 68

Quoted 10 lines
include/environment/ti/mmc.h new file +10 -0
+		"if mmc rescan; then " \
+			"echo SD/MMC found on device ${mmcdev};" \
+			"if run loadimage; then " \
+				"if test ${boot_fit} -eq 1; then " \
+					"run loadfit; " \
+				"else " \
+					"run mmcloados;" \
+				"fi;" \
+			"fi;" \
+		"fi;\0"
Reviewed-by Lukasz Majewski <[email protected]>

Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de

#16 lore raw

PATCH 4/5 ARM: ti: consolidate mmc environment variables

In reply to Sekhar Nori
Quoted 8 lines · Sekhar Nori

Introduce include/environment/ti/mmc.h that consolidates environment variable definitions for various TI boards that support MMC/SD.

This allows reuse of same environment variables on non-ARMv7 TI platforms like OMAP-L138 for example.

Quoted 6 lines

While at it, move DFU-related environment variable includes to only non-SPL builds for AM335x and AM437x since they are not really used for SPL today.

Signed-off-by Sekhar Nori <[email protected]>
Reviewed-by Tom Rini <[email protected]>
Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170406/054d27c5/attachment.sig>
#17 lore raw

PATCH 4/5 ARM: ti: consolidate mmc environment variables

In reply to Sekhar Nori
Quoted 8 lines · Sekhar Nori

Introduce include/environment/ti/mmc.h that consolidates environment variable definitions for various TI boards that support MMC/SD.

This allows reuse of same environment variables on non-ARMv7 TI platforms like OMAP-L138 for example.

Quoted 8 lines

While at it, move DFU-related environment variable includes to only non-SPL builds for AM335x and AM437x since they are not really used for SPL today.

Signed-off-by Sekhar Nori <[email protected]>
Reviewed-by Lukasz Majewski <[email protected]>
Reviewed-by Tom Rini <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170410/f40b3297/attachment.sig>
author
#18 lore raw

PATCH 5/5 davinci: omapl138_lcdk: switch to using common mmc args

In reply to Sekhar Nori

Now that we have common MMC/SD boot environment variables that can be used across TI platforms, switch OMAP-L138 LCDK to use them.

As a nice side-effect, we get support for using uEnv.txt on this platform.

Signed-off-by Sekhar Nori <[email protected]>
---
 include/configs/omapl138_lcdk.h | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)
include/configs/omapl138_lcdk.h +10 -13
index 599fd5b7a874..e70760402b43 100644
@@ -261,30 +261,27 @@
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_REVISION_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_BOOTARGS		"console=ttyS2,115200n8 root=/dev/mmcblk0p2 rw rootwait ip=off"
 #define CONFIG_BOOTCOMMAND \
-	"if mmc rescan; then " \
+		"run envboot; " \
 		"run mmcboot; "
-	"fi"
 
 #define DEFAULT_LINUX_BOOT_ENV \
 	"loadaddr=0xc0700000\0" \
 	"fdtaddr=0xc0600000\0" \
 	"scriptaddr=0xc0600000\0"
 
+#include <environment/ti/mmc.h>
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
+	DEFAULT_MMC_TI_ARGS \
+	"bootpart=0:2\0" \
+	"bootdir=/boot\0" \
+	"bootfile=zImage\0" \
 	"fdtfile=da850-lcdk.dtb\0" \
-	"fdtboot=bootz ${loadaddr} - ${fdtaddr};\0" \
-	"mmcboot=" \
-		"if fatload mmc 0 ${scriptaddr} boot.scr; then " \
-			"source ${scriptaddr}; " \
-		"else " \
-			"fatload mmc 0 ${loadaddr} " \
-				__stringify(CONFIG_BOOTFILE) "; " \
-			"fatload mmc 0 ${fdtaddr} ${fdtfile}; " \
-			"run fdtboot; " \
-		"fi;\0"
+	"boot_fdt=yes\0" \
+	"boot_fit=0\0" \
+	"console=ttyS2,115200n8\0"
 
 /*
  * U-Boot commands
Signature · 1 line
2.9.0
#19 lore raw

PATCH 5/5 davinci: omapl138_lcdk: switch to using common mmc args

Quoted 47 lines · On Thu, 6 Apr 2017 14:52:57 +0530 Sekhar Nori <[email protected]> wrote:

Now that we have common MMC/SD boot environment variables that can be used across TI platforms, switch OMAP-L138 LCDK to use them.

As a nice side-effect, we get support for using uEnv.txt on this platform.

Signed-off-by Sekhar Nori <[email protected]>
---
 include/configs/omapl138_lcdk.h | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)
(quoted diff) +0 -0

b/include/configs/omapl138_lcdk.h index 599fd5b7a874..e70760402b43 100644 --- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h

include/configs/omapl138_lcdk.h +7 -9
@@ -261,30 +261,27 @@
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_REVISION_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_BOOTARGS		"console=ttyS2,115200n8
 root=/dev/mmcblk0p2 rw rootwait ip=off" #define CONFIG_BOOTCOMMAND \
-	"if mmc rescan; then " \
+		"run envboot; " \
 		"run mmcboot; "
-	"fi"
 
 #define DEFAULT_LINUX_BOOT_ENV \
 	"loadaddr=0xc0700000\0" \
 	"fdtaddr=0xc0600000\0" \
 	"scriptaddr=0xc0600000\0"
 
+#include <environment/ti/mmc.h>
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
+	DEFAULT_MMC_TI_ARGS \
+	"bootpart=0:2\0" \
+	"bootdir=/boot\0" \
+	"bootfile=zImage\0" \
 	"fdtfile=da850-lcdk.dtb\0" \
-	"fdtboot=bootz ${loadaddr} - ${fdtaddr};\0" \
-	"mmcboot=" \
-		"if fatload mmc 0 ${scriptaddr} boot.scr; then " \
-			"source ${scriptaddr}; " \
-		"else " \
-			"fatload mmc 0 ${loadaddr} " \

include/configs/omapl138_lcdk.h line 287

Quoted 10 lines
include/configs/omapl138_lcdk.h +3 -4
-				__stringify(CONFIG_BOOTFILE) "; " \
-			"fatload mmc 0 ${fdtaddr} ${fdtfile}; " \
-			"run fdtboot; " \
-		"fi;\0"
+	"boot_fdt=yes\0" \
+	"boot_fit=0\0" \
+	"console=ttyS2,115200n8\0"
 
 /*
  * U-Boot commands
Reviewed-by Lukasz Majewski <[email protected]>

Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de

#20 lore raw

PATCH 5/5 davinci: omapl138_lcdk: switch to using common mmc args

In reply to Sekhar Nori
Quoted 8 lines · Sekhar Nori

Now that we have common MMC/SD boot environment variables that can be used across TI platforms, switch OMAP-L138 LCDK to use them.

As a nice side-effect, we get support for using uEnv.txt on this platform.

Signed-off-by Sekhar Nori <[email protected]>
Reviewed-by Tom Rini <[email protected]>
Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170406/e410ac98/attachment.sig>
#21 lore raw

PATCH 5/5 davinci: omapl138_lcdk: switch to using common mmc args

In reply to Sekhar Nori
Quoted 10 lines · Sekhar Nori

Now that we have common MMC/SD boot environment variables that can be used across TI platforms, switch OMAP-L138 LCDK to use them.

As a nice side-effect, we get support for using uEnv.txt on this platform.

Signed-off-by Sekhar Nori <[email protected]>
Reviewed-by Lukasz Majewski <[email protected]>
Reviewed-by Tom Rini <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170410/63117dfe/attachment.sig>