mx6sabre: Move environment variables to .env files
Move the shared environment from CFG_EXTRA_ENV_SETTINGS in mx6sabre_common.h to a common text environment fragment in include/env/nxp/mx6sabre_common.env. The mx6sabresd and mx6sabreauto board environments include this fragment and add their own console setting, which is the only board specific difference between them. The eMMC firmware update variables remain guarded by CONFIG_SUPPORT_EMMC_BOOT inside the fragment. The now unused CONSOLE_DEV defines and the linux/stringify.h include are dropped. The generated default environment is unchanged for both boards. This was verified by comparing the output of scripts/get_default_envs.sh before and after the change, which produced identical results. Signed-off-by: Aristo Chen <aristo.chen@canonical.com> Reviewed-by: Peng Fan <peng.fan@nxp.com>
This commit is contained in:
Aristo Chen
committed by
Fabio Estevam
Fabio Estevam
parent
4377bd764c
commit
8d21d74bdf
@@ -0,0 +1,5 @@
|
||||
/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
|
||||
|
||||
console=ttymxc3
|
||||
|
||||
#include <env/nxp/mx6sabre_common.env>
|
||||
@@ -0,0 +1,5 @@
|
||||
/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
|
||||
|
||||
console=ttymxc0
|
||||
|
||||
#include <env/nxp/mx6sabre_common.env>
|
||||
@@ -8,133 +8,11 @@
|
||||
#ifndef __MX6QSABRE_COMMON_CONFIG_H
|
||||
#define __MX6QSABRE_COMMON_CONFIG_H
|
||||
|
||||
#include <linux/stringify.h>
|
||||
|
||||
#include "mx6_common.h"
|
||||
|
||||
/* MMC Configs */
|
||||
#define CFG_SYS_FSL_ESDHC_ADDR 0
|
||||
|
||||
#ifdef CONFIG_SUPPORT_EMMC_BOOT
|
||||
#define EMMC_ENV \
|
||||
"emmcdev=2\0" \
|
||||
"update_emmc_firmware=" \
|
||||
"if test ${ip_dyn} = yes; then " \
|
||||
"setenv get_cmd dhcp; " \
|
||||
"else " \
|
||||
"setenv get_cmd tftp; " \
|
||||
"fi; " \
|
||||
"if ${get_cmd} ${update_sd_firmware_filename}; then " \
|
||||
"if mmc dev ${emmcdev} 1; then " \
|
||||
"setexpr fw_sz ${filesize} / 0x200; " \
|
||||
"setexpr fw_sz ${fw_sz} + 1; " \
|
||||
"mmc write ${loadaddr} 0x2 ${fw_sz}; " \
|
||||
"fi; " \
|
||||
"fi\0"
|
||||
#else
|
||||
#define EMMC_ENV ""
|
||||
#endif
|
||||
|
||||
#define CFG_EXTRA_ENV_SETTINGS \
|
||||
"script=boot.scr\0" \
|
||||
"image=zImage\0" \
|
||||
"fdtfile=undefined\0" \
|
||||
"fdt_addr=0x18000000\0" \
|
||||
"boot_fdt=try\0" \
|
||||
"ip_dyn=yes\0" \
|
||||
"console=" CONSOLE_DEV "\0" \
|
||||
"dfuspi=dfu 0 sf 0:0:10000000:0\0" \
|
||||
"dfu_alt_info_spl=spl raw 0x400\0" \
|
||||
"dfu_alt_info_img=u-boot raw 0x10000\0" \
|
||||
"dfu_alt_info=spl raw 0x400\0" \
|
||||
"initrd_high=0xffffffff\0" \
|
||||
"splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
|
||||
"mmcdev=" __stringify(CONFIG_ENV_MMC_DEVICE_INDEX) "\0" \
|
||||
"mmcpart=1\0" \
|
||||
"finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
|
||||
"update_sd_firmware=" \
|
||||
"if test ${ip_dyn} = yes; then " \
|
||||
"setenv get_cmd dhcp; " \
|
||||
"else " \
|
||||
"setenv get_cmd tftp; " \
|
||||
"fi; " \
|
||||
"if mmc dev ${mmcdev}; then " \
|
||||
"if ${get_cmd} ${update_sd_firmware_filename}; then " \
|
||||
"setexpr fw_sz ${filesize} / 0x200; " \
|
||||
"setexpr fw_sz ${fw_sz} + 1; " \
|
||||
"mmc write ${loadaddr} 0x2 ${fw_sz}; " \
|
||||
"fi; " \
|
||||
"fi\0" \
|
||||
EMMC_ENV \
|
||||
"mmcargs=setenv bootargs console=${console},${baudrate} " \
|
||||
"root=PARTUUID=${uuid} rootwait rw\0" \
|
||||
"loadbootscript=" \
|
||||
"load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script} || " \
|
||||
"load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${script};\0" \
|
||||
"bootscript=echo Running bootscript from mmc ...; " \
|
||||
"source\0" \
|
||||
"loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image} || " \
|
||||
"load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${image}\0" \
|
||||
"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile} || " \
|
||||
"load mmc ${mmcdev}:${mmcpart} ${fdt_addr} boot/${fdtfile}\0" \
|
||||
"mmcboot=echo Booting from mmc ...; " \
|
||||
"run finduuid; " \
|
||||
"run mmcargs; " \
|
||||
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
|
||||
"if run loadfdt; then " \
|
||||
"bootz ${loadaddr} - ${fdt_addr}; " \
|
||||
"else " \
|
||||
"if test ${boot_fdt} = try; then " \
|
||||
"bootz; " \
|
||||
"else " \
|
||||
"echo WARN: Cannot load the DT; " \
|
||||
"fi; " \
|
||||
"fi; " \
|
||||
"else " \
|
||||
"bootz; " \
|
||||
"fi;\0" \
|
||||
"netargs=setenv bootargs console=${console},${baudrate} " \
|
||||
"root=/dev/nfs " \
|
||||
"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
|
||||
"netboot=echo Booting from net ...; " \
|
||||
"run netargs; " \
|
||||
"if test ${ip_dyn} = yes; then " \
|
||||
"setenv get_cmd dhcp; " \
|
||||
"else " \
|
||||
"setenv get_cmd tftp; " \
|
||||
"fi; " \
|
||||
"${get_cmd} ${image}; " \
|
||||
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
|
||||
"if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \
|
||||
"bootz ${loadaddr} - ${fdt_addr}; " \
|
||||
"else " \
|
||||
"if test ${boot_fdt} = try; then " \
|
||||
"bootz; " \
|
||||
"else " \
|
||||
"echo WARN: Cannot load the DT; " \
|
||||
"fi; " \
|
||||
"fi; " \
|
||||
"else " \
|
||||
"bootz; " \
|
||||
"fi;\0" \
|
||||
"findfdt="\
|
||||
"if test $fdtfile = undefined; then " \
|
||||
"if test $board_name = SABREAUTO && test $board_rev = MX6QP; then " \
|
||||
"setenv fdtfile imx6qp-sabreauto.dtb; fi; " \
|
||||
"if test $board_name = SABREAUTO && test $board_rev = MX6Q; then " \
|
||||
"setenv fdtfile imx6q-sabreauto.dtb; fi; " \
|
||||
"if test $board_name = SABREAUTO && test $board_rev = MX6DL; then " \
|
||||
"setenv fdtfile imx6dl-sabreauto.dtb; fi; " \
|
||||
"if test $board_name = SABRESD && test $board_rev = MX6QP; then " \
|
||||
"setenv fdtfile imx6qp-sabresd.dtb; fi; " \
|
||||
"if test $board_name = SABRESD && test $board_rev = MX6Q; then " \
|
||||
"setenv fdtfile imx6q-sabresd.dtb; fi; " \
|
||||
"if test $board_name = SABRESD && test $board_rev = MX6DL; then " \
|
||||
"setenv fdtfile imx6dl-sabresd.dtb; fi; " \
|
||||
"if test $fdtfile = undefined; then " \
|
||||
"echo WARNING: Could not determine dtb to use; fi; " \
|
||||
"fi;\0" \
|
||||
|
||||
/* Physical Memory Map */
|
||||
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
|
||||
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
#define __MX6SABREAUTO_CONFIG_H
|
||||
|
||||
#define CFG_MXC_UART_BASE UART4_BASE
|
||||
#define CONSOLE_DEV "ttymxc3"
|
||||
|
||||
#define CFG_SYS_I2C_PCA953X_WIDTH { {0x30, 8}, {0x32, 8}, {0x34, 8} }
|
||||
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
#define __MX6SABRESD_CONFIG_H
|
||||
|
||||
#define CFG_MXC_UART_BASE UART1_BASE
|
||||
#define CONSOLE_DEV "ttymxc0"
|
||||
|
||||
#include "mx6sabre_common.h"
|
||||
|
||||
|
||||
Vendored
+114
@@ -0,0 +1,114 @@
|
||||
/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
|
||||
|
||||
script=boot.scr
|
||||
image=zImage
|
||||
fdtfile=undefined
|
||||
fdt_addr=0x18000000
|
||||
boot_fdt=try
|
||||
ip_dyn=yes
|
||||
dfuspi=dfu 0 sf 0:0:10000000:0
|
||||
dfu_alt_info_spl=spl raw 0x400
|
||||
dfu_alt_info_img=u-boot raw 0x10000
|
||||
dfu_alt_info=spl raw 0x400
|
||||
initrd_high=0xffffffff
|
||||
splashimage=CONFIG_SYS_LOAD_ADDR
|
||||
mmcdev=CONFIG_ENV_MMC_DEVICE_INDEX
|
||||
mmcpart=1
|
||||
finduuid=part uuid mmc ${mmcdev}:2 uuid
|
||||
update_sd_firmware=if test ${ip_dyn} = yes; then
|
||||
setenv get_cmd dhcp;
|
||||
else
|
||||
setenv get_cmd tftp;
|
||||
fi;
|
||||
if mmc dev ${mmcdev}; then
|
||||
if ${get_cmd} ${update_sd_firmware_filename}; then
|
||||
setexpr fw_sz ${filesize} / 0x200;
|
||||
setexpr fw_sz ${fw_sz} + 1;
|
||||
mmc write ${loadaddr} 0x2 ${fw_sz};
|
||||
fi;
|
||||
fi
|
||||
#ifdef CONFIG_SUPPORT_EMMC_BOOT
|
||||
emmcdev=2
|
||||
update_emmc_firmware=if test ${ip_dyn} = yes; then
|
||||
setenv get_cmd dhcp;
|
||||
else
|
||||
setenv get_cmd tftp;
|
||||
fi;
|
||||
if ${get_cmd} ${update_sd_firmware_filename}; then
|
||||
if mmc dev ${emmcdev} 1; then
|
||||
setexpr fw_sz ${filesize} / 0x200;
|
||||
setexpr fw_sz ${fw_sz} + 1;
|
||||
mmc write ${loadaddr} 0x2 ${fw_sz};
|
||||
fi;
|
||||
fi
|
||||
#endif
|
||||
mmcargs=setenv bootargs console=${console},${baudrate} root=PARTUUID=${uuid} rootwait rw
|
||||
loadbootscript=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script} ||
|
||||
load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${script};
|
||||
bootscript=echo Running bootscript from mmc ...; source
|
||||
loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image} ||
|
||||
load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${image}
|
||||
loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile} ||
|
||||
load mmc ${mmcdev}:${mmcpart} ${fdt_addr} boot/${fdtfile}
|
||||
mmcboot=echo Booting from mmc ...;
|
||||
run finduuid;
|
||||
run mmcargs;
|
||||
if test ${boot_fdt} = yes || test ${boot_fdt} = try; then
|
||||
if run loadfdt; then
|
||||
bootz ${loadaddr} - ${fdt_addr};
|
||||
else
|
||||
if test ${boot_fdt} = try; then
|
||||
bootz;
|
||||
else
|
||||
echo WARN: Cannot load the DT;
|
||||
fi;
|
||||
fi;
|
||||
else
|
||||
bootz;
|
||||
fi;
|
||||
netargs=setenv bootargs console=${console},${baudrate} root=/dev/nfs
|
||||
ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp
|
||||
netboot=echo Booting from net ...;
|
||||
run netargs;
|
||||
if test ${ip_dyn} = yes; then
|
||||
setenv get_cmd dhcp;
|
||||
else
|
||||
setenv get_cmd tftp;
|
||||
fi;
|
||||
${get_cmd} ${image};
|
||||
if test ${boot_fdt} = yes || test ${boot_fdt} = try; then
|
||||
if ${get_cmd} ${fdt_addr} ${fdtfile}; then
|
||||
bootz ${loadaddr} - ${fdt_addr};
|
||||
else
|
||||
if test ${boot_fdt} = try; then
|
||||
bootz;
|
||||
else
|
||||
echo WARN: Cannot load the DT;
|
||||
fi;
|
||||
fi;
|
||||
else
|
||||
bootz;
|
||||
fi;
|
||||
findfdt=if test $fdtfile = undefined; then
|
||||
if test $board_name = SABREAUTO && test $board_rev = MX6QP; then
|
||||
setenv fdtfile imx6qp-sabreauto.dtb;
|
||||
fi;
|
||||
if test $board_name = SABREAUTO && test $board_rev = MX6Q; then
|
||||
setenv fdtfile imx6q-sabreauto.dtb;
|
||||
fi;
|
||||
if test $board_name = SABREAUTO && test $board_rev = MX6DL; then
|
||||
setenv fdtfile imx6dl-sabreauto.dtb;
|
||||
fi;
|
||||
if test $board_name = SABRESD && test $board_rev = MX6QP; then
|
||||
setenv fdtfile imx6qp-sabresd.dtb;
|
||||
fi;
|
||||
if test $board_name = SABRESD && test $board_rev = MX6Q; then
|
||||
setenv fdtfile imx6q-sabresd.dtb;
|
||||
fi;
|
||||
if test $board_name = SABRESD && test $board_rev = MX6DL; then
|
||||
setenv fdtfile imx6dl-sabresd.dtb;
|
||||
fi;
|
||||
if test $fdtfile = undefined; then
|
||||
echo WARNING: Could not determine dtb to use;
|
||||
fi;
|
||||
fi;
|
||||
Reference in New Issue
Block a user