Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D706C11F64 for ; Thu, 1 Jul 2021 13:26:42 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1180161416 for ; Thu, 1 Jul 2021 13:26:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1180161416 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2CB3C832A1; Thu, 1 Jul 2021 15:26:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 5AC0283297; Thu, 1 Jul 2021 15:26:24 +0200 (CEST) Received: from mail-qv1-f49.google.com (mail-qv1-f49.google.com [209.85.219.49]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4DAF0829EC for ; Thu, 1 Jul 2021 15:26:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qv1-f49.google.com with SMTP id m15so2918962qvc.9 for ; Thu, 01 Jul 2021 06:26:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tM25pHOHm+THeoIIemd/gFz9S2z/DVxwN0pQvbpjK5s=; b=l+lQNYYAx1XQ0N3yRfT9FgN9ZpHfyD0HrF+WsqPA1IywXFqm8oY0P8VUELENOCx27K q9KAr2egm8m9B/OqIIJ7IQT1gcqcxQLOfzhsAFk+DLwQXIR7jCaCl6joqmYoOmMo+Wh7 KgywV2LTSUUnE8ltTGHdc3cnUSALAWBQDF6g9ETRbs7n4YKqMDvqzF8OxGHzFqcK8Sbu c4sM+zA0YtFP92rQMAUBjG6DD8jEtxDonCxOvalG7NxmV5mXGiOQI6U8IbIGX6KY4uC0 9u8SVXtA9GHl8nq+YYDRbX/p+ImIZ6XA+I6XIVZSNJcG+xl/u0xlqOibPE8uJyE6JB2i iIaQ== X-Gm-Message-State: AOAM531bNhevWV9p2IVoTWdTm9DwdV6frML1jX7JUWDpKgOVNlZ4TNdv OSfsFuQ6frDmGxP8NBELeaM/UurQJfUz X-Google-Smtp-Source: ABdhPJy87cypxaCZaJhbzayuI3uHczMUtEJb8PVyTP+JJQQ6JXnIt7rcTcs+fVA8SF3OB4cl2KIATg== X-Received: by 2002:a05:6214:140c:: with SMTP id n12mr27965145qvx.11.1625145978769; Thu, 01 Jul 2021 06:26:18 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-ad98-12b1-a1ff-34ae.res6.spectrum.com. [2603:6081:7b01:cbda:ad98:12b1:a1ff:34ae]) by smtp.gmail.com with ESMTPSA id c65sm8865848qkg.84.2021.07.01.06.26.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jul 2021 06:26:17 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Lokesh Vutla Subject: [PATCH 3/3] ti: omap5: Switch to generic distro boot for non-Android cases Date: Thu, 1 Jul 2021 09:26:12 -0400 Message-Id: <20210701132612.7559-3-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210701132612.7559-1-trini@konsulko.com> References: <20210701132612.7559-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Remove the environment support for various legacy boot methods. With this, we will now default to booting any distribution that follows the generic distro boot framework and no longer attempt to boot various legacy (to this SoC) scripts/etc. Note that if we do not find anything here we will continue to try and Android methods and will start by trying fastboot. Cc: Lokesh Vutla Signed-off-by: Tom Rini --- include/configs/ti_omap5_common.h | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index dfe69a821ed8..055d108ddefe 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -177,21 +177,13 @@ #define DEFAULT_COMMON_BOOT_TI_ARGS \ "console=" CONSOLEDEV ",115200n8\0" \ "fdtfile=undefined\0" \ - "bootpart=0:2\0" \ - "bootdir=/boot\0" \ - "bootfile=zImage\0" \ + "finduuid=part uuid mmc 0:2 uuid\0" \ "usbtty=cdc_acm\0" \ "vram=16M\0" \ AVB_VERIFY_CMD \ "partitions=" PARTS_DEFAULT "\0" \ "optargs=\0" \ "dofastboot=0\0" \ - "emmc_linux_boot=" \ - "echo Trying to boot Linux from eMMC ...; " \ - "setenv mmcdev 1; " \ - "setenv bootpart 1:2; " \ - "setenv mmcroot /dev/mmcblk0p2 rw; " \ - "run mmcboot;\0" \ "emmc_android_boot=" \ "setenv mmcdev 1; " \ "mmc dev $mmcdev; " \ @@ -278,12 +270,18 @@ "run update_to_fit;" \ "fi;" \ "run findfdt; " \ - "run envboot; " \ - "run mmcboot;" \ - "run emmc_linux_boot; " \ + "run finduuid; " \ + "run distro_bootcmd;" \ "run emmc_android_boot; " \ "" +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(MMC, mmc, 1) \ + func(PXE, pxe, na) \ + func(DHCP, dhcp, na) + +#include #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ @@ -294,6 +292,7 @@ DFUARGS \ NETARGS \ NANDARGS \ + BOOTENV /* * SPL related defines. The Public RAM memory map the ROM defines the -- 2.17.1