Android support for VIM3 and VIM3L is maintained with the A/B layout used by the AOSP builds. Remove the unused non-A/B defconfigs and their MAINTAINERS entries.
Signed-off-by: Guillaume La Roque <[email protected]> --- board/amlogic/vim3/MAINTAINERS | 2 - configs/khadas-vim3_android_defconfig | 122 --------------------------------- configs/khadas-vim3l_android_defconfig | 122 --------------------------------- 3 files changed, 246 deletions(-) diff --git a/board/amlogic/vim3/MAINTAINERS b/board/amlogic/vim3/MAINTAINERS index c5f8d9cc5ce..a9b977646c5 100644 --- a/board/amlogic/vim3/MAINTAINERS +++ b/board/amlogic/vim3/MAINTAINERS @@ -4,10 +4,8 @@ S: Maintained L: [email protected] F: board/amlogic/vim3/ F: configs/khadas-vim3_defconfig -F: configs/khadas-vim3_android_defconfig F: configs/khadas-vim3_android_ab_defconfig F: configs/khadas-vim3l_defconfig -F: configs/khadas-vim3l_android_defconfig F: configs/khadas-vim3l_android_ab_defconfig F: doc/board/amlogic/khadas-vim3.rst F: doc/board/amlogic/khadas-vim3l.rst diff --git a/configs/khadas-vim3_android_defconfig b/configs/khadas-vim3_android_defconfig deleted file mode 100644 index 1d518581605..00000000000 --- a/configs/khadas-vim3_android_defconfig +++ /dev/null @@ -1,122 +0,0 @@ -CONFIG_ARM=y -CONFIG_SYS_BOARD="vim3" -CONFIG_SYS_CONFIG_NAME="khadas-vim3_android" -CONFIG_ARCH_MESON=y -CONFIG_TEXT_BASE=0x01000000 -CONFIG_SYS_MALLOC_LEN=0x08000000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 -CONFIG_ENV_SIZE=0x10000 -CONFIG_ENV_OFFSET=0x0 -CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-g12b-a311d-khadas-vim3" -CONFIG_OF_LIBFDT_OVERLAY=y -CONFIG_DM_RESET=y -CONFIG_MESON_G12A=y -CONFIG_SYS_LOAD_ADDR=0x1000000 -CONFIG_DEBUG_UART_BASE=0xff803000 -CONFIG_DEBUG_UART_CLOCK=24000000 -CONFIG_IDENT_STRING=" khadas-vim3" -CONFIG_PCI=y -CONFIG_DEBUG_UART=y -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_OF_BOARD_SETUP=y -# 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_IMI is not set -CONFIG_CMD_GPIO=y -CONFIG_CMD_GPT=y -CONFIG_CMD_I2C=y -# CONFIG_CMD_LOADS is not set -CONFIG_CMD_MMC=y -CONFIG_CMD_PCI=y -CONFIG_CMD_SF_TEST=y -CONFIG_CMD_SPI=y -CONFIG_CMD_USB=y -CONFIG_CMD_USB_MASS_STORAGE=y -# CONFIG_CMD_SETEXPR is not set -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 -CONFIG_ENV_MMC_DEVICE_INDEX=2 -CONFIG_ENV_MMC_EMMC_HW_PARTITION=2 -CONFIG_ADC=y -CONFIG_SARADC_MESON=y -CONFIG_BUTTON=y -CONFIG_BUTTON_ADC=y -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_DM_I2C=y -CONFIG_SYS_I2C_MESON=y -CONFIG_MMC_MESON_GX=y -CONFIG_MTD=y -CONFIG_DM_MTD=y -CONFIG_DM_SPI_FLASH=y -CONFIG_SPI_FLASH_WINBOND=y -CONFIG_DM_MDIO=y -CONFIG_DM_MDIO_MUX=y -CONFIG_ETH_DESIGNWARE_MESON8B=y -CONFIG_MDIO_MUX_MESON_G12A=y -CONFIG_PHY_REALTEK=y -CONFIG_NVME_PCI=y -CONFIG_PCIE_DW_MESON=y -CONFIG_MESON_G12A_USB_PHY=y -CONFIG_PINCTRL=y -CONFIG_PINCTRL_MESON_G12A=y -CONFIG_POWER_DOMAIN=y -CONFIG_MESON_EE_POWER_DOMAIN=y -CONFIG_DM_REGULATOR=y -CONFIG_DM_REGULATOR_FIXED=y -CONFIG_DEBUG_UART_ANNOUNCE=y -CONFIG_DEBUG_UART_SKIP_INIT=y -CONFIG_MESON_SERIAL=y -CONFIG_SPI=y -CONFIG_DM_SPI=y -CONFIG_MESON_SPIFC=y -CONFIG_SYSINFO=y -CONFIG_SYSINFO_SMBIOS=y -CONFIG_USB=y -CONFIG_DM_USB_GADGET=y -CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_DWC3=y -CONFIG_USB_DWC3=y -# CONFIG_USB_DWC3_GADGET is not set -CONFIG_USB_DWC3_MESON_G12A=y -CONFIG_USB_KEYBOARD=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e -CONFIG_USB_GADGET_PRODUCT_NUM=0xfada -CONFIG_USB_GADGET_DWC2_OTG=y -CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y -CONFIG_VIDEO=y -# CONFIG_VIDEO_BPP8 is not set -# CONFIG_VIDEO_BPP16 is not set -CONFIG_SYS_WHITE_ON_BLACK=y -CONFIG_VIDEO_MESON=y -CONFIG_VIDEO_DT_SIMPLEFB=y -CONFIG_SPLASH_SCREEN=y -CONFIG_SPLASH_SCREEN_ALIGN=y -CONFIG_VIDEO_BMP_RLE8=y -CONFIG_BMP_16BPP=y -CONFIG_BMP_24BPP=y -CONFIG_BMP_32BPP=y -CONFIG_LIBAVB=y diff --git a/configs/khadas-vim3l_android_defconfig b/configs/khadas-vim3l_android_defconfig deleted file mode 100644 index 37a1d86a233..00000000000 --- a/configs/khadas-vim3l_android_defconfig +++ /dev/null @@ -1,122 +0,0 @@ -CONFIG_ARM=y -CONFIG_SYS_BOARD="vim3" -CONFIG_SYS_CONFIG_NAME="khadas-vim3l_android" -CONFIG_ARCH_MESON=y -CONFIG_TEXT_BASE=0x01000000 -CONFIG_SYS_MALLOC_LEN=0x08000000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 -CONFIG_ENV_SIZE=0x10000 -CONFIG_ENV_OFFSET=0x0 -CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-sm1-khadas-vim3l" -CONFIG_OF_LIBFDT_OVERLAY=y -CONFIG_DM_RESET=y -CONFIG_MESON_G12A=y -CONFIG_SYS_LOAD_ADDR=0x1000000 -CONFIG_DEBUG_UART_BASE=0xff803000 -CONFIG_DEBUG_UART_CLOCK=24000000 -CONFIG_IDENT_STRING=" khadas-vim3l" -CONFIG_PCI=y -CONFIG_DEBUG_UART=y -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_OF_BOARD_SETUP=y -# 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_IMI is not set -CONFIG_CMD_GPIO=y -CONFIG_CMD_GPT=y -CONFIG_CMD_I2C=y -# CONFIG_CMD_LOADS is not set -CONFIG_CMD_MMC=y -CONFIG_CMD_PCI=y -CONFIG_CMD_SF_TEST=y -CONFIG_CMD_SPI=y -CONFIG_CMD_USB=y -CONFIG_CMD_USB_MASS_STORAGE=y -# CONFIG_CMD_SETEXPR is not set -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 -CONFIG_ENV_MMC_DEVICE_INDEX=2 -CONFIG_ENV_MMC_EMMC_HW_PARTITION=2 -CONFIG_ADC=y -CONFIG_SARADC_MESON=y -CONFIG_BUTTON=y -CONFIG_BUTTON_ADC=y -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_DM_I2C=y -CONFIG_SYS_I2C_MESON=y -CONFIG_MMC_MESON_GX=y -CONFIG_MTD=y -CONFIG_DM_MTD=y -CONFIG_DM_SPI_FLASH=y -CONFIG_SPI_FLASH_WINBOND=y -CONFIG_DM_MDIO=y -CONFIG_DM_MDIO_MUX=y -CONFIG_ETH_DESIGNWARE_MESON8B=y -CONFIG_MDIO_MUX_MESON_G12A=y -CONFIG_PHY_REALTEK=y -CONFIG_NVME_PCI=y -CONFIG_PCIE_DW_MESON=y -CONFIG_MESON_G12A_USB_PHY=y -CONFIG_PINCTRL=y -CONFIG_PINCTRL_MESON_G12A=y -CONFIG_POWER_DOMAIN=y -CONFIG_MESON_EE_POWER_DOMAIN=y -CONFIG_DM_REGULATOR=y -CONFIG_DM_REGULATOR_FIXED=y -CONFIG_DEBUG_UART_ANNOUNCE=y -CONFIG_DEBUG_UART_SKIP_INIT=y -CONFIG_MESON_SERIAL=y -CONFIG_SPI=y -CONFIG_DM_SPI=y -CONFIG_MESON_SPIFC=y -CONFIG_SYSINFO=y -CONFIG_SYSINFO_SMBIOS=y -CONFIG_USB=y -CONFIG_DM_USB_GADGET=y -CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_DWC3=y -CONFIG_USB_DWC3=y -# CONFIG_USB_DWC3_GADGET is not set -CONFIG_USB_DWC3_MESON_G12A=y -CONFIG_USB_KEYBOARD=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e -CONFIG_USB_GADGET_PRODUCT_NUM=0xfada -CONFIG_USB_GADGET_DWC2_OTG=y -CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y -CONFIG_VIDEO=y -# CONFIG_VIDEO_BPP8 is not set -# CONFIG_VIDEO_BPP16 is not set -CONFIG_SYS_WHITE_ON_BLACK=y -CONFIG_VIDEO_MESON=y -CONFIG_VIDEO_DT_SIMPLEFB=y -CONFIG_SPLASH_SCREEN=y -CONFIG_SPLASH_SCREEN_ALIGN=y -CONFIG_VIDEO_BMP_RLE8=y -CONFIG_BMP_16BPP=y -CONFIG_BMP_24BPP=y -CONFIG_BMP_32BPP=y -CONFIG_LIBAVB=y -- 2.34.1
