From: Guillaume La Roque <glaroque@baylibre.com>
To: u-boot-amlogic@groups.io, u-boot@lists.u-boot-project.org
Cc: Neil Armstrong <neil.armstrong@linaro.org>,
Tom Rini <trini@konsulko.com>,
Quentin Schulz <quentin.schulz@cherry.de>,
Marek Vasut <marek.vasut+renesas@mailbox.org>,
Guillaume La Roque <glaroque@baylibre.com>
Subject: [PATCH 3/3] configs: remove unused meson64_android.h
Date: Thu, 10 Sep 2026 16:04:24 +0200 [thread overview]
Message-ID: <20260910-remove_sei_android-v1-3-b7bcbcef3834@baylibre.com> (raw)
In-Reply-To: <20260910-remove_sei_android-v1-0-b7bcbcef3834@baylibre.com>
SEI510 and SEI610 were the last users of meson64_android.h. Remove
this unused header now that both boards use meson64.h.
Signed-off-by: Guillaume La Roque <glaroque@baylibre.com>
---
MAINTAINERS | 1 -
include/configs/meson64_android.h | 279 --------------------------------------
2 files changed, 280 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 4e9ccca5ca4..e5bf89afdec 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -198,7 +198,6 @@ F: drivers/power/domain/meson-gx-pwrc-vpu.c
F: drivers/video/meson/
F: drivers/watchdog/meson_gxbb_wdt.c
F: include/configs/meson64.h
-F: include/configs/meson64_android.h
F: tools/amlimage*
F: doc/board/amlogic/
N: meson
diff --git a/include/configs/meson64_android.h b/include/configs/meson64_android.h
deleted file mode 100644
index d6ef0a83a68..00000000000
--- a/include/configs/meson64_android.h
+++ /dev/null
@@ -1,279 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Configuration for Android Amlogic Meson 64bits SoCs
- *
- * Copyright (C) 2019 Baylibre, SAS
- * Author: Jerome Brunet <jbrunet@baylibre.com>
- */
-
-#ifndef __MESON64_ANDROID_CONFIG_H
-#define __MESON64_ANDROID_CONFIG_H
-
-#include <linux/sizes.h>
-
-#ifndef BOOT_PARTITION
-#define BOOT_PARTITION "boot"
-#endif
-
-#ifndef LOGO_PARTITION
-#define LOGO_PARTITION "logo"
-#endif
-
-#ifndef CONTROL_PARTITION
-#define CONTROL_PARTITION "misc"
-#endif
-
-#ifndef EXTRA_ANDROID_ENV_SETTINGS
-#define EXTRA_ANDROID_ENV_SETTINGS ""
-#endif
-
-#if defined(CONFIG_CMD_AVB)
-#define AVB_VERIFY_CHECK \
- "if test \"${force_avb}\" -eq 1; then " \
- "if run avb_verify; then " \
- "echo AVB verification OK.;" \
- "setenv bootargs \"$bootargs $avb_bootargs\";" \
- "else " \
- "echo AVB verification failed.;" \
- "exit; fi;" \
- "else " \
- "setenv bootargs \"$bootargs androidboot.verifiedbootstate=orange\";" \
- "echo Running without AVB...; "\
- "fi;"
-
-#define AVB_VERIFY_CMD "avb_verify=avb init ${mmcdev}; avb verify $slot_suffix;\0"
-#else
-#define AVB_VERIFY_CHECK ""
-#define AVB_VERIFY_CMD ""
-#endif
-
-#if defined(CONFIG_CMD_BCB) && defined(CONFIG_ANDROID_AB)
-#define ANDROIDBOOT_GET_CURRENT_SLOT_CMD "get_current_slot=" \
- "if part number mmc ${mmcdev} " CONTROL_PARTITION " control_part_number; " \
- "then " \
- "echo " CONTROL_PARTITION \
- " partition number:${control_part_number};" \
- "bcb ab_select current_slot mmc ${mmcdev}:${control_part_number};" \
- "else " \
- "echo " CONTROL_PARTITION " partition not found;" \
- "fi;\0"
-
-#define AB_SELECT_SLOT \
- "run get_current_slot; " \
- "if test -e \"${current_slot}\"; " \
- "then " \
- "setenv slot_suffix _${current_slot}; " \
- "else " \
- "echo current_slot not found;" \
- "exit;" \
- "fi;"
-
-#define AB_SELECT_ARGS \
- "setenv bootargs_ab androidboot.slot_suffix=${slot_suffix}; " \
- "echo A/B cmdline addition: ${bootargs_ab};" \
- "setenv bootargs ${bootargs} ${bootargs_ab};"
-
-#define AB_BOOTARGS " androidboot.force_normal_boot=1"
-#define RECOVERY_PARTITION "boot"
-#else
-#define AB_SELECT_SLOT ""
-#define AB_SELECT_ARGS " "
-#define ANDROIDBOOT_GET_CURRENT_SLOT_CMD ""
-#define AB_BOOTARGS " "
-#define RECOVERY_PARTITION "recovery"
-#endif
-
-#if defined(CONFIG_CMD_ABOOTIMG)
-/*
- * Prepares complete device tree blob for current board (for Android boot).
- *
- * Boot image or recovery image should be loaded into $loadaddr prior to running
- * these commands. The logic of these commnads is next:
- *
- * 1. Read correct DTB for current SoC/board from boot image in $loadaddr
- * to $fdtaddr
- * 2. Merge all needed DTBO for current board from 'dtbo' partition into read
- * DTB
- * 3. User should provide $fdtaddr as 3rd argument to 'bootm'
- */
-#define PREPARE_FDT \
- "echo Preparing FDT...; " \
- "if test $board_name = sei510; then " \
- "echo \" Reading DTB for sei510...\"; " \
- "setenv dtb_index 0;" \
- "elif test $board_name = sei610; then " \
- "echo \" Reading DTB for sei610...\"; " \
- "setenv dtb_index 1;" \
- "else " \
- "echo Error: Android boot is not supported for $board_name; " \
- "exit; " \
- "fi; " \
- "abootimg get dtb --index=$dtb_index dtb_start dtb_size; " \
- "cp.b $dtb_start $fdt_addr_r $dtb_size; " \
- "fdt addr $fdt_addr_r 0x80000; "
-
-#define BOOT_CMD "bootm ${loadaddr} ${loadaddr} ${fdt_addr_r};"
-
-#else
-#define PREPARE_FDT " "
-#define BOOT_CMD "bootm ${loadaddr};"
-#endif
-
-#define BOOTENV_DEV_FASTBOOT(devtypeu, devtypel, instance) \
- "bootcmd_fastboot=" \
- "setenv run_fastboot 0;" \
- "if test \"${boot_source}\" = \"usb\"; then " \
- "echo Fastboot forced by usb rom boot;" \
- "setenv run_fastboot 1;" \
- "fi;" \
- "if test \"${run_fastboot}\" -eq 0; then " \
- "if gpt verify mmc ${mmcdev} ${partitions}; then; " \
- "else " \
- "echo Broken MMC partition scheme;" \
- "setenv run_fastboot 1;" \
- "fi; " \
- "fi;" \
- "if test \"${run_fastboot}\" -eq 0; then " \
- "if bcb load " __stringify(CONFIG_FASTBOOT_FLASH_MMC_DEV) " " \
- CONTROL_PARTITION "; then " \
- "if bcb test command = bootonce-bootloader; then " \
- "echo BCB: Bootloader boot...; " \
- "bcb clear command; bcb store; " \
- "setenv run_fastboot 1;" \
- "elif bcb test command = boot-fastboot; then " \
- "echo BCB: fastboot userspace boot...; " \
- "setenv force_recovery 1;" \
- "fi; " \
- "else " \
- "echo Warning: BCB is corrupted or does not exist; " \
- "fi;" \
- "fi;" \
- "if test \"${run_fastboot}\" -eq 1; then " \
- "echo Running Fastboot...;" \
- "fastboot " __stringify(CONFIG_FASTBOOT_USB_DEV) "; " \
- "fi\0"
-
-#define BOOTENV_DEV_NAME_FASTBOOT(devtypeu, devtypel, instance) \
- "fastboot "
-
-#define BOOTENV_DEV_RECOVERY(devtypeu, devtypel, instance) \
- "bootcmd_recovery=" \
- "pinmux dev pinctrl@14;" \
- "pinmux dev pinctrl@40;" \
- "setenv run_recovery 0;" \
- "if run check_button; then " \
- "echo Recovery button is pressed;" \
- "setenv run_recovery 1;" \
- "fi; " \
- "if bcb load " __stringify(CONFIG_FASTBOOT_FLASH_MMC_DEV) " " \
- CONTROL_PARTITION "; then " \
- "if bcb test command = boot-recovery; then " \
- "echo BCB: Recovery boot...; " \
- "setenv run_recovery 1;" \
- "fi;" \
- "else " \
- "echo Warning: BCB is corrupted or does not exist; " \
- "fi;" \
- "if test \"${skip_recovery}\" -eq 1; then " \
- "echo Recovery skipped by environment;" \
- "setenv run_recovery 0;" \
- "fi;" \
- "if test \"${force_recovery}\" -eq 1; then " \
- "echo Recovery forced by environment;" \
- "setenv run_recovery 1;" \
- "fi;" \
- "if test \"${run_recovery}\" -eq 1; then " \
- "echo Running Recovery...;" \
- "mmc dev ${mmcdev};" \
- "setenv bootargs \"${bootargs} androidboot.serialno=${serial#}\";" \
- AB_SELECT_SLOT \
- AB_SELECT_ARGS \
- AVB_VERIFY_CHECK \
- "part start mmc ${mmcdev} " RECOVERY_PARTITION "${slot_suffix} boot_start;" \
- "part size mmc ${mmcdev} " RECOVERY_PARTITION "${slot_suffix} boot_size;" \
- "if mmc read ${loadaddr} ${boot_start} ${boot_size}; then " \
- PREPARE_FDT \
- "echo Running Android Recovery...;" \
- BOOT_CMD \
- "fi;" \
- "echo Failed to boot Android...;" \
- "reset;" \
- "fi\0"
-
-#define BOOTENV_DEV_NAME_RECOVERY(devtypeu, devtypel, instance) \
- "recovery "
-
-#define BOOTENV_DEV_SYSTEM(devtypeu, devtypel, instance) \
- "bootcmd_system=" \
- "echo Loading Android " BOOT_PARTITION " partition...;" \
- "mmc dev ${mmcdev};" \
- "setenv bootargs ${bootargs} androidboot.serialno=${serial#};" \
- AB_SELECT_SLOT \
- AB_SELECT_ARGS \
- AVB_VERIFY_CHECK \
- "part start mmc ${mmcdev} " BOOT_PARTITION "${slot_suffix} boot_start;" \
- "part size mmc ${mmcdev} " BOOT_PARTITION "${slot_suffix} boot_size;" \
- "if mmc read ${loadaddr} ${boot_start} ${boot_size}; then " \
- PREPARE_FDT \
- "setenv bootargs \"${bootargs} " AB_BOOTARGS "\" ; " \
- "echo Running Android...;" \
- BOOT_CMD \
- "fi;" \
- "echo Failed to boot Android...;\0"
-
-#define BOOTENV_DEV_NAME_SYSTEM(devtypeu, devtypel, instance) \
- "system "
-
-#define BOOTENV_DEV_PANIC(devtypeu, devtypel, instance) \
- "bootcmd_panic=" \
- "fastboot " __stringify(CONFIG_FASTBOOT_USB_DEV) "; " \
- "reset\0"
-
-#define BOOTENV_DEV_NAME_PANIC(devtypeu, devtypel, instance) \
- "panic "
-
-#define BOOT_TARGET_DEVICES(func) \
- func(FASTBOOT, fastboot, na) \
- func(RECOVERY, recovery, na) \
- func(SYSTEM, system, na) \
- func(PANIC, panic, na) \
-
-#define PREBOOT_LOAD_LOGO \
- "if test \"${boot_source}\" != \"usb\" && " \
- "gpt verify mmc ${mmcdev} ${partitions}; then; " \
- "mmc dev ${mmcdev};" \
- "part start mmc ${mmcdev} " LOGO_PARTITION " boot_start;" \
- "part size mmc ${mmcdev} " LOGO_PARTITION " boot_size;" \
- "if mmc read ${loadaddr} ${boot_start} ${boot_size}; then " \
- "bmp display ${loadaddr} m m;" \
- "fi;" \
- "fi;"
-
-#define CFG_EXTRA_ENV_SETTINGS \
- EXTRA_ANDROID_ENV_SETTINGS \
- "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" \
- ANDROIDBOOT_GET_CURRENT_SLOT_CMD \
- AVB_VERIFY_CMD \
- "force_avb=0\0" \
- "gpio_recovery=88\0" \
- "check_button=gpio input ${gpio_recovery};test $? -eq 0;\0" \
- "load_logo=" PREBOOT_LOAD_LOGO "\0" \
- "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" \
- "fdtfile=amlogic/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
- BOOTENV
-
-#include <configs/meson64.h>
-
-#endif /* __MESON64_ANDROID_CONFIG_H */
--
2.34.1
next prev parent reply other threads:[~2026-09-10 14:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-10 14:04 [PATCH 0/3] configs: sei510/sei610: drop Android support Guillaume La Roque
2026-09-10 14:04 ` [PATCH 1/3] configs: sei510: " Guillaume La Roque
2026-09-10 14:04 ` [PATCH 2/3] configs: sei610: " Guillaume La Roque
2026-09-10 14:04 ` Guillaume La Roque [this message]
2026-09-10 14:06 ` [PATCH 0/3] configs: sei510/sei610: " Neil Armstrong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260910-remove_sei_android-v1-3-b7bcbcef3834@baylibre.com \
--to=glaroque@baylibre.com \
--cc=marek.vasut+renesas@mailbox.org \
--cc=neil.armstrong@linaro.org \
--cc=quentin.schulz@cherry.de \
--cc=trini@konsulko.com \
--cc=u-boot-amlogic@groups.io \
--cc=u-boot@lists.u-boot-project.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.