[PATCH v1 1/2] imx8mp: configs: add support for distro boot commands
From: Alice Guo alice.guo@nxp.com
Supported boot device types in iMX8MP: MMC.
CONFIG_CMD_PART is added for command part and CONFIG_CMD_FS_GENERIC is for command fstype.
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 because "run distro_bootcmd" is set to be the default boot mode.
On the iMX8MP platform I used, "mmc1" represents SD card and "mmc2" represents eMMC.
Signed-off-by: Alice Guo alice.guo@nxp.com --- configs/imx8mp_evk_defconfig | 2 ++ include/configs/imx8mp_evk.h | 66 ++++++------------------------------ 2 files changed, 13 insertions(+), 55 deletions(-)
diff --git a/configs/imx8mp_evk_defconfig b/configs/imx8mp_evk_defconfig index cd5724e811..7831a940a3 100644 --- a/configs/imx8mp_evk_defconfig +++ b/configs/imx8mp_evk_defconfig @@ -51,6 +51,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/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 8253c6aa2f..70f5fb2928 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -44,69 +44,25 @@
#endif
+#ifndef CONFIG_SPL_BUILD +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 1) \ + func(MMC, mmc, 2) + +#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 earlycon=ec_imx6q,0x30890000,115200\0" \ "fdt_addr=0x43000000\0" \ - "boot_fdt=try\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\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 ${jh_clk} 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_fdt} = yes || test ${boot_fdt} = try; then " \ - "if run loadfdt; then " \ - "booti ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "echo WARN: Cannot load the DT; " \ - "fi; " \ - "else " \ - "echo wait for boot; " \ - "fi;\0" \ - "netargs=setenv bootargs ${jh_clk} 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_fdt} = yes || test ${boot_fdt} = try; then " \ - "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ - "booti ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "echo WARN: Cannot load the DT; " \ - "fi; " \ - "else " \ - "booti; " \ - "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; " \ - "else booti ${loadaddr} - ${fdt_addr}; fi"
/* Link Definitions */ #define CONFIG_LOADADDR 0x40480000 -- 2.17.1
From: Alice Guo alice.guo@nxp.com
Distro Boot requires a U-Boot-specific script named boot.scr or boot.scr.uimg which contains boot commands to boot the system. The boot.cmd is such a file. Use mkimage to generate boot.scr or boot.scr.uimg from boot.cmd, and the command is: mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Distro Boot Script" -d boot.cmd boot.scr.uimg
The boot.cmd file is an example script and can be modified based on needs. bootargs is set in this script and root uses the default value "/dev/mmcblk1p2 rootwait rw" which can be changed by overriding mmcroot.
Signed-off-by: Alice Guo alice.guo@nxp.com --- board/freescale/imx8mp_evk/boot.cmd | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 board/freescale/imx8mp_evk/boot.cmd
diff --git a/board/freescale/imx8mp_evk/boot.cmd b/board/freescale/imx8mp_evk/boot.cmd new file mode 100644 index 0000000000..10bcced774 --- /dev/null +++ b/board/freescale/imx8mp_evk/boot.cmd @@ -0,0 +1,25 @@ +setenv bootargs console=${console} root=${mmcroot}; + +for boot_target in ${boot_targets}; +do + if test "${boot_target}" = "mmc1" ; then + if fatload mmc 1:${mmcpart} ${kernel_addr_r} ${image}; then + if fatload mmc 1:${mmcpart} ${fdt_addr} ${fdt_file}; then + echo Load image and .dtb from SD card(mmc1); + booti ${kernel_addr_r} - ${fdt_addr}; + exit; + fi + fi + fi + + if test "${boot_target}" = "mmc2" ; then + if fatload mmc 2:${mmcpart} ${kernel_addr_r} ${image}; then + if fatload mmc 2:${mmcpart} ${fdt_addr} ${fdt_file}; then + echo Load image and .dtb from eMMC(mmc2); + booti ${kernel_addr_r} - ${fdt_addr}; + exit; + fi + fi + fi + +done -- 2.17.1
Hello Alice,
-----Original Message----- From: U-Boot u-boot-bounces@lists.denx.de On Behalf Of Alice Guo (OSS) Sent: Thursday, December 17, 2020 11:29 AM To: sbabic@denx.de; festevam@gmail.com; peng.fan@nxp.com Cc: uboot-imx@nxp.com; ye.li@nxp.com; u-boot@lists.denx.de; Alice Guo alice.guo@nxp.com Subject: [PATCH v1 1/2] imx8mp: configs: add support for distro boot commands
From: Alice Guo alice.guo@nxp.com
Supported boot device types in iMX8MP: MMC.
CONFIG_CMD_PART is added for command part and CONFIG_CMD_FS_GENERIC is for command fstype.
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 because "run distro_bootcmd" is set to be the default boot mode.
On the iMX8MP platform I used, "mmc1" represents SD card and "mmc2" represents eMMC.
Signed-off-by: Alice Guo alice.guo@nxp.com
configs/imx8mp_evk_defconfig | 2 ++ include/configs/imx8mp_evk.h | 66 ++++++------------------------------ 2 files changed, 13 insertions(+), 55 deletions(-)
diff --git a/configs/imx8mp_evk_defconfig b/configs/imx8mp_evk_defconfig index cd5724e811..7831a940a3 100644 --- a/configs/imx8mp_evk_defconfig +++ b/configs/imx8mp_evk_defconfig @@ -51,6 +51,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/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 8253c6aa2f..70f5fb2928 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -44,69 +44,25 @@
#endif
+#ifndef CONFIG_SPL_BUILD +#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \func(MMC, mmc, 2)+#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 earlycon=ec_imx6q,0x30890000,115200\0" \ "fdt_addr=0x43000000\0" \
"boot_fdt=try\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \"initrd_addr=0x43800000\0" \"bootm_size=0x10000000\0" \
I believe that without proper bootm_size set, FIT image cannot be loaded correctly.
Commit acbc1d86f1 ("imx8m: config: convert to bootm_size") had this addressed, and removing the "bootm_size" would break FIT load again.
Have you tested your implementation with "bootm" in boot script? So far, I see that only "booti" has been used.
"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 ${jh_clk} 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_fdt} = yes || test ${boot_fdt} = try; then " \"if run loadfdt; then " \"booti ${loadaddr} - ${fdt_addr}; " \"else " \"echo WARN: Cannot load the DT; " \"fi; " \"else " \"echo wait for boot; " \"fi;\0" \"netargs=setenv bootargs ${jh_clk} 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_fdt} = yes || test ${boot_fdt} = try; then " \"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \"booti ${loadaddr} - ${fdt_addr}; " \"else " \"echo WARN: Cannot load the DT; " \"fi; " \"else " \"booti; " \"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; " \"else booti ${loadaddr} - ${fdt_addr}; fi"/* Link Definitions */
#define CONFIG_LOADADDR 0x40480000
2.17.1
-- Andrey
-----Original Message----- From: ZHIZHIKIN Andrey andrey.zhizhikin@leica-geosystems.com Sent: 2020年12月17日 19:21 To: Alice Guo (OSS) alice.guo@oss.nxp.com; sbabic@denx.de; festevam@gmail.com; Peng Fan peng.fan@nxp.com Cc: dl-uboot-imx uboot-imx@nxp.com; Ye Li ye.li@nxp.com; u-boot@lists.denx.de; Alice Guo alice.guo@nxp.com Subject: [EXT] RE: [PATCH v1 1/2] imx8mp: configs: add support for distro boot commands
Caution: EXT Email
Hello Alice,
-----Original Message----- From: U-Boot u-boot-bounces@lists.denx.de On Behalf Of Alice Guo (OSS) Sent: Thursday, December 17, 2020 11:29 AM To: sbabic@denx.de; festevam@gmail.com; peng.fan@nxp.com Cc: uboot-imx@nxp.com; ye.li@nxp.com; u-boot@lists.denx.de; Alice Guo alice.guo@nxp.com Subject: [PATCH v1 1/2] imx8mp: configs: add support for distro boot commands
From: Alice Guo alice.guo@nxp.com
Supported boot device types in iMX8MP: MMC.
CONFIG_CMD_PART is added for command part and
CONFIG_CMD_FS_GENERIC is
for command fstype.
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 because "run distro_bootcmd" is set to be the default boot mode.
On the iMX8MP platform I used, "mmc1" represents SD card and "mmc2" represents eMMC.
Signed-off-by: Alice Guo alice.guo@nxp.com
configs/imx8mp_evk_defconfig | 2 ++ include/configs/imx8mp_evk.h | 66 ++++++------------------------------ 2 files changed, 13 insertions(+), 55 deletions(-)
diff --git a/configs/imx8mp_evk_defconfig b/configs/imx8mp_evk_defconfig index cd5724e811..7831a940a3 100644 --- a/configs/imx8mp_evk_defconfig +++ b/configs/imx8mp_evk_defconfig @@ -51,6 +51,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/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 8253c6aa2f..70f5fb2928 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -44,69 +44,25 @@
#endif
+#ifndef CONFIG_SPL_BUILD +#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \func(MMC, mmc, 2)+#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,115200earlycon=ec_imx6q,0x30890000,115200\0" \
"fdt_addr=0x43000000\0" \
"boot_fdt=try\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \"initrd_addr=0x43800000\0" \"bootm_size=0x10000000\0" \I believe that without proper bootm_size set, FIT image cannot be loaded correctly.
Commit acbc1d86f1 ("imx8m: config: convert to bootm_size") had this addressed, and removing the "bootm_size" would break FIT load again.
Have you tested your implementation with "bootm" in boot script? So far, I see that only "booti" has been used.
Hi, Thank you for your advice. I have no need to support FIT image so that I did not notice this problem. I will check and modify it.
Best Regards, Alice
"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 ${jh_clk} 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_fdt} = yes || test ${boot_fdt} = try; then " \"if run loadfdt; then " \"booti ${loadaddr} - ${fdt_addr}; " \"else " \"echo WARN: Cannot load the DT; " \"fi; " \"else " \"echo wait for boot; " \"fi;\0" \"netargs=setenv bootargs ${jh_clk} 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_fdt} = yes || test ${boot_fdt} = try; then " \"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \"booti ${loadaddr} - ${fdt_addr}; " \"else " \"echo WARN: Cannot load the DT; " \"fi; " \"else " \"booti; " \"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; " \"else booti ${loadaddr} - ${fdt_addr}; fi"/* Link Definitions */
#define CONFIG_LOADADDR 0x40480000
2.17.1
-- Andrey
Hi Alice,
On Thu, Dec 17, 2020 at 7:28 AM Alice Guo (OSS) alice.guo@oss.nxp.com wrote:
diff --git a/configs/imx8mp_evk_defconfig b/configs/imx8mp_evk_defconfig index cd5724e811..7831a940a3 100644 --- a/configs/imx8mp_evk_defconfig +++ b/configs/imx8mp_evk_defconfig @@ -51,6 +51,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
Please read doc/README.distro, which states:
"In your board's defconfig, enable the DISTRO_DEFAULTS option by adding a line with "CONFIG_DISTRO_DEFAULTS=y"."
-----Original Message----- From: Fabio Estevam festevam@gmail.com Sent: 2020年12月18日 18:59 To: Alice Guo (OSS) alice.guo@oss.nxp.com Cc: Stefano Babic sbabic@denx.de; Peng Fan peng.fan@nxp.com; dl-uboot-imx uboot-imx@nxp.com; Ye Li ye.li@nxp.com; U-Boot-Denx u-boot@lists.denx.de; Alice Guo alice.guo@nxp.com Subject: [EXT] Re: [PATCH v1 1/2] imx8mp: configs: add support for distro boot commands
Caution: EXT Email
Hi Alice,
On Thu, Dec 17, 2020 at 7:28 AM Alice Guo (OSS) alice.guo@oss.nxp.com wrote:
diff --git a/configs/imx8mp_evk_defconfig b/configs/imx8mp_evk_defconfig index cd5724e811..7831a940a3 100644 --- a/configs/imx8mp_evk_defconfig +++ b/configs/imx8mp_evk_defconfig @@ -51,6 +51,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
Please read doc/README.distro, which states:
"In your board's defconfig, enable the DISTRO_DEFAULTS option by adding a line with "CONFIG_DISTRO_DEFAULTS=y"."
Hi, I know "CONFIG_DISTRO_DEFAULTS=y" exists. It can work when I write like this so that I did not change it. I will modify as your advice. Thank you.
Best Regards, Alice
participants (3)
-
Alice Guo (OSS) -
Fabio Estevam -
ZHIZHIKIN Andrey