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 aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81368D62075 for ; Tue, 19 Nov 2024 10:36:49 +0000 (UTC) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.groups.io with SMTP id smtpd.web11.17863.1732012604142873833 for ; Tue, 19 Nov 2024 02:36:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@baylibre-com.20230601.gappssmtp.com header.s=20230601 header.b=iPG5DBQw; spf=pass (domain: baylibre.com, ip: 209.85.128.47, mailfrom: mkorpershoek@baylibre.com) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4314c4cb752so36784535e9.2 for ; Tue, 19 Nov 2024 02:36:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1732012602; x=1732617402; darn=groups.io; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=/LBhCHTMqQoVJOzxseY1ef0b7wf1TZ9sjxf392UfOXQ=; b=iPG5DBQwaoTyHhArJHLmGkZSDHpTYwNvUQVPQvineUbeO05gMHK/cJSDe1isOBGbKP JQP/r87HJW2MvcEoNbuHEigb2hdz9JkfkzAX5VsSGb8QlPDY9YdPHVHKRom4Q9CpZSpC 5vQJQgaQ2nPVxhmzgAOBLVCCQreFAC7/5ZimGtOOgP/noKvrvnw1E9rkWw7Xp4sFHEuf Ug5In4IA6O3PKfsI/hQDz/LXua3tdBRcmW5EvraE8GE8U5rSm2eGC26UxMEkwoa1B4h8 Xesg0DlIaipBJJS1j6Rs+eWZvR8O/pxxZUtAdMNI3ZVkbPh4YxOLqKW1FvmQPU5q92Kv 0Z3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732012602; x=1732617402; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=/LBhCHTMqQoVJOzxseY1ef0b7wf1TZ9sjxf392UfOXQ=; b=F26WdD/wcpDMxz7o3+mctw8Wm7I7sutRLL6TJU881H1vBwgi8sEMoPfEd/TQDUauFU lspkNNlCsEhbTa0IwUFecFFSrfGI6Xlft6Ug6tREpfesgEdryBZDY2wCFp5j7eumnV8E EcgwffASmgzLzD1+0JByBmgrUQIeTGF9RHA4ro3bByAX+1FHRWq55U66lW5s4WBwtAaK Rt4x1XoF/Ug2s2W4zKe9JWDWctczMWpDul64Gvu0HdcDXXaCteyQW9B0+cRkuTN6Esp5 6gsUfVUwG9uE/440m20OHbrB9Ojmf0V1rX7PJ7lI4ax3UkXo0Yl2aekianVvdBQUgukX 6SCQ== X-Forwarded-Encrypted: i=1; AJvYcCWXC7QSrMzWBg8m84sicGU88gVCwzR/5PXGRl+ORrRw4yNL3salFc2f3Yjo467j9daryVf810ajAajYfnXo1g==@groups.io X-Gm-Message-State: AOJu0YwuwVRIEZTdjhc2tgpYy+SpuclW0CKQf0OTdNJCL59cuLpQ0nHv 8bhw4pEy0ZAsamTM40pwJkcBMXoS+EfWPr+5boWzhQXKmfsfK96bzt6EWZpC1OQ= X-Google-Smtp-Source: AGHT+IGeOhQVK5roYdKsJcwiXti8c1+ZumWM5pcDIV4pdd7hQR+qoNMUg1QKoU1H/sDJeUrYKMRF/w== X-Received: by 2002:a05:600c:1908:b0:431:52da:9d67 with SMTP id 5b1f17b1804b1-432df7178f9mr147610135e9.3.1732012602628; Tue, 19 Nov 2024 02:36:42 -0800 (PST) Received: from localhost ([82.66.159.240]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-432dab80a28sm188186415e9.24.2024.11.19.02.36.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Nov 2024 02:36:42 -0800 (PST) From: Mattijs Korpershoek To: Guillaume La Roque , Simon Glass , Tom Rini , Neil Armstrong Cc: Julien Masson , u-boot@lists.denx.de, u-boot-amlogic@groups.io, Guillaume La Roque Subject: Re: [PATCH v2 4/5] configs: khadas-vim3_android{_ab}: move on bootmeth android In-Reply-To: <20241114-adnroidv2-v2-4-015bffb1373a@baylibre.com> References: <20241114-adnroidv2-v2-0-015bffb1373a@baylibre.com> <20241114-adnroidv2-v2-4-015bffb1373a@baylibre.com> Date: Tue, 19 Nov 2024 11:36:40 +0100 Message-ID: <87serny0g7.fsf@baylibre.com> MIME-Version: 1.0 Content-Type: text/plain List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 19 Nov 2024 10:36:49 -0000 X-Groupsio-URL: https://groups.io/g/u-boot-amlogic/message/2564 Hi Guillaume, Thank you for the patch. On jeu., nov. 14, 2024 at 22:29, Guillaume La Roque wrote: > Actually khadas vim3 use distro command to boot android image. > Move on new bootmeth android for A/B and non-A/B vim3 android. > > Signed-off-by: Guillaume La Roque > --- > configs/khadas-vim3_android_ab_defconfig | 7 ++++++- > configs/khadas-vim3_android_defconfig | 7 ++++++- > include/configs/khadas-vim3_android.h | 26 ++++++++++++++++++++++---- > include/configs/meson64_android.h | 3 --- > 4 files changed, 34 insertions(+), 9 deletions(-) > > diff --git a/configs/khadas-vim3_android_ab_defconfig b/configs/khadas-vim3_android_ab_defconfig > index de5357c45cbf..a078c5d363ae 100644 > --- a/configs/khadas-vim3_android_ab_defconfig > +++ b/configs/khadas-vim3_android_ab_defconfig > @@ -24,6 +24,12 @@ CONFIG_REMAKE_ELF=y > CONFIG_FIT=y > CONFIG_FIT_SIGNATURE=y > CONFIG_FIT_VERBOSE=y > +CONFIG_BOOTMETH_ANDROID=y > +# CONFIG_BOOTMETH_EXTLINUX is not set > +# CONFIG_BOOTMETH_EXTLINUX_PXE is not set > +# CONFIG_BOOTMETH_EFILOADER is not set > +# CONFIG_BOOTMETH_EFI_BOOTMGR is not set > +# CONFIG_BOOTMETH_VBE is not set > CONFIG_LEGACY_IMAGE_FORMAT=y > CONFIG_OF_BOARD_SETUP=y > # CONFIG_DISPLAY_CPUINFO is not set > @@ -35,7 +41,6 @@ CONFIG_SYS_MAXARGS=32 > CONFIG_CMD_ADTIMG=y > CONFIG_CMD_ABOOTIMG=y > # CONFIG_CMD_IMI is not set > -CONFIG_CMD_BCB=y > CONFIG_CMD_GPIO=y > CONFIG_CMD_GPT=y > CONFIG_CMD_I2C=y > diff --git a/configs/khadas-vim3_android_defconfig b/configs/khadas-vim3_android_defconfig > index a0d9c423c3c3..b77a44ce859b 100644 > --- a/configs/khadas-vim3_android_defconfig > +++ b/configs/khadas-vim3_android_defconfig > @@ -24,6 +24,12 @@ CONFIG_REMAKE_ELF=y > CONFIG_FIT=y > CONFIG_FIT_SIGNATURE=y > CONFIG_FIT_VERBOSE=y > +CONFIG_BOOTMETH_ANDROID=y > +# CONFIG_BOOTMETH_EXTLINUX is not set > +# CONFIG_BOOTMETH_EXTLINUX_PXE is not set > +# CONFIG_BOOTMETH_EFILOADER is not set > +# CONFIG_BOOTMETH_EFI_BOOTMGR is not set > +# CONFIG_BOOTMETH_VBE is not set > CONFIG_LEGACY_IMAGE_FORMAT=y > CONFIG_OF_BOARD_SETUP=y > # CONFIG_DISPLAY_CPUINFO is not set > @@ -34,7 +40,6 @@ CONFIG_SYS_MAXARGS=32 > CONFIG_CMD_ADTIMG=y > CONFIG_CMD_ABOOTIMG=y > # CONFIG_CMD_IMI is not set > -CONFIG_CMD_BCB=y > CONFIG_CMD_GPIO=y > CONFIG_CMD_GPT=y > CONFIG_CMD_I2C=y > diff --git a/include/configs/khadas-vim3_android.h b/include/configs/khadas-vim3_android.h > index 0e2953fe71b3..096ab4e5fb1f 100644 > --- a/include/configs/khadas-vim3_android.h > +++ b/include/configs/khadas-vim3_android.h > @@ -41,10 +41,28 @@ > "name=rootfs,size=-,uuid=" ROOT_UUID > #endif > > -#define EXTRA_ANDROID_ENV_SETTINGS \ > - "board=vim3\0" \ > - "board_name=vim3\0" \ > +#define CFG_EXTRA_ENV_SETTINGS \ > + "board=vim3\0" \ > + "board_name=vim3\0" \ > + "bootmeths=android\0" \ > + "bootcmd=bootflow scan\0" \ > + "adtb_idx=3\0" \ > + "partitions=" PARTS_DEFAULT "\0" \ > + "mmcdev=2\0" \ > + "fastboot_raw_partition_bootloader=0x1 0xfff mmcpart 1\0" \ > + "fastboot_raw_partition_bootenv=0x0 0xfff mmcpart 2\0" \ > + "gpio_recovery=88\0" \ gpio_recovery is not used anywhere. Can we please drop this? With that addressed, please add: Reviewed-by: Mattijs Korpershoek > + "stdin=" STDIN_CFG "\0" \ > + "stdout=" STDOUT_CFG "\0" \ > + "stderr=" STDOUT_CFG "\0" \ > + "dtboaddr=0x08200000\0" \ > + "loadaddr=0x01080000\0" \ > + "fdt_addr_r=0x01000000\0" \ > + "scriptaddr=0x08000000\0" \ > + "kernel_addr_r=0x01080000\0" \ > + "pxefile_addr_r=0x01080000\0" \ > + "ramdisk_addr_r=0x13000000\0" \ > > -#include > +#include > > #endif /* __CONFIG_H */ > diff --git a/include/configs/meson64_android.h b/include/configs/meson64_android.h > index 37ef8b8f7a7e..d6ef0a83a686 100644 > --- a/include/configs/meson64_android.h > +++ b/include/configs/meson64_android.h > @@ -104,9 +104,6 @@ > "elif test $board_name = sei610; then " \ > "echo \" Reading DTB for sei610...\"; " \ > "setenv dtb_index 1;" \ > - "elif test $board_name = vim3; then " \ > - "echo \" Reading DTB for vim3...\"; " \ > - "setenv dtb_index 3;" \ > "else " \ > "echo Error: Android boot is not supported for $board_name; " \ > "exit; " \ > > -- > 2.34.1