From patchwork Fri Feb 8 17:42:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1038883 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43x2wB2tfxz9s3l for ; Sat, 9 Feb 2019 04:58:02 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 06A53C2207E; Fri, 8 Feb 2019 17:52:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 384EEC22094; Fri, 8 Feb 2019 17:43:54 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D2C0AC22095; Fri, 8 Feb 2019 17:43:01 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 85DA5C22039 for ; Fri, 8 Feb 2019 17:42:57 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LpuQT-1hLyPa3uv1-00fiIg; Fri, 08 Feb 2019 18:42:54 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:18 +0100 Message-Id: <20190208174229.23562-16-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:+IUtEkJ74j2WLlUGrC4MaRC4Bj0gTq3DFKDwP8kwgakL19RbVoM CIrYUhfpIi6+mMHiK6chZJJMihj5afJcS3/nUxPvRyX3PBDOnPM5Icx/WrOgAN/ZwvfGWrv dGZesVbbS7isAvKanZIKo8AiRa/eSGYbQhVXHrbWnu938wGINiebMD9t7Yx6hRUL67hD12i ZIFkTErgkrHpUza5563sQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:sR1/9K30n5w=:caTDeJ+OVwE6ixfCV1GO/5 Ss7Ia1WQzsL1E/3hu7kPXs+ET/P2/slj6gh9hf57d3eS/IrZjA8Hli9hcnkkBgXXFuydkBci3 FdyvB8i8mIOXmIYmn6dClzvT/SM+KvT4XmfyfTqCW3utsqCMyLODpYUSGmNr0H7fKr3TiuO3W KTgwpwgeZsCqomq7dwUwQx2+Tpd8oWygoSVdLXqFihKAoAGhQxzZpLHyYujBzC1ll/6Eh9wnm ZHWbXzdlydrStgBIXHiwpxIjRhjuLY6yuCe6QI3gd2o5lD2Ejs9NCH2X3/MTBMq15d6GU8w+3 eRqDpIqNU2r3V+WdKXfXp71BdgzfP0RqT+C6Ofwe+XesH8RVS8N1evTC042MzQs6XZUyThzNA jqh3vi3lFkfCVjTfekk3BacbtIP5ruyLGR5x8wOia9QLyOTpQ1QBR/k16yzcXvmC61814TgHH /kTt4u3S2mRElwVha2GwUcQwmqvBn+UaILp08rGfAq41OWE72OPJZkR04Mcxf1fRQbAM2KOZB wauz9MzAlo1QM0xmJ6pNKayDEEdBAZPb1NmRoJ54daJmG1S4yDxzecqHXNiWSPQWpxC0comsa Tk563IbkdwivkRbQ8O6HdSRmcXGkRv7zCFL5BMwZfieAhwdgcUAjvx4/ivfM0NSN3RXNbkT49 iP3HBv6ly+THTr7nUFARGqCeqTPg3Wnq1cJvuXuskIRKwLXcYFKReNX03XhI+IIKKCU7cvXsh UNdLrGG/ox/7k4fHF1aA4VRDeemOsfFxP6RFEA== Cc: Marcel Ziswiler , Max Krummenacher , Stefan Agner Subject: [U-Boot] [PATCH v1 15/26] colibri_imx6: add distroboot support X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Stefan Agner 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 Acked-by: Max Krummenacher Acked-by: Marcel Ziswiler --- include/configs/colibri_imx6.h | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index c782b2924c..77f884f341 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -100,14 +100,18 @@ #define CONFIG_LOADADDR 0x12000000 -#ifdef CONFIG_CMD_MMC -#define CONFIG_DRIVE_MMC "mmc " +#ifndef CONFIG_SPL_BUILD +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 1) \ + func(USB, usb, 0) \ + func(DHCP, dhcp, na) +#include +#undef BOOTENV_RUN_NET_USB_START +#define BOOTENV_RUN_NET_USB_START "" #else -#define CONFIG_DRIVE_MMC +#define BOOTENV #endif -#define CONFIG_DRIVE_TYPES CONFIG_DRIVE_MMC - #define DFU_ALT_EMMC_INFO \ "u-boot.imx raw 0x2 0x3ff mmcpart 0;" \ "boot part 0 1;" \ @@ -134,7 +138,9 @@ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\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 \ "nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \ @@ -171,9 +177,10 @@ #define FDT_FILE "imx6dl-colibri-eval-v3.dtb" #define CONFIG_EXTRA_ENV_SETTINGS \ + BOOTENV \ "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ - "run nfsboot ; echo ; echo nfsboot failed ; " \ - "usb start ;" \ + "run distro_bootcmd ; " \ + "usb start ; " \ "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ "boot_file=uImage\0" \ "console=ttymxc0\0" \