imx6: aristainetos: remove 2b version

remove 2b version of aristainetos board, as it
is easier to make the DM / DTS port and introduce
the 2b board version again (also some more board
version).

Signed-off-by: Heiko Schocher <hs@denx.de>

diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
index 9624091..c78e919 100644 (file)
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/mx6/Kconfig
@@ -134,14 +134,6 @@ config TARGET_ARISTAINETOS2
        select FEC_MXC
        imply CMD_SATA
 
-config TARGET_ARISTAINETOS2B
-       bool "Support aristainetos2-revB"
-       select BOARD_LATE_INIT
-       select MX6DL
-       select SYS_I2C_MXC
-       select MXC_UART
-       select FEC_MXC
-
 config TARGET_CGTQMX6EVAL
        bool "cgtqmx6eval"
        select BOARD_LATE_INIT

diff --git a/board/aristainetos/Kconfig b/board/aristainetos/Kconfig
index 60ad69f..2bb12fc 100644 (file)
--- a/board/aristainetos/Kconfig
+++ b/board/aristainetos/Kconfig
@@ -12,21 +12,3 @@ config BOARDNAME
        default "aristainetos2"
 
 endif
-
-if TARGET_ARISTAINETOS2B
-
-source "board/aristainetos/common/Kconfig"
-
-config SYS_BOARD
-       default "aristainetos"
-
-config SYS_CONFIG_NAME
-       default "aristainetos2b"
-
-config SYS_BOARD_VERSION
-       default 3
-
-config BOARDNAME
-       default "aristainetos2-revB"
-
-endif

diff --git a/board/aristainetos/MAINTAINERS b/board/aristainetos/MAINTAINERS
index c9e0528..7e9f38d 100644 (file)
--- a/board/aristainetos/MAINTAINERS
+++ b/board/aristainetos/MAINTAINERS
@@ -4,4 +4,3 @@ S:      Maintained
 F:     board/aristainetos/
 F:     include/configs/aristainetos2.h
 F:     configs/aristainetos2_defconfig
-F:     configs/aristainetos2b_defconfig

diff --git a/board/aristainetos/common/Kconfig b/board/aristainetos/common/Kconfig
index 53a3f4d..16c1325 100644 (file)
--- a/board/aristainetos/common/Kconfig
+++ b/board/aristainetos/common/Kconfig
@@ -8,7 +8,6 @@ config SYS_BOARD_VERSION
        help
          version of aristainetos board version
          2 version 2
-         3 version 2b
 
 config SYS_I2C_MXC_I2C1
        default y

diff --git a/configs/aristainetos2b_defconfig b/configs/aristainetos2b_defconfig
deleted file mode 100644 (file)
index 28bf87e..0000000
--- a/configs/aristainetos2b_defconfig
+++ /dev/null
@@ -1,68 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_MX6=y
-CONFIG_SYS_TEXT_BASE=0x17800000
-CONFIG_TARGET_ARISTAINETOS2B=y
-CONFIG_ENV_SIZE=0x3000
-CONFIG_ENV_OFFSET=0xD0000
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg"
-CONFIG_BOOTDELAY=3
-# CONFIG_CONSOLE_MUX is not set
-CONFIG_SYS_CONSOLE_IS_IN_ENV=y
-CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
-CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_BOUNCE_BUFFER=y
-CONFIG_BOARD_EARLY_INIT_F=y
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_BOOTZ=y
-# CONFIG_CMD_FLASH is not set
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_NAND_TRIMFFS=y
-CONFIG_CMD_SF=y
-CONFIG_CMD_USB=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_BMP=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_DATE=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
-CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
-CONFIG_CMD_MTDPARTS=y
-CONFIG_CMD_UBI=y
-CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_OFFSET_REDUND=0xE0000
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_FSL_USDHC=y
-CONFIG_MTD=y
-CONFIG_MTD_RAW_NAND=y
-CONFIG_NAND_MXS=y
-CONFIG_SPI_FLASH=y
-CONFIG_SF_DEFAULT_MODE=0
-CONFIG_SF_DEFAULT_SPEED=20000000
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_MTD=y
-CONFIG_MTD_UBI_FASTMAP=y
-CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1
-CONFIG_PHYLIB=y
-CONFIG_PHY_MICREL=y
-CONFIG_PHY_MICREL_KSZ90X1=y
-CONFIG_MII=y
-CONFIG_PWM_IMX=y
-CONFIG_SPI=y
-CONFIG_MXC_SPI=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
-CONFIG_VIDEO_IPUV3=y
-CONFIG_VIDEO=y
-# CONFIG_VIDEO_SW_CURSOR is not set
-CONFIG_IMX_WATCHDOG=y
-CONFIG_OF_LIBFDT=y

diff --git a/include/configs/aristainetos2b.h b/include/configs/aristainetos2b.h
deleted file mode 100644 (file)
index a7ba48e..0000000
--- a/include/configs/aristainetos2b.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2015
- * Heiko Schocher, DENX Software Engineering, hs@denx.de.
- *
- * Based on:
- * Copyright (C) 2012 Freescale Semiconductor, Inc.
- *
- * Configuration settings for the Freescale i.MX6DL aristainetos2 board.
- */
-#ifndef __ARISTAINETOS2B_CONFIG_H
-#define __ARISTAINETOS2B_CONFIG_H
-
-#define CONFIG_HOSTNAME                "aristainetos2"
-
-#define CONFIG_MXC_UART_BASE   UART2_BASE
-#define CONSOLE_DEV    "ttymxc1"
-
-#define CONFIG_FEC_XCV_TYPE            RGMII
-
-#define CONFIG_EXTRA_ENV_BOARD_SETTINGS \
-       "board_type=aristainetos2_7@1\0" \
-       "nor_bootdelay=-2\0" \
-       "mtdids=nand0=gpmi-nand,nor0=spi0.0\0" \
-       "mtdparts=mtdparts=spi0.0:832k(u-boot),64k(env),64k(env-red)," \
-               "-(rescue-system);gpmi-nand:-(ubi)\0" \
-       "addmisc=setenv bootargs ${bootargs} net.ifnames=0 consoleblank=0\0" \
-       "ubiargs=setenv bootargs console=${console},${baudrate} " \
-               "ubi.mtd=0,4096 root=ubi0:rootfs rootfstype=ubifs\0 " \
-       "ubifs_load_fit=sf probe;ubi part ubi 4096;ubifsmount ubi:rootfs;" \
-               "ubifsload ${fit_addr_r} /boot/system.itb; " \
-               "imi ${fit_addr_r}\0 " \
-
-#define ARISTAINETOS_USB_OTG_PWR       IMX_GPIO_NR(4, 15)
-#define ARISTAINETOS_USB_H1_PWR        IMX_GPIO_NR(1, 0)
-#define CONFIG_GPIO_ENABLE_SPI_FLASH   IMX_GPIO_NR(2, 15)
-
-/* Framebuffer */
-#define CONFIG_SYS_LDB_CLOCK 33246000
-#define CONFIG_LG4573
-#define CONFIG_LG4573_BUS 0
-#define CONFIG_LG4573_CS 1
-
-#include "aristainetos-common.h"
-
-#endif                         /* __ARISTAINETOS2B_CONFIG_H */