arm: am57xx: cl-som-am57x: 2'nd stage

PATCH New Uri Mashiach 2 participants 13 messages May 17, 2017 – Jun 6, 2017

lore

Share & tools

lore

Uri Mashiach

author

2017-05-17 14:29 UTC #0 lore raw

cover arm: am57xx: cl-som-am57x: 2'nd stage

Various commits related to the CL-SOM-AM57x module.

Uri Mashiach (4):
arm: am57xx: cl-som-am57x: support for FS boot
arm: am57xx: cl-som-am57x: change the shell prompt
ARM: am57xx: cl-som-am57x: support for AM5718
arm: am57xx: cl-som-am57x: adjust default env to the installation
system

 board/compulab/cl-som-am57x/spl.c |  5 +++++
 configs/cl-som-am57x_defconfig    |  2 ++
 include/configs/cl-som-am57x.h    | 12 +++++++-----
 3 files changed, 14 insertions(+), 5 deletions(-)

Signature · 1 line

2.7.4

Uri Mashiach

author

2017-05-17 14:29 UTC #1 lore raw

PATCH 1/4 arm: am57xx: cl-som-am57x: support for FS boot

Supported boot devices are raw QSPI and raw SD card. Add support for a FAT16/32 file system for SD card.

The SOC's boot ROM only supports FAT file system. Therefore remove the SPL support for the EXT file system.

Signed-off-by Uri Mashiach <[email protected]>

---
 configs/cl-som-am57x_defconfig | 1 +
 include/configs/cl-som-am57x.h | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

configs/cl-som-am57x_defconfig +1 -0

index ed419a3..57d96b4 100644
@@ -5,6 +5,7 @@ CONFIG_TARGET_CL_SOM_AM57X=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
+# CONFIG_SPL_EXT_SUPPORT is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

include/configs/cl-som-am57x.h +3 -3

index 3000453..8e69306 100644
@@ -42,9 +42,9 @@
 #define CONFIG_SPL_SPI_FLASH_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 
-/* SD/MMC RAW boot */
-#undef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
-#undef CONFIG_SYS_MMCSD_FS_BOOT_PARTITION
+/* SD/MMC RAW/FS boot */
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
+#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
 
 /* Environment */
 #define CONFIG_ENV_SIZE			(16 << 10) /* 16 KiB env size */

Signature · 1 line

2.7.4

Tom Rini

2017-05-17 21:57 UTC #2 lore raw

PATCH 1/4 arm: am57xx: cl-som-am57x: support for FS boot

Quoted 7 lines · Uri Mashiach

Supported boot devices are raw QSPI and raw SD card. Add support for a FAT16/32 file system for SD card.
The SOC's boot ROM only supports FAT file system. Therefore remove the SPL support for the EXT file system.
Signed-off-by Uri Mashiach <[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/20170517/13c6a644/attachment.sig>

Tom Rini

2017-06-06 00:20 UTC #3 lore raw

PATCH 1/4 arm: am57xx: cl-som-am57x: support for FS boot

In reply to Uri Mashiach

Quoted 8 lines · Uri Mashiach

Supported boot devices are raw QSPI and raw SD card. Add support for a FAT16/32 file system for SD card.
The SOC's boot ROM only supports FAT file system. Therefore remove the SPL support for the EXT file system.
Signed-off-by Uri Mashiach <[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/20170605/98c74886/attachment.sig>

Uri Mashiach

author

2017-05-17 14:29 UTC #4 lore raw

PATCH 2/4 arm: am57xx: cl-som-am57x: change the shell prompt

In reply to Uri Mashiach

Change the shell prompt to "U-Boot# ".

Signed-off-by Uri Mashiach <[email protected]>

---
 configs/cl-som-am57x_defconfig | 1 +
 1 file changed, 1 insertion(+)

configs/cl-som-am57x_defconfig +1 -0

index 57d96b4..29322f9 100644
@@ -7,6 +7,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 # CONFIG_SPL_EXT_SUPPORT is not set
 CONFIG_HUSH_PARSER=y
+CONFIG_SYS_PROMPT="U-Boot# "
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_ASKENV=y

Signature · 1 line

2.7.4

Tom Rini

2017-05-17 21:59 UTC #5 lore raw

PATCH 2/4 arm: am57xx: cl-som-am57x: change the shell prompt

Quoted 3 lines · Uri Mashiach

Change the shell prompt to "U-Boot# ".
Signed-off-by Uri Mashiach <[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/20170517/fc023d7d/attachment.sig>

Tom Rini

2017-06-06 00:20 UTC #6 lore raw

PATCH 2/4 arm: am57xx: cl-som-am57x: change the shell prompt

In reply to Uri Mashiach

Quoted 4 lines · Uri Mashiach

Change the shell prompt to "U-Boot# ".
Signed-off-by Uri Mashiach <[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/20170605/f07a6f0c/attachment.sig>

Uri Mashiach

author

2017-05-17 14:29 UTC #7 lore raw

PATCH 3/4 ARM: am57xx: cl-som-am57x: support for AM5718

In reply to Uri Mashiach

Disable SDRAM controller EMIF2 for single core SOC Set SDRAM size size to 1GB

Signed-off-by Uri Mashiach <[email protected]>

---
 board/compulab/cl-som-am57x/spl.c | 5 +++++
 1 file changed, 5 insertions(+)

board/compulab/cl-som-am57x/spl.c +5 -0

index 855678f..de2dadc 100644
@@ -19,7 +19,12 @@ static const struct dmm_lisa_map_regs cl_som_am57x_lisa_regs = {
 
 void emif_get_dmm_regs(const struct dmm_lisa_map_regs **dmm_lisa_regs)
 {
+	/* Disable SDRAM controller EMIF2 for single core SOC */
 	*dmm_lisa_regs = &cl_som_am57x_lisa_regs;
+	if (omap_revision() == DRA722_ES1_0) {
+		((struct dmm_lisa_map_regs *) *dmm_lisa_regs)->dmm_lisa_map_3 =
+		  0x80640100;
+	}
 }
 
 static const struct emif_regs cl_som_am57x_emif1_ddr3_532mhz_emif_regs = {

Signature · 1 line

2.7.4

Tom Rini

2017-05-17 22:00 UTC #8 lore raw

PATCH 3/4 ARM: am57xx: cl-som-am57x: support for AM5718

Quoted 4 lines · Uri Mashiach

Disable SDRAM controller EMIF2 for single core SOC Set SDRAM size size to 1GB
Signed-off-by Uri Mashiach <[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/20170517/1ac1aded/attachment.sig>

Tom Rini

2017-06-06 00:20 UTC #9 lore raw

PATCH 3/4 ARM: am57xx: cl-som-am57x: support for AM5718

In reply to Uri Mashiach

Quoted 5 lines · Uri Mashiach

Disable SDRAM controller EMIF2 for single core SOC Set SDRAM size size to 1GB
Signed-off-by Uri Mashiach <[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/20170605/ebfad9e1/attachment.sig>

Uri Mashiach

author

2017-05-17 14:29 UTC #10 lore raw

PATCH 4/4 arm: am57xx: cl-som-am57x: adjust default env to the installation system

In reply to Uri Mashiach

The SD card automatic installation system depends on the default environment of the previous U-Boot.

Add the missing environment variables.

Signed-off-by Uri Mashiach <[email protected]>

---
 include/configs/cl-som-am57x.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

include/configs/cl-som-am57x.h +4 -2

index 8e69306..581468c 100644
@@ -130,8 +130,10 @@
 	"bootkernel=bootz ${loadaddr} - ${fdtaddr}\0" \
 	"mmcloadfdt=load mmc ${mmcdev} ${fdtaddr} ${fdtfile}\0" \
 	"mmcloadkernel=load mmc ${mmcdev} ${loadaddr} ${kernel}\0" \
+	"emmcloadfdt=load mmc ${mmcdev} ${fdtaddr} ${fdtfile}\0" \
+	"emmcloadkernel=load mmc ${mmcdev} ${loadaddr} ${kernel}\0" \
 	"load_mmc=mmc dev ${mmcdev} && mmc rescan && " \
-		"run mmcloadkernel run mmcloadfdt\0" \
+		"run mmcloadkernel && run mmcloadfdt\0" \
 	"mmcroot=/dev/mmcblk1p2\0" \
 	"mmcrootfstype=ext4 rw rootwait\0" \
 	"mmcargs=setenv bootargs console=${console} root=${mmcroot} " \

@@ -167,7 +169,7 @@
 		"source ${loadaddr}\0" \
 	"sataboot=run load_sata && run sataargs && " \
 		"echo Booting from SATA ... && " \
-		"run bootkernel\0" \
+		"run bootkernel\0"
 
 #undef CONFIG_BOOTCOMMAND
 #define CONFIG_BOOTCOMMAND \

Signature · 1 line

2.7.4

Tom Rini

2017-05-17 22:00 UTC #11 lore raw

PATCH 4/4 arm: am57xx: cl-som-am57x: adjust default env to the installation system

Quoted 6 lines · Uri Mashiach

The SD card automatic installation system depends on the default environment of the previous U-Boot.
Add the missing environment variables.
Signed-off-by Uri Mashiach <[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/20170517/9631be28/attachment.sig>

Tom Rini

2017-06-06 00:20 UTC #12 lore raw

PATCH 4/4 arm: am57xx: cl-som-am57x: adjust default env to the installation system

In reply to Uri Mashiach

Quoted 7 lines · Uri Mashiach

The SD card automatic installation system depends on the default environment of the previous U-Boot.
Add the missing environment variables.
Signed-off-by Uri Mashiach <[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/20170605/472e21a3/attachment.sig>