From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id E24FEC433EF for ; Mon, 22 Nov 2021 09:54:10 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 45E4383718; Mon, 22 Nov 2021 10:54:08 +0100 (CET) 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.20210112.gappssmtp.com header.i=@baylibre-com.20210112.gappssmtp.com header.b="pgaKAsb6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3E25983718; Mon, 22 Nov 2021 10:54:06 +0100 (CET) Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) (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 8301F8371F for ; Mon, 22 Nov 2021 10:54:02 +0100 (CET) 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-wr1-x436.google.com with SMTP id r8so31492061wra.7 for ; Mon, 22 Nov 2021 01:54:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=nEZ5AMUyip/GRnsQf6b+hilZGeJX9YpZI5RWuGlJTOY=; b=pgaKAsb6oeuTOi1IKd03gNpSDcEd+GYed3L81fyKtfJ/TQVtTWSXcV6nDi9YKfDexL 1ATB/d3sD/cWrjcoRMAiRFFvvZa3ZFOUKXSYjux212j6QWs6+59bGh+jv8pgIEh9Hf3r ugQEDChTiIhKaGi4hjVbW52C1sp55ZvwUsL8IqJhMHDvtD2sl8qdAQpRlN1Pa4UsvvPk 812HkHzYhaAdP8a00cKag8E6BDba3DsSS60eJpsrF1oCWpc3MjBPhYs26CEV0OueffLt fm30uohp82yL+nvALj9h3Rs2Kfoq5uY7lAcWPkI2EZqNW4kghOiGPPr3xD21rvooyxsI NWmA== 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:in-reply-to:references:date :message-id:mime-version; bh=nEZ5AMUyip/GRnsQf6b+hilZGeJX9YpZI5RWuGlJTOY=; b=I/Y3NiPJpm0YRA5okFuMsPeFQobSa643AFIkstMTnD9PqlXvROCndbw6LN5ijh8JQu jIze2icG6H31BByN2DuFg0qLrLRbs30Ti4/kEcujlzJUHKNJHeffycB3o1REFBKR2ogJ 6Luwiy+9rpAipPLD0lXQZ61OFP28CWvX5IPN9LHHjx+QZJG7PsRXJa1nmk7y1L6T9qCh AO51RXw87CK+N8R1Byqbj/RV86JJSSn7i34hLtx953v91ap+1zw6SGErCwco3sP503al Zfzyco7j6fODTsUhD5EWC2YOt6MJpWkrssECKejVy2zpe5dwSZ2K28fPZB2BUU3T8vfj Cehg== X-Gm-Message-State: AOAM533QRud49GfsLpae9wgl/MLzmpZ7R7pRJ53NCE8cnTJ74Z6QmHa4 Jbgd8/k118xxkvrexM+0d+//4A== X-Google-Smtp-Source: ABdhPJzaUXRgTJJcR3Qf5QS0XtgGY5I5qr393hs48+3SnI1FvLSgkBsANEAYrFsneFxKJsC+mA8BDA== X-Received: by 2002:a5d:65c7:: with SMTP id e7mr36144034wrw.319.1637574842074; Mon, 22 Nov 2021 01:54:02 -0800 (PST) Received: from localhost ([2a01:cb19:826e:8e00:1eb7:3acb:81f4:cb1c]) by smtp.gmail.com with ESMTPSA id q26sm8569446wrc.39.2021.11.22.01.54.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Nov 2021 01:54:01 -0800 (PST) From: Mattijs Korpershoek To: Neil Armstrong Cc: u-boot-amlogic@groups.io, u-boot@lists.denx.de, Guillaume La Roque Subject: Re: [PATCH 5/5] configs: khadas-vim3{l}_android_ab: enable A/B support In-Reply-To: References: <20211119100829.843139-1-mkorpershoek@baylibre.com> <20211119100829.843139-6-mkorpershoek@baylibre.com> Date: Mon, 22 Nov 2021 10:54:00 +0100 Message-ID: <878rxgecsn.fsf@baylibre.com> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 Hi Neil, Thank you for your review. Neil Armstrong writes: > Hi, > > On 19/11/2021 11:08, Mattijs Korpershoek wrote: >> meson64_android.h also relies on CMD_AB_SELECT so enable that as well. >> >> Signed-off-by: Guillaume La Roque >> Signed-off-by: Mattijs Korpershoek >> --- >> configs/khadas-vim3_android_ab_defconfig | 2 ++ >> configs/khadas-vim3l_android_ab_defconfig | 2 ++ >> include/configs/khadas-vim3_android.h | 16 ++++++++++++++++ >> include/configs/khadas-vim3l_android.h | 16 ++++++++++++++++ >> 4 files changed, 36 insertions(+) >> >> diff --git a/configs/khadas-vim3_android_ab_defconfig b/configs/khadas-vim3_android_ab_defconfig >> index 9305a54b1b..88325c37db 100644 >> --- a/configs/khadas-vim3_android_ab_defconfig >> +++ b/configs/khadas-vim3_android_ab_defconfig >> @@ -17,6 +17,7 @@ CONFIG_OF_BOARD_SETUP=y >> # CONFIG_DISPLAY_CPUINFO is not set >> CONFIG_MISC_INIT_R=y >> CONFIG_AVB_VERIFY=y >> +CONFIG_ANDROID_AB=y >> # CONFIG_CMD_BDI is not set >> CONFIG_CMD_ADTIMG=y >> CONFIG_CMD_ABOOTIMG=y >> @@ -33,6 +34,7 @@ CONFIG_CMD_SPI=y >> CONFIG_CMD_USB=y >> CONFIG_CMD_USB_MASS_STORAGE=y >> # CONFIG_CMD_SETEXPR is not set >> +CONFIG_CMD_AB_SELECT=y >> CONFIG_CMD_REGULATOR=y >> CONFIG_CMD_AVB=y >> CONFIG_OF_CONTROL=y >> diff --git a/configs/khadas-vim3l_android_ab_defconfig b/configs/khadas-vim3l_android_ab_defconfig >> index 5eed79b263..608b54dca2 100644 >> --- a/configs/khadas-vim3l_android_ab_defconfig >> +++ b/configs/khadas-vim3l_android_ab_defconfig >> @@ -17,6 +17,7 @@ CONFIG_OF_BOARD_SETUP=y >> # CONFIG_DISPLAY_CPUINFO is not set >> CONFIG_MISC_INIT_R=y >> CONFIG_AVB_VERIFY=y >> +CONFIG_ANDROID_AB=y >> # CONFIG_CMD_BDI is not set >> CONFIG_CMD_ADTIMG=y >> CONFIG_CMD_ABOOTIMG=y >> @@ -33,6 +34,7 @@ CONFIG_CMD_SPI=y >> CONFIG_CMD_USB=y >> CONFIG_CMD_USB_MASS_STORAGE=y >> # CONFIG_CMD_SETEXPR is not set >> +CONFIG_CMD_AB_SELECT=y >> CONFIG_CMD_REGULATOR=y >> CONFIG_CMD_AVB=y >> CONFIG_OF_CONTROL=y >> diff --git a/include/configs/khadas-vim3_android.h b/include/configs/khadas-vim3_android.h >> index a6f6dd0a7a..da6adf6c41 100644 >> --- a/include/configs/khadas-vim3_android.h >> +++ b/include/configs/khadas-vim3_android.h >> @@ -12,6 +12,21 @@ >> #define LOGO_UUID "43a3305d-150f-4cc9-bd3b-38fca8693846;" >> #define ROOT_UUID "ddb8c3f6-d94d-4394-b633-3134139cc2e0;" >> >> +#if defined(CONFIG_CMD_AB_SELECT) >> +#define PARTS_DEFAULT \ >> + "uuid_disk=${uuid_gpt_disk};" \ >> + "name=logo,start=512K,size=2M,uuid=" LOGO_UUID \ >> + "name=misc,size=512K,uuid=${uuid_gpt_misc};" \ >> + "name=dtbo_a,size=8M,uuid=${uuid_gpt_dtbo_a};" \ >> + "name=dtbo_b,size=8M,uuid=${uuid_gpt_dtbo_b};" \ >> + "name=vbmeta_a,size=512K,uuid=${uuid_gpt_vbmeta_a};" \ >> + "name=vbmeta_b,size=512K,uuid=${uuid_gpt_vbmeta_b};" \ >> + "name=boot_a,size=32M,bootable,uuid=${uuid_gpt_boot_a};" \ >> + "name=boot_b,size=32M,bootable,uuid=${uuid_gpt_boot_b};" \ >> + "name=super,size=3072M,uuid=${uuid_gpt_super};" \ >> + "name=userdata,size=11282M,uuid=${uuid_gpt_userdata};" \ >> + "name=rootfs,size=-,uuid=" ROOT_UUID >> +#else >> #define PARTS_DEFAULT \ >> "uuid_disk=${uuid_gpt_disk};" \ >> "name=logo,start=512K,size=2M,uuid=" LOGO_UUID \ >> @@ -24,6 +39,7 @@ >> "name=super,size=1792M,uuid=${uuid_gpt_super};" \ >> "name=userdata,size=12786M,uuid=${uuid_gpt_userdata};" \ >> "name=rootfs,size=-,uuid=" ROOT_UUID >> +#endif >> >> #define EXTRA_ANDROID_ENV_SETTINGS \ >> "board=vim3\0" \ >> diff --git a/include/configs/khadas-vim3l_android.h b/include/configs/khadas-vim3l_android.h >> index 7affc3e448..b1768e2d82 100644 >> --- a/include/configs/khadas-vim3l_android.h >> +++ b/include/configs/khadas-vim3l_android.h >> @@ -12,6 +12,21 @@ >> #define LOGO_UUID "43a3305d-150f-4cc9-bd3b-38fca8693846;" >> #define ROOT_UUID "ddb8c3f6-d94d-4394-b633-3134139cc2e0;" >> >> +#if defined(CONFIG_CMD_AB_SELECT) >> +#define PARTS_DEFAULT \ >> + "uuid_disk=${uuid_gpt_disk};" \ >> + "name=logo,start=512K,size=2M,uuid=" LOGO_UUID \ >> + "name=misc,size=512K,uuid=${uuid_gpt_misc};" \ >> + "name=dtbo_a,size=8M,uuid=${uuid_gpt_dtbo_a};" \ >> + "name=dtbo_b,size=8M,uuid=${uuid_gpt_dtbo_b};" \ >> + "name=vbmeta_a,size=512K,uuid=${uuid_gpt_vbmeta_a};" \ >> + "name=vbmeta_b,size=512K,uuid=${uuid_gpt_vbmeta_b};" \ >> + "name=boot_a,size=32M,bootable,uuid=${uuid_gpt_boot_a};" \ >> + "name=boot_b,size=32M,bootable,uuid=${uuid_gpt_boot_b};" \ >> + "name=super,size=3072M,uuid=${uuid_gpt_super};" \ >> + "name=userdata,size=11282M,uuid=${uuid_gpt_userdata};" \ >> + "name=rootfs,size=-,uuid=" ROOT_UUID >> +#else >> #define PARTS_DEFAULT \ >> "uuid_disk=${uuid_gpt_disk};" \ >> "name=logo,start=512K,size=2M,uuid=" LOGO_UUID \ >> @@ -24,6 +39,7 @@ >> "name=super,size=1792M,uuid=${uuid_gpt_super};" \ >> "name=userdata,size=12786M,uuid=${uuid_gpt_userdata};" \ >> "name=rootfs,size=-,uuid=" ROOT_UUID >> +#endif >> >> #define EXTRA_ANDROID_ENV_SETTINGS \ >> "board=vim3l\0" \ >> > > > You should move this khadas-vim3l_android.h change adding AB support before adding defconfig for AB, > move this patch in position 4 and add CONFIG_*AB*=y in the XXXXX_android_ab_defconfig configs > you add. Will do in v2. > > Neil