From patchwork Thu Jul 29 07:21:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mattijs Korpershoek X-Patchwork-Id: 1511227 X-Patchwork-Delegate: narmstrong@baylibre.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=TQ2AIY3r; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 ozlabs.org (Postfix) with ESMTPS id 4Gb8Gq26SJz9sWS for ; Thu, 29 Jul 2021 22:00:03 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8122B82EA7; Thu, 29 Jul 2021 13:59:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.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=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="TQ2AIY3r"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E687682DDA; Thu, 29 Jul 2021 09:21:25 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) (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 5AD1C82DF7 for ; Thu, 29 Jul 2021 09:21:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mkorpershoek@baylibre.com Received: by mail-wm1-x32f.google.com with SMTP id f18-20020a05600c4e92b0290253c32620e7so5864858wmq.5 for ; Thu, 29 Jul 2021 00:21:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hmNDMZ00AgINxFpQ9wH4V9eX1Y8RZdMLoXeGtXbbQxY=; b=TQ2AIY3ruR82sPzRxK792nRoReVrgZtwzz4kK11iJezz3utr3ioMOqna+ynBUdAgt3 A9HbVxDZ9rWcixHRUF3czNPyVwsgFiUPbd/5glYVRjGFwFJ1o6EGptM7f7M4cgtBgKC9 h7rwl+rWiBxcMDWr9/w1uAK0A9coLM0feOW3/enhd2n9L3RmBIxbSHJfIxKQKPuOuxC/ Z5JhGIb+dprrf5H7mPD6D0T9j1IqF5tuKwOjuC8Y+CYEx3RutzzQKUKk+y11pERxFuv2 k8WPE8PdCDo2K2T/hZ5QVXsQTK0rpsBM3+P/b2PQkr0V5XlT/73hsqmkE/QgJRAlu+ya Jbwg== 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:mime-version:content-transfer-encoding; bh=hmNDMZ00AgINxFpQ9wH4V9eX1Y8RZdMLoXeGtXbbQxY=; b=VI9Of2HjkeS/Xj5IhJHcrSGcDEIP3B5NCh8ZYRif2+Qr30EofjOc3/O/HiHVgVLfkt gYc52X9FFYv1WwEpMA46SjEvzfXaul5dNQU2z3rRWotzr0+fD/jj0dRosJF29IWY0FV1 vNnZ1QKpsdumA6FWlLJWwy1ZptveNwUKS45BzLJf4rkIlZ+Wxjz07mAW5krnX/9UGSCn JjyKOooPl8zs+Jzjnf+lw3NgXM+fKrwMFnd9C3/TrsyGpMFEpe74vqrPVCEkijmcqbvP kv17RbPVwiVB0b39z+CB0zuOb7nKuUGP86JMylD4atnSIotoXB6KZcLg0i2KFeHR97g+ KONw== X-Gm-Message-State: AOAM5301mrM2fMED0Xxl3o09W8XlF1vWe3TEfznn9QqZ4Q+3A5pY+7zs xSwThI8tiwq9+uyGaKkNClbHsw== X-Google-Smtp-Source: ABdhPJzD/kgJTYE7nAAJxvKM5dFfoAZe1wGR7NAxz8MonXdJvBajCL5w5QKnllF5lNHFaJG+15q/Kg== X-Received: by 2002:a05:600c:3593:: with SMTP id p19mr3146274wmq.33.1627543279824; Thu, 29 Jul 2021 00:21:19 -0700 (PDT) Received: from groot.home ([2a01:cb19:826e:8e00:b844:cc86:4a22:410b]) by smtp.gmail.com with ESMTPSA id q5sm2298185wrx.33.2021.07.29.00.21.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jul 2021 00:21:19 -0700 (PDT) From: Mattijs Korpershoek To: Neil Armstrong Cc: u-boot-amlogic@groups.io, u-boot@lists.denx.de, Mattijs Korpershoek Subject: [PATCH 4/6] configs: meson64_android: use boot part label instead of index Date: Thu, 29 Jul 2021 09:21:11 +0200 Message-Id: <20210729072113.208099-5-mkorpershoek@baylibre.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210729072113.208099-1-mkorpershoek@baylibre.com> References: <20210729072113.208099-1-mkorpershoek@baylibre.com> MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 29 Jul 2021 13:59:28 +0200 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 To boot Android, we read the gpt and assume that the partition with index "1" will be the "boot" partition. This might not always be the case, as there are no requirements from Android on the partition order. However, Android does seem to use the "boot" label quite a lot on their public documentation [1] Load the boot partition by label instead of by index [1] https://source.android.com/devices/bootloader/partitions Signed-off-by: Guillaume La Roque Signed-off-by: Mattijs Korpershoek --- include/configs/meson64_android.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/configs/meson64_android.h b/include/configs/meson64_android.h index 4027a7fe0d..e22f05c889 100644 --- a/include/configs/meson64_android.h +++ b/include/configs/meson64_android.h @@ -9,6 +9,9 @@ #ifndef __MESON64_ANDROID_CONFIG_H #define __MESON64_ANDROID_CONFIG_H +#ifndef BOOT_PARTITION +#define BOOT_PARTITION "boot" +#endif #define BOOTENV_DEV_FASTBOOT(devtypeu, devtypel, instance) \ "bootcmd_fastboot=" \ @@ -77,11 +80,11 @@ #define BOOTENV_DEV_SYSTEM(devtypeu, devtypel, instance) \ "bootcmd_system=" \ - "echo Loading Android boot partition...;" \ + "echo Loading Android " BOOT_PARTITION " partition...;" \ "mmc dev ${mmcdev};" \ "setenv bootargs ${bootargs} console=${console} androidboot.serialno=${serial#};" \ - "part start mmc ${mmcdev} ${bootpart} boot_start;" \ - "part size mmc ${mmcdev} ${bootpart} boot_size;" \ + "part start mmc ${mmcdev} " BOOT_PARTITION " boot_start;" \ + "part size mmc ${mmcdev} " BOOT_PARTITION " boot_size;" \ "if mmc read ${loadaddr} ${boot_start} ${boot_size}; then " \ "echo Running Android...;" \ "bootm ${loadaddr};" \ @@ -111,7 +114,6 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "partitions=" PARTS_DEFAULT "\0" \ "mmcdev=2\0" \ - "bootpart=1\0" \ "logopart=2\0" \ "gpio_recovery=88\0" \ "check_button=gpio input ${gpio_recovery};test $? -eq 0;\0" \