Commit 4cbcf8db authored by Thomas Schäfer's avatar Thomas Schäfer
Browse files

pitx-imx8m: remove legacy boot commands



- Remove 'legacy_boot' from bootcmd and clean up related boot scripts
  in default environment.
Signed-off-by: Thomas Schäfer's avatarThomas Schaefer <thomas.schaefer@kontron.com>
parent ecfe7ed1
...@@ -24,7 +24,7 @@ CONFIG_SPL_LOAD_FIT=y ...@@ -24,7 +24,7 @@ CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg"
CONFIG_BOOTCOMMAND="run legacy_boot || run distro_bootcmd" CONFIG_BOOTCOMMAND="run distro_bootcmd"
CONFIG_LOG_MAX_LEVEL=6 CONFIG_LOG_MAX_LEVEL=6
CONFIG_LOG_DEFAULT_LEVEL=3 CONFIG_LOG_DEFAULT_LEVEL=3
CONFIG_VERSION_VARIABLE=y CONFIG_VERSION_VARIABLE=y
......
...@@ -150,52 +150,14 @@ ...@@ -150,52 +150,14 @@
"console=ttymxc2,115200 earlycon=ec_imx6q,0x30880000\0" \ "console=ttymxc2,115200 earlycon=ec_imx6q,0x30880000\0" \
"fdt_addr_r=0x43000000\0" \ "fdt_addr_r=0x43000000\0" \
"fdt_high=0xffffffffffffffff\0" \ "fdt_high=0xffffffffffffffff\0" \
"boot_fdt=try\0" \ "boot_fdt=try\0" \
"fdtfile=pitx-imx8m_hdmi.dtb\0" \ "fdtfile=pitx-imx8m_hdmi.dtb\0" \
"set_fdtfile=setenv fdtfile pitx-imx8m_hdmi.dtb\0" \
"initrd_addr=0x43800000\0" \ "initrd_addr=0x43800000\0" \
"initrd_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
"scriptaddr=0x40400000\0" \ "scriptaddr=0x40400000\0" \
"legacy_boot=run sdboot || run mmcboot || run usbboot || " \
"run netboot || run bootfailed\0" \
"bootfailed=echo Booting failed from all legacy boot sources " \
"&& false\0" \
"bootos=run setbootargs && " \
"run loadimage && " \
"run loadfdt && " \
"booti ${loadaddr} - ${fdt_addr_r} || false\0" \
"boot_scripts=boot.scr.uimg boot.scr update_pitx/update.scr\0" \ "boot_scripts=boot.scr.uimg boot.scr update_pitx/update.scr\0" \
"loadimage=load ${intf} ${bdev}:${bpart} ${loadaddr} ${image}\0" \ "video_off=yes\0" \
"loadfdt=run set_fdtfile && " \
"load ${intf} ${bdev}:${bpart} ${fdt_addr_r} ${fdtfile}\0" \
"setbootargs=setenv bootargs console=${console},${baudrate} " \
"root=${rootpath}\0" \
"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
"mmcboot=echo Booting from mmc ... && " \
"setenv bdev 0 && setenv bpart 1 && setenv intf mmc && " \
"mmc dev ${bdev} && setenv rootpath ${mmcroot} && " \
"run bootos\0" \
"usbroot=/dev/sda1 rootwait rw\0" \
"usbboot=echo Booting from USB ... && " \
"setenv bdev 0 && setenv bpart 1 && setenv intf usb && " \
"usb start && usb dev ${bdev} && setenv rootpath ${usbroot} && "\
"run bootos\0" \
"netsetbootargs=bootp && " \
"setenv bootargs console=${console},${baudrate} " \
"root=/dev/nfs ip=dhcp " \
"nfsroot=${serverip}:${nfsrootpath},v3,tcp\0" \
"nfsrootpath=/srv/export/pitx-imx8m\0" \
"netboot=echo Booting from net ...; " \
"run netsetbootargs && " \
"tftp ${loadaddr} ${image} && " \
"run set_fdtfile && tftp ${fdt_addr_r} ${fdtfile} && " \
"booti ${loadaddr} - ${fdt_addr_r} || false\0" \
"sdroot=/dev/mmcblk1p2 rootwait rw\0" \
"sdboot=echo Booting from SD card ... && " \
"setenv bdev 1 && setenv bpart 1 && setenv intf mmc && " \
"mmc dev ${bdev} && setenv rootpath ${sdroot} && " \
"run bootos\0" \
BOOTENV BOOTENV
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment