Android is no longer supported on SEI610. Remove its Android configuration and use meson64.h for generic board support.
Drop "fastboot oem format" as well, since it depends on the removed Android partition layout. Signed-off-by: Guillaume La Roque <[email protected]> --- board/amlogic/sei610/MAINTAINERS | 1 - configs/sei610_defconfig | 10 ---------- include/configs/sei610.h | 30 ------------------------------ 3 files changed, 41 deletions(-) diff --git a/board/amlogic/sei610/MAINTAINERS b/board/amlogic/sei610/MAINTAINERS index 799ad687f09..6d0159f204b 100644 --- a/board/amlogic/sei610/MAINTAINERS +++ b/board/amlogic/sei610/MAINTAINERS @@ -4,5 +4,4 @@ S: Maintained L: [email protected] F: board/amlogic/sei610/ F: configs/sei610_defconfig -F: include/configs/sei610.h F: doc/board/amlogic/sei610.rst diff --git a/configs/sei610_defconfig b/configs/sei610_defconfig index 7f6488dfba0..91ebc3282e1 100644 --- a/configs/sei610_defconfig +++ b/configs/sei610_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="sei610" -CONFIG_SYS_CONFIG_NAME="sei610" CONFIG_ARCH_MESON=y CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x8000000 @@ -25,18 +24,12 @@ CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y -CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="run load_logo" # CONFIG_CONSOLE_MUX is not set # CONFIG_DISPLAY_CPUINFO is not set CONFIG_MISC_INIT_R=y -CONFIG_AVB_VERIFY=y CONFIG_SYS_MAXARGS=32 # CONFIG_CMD_BDI is not set -CONFIG_CMD_ADTIMG=y -CONFIG_CMD_ABOOTIMG=y # CONFIG_CMD_IMI is not set -CONFIG_CMD_BCB=y CONFIG_CMD_DFU=y CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y @@ -47,7 +40,6 @@ CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_BMP=y CONFIG_CMD_REGULATOR=y -CONFIG_CMD_AVB=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y @@ -58,7 +50,6 @@ CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x6000000 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=2 -CONFIG_FASTBOOT_CMD_OEM_FORMAT=y # CONFIG_INPUT is not set CONFIG_MMC_MESON_GX=y CONFIG_DM_MDIO=y @@ -99,4 +90,3 @@ CONFIG_VIDEO_BMP_RLE8=y CONFIG_BMP_16BPP=y CONFIG_BMP_24BPP=y CONFIG_BMP_32BPP=y -CONFIG_LIBAVB=y diff --git a/include/configs/sei610.h b/include/configs/sei610.h deleted file mode 100644 index 783eece271d..00000000000 --- a/include/configs/sei610.h +++ /dev/null @@ -1,30 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Configuration for the SEI610 - * - * Copyright (C) 2019 Baylibre, SAS - * Author: Jerome Brunet <[email protected]> - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#define LOGO_UUID "43a3305d-150f-4cc9-bd3b-38fca8693846;" -#define ROOT_UUID "ddb8c3f6-d94d-4394-b633-3134139cc2e0;" - -#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,size=8M,uuid=${uuid_gpt_dtbo};" \ - "name=vbmeta,size=512K,uuid=${uuid_gpt_vbmeta};" \ - "name=boot,size=32M,bootable,uuid=${uuid_gpt_boot};" \ - "name=recovery,size=32M,uuid=${uuid_gpt_recovery};" \ - "name=cache,size=256M,uuid=${uuid_gpt_cache};" \ - "name=super,size=2304M,uuid=${uuid_gpt_super};" \ - "name=userdata,size=12274M,uuid=${uuid_gpt_userdata};" \ - "name=rootfs,size=-,uuid=" ROOT_UUID - -#include <configs/meson64_android.h> - -#endif /* __CONFIG_H */ -- 2.34.1
