dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-05 10:42:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

colibri_imx6: add distroboot support

Browse Source 
Add support for distro boot. This is especially helpful for external
devices. There is a global boot command which scans a predefined
list of boot targets:
  run distro_bootcmd

As well as direct boot commands such as:
  run bootcmd_mmc1
  run bootcmd_usb
  run bootcmd_dhcp
  ...

Refer to doc/README.distro fo details.

While at it, remove the CONFIG_DRIVE_TYPES define which has not
been used and was meant to be used for multi device boot support
which is now provided by distroboot.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
This commit is contained in:
Stefan Agner
2019-02-08 18:42:18 +01:00
committed by Stefano Babic
parent 2910c0a135
commit e85a536ca4
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/configs/colibri_imx6.h
View File

@@ -100,14 +100,18 @@
#define CONFIG_LOADADDR 0x12000000 #define CONFIG_LOADADDR 0x12000000
#ifdef CONFIG_CMD_MMC #ifndef CONFIG_SPL_BUILD
#define CONFIG_DRIVE_MMC "mmc " #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \
func(USB, usb, 0) \
func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h>
#undef BOOTENV_RUN_NET_USB_START
#define BOOTENV_RUN_NET_USB_START ""
#else #else
#define CONFIG_DRIVE_MMC #define BOOTENV
#endif #endif
#define CONFIG_DRIVE_TYPES CONFIG_DRIVE_MMC
#define DFU_ALT_EMMC_INFO \ #define DFU_ALT_EMMC_INFO \
"u-boot.imx raw 0x2 0x3ff mmcpart 0;" \ "u-boot.imx raw 0x2 0x3ff mmcpart 0;" \
"boot part 0 1;" \ "boot part 0 1;" \
@@ -134,7 +138,9 @@
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \
"kernel_addr_r=0x11000000\0" \ "kernel_addr_r=0x11000000\0" \
"ramdisk_addr_r=0x12100000\0" "pxefile_addr_r=0x17100000\0" \
"ramdisk_addr_r=0x12100000\0" \
"scriptaddr=0x17000000\0"
#define NFS_BOOTCMD \ #define NFS_BOOTCMD \
"nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \ "nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \
@@ -171,8 +177,9 @@
#define FDT_FILE "imx6dl-colibri-eval-v3.dtb" #define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
BOOTENV \
"bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
"run nfsboot ; echo ; echo nfsboot failed ; " \ "run distro_bootcmd ; " \
"usb start ; " \ "usb start ; " \
"setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
"boot_file=uImage\0" \ "boot_file=uImage\0" \