diff mbox series

[v2,1/2] imx8mm: configs: add support for distro boot commands

Message ID 20201216055036.24914-1-alice.guo@oss.nxp.com
State Superseded
Delegated to: Stefano Babic
Headers show
Series [v2,1/2] imx8mm: configs: add support for distro boot commands | expand

Commit Message

Alice Guo (OSS) Dec. 16, 2020, 5:50 a.m. UTC 
From: Alice Guo <alice.guo@nxp.com>

Supported boot device types in iMX8MM: MMC, DHCP.

CONFIG_CMD_PART is added for command part and CONFIG_CMD_FS_GENERIC is
for command fstype.

CONFIG_BOOTCOMMAND which is defined in include/configs/imx8mm_evk.h is
deleted because "run distro_bootcmd" is required to be the default boot
mode.

scriptaddr is the location in RAM where boot.scr.uimg/boot.scr will be
loaded to prior to execution.

kernel_addr_r is the location in RAM where the kernel will be loaded to.

Delete unnecessary environment variables.

Signed-off-by: Alice Guo <alice.guo@nxp.com>
---

Changes for v2:
 - remove supported boot device type QSPI
 - delete unnecessary environment variables
 - set "run distro_bootcmd" to be the default boot mode

 configs/imx8mm_evk_defconfig |  2 ++
 include/configs/imx8mm_evk.h | 67 +++++++-----------------------------
 2 files changed, 14 insertions(+), 55 deletions(-)

--
2.17.1

Comments

Peng Fan Dec. 16, 2020, 7:06 a.m. UTC | #1 
> Subject: [PATCH v2 1/2] imx8mm: configs: add support for distro boot
> commands
> 
> From: Alice Guo <alice.guo@nxp.com>
> 
> Supported boot device types in iMX8MM: MMC, DHCP.
> 
> CONFIG_CMD_PART is added for command part and
> CONFIG_CMD_FS_GENERIC is for command fstype.
> 
> CONFIG_BOOTCOMMAND which is defined in include/configs/imx8mm_evk.h
> is deleted because "run distro_bootcmd" is required to be the default boot
> mode.
> 
> scriptaddr is the location in RAM where boot.scr.uimg/boot.scr will be loaded
> to prior to execution.
> 
> kernel_addr_r is the location in RAM where the kernel will be loaded to.
> 
> Delete unnecessary environment variables.
> 
> Signed-off-by: Alice Guo <alice.guo@nxp.com>
> ---
> 
> Changes for v2:
>  - remove supported boot device type QSPI
>  - delete unnecessary environment variables
>  - set "run distro_bootcmd" to be the default boot mode
> 
>  configs/imx8mm_evk_defconfig |  2 ++
>  include/configs/imx8mm_evk.h | 67 +++++++-----------------------------
>  2 files changed, 14 insertions(+), 55 deletions(-)
> 
> diff --git a/configs/imx8mm_evk_defconfig b/configs/imx8mm_evk_defconfig
> index 91d3bc3ac9..4c0dd27e71 100644
> --- a/configs/imx8mm_evk_defconfig
> +++ b/configs/imx8mm_evk_defconfig
> @@ -49,6 +49,8 @@ CONFIG_CMD_EXT2=y
>  CONFIG_CMD_EXT4=y
>  CONFIG_CMD_EXT4_WRITE=y
>  CONFIG_CMD_FAT=y
> +CONFIG_CMD_PART=y
> +CONFIG_CMD_FS_GENERIC=y
>  CONFIG_OF_CONTROL=y
>  CONFIG_SPL_OF_CONTROL=y
>  CONFIG_ENV_OVERWRITE=y
> diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
> index 83521ad401..3bb2bcc287 100644
> --- a/include/configs/imx8mm_evk.h
> +++ b/include/configs/imx8mm_evk.h
> @@ -32,69 +32,26 @@
> 
>  #endif
> 
> +#ifndef CONFIG_SPL_BUILD
> +#define BOOT_TARGET_DEVICES(func) \
> +	func(MMC, mmc, 1) \
> +	func(MMC, mmc, 2) \
> +	func(DHCP, dhcp, na)
> +
> +#include <config_distro_bootcmd.h>
> +#endif
> +
>  /* Initial environment variables */
>  #define CONFIG_EXTRA_ENV_SETTINGS		\
> -	"script=boot.scr\0" \
> +	BOOTENV \
> +	"scriptaddr=0x43500000\0" \
> +	"kernel_addr_r=0x40880000\0" \
>  	"image=Image\0" \
>  	"console=ttymxc1,115200\0" \
>  	"fdt_addr=0x43000000\0"			\
> -	"boot_fit=no\0" \
>  	"fdt_file=imx8mm-evk.dtb\0" \
> -	"initrd_addr=0x43800000\0"		\
> -	"bootm_size=0x10000000\0" \
> -	"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
>  	"mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
>  	"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> -	"mmcautodetect=yes\0" \
> -	"mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \
> -	"loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr}
> ${script};\0" \
> -	"bootscript=echo Running bootscript from mmc ...; " \
> -		"source\0" \
> -	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr}
> ${image}\0" \
> -	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0"
> \
> -	"mmcboot=echo Booting from mmc ...; " \
> -		"run mmcargs; " \
> -		"if test ${boot_fit} = yes || test ${boot_fit} = try; then " \
> -			"bootm ${loadaddr}; " \
> -		"else " \
> -			"if run loadfdt; then " \
> -				"booti ${loadaddr} - ${fdt_addr}; " \
> -			"else " \
> -				"echo WARN: Cannot load the DT; " \
> -			"fi; " \
> -		"fi;\0" \
> -	"netargs=setenv bootargs console=${console} " \
> -		"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} ${loadaddr} ${image}; " \
> -		"if test ${boot_fit} = yes || test ${boot_fit} = try; then " \
> -			"bootm ${loadaddr}; " \
> -		"else " \
> -			"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
> -				"booti ${loadaddr} - ${fdt_addr}; " \
> -			"else " \
> -				"echo WARN: Cannot load the DT; " \
> -			"fi; " \
> -		"fi;\0"
> -
> -#define CONFIG_BOOTCOMMAND \
> -	   "mmc dev ${mmcdev}; if mmc rescan; then " \
> -		   "if run loadbootscript; then " \
> -			   "run bootscript; " \
> -		   "else " \
> -			   "if run loadimage; then " \
> -				   "run mmcboot; " \
> -			   "else run netboot; " \
> -			   "fi; " \
> -		   "fi; " \
> -	   "fi;"
> 
>  /* Link Definitions */
>  #define CONFIG_LOADADDR			0x40480000
> --

Reviewed-by: Peng Fan <peng.fan@nxp.com>
diff mbox series

Patch

diff --git a/configs/imx8mm_evk_defconfig b/configs/imx8mm_evk_defconfig
index 91d3bc3ac9..4c0dd27e71 100644
--- a/configs/imx8mm_evk_defconfig
+++ b/configs/imx8mm_evk_defconfig
@@ -49,6 +49,8 @@  CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_PART=y
+CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index 83521ad401..3bb2bcc287 100644
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -32,69 +32,26 @@ 

 #endif

+#ifndef CONFIG_SPL_BUILD
+#define BOOT_TARGET_DEVICES(func) \
+	func(MMC, mmc, 1) \
+	func(MMC, mmc, 2) \
+	func(DHCP, dhcp, na)
+
+#include <config_distro_bootcmd.h>
+#endif
+
 /* Initial environment variables */
 #define CONFIG_EXTRA_ENV_SETTINGS		\
-	"script=boot.scr\0" \
+	BOOTENV \
+	"scriptaddr=0x43500000\0" \
+	"kernel_addr_r=0x40880000\0" \
 	"image=Image\0" \
 	"console=ttymxc1,115200\0" \
 	"fdt_addr=0x43000000\0"			\
-	"boot_fit=no\0" \
 	"fdt_file=imx8mm-evk.dtb\0" \
-	"initrd_addr=0x43800000\0"		\
-	"bootm_size=0x10000000\0" \
-	"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
 	"mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
 	"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
-	"mmcautodetect=yes\0" \
-	"mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \
-	"loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
-	"bootscript=echo Running bootscript from mmc ...; " \
-		"source\0" \
-	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
-	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
-	"mmcboot=echo Booting from mmc ...; " \
-		"run mmcargs; " \
-		"if test ${boot_fit} = yes || test ${boot_fit} = try; then " \
-			"bootm ${loadaddr}; " \
-		"else " \
-			"if run loadfdt; then " \
-				"booti ${loadaddr} - ${fdt_addr}; " \
-			"else " \
-				"echo WARN: Cannot load the DT; " \
-			"fi; " \
-		"fi;\0" \
-	"netargs=setenv bootargs console=${console} " \
-		"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} ${loadaddr} ${image}; " \
-		"if test ${boot_fit} = yes || test ${boot_fit} = try; then " \
-			"bootm ${loadaddr}; " \
-		"else " \
-			"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
-				"booti ${loadaddr} - ${fdt_addr}; " \
-			"else " \
-				"echo WARN: Cannot load the DT; " \
-			"fi; " \
-		"fi;\0"
-
-#define CONFIG_BOOTCOMMAND \
-	   "mmc dev ${mmcdev}; if mmc rescan; then " \
-		   "if run loadbootscript; then " \
-			   "run bootscript; " \
-		   "else " \
-			   "if run loadimage; then " \
-				   "run mmcboot; " \
-			   "else run netboot; " \
-			   "fi; " \
-		   "fi; " \
-	   "fi;"

 /* Link Definitions */
 #define CONFIG_LOADADDR			0x40480000