[U-Boot] [PATCH 0/4] 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(-)
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 uri.mashiach@compulab.co.il --- configs/cl-som-am57x_defconfig | 1 + include/configs/cl-som-am57x.h | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/configs/cl-som-am57x_defconfig b/configs/cl-som-am57x_defconfig index ed419a3..57d96b4 100644 --- a/configs/cl-som-am57x_defconfig +++ b/configs/cl-som-am57x_defconfig @@ -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 diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index 3000453..8e69306 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -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 */
On Wed, May 17, 2017 at 05:29:25PM +0300, Uri Mashiach wrote:
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 uri.mashiach@compulab.co.il
Reviewed-by: Tom Rini trini@konsulko.com
On Wed, May 17, 2017 at 05:29:25PM +0300, Uri Mashiach wrote:
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 uri.mashiach@compulab.co.il Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
Change the shell prompt to "U-Boot# ".
Signed-off-by: Uri Mashiach uri.mashiach@compulab.co.il --- configs/cl-som-am57x_defconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/configs/cl-som-am57x_defconfig b/configs/cl-som-am57x_defconfig index 57d96b4..29322f9 100644 --- a/configs/cl-som-am57x_defconfig +++ b/configs/cl-som-am57x_defconfig @@ -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
On Wed, May 17, 2017 at 05:29:26PM +0300, Uri Mashiach wrote:
Change the shell prompt to "U-Boot# ".
Signed-off-by: Uri Mashiach uri.mashiach@compulab.co.il
Reviewed-by: Tom Rini trini@konsulko.com
On Wed, May 17, 2017 at 05:29:26PM +0300, Uri Mashiach wrote:
Change the shell prompt to "U-Boot# ".
Signed-off-by: Uri Mashiach uri.mashiach@compulab.co.il Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
Disable SDRAM controller EMIF2 for single core SOC Set SDRAM size size to 1GB
Signed-off-by: Uri Mashiach uri.mashiach@compulab.co.il --- board/compulab/cl-som-am57x/spl.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/board/compulab/cl-som-am57x/spl.c b/board/compulab/cl-som-am57x/spl.c index 855678f..de2dadc 100644 --- a/board/compulab/cl-som-am57x/spl.c +++ b/board/compulab/cl-som-am57x/spl.c @@ -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 = {
On Wed, May 17, 2017 at 05:29:27PM +0300, Uri Mashiach wrote:
Disable SDRAM controller EMIF2 for single core SOC Set SDRAM size size to 1GB
Signed-off-by: Uri Mashiach uri.mashiach@compulab.co.il
Reviewed-by: Tom Rini trini@konsulko.com
On Wed, May 17, 2017 at 05:29:27PM +0300, Uri Mashiach wrote:
Disable SDRAM controller EMIF2 for single core SOC Set SDRAM size size to 1GB
Signed-off-by: Uri Mashiach uri.mashiach@compulab.co.il Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
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 uri.mashiach@compulab.co.il --- include/configs/cl-som-am57x.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index 8e69306..581468c 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -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 \
On Wed, May 17, 2017 at 05:29:28PM +0300, Uri Mashiach wrote:
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 uri.mashiach@compulab.co.il
Reviewed-by: Tom Rini trini@konsulko.com
On Wed, May 17, 2017 at 05:29:28PM +0300, Uri Mashiach wrote:
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 uri.mashiach@compulab.co.il Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
participants (2)
-
Tom Rini -
Uri Mashiach