| Message ID | 20211206162930.56301-6-aford173@gmail.com |
|---|---|
| State | Accepted |
| Commit | d5f1beb058a48fb057d3a62dc751a19c1a3db279 |
| Delegated to: | Marek Vasut |
| Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=g0NOCzW0; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J787W620rz9s1l for <incoming@patchwork.ozlabs.org>; Tue, 7 Dec 2021 03:31:03 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6336A830E4; Mon, 6 Dec 2021 17:30:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="g0NOCzW0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4955783084; Mon, 6 Dec 2021 17:30:03 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-x835.google.com (mail-qt1-x835.google.com [IPv6:2607:f8b0:4864:20::835]) (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 4FB3183087 for <u-boot@lists.denx.de>; Mon, 6 Dec 2021 17:29:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=aford173@gmail.com Received: by mail-qt1-x835.google.com with SMTP id z9so11324266qtj.9 for <u-boot@lists.denx.de>; Mon, 06 Dec 2021 08:29:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Em9kcixMBtTSMKh2fRLLprFeoHs3FWR94xyhhxiFBp0=; b=g0NOCzW0XIlnWgr+Ypaczt4fgouwY6ZkC652V2qDwxXvT7Csz1zjWRCnnwl3SIjlOu mur+UmIBR1vR7OxezpAWni1aVd6W6yPjIozzYS3rOEyzVOo/HyEBwoNBIpkoDIm6VnUr eVRbpydrshP+iwm9QM4UTsrKJwCy4hXTeRwbQtWSSQZ2mAj1G9MiedrMdtZd1GSB4T/+ XF2SN6D8hR2LeBHhINnZJkj4YYRSwSt/GI7f1YR4gGt3bLyG3RDFKoxcbDHoVE5fbYks dMS8mzDtUTy5Rc/dFd5vBeRWIAxQJJYWbgimMs+vhscFCeUT3iqmR1dORxF1eUPGtIcB TmxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Em9kcixMBtTSMKh2fRLLprFeoHs3FWR94xyhhxiFBp0=; b=pDZYYrb1hULlcewD+J5ZSdq0KLTcjKeZWvbVPXaDLFFYIyB5vt4NxlqAPXl70AhoyR p6Qlr9B0lNsieKVVy6S7qEc78iMArwu9J/hTRUNCMJkXF2GzQdf5ZTYB+5rx7Ti8TxHZ iPe6xJckC6Lj4V6Xhw7PYUUTGz1RhEpVx14CtFW3i5VmCAtxPeQwEHHVuVKz5ZZsRhA0 vtlvnpr6ZxOSkdlyDSl3HnzXtjgKAS39FVZ1JbFstnjWdCWtlj3AjiXliD6I9JEVjo1V AtyqwgiR6Ze6wrViRsk8QDR1CwjeLVgpxR3pbKYuRHYjqdwNAtSqDLsxgFel3kJoB4TH Qjkw== X-Gm-Message-State: AOAM532UYmOb7q90/SiuoicLDgPNwAsMEq+fR5G1hPR3Ys9VC5UK/K+K bJopf5Bgm9SAnCS89Ghn6y/lkYFHeec= X-Google-Smtp-Source: ABdhPJwYIbrJhEdHj78LsecX2yGIVBtSp+JPRdWEwCMgbeUGU4XX1gCrPwhsJcQ2sc8it8dGSfEkXw== X-Received: by 2002:a05:622a:1351:: with SMTP id w17mr40168421qtk.276.1638808190607; Mon, 06 Dec 2021 08:29:50 -0800 (PST) Received: from aford-OptiPlex-7050.logicpd.com ([174.46.170.158]) by smtp.gmail.com with ESMTPSA id d6sm7172526qtq.15.2021.12.06.08.29.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Dec 2021 08:29:50 -0800 (PST) From: Adam Ford <aford173@gmail.com> To: u-boot@lists.denx.de Cc: marek.vasut+renesas@gmail.com, joe.hershberger@ni.com, rfried.dev@gmail.com, Adam Ford <aford173@gmail.com> Subject: [PATCH 5/5] configs: beacon-rzg2m: Config to address new aliases Date: Mon, 6 Dec 2021 10:29:30 -0600 Message-Id: <20211206162930.56301-6-aford173@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211206162930.56301-1-aford173@gmail.com> References: <20211206162930.56301-1-aford173@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean |
| Series |
Resync Devices trees with Linux 5.16-rc3 and fix breakages
|
expand
|
diff --git a/include/configs/beacon-rzg2m.h b/include/configs/beacon-rzg2m.h index 18d442e06a..14d6df328a 100644 --- a/include/configs/beacon-rzg2m.h +++ b/include/configs/beacon-rzg2m.h @@ -23,7 +23,7 @@ "boot_fdt=try\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "initrd_addr=0x43800000\0" \ - "mmcdev=0\0" \ + "mmcdev=1\0" \ "mmcpart=1\0" \ "mmcrootpart=2\0" \ "finduuid=part uuid mmc ${mmcdev}:${mmcrootpart} uuid\0" \
The resync of the device trees from Linux 5.16-rc3 caused aliases to appear on the MMC devices which changed the numbering. This changed the default boot device and caused boot failure. Update the mmcdev variable to reflect the new aliases. Signed-off-by: Adam Ford <aford173@gmail.com> --- include/configs/beacon-rzg2m.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)