Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

ARM: ti: consolidate mmc environment variables

Browse source 
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 <nsekhar@ti.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Sekhar Nori 2017-04-06 14:52:56 +05:30 committed by Tom Rini
parent 6e8069616e
commit 88fdfcd21d
7 changed files with 78 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/configs/am335x_evm.h
View file

@ -17,7 +17,6 @@
#define __CONFIG_AM335X_EVM_H #define __CONFIG_AM335X_EVM_H
#include <configs/ti_am335x_common.h> #include <configs/ti_am335x_common.h>
#include <environment/ti/dfu.h>
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
# define CONFIG_TIMESTAMP # define CONFIG_TIMESTAMP
@ -96,6 +95,9 @@
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
#include <environment/ti/dfu.h>
#include <environment/ti/mmc.h>
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \ DEFAULT_LINUX_BOOT_ENV \
DEFAULT_MMC_TI_ARGS \ DEFAULT_MMC_TI_ARGS \

4
include/configs/am43xx_evm.h
View file

@ -13,7 +13,6 @@
#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 21) /* 2GB */ #define CONFIG_MAX_RAM_BANK_SIZE (1024 << 21) /* 2GB */
#define CONFIG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */ #define CONFIG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */
#include <environment/ti/dfu.h>
#include <asm/arch/omap.h> #include <asm/arch/omap.h>
/* NS16550 Configuration */ /* NS16550 Configuration */
@ -162,6 +161,9 @@
#define CONFIG_TI_EDMA3 #define CONFIG_TI_EDMA3
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
#include <environment/ti/dfu.h>
#include <environment/ti/mmc.h>
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \ DEFAULT_LINUX_BOOT_ENV \
DEFAULT_MMC_TI_ARGS \ DEFAULT_MMC_TI_ARGS \

1
include/configs/k2g_evm.h
View file

@ -10,6 +10,7 @@
#ifndef __CONFIG_K2G_EVM_H #ifndef __CONFIG_K2G_EVM_H
#define __CONFIG_K2G_EVM_H #define __CONFIG_K2G_EVM_H
#include <environment/ti/mmc.h>
#include <environment/ti/spi.h> #include <environment/ti/spi.h>
/* Platform type */ /* Platform type */

61
include/configs/ti_armv7_common.h
View file

@ -51,67 +51,6 @@
"bootm_size=0x10000000\0" \ "bootm_size=0x10000000\0" \
"boot_fdt=try\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" \
"loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\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};" \
"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 " \
"if run loadfdt; then " \
"bootz ${loadaddr} - ${fdtaddr}; " \
"else " \
"if test ${boot_fdt} = try; then " \
"bootz; " \
"else " \
"echo WARN: Cannot load the DT; " \
"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 \ #define DEFAULT_FIT_TI_ARGS \
"boot_fit=0\0" \ "boot_fit=0\0" \
"fit_loadaddr=0x88000000\0" \ "fit_loadaddr=0x88000000\0" \

1
include/configs/ti_omap4_common.h
View file

@ -104,6 +104,7 @@
"run distro_bootcmd" "run distro_bootcmd"
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#include <environment/ti/mmc.h>
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \ DEFAULT_LINUX_BOOT_ENV \

2
include/configs/ti_omap5_common.h
View file

@ -58,6 +58,8 @@
#define DFUARGS #define DFUARGS
#endif #endif
#include <environment/ti/mmc.h>
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \ DEFAULT_LINUX_BOOT_ENV \

68
include/environment/ti/mmc.h Normal file
View file

@ -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+
*/
#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" \
"loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\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};" \
"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 " \
"if run loadfdt; then " \
"bootz ${loadaddr} - ${fdtaddr}; " \
"else " \
"if test ${boot_fdt} = try; then " \
"bootz; " \
"else " \
"echo WARN: Cannot load the DT; " \
"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"