include: configs: j721e_evm: Change to using .env
Move to using .env file for setting up environment variables for J721E and J7200. Signed-off-by: Neha Malcom Francis <n-francis@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Neha Malcom Francis
Tom Rini
parent
7e55dd25c3
commit
fce062d91a
3 changed files with 94 additions and 134 deletions
|
|
@ -56,6 +56,9 @@ config SYS_VENDOR
|
|||
config SYS_CONFIG_NAME
|
||||
default "j721e_evm"
|
||||
|
||||
config ENV_SOURCE_FILE
|
||||
default "j721e"
|
||||
|
||||
source "board/ti/common/Kconfig"
|
||||
|
||||
endif
|
||||
|
|
@ -71,6 +74,9 @@ config SYS_VENDOR
|
|||
config SYS_CONFIG_NAME
|
||||
default "j721e_evm"
|
||||
|
||||
config ENV_SOURCE_FILE
|
||||
default "j721e"
|
||||
|
||||
source "board/ti/common/Kconfig"
|
||||
|
||||
endif
|
||||
|
|
@ -86,6 +92,9 @@ config SYS_VENDOR
|
|||
config SYS_CONFIG_NAME
|
||||
default "j721e_evm"
|
||||
|
||||
config ENV_SOURCE_FILE
|
||||
default "j721e"
|
||||
|
||||
source "board/ti/common/Kconfig"
|
||||
|
||||
endif
|
||||
|
|
@ -101,6 +110,9 @@ config SYS_VENDOR
|
|||
config SYS_CONFIG_NAME
|
||||
default "j721e_evm"
|
||||
|
||||
config ENV_SOURCE_FILE
|
||||
default "j721e"
|
||||
|
||||
source "board/ti/common/Kconfig"
|
||||
|
||||
endif
|
||||
|
|
|
|||
82
board/ti/j721e/j721e.env
Normal file
82
board/ti/j721e/j721e.env
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
#include <environment/ti/ti_armv7_common.env>
|
||||
#include <environment/ti/mmc.env>
|
||||
#include <environment/ti/ufs.env>
|
||||
#include <environment/ti/k3_dfu.env>
|
||||
|
||||
#if CONFIG_CMD_REMOTEPROC
|
||||
#include <environment/ti/k3_rproc.env>
|
||||
#endif
|
||||
|
||||
default_device_tree=k3-j721e-common-proc-board.dtb
|
||||
findfdt=
|
||||
setenv name_fdt ${default_device_tree};
|
||||
if test $board_name = j721e; then
|
||||
setenv name_fdt k3-j721e-common-proc-board.dtb; fi;
|
||||
if test $board_name = j721e-eaik || test $board_name = j721e-sk; then
|
||||
setenv name_fdt k3-j721e-sk.dtb; fi;
|
||||
setenv fdtfile ${name_fdt}
|
||||
name_kern=Image
|
||||
console=ttyS2,115200n8
|
||||
args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000
|
||||
${mtdparts}
|
||||
run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}
|
||||
|
||||
#if CONFIG_SYS_K3_SPL_ATF
|
||||
#if CONFIG_TARGET_J721E_R5_EVM
|
||||
addr_mcur5f0_0load=0x89000000
|
||||
name_mcur5f0_0fw=/lib/firmware/j7-mcu-r5f0_0-fw
|
||||
#elif CONFIG_TARGET_J7200_R5_EVM
|
||||
addr_mcur5f0_0load=0x89000000
|
||||
name_mcur5f0_0fw=/lib/firmware/j7200-mcu-r5f0_0-fw
|
||||
#endif
|
||||
#endif
|
||||
|
||||
boot=mmc
|
||||
mmcdev=1
|
||||
bootpart=1:2
|
||||
bootdir=/boot
|
||||
rd_spec=-
|
||||
init_mmc=run args_all args_mmc
|
||||
get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}
|
||||
get_overlay_mmc=
|
||||
fdt address ${fdtaddr};
|
||||
fdt resize 0x100000;
|
||||
for overlay in $name_overlays;
|
||||
do;
|
||||
load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} &&
|
||||
fdt apply ${dtboaddr};
|
||||
done;
|
||||
partitions=uuid_disk=${uuid_gpt_disk};
|
||||
name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}
|
||||
get_kern_mmc=load mmc ${bootpart} ${loadaddr}
|
||||
${bootdir}/${name_kern}
|
||||
get_fit_mmc=load mmc ${bootpart} ${addr_fit}
|
||||
${bootdir}/${name_fit}
|
||||
|
||||
#if CONFIG_TARGET_J7200_A72_EVM
|
||||
do_main_cpsw0_qsgmii_phyinit=1
|
||||
init_main_cpsw0_qsgmii_phy=gpio set gpio@22_17;
|
||||
gpio clear gpio@22_16
|
||||
main_cpsw0_qsgmii_phyinit=
|
||||
if test ${do_main_cpsw0_qsgmii_phyinit} -eq 1 && test ${dorprocboot} -eq 1 && test ${boot} = mmc; then
|
||||
run init_main_cpsw0_qsgmii_phy;
|
||||
fi;
|
||||
#elif CONFIG_TARGET_J721E_A72_EVM
|
||||
init_main_cpsw0_qsgmii_phy=gpio set gpio@22_17;
|
||||
gpio clear gpio@22_16
|
||||
main_cpsw0_qsgmii_phyinit=
|
||||
if test $board_name = J721EX-PM1-SOM || test $board_name = J721EX-PM2-SOM || test $board_name = j721e; then
|
||||
do_main_cpsw0_qsgmii_phyinit=1; else
|
||||
do_main_cpsw0_qsgmii_phyinit=0; fi;
|
||||
if test ${do_main_cpsw0_qsgmii_phyinit} -eq 1 && test ${dorprocboot} -eq 1 && test ${boot} = mmc; then
|
||||
run init_main_cpsw0_qsgmii_phy; \
|
||||
fi;
|
||||
#endif
|
||||
|
||||
#if CONFIG_TARGET_J721E_A72_EVM
|
||||
rproc_fw_binaries=2 /lib/firmware/j7-main-r5f0_0-fw 3 /lib/firmware/j7-main-r5f0_1-fw 4 /lib/firmware/j7-main-r5f1_0-fw 5 /lib/firmware/j7-main-r5f1_1-fw 6 /lib/firmware/j7-c66_0-fw 7 /lib/firmware/j7-c66_1-fw 8 /lib/firmware/j7-c71_0-fw
|
||||
#endif
|
||||
|
||||
#if CONFIG_TARGET_J7200_A72_EVM
|
||||
rproc_fw_binaries=2 /lib/firmware/j7200-main-r5f0_0-fw 3 /lib/firmware/j7200-main-r5f0_1-fw
|
||||
#endif
|
||||
|
|
@ -10,10 +10,6 @@
|
|||
#define __CONFIG_J721E_EVM_H
|
||||
|
||||
#include <linux/sizes.h>
|
||||
#include <environment/ti/mmc.h>
|
||||
#include <environment/ti/k3_rproc.h>
|
||||
#include <environment/ti/ufs.h>
|
||||
#include <environment/ti/k3_dfu.h>
|
||||
|
||||
/* DDR Configuration */
|
||||
#define CFG_SYS_SDRAM_BASE1 0x880000000
|
||||
|
|
@ -28,127 +24,6 @@
|
|||
#define CFG_SYS_UBOOT_BASE 0x50080000
|
||||
#endif
|
||||
|
||||
/* HyperFlash related configuration */
|
||||
|
||||
/* U-Boot general configuration */
|
||||
#define EXTRA_ENV_J721E_BOARD_SETTINGS \
|
||||
"default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
|
||||
"findfdt=" \
|
||||
"setenv name_fdt ${default_device_tree};" \
|
||||
"if test $board_name = j721e; then " \
|
||||
"setenv name_fdt k3-j721e-common-proc-board.dtb; fi;" \
|
||||
"if test $board_name = j721e-eaik || test $board_name = j721e-sk; then " \
|
||||
"setenv name_fdt k3-j721e-sk.dtb; fi;" \
|
||||
"setenv fdtfile ${name_fdt}\0" \
|
||||
"name_kern=Image\0" \
|
||||
"console=ttyS2,115200n8\0" \
|
||||
"args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 " \
|
||||
"${mtdparts}\0" \
|
||||
"run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0"
|
||||
|
||||
#define PARTS_DEFAULT \
|
||||
/* Linux partitions */ \
|
||||
"uuid_disk=${uuid_gpt_disk};" \
|
||||
"name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}\0"
|
||||
|
||||
#ifdef CONFIG_SYS_K3_SPL_ATF
|
||||
#if defined(CONFIG_TARGET_J721E_R5_EVM)
|
||||
#define EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC \
|
||||
"addr_mcur5f0_0load=0x89000000\0" \
|
||||
"name_mcur5f0_0fw=/lib/firmware/j7-mcu-r5f0_0-fw\0"
|
||||
#elif defined(CONFIG_TARGET_J7200_R5_EVM)
|
||||
#define EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC \
|
||||
"addr_mcur5f0_0load=0x89000000\0" \
|
||||
"name_mcur5f0_0fw=/lib/firmware/j7200-mcu-r5f0_0-fw\0"
|
||||
#endif /* CONFIG_TARGET_J721E_R5_EVM */
|
||||
#else
|
||||
#define EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC ""
|
||||
#endif /* CONFIG_SYS_K3_SPL_ATF */
|
||||
|
||||
/* U-Boot MMC-specific configuration */
|
||||
#define EXTRA_ENV_J721E_BOARD_SETTINGS_MMC \
|
||||
"boot=mmc\0" \
|
||||
"mmcdev=1\0" \
|
||||
"bootpart=1:2\0" \
|
||||
"bootdir=/boot\0" \
|
||||
EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC \
|
||||
"rd_spec=-\0" \
|
||||
"init_mmc=run args_all args_mmc\0" \
|
||||
"get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}\0" \
|
||||
"get_overlay_mmc=" \
|
||||
"fdt address ${fdtaddr};" \
|
||||
"fdt resize 0x100000;" \
|
||||
"for overlay in $name_overlays;" \
|
||||
"do;" \
|
||||
"load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && " \
|
||||
"fdt apply ${dtboaddr};" \
|
||||
"done;\0" \
|
||||
"partitions=" PARTS_DEFAULT \
|
||||
"get_kern_mmc=load mmc ${bootpart} ${loadaddr} " \
|
||||
"${bootdir}/${name_kern}\0" \
|
||||
"get_fit_mmc=load mmc ${bootpart} ${addr_fit} " \
|
||||
"${bootdir}/${name_fit}\0" \
|
||||
"partitions=" PARTS_DEFAULT
|
||||
|
||||
/* Set the default list of remote processors to boot */
|
||||
#if defined(CONFIG_TARGET_J7200_A72_EVM)
|
||||
#define EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY \
|
||||
"do_main_cpsw0_qsgmii_phyinit=1\0" \
|
||||
"init_main_cpsw0_qsgmii_phy=gpio set gpio@22_17;" \
|
||||
"gpio clear gpio@22_16\0" \
|
||||
"main_cpsw0_qsgmii_phyinit=" \
|
||||
"if test ${do_main_cpsw0_qsgmii_phyinit} -eq 1 && test ${dorprocboot} -eq 1 && " \
|
||||
"test ${boot} = mmc; then " \
|
||||
"run init_main_cpsw0_qsgmii_phy;" \
|
||||
"fi;\0"
|
||||
#ifdef DEFAULT_RPROCS
|
||||
#undef DEFAULT_RPROCS
|
||||
#endif
|
||||
#elif defined(CONFIG_TARGET_J721E_A72_EVM)
|
||||
#define EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY \
|
||||
"init_main_cpsw0_qsgmii_phy=gpio set gpio@22_17;" \
|
||||
"gpio clear gpio@22_16\0" \
|
||||
"main_cpsw0_qsgmii_phyinit=" \
|
||||
"if test $board_name = J721EX-PM1-SOM || test $board_name = J721EX-PM2-SOM " \
|
||||
"|| test $board_name = j721e; then " \
|
||||
"do_main_cpsw0_qsgmii_phyinit=1; else " \
|
||||
"do_main_cpsw0_qsgmii_phyinit=0; fi;" \
|
||||
"if test ${do_main_cpsw0_qsgmii_phyinit} -eq 1 && test ${dorprocboot} -eq 1 && " \
|
||||
"test ${boot} = mmc; then " \
|
||||
"run init_main_cpsw0_qsgmii_phy;" \
|
||||
"fi;\0"
|
||||
#ifdef DEFAULT_RPROCS
|
||||
#undef DEFAULT_RPROCS
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_TARGET_J721E_A72_EVM
|
||||
#define DEFAULT_RPROCS "" \
|
||||
"2 /lib/firmware/j7-main-r5f0_0-fw " \
|
||||
"3 /lib/firmware/j7-main-r5f0_1-fw " \
|
||||
"4 /lib/firmware/j7-main-r5f1_0-fw " \
|
||||
"5 /lib/firmware/j7-main-r5f1_1-fw " \
|
||||
"6 /lib/firmware/j7-c66_0-fw " \
|
||||
"7 /lib/firmware/j7-c66_1-fw " \
|
||||
"8 /lib/firmware/j7-c71_0-fw "
|
||||
#endif /* CONFIG_TARGET_J721E_A72_EVM */
|
||||
|
||||
#ifdef CONFIG_TARGET_J7200_A72_EVM
|
||||
#define DEFAULT_RPROCS "" \
|
||||
"2 /lib/firmware/j7200-main-r5f0_0-fw " \
|
||||
"3 /lib/firmware/j7200-main-r5f0_1-fw "
|
||||
#endif /* CONFIG_TARGET_J7200_A72_EVM */
|
||||
|
||||
#ifndef EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY
|
||||
#define EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY
|
||||
#endif
|
||||
|
||||
#define EXTRA_ENV_DFUARGS \
|
||||
DFU_ALT_INFO_MMC \
|
||||
DFU_ALT_INFO_EMMC \
|
||||
DFU_ALT_INFO_RAM \
|
||||
DFU_ALT_INFO_OSPI
|
||||
|
||||
#if CONFIG_IS_ENABLED(CMD_PXE)
|
||||
# define BOOT_TARGET_PXE(func) func(PXE, pxe, na)
|
||||
#else
|
||||
|
|
@ -178,15 +53,6 @@
|
|||
|
||||
/* Incorporate settings into the U-Boot environment */
|
||||
#define CFG_EXTRA_ENV_SETTINGS \
|
||||
DEFAULT_LINUX_BOOT_ENV \
|
||||
DEFAULT_MMC_TI_ARGS \
|
||||
DEFAULT_FIT_TI_ARGS \
|
||||
EXTRA_ENV_J721E_BOARD_SETTINGS \
|
||||
EXTRA_ENV_J721E_BOARD_SETTINGS_MMC \
|
||||
EXTRA_ENV_RPROC_SETTINGS \
|
||||
EXTRA_ENV_DFUARGS \
|
||||
DEFAULT_UFS_TI_ARGS \
|
||||
EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY \
|
||||
BOOTENV
|
||||
|
||||
/* Now for the remaining common defines */
|
||||
|
|
|
|||
Loading…
Reference in a new issue