[PATCH 10/18] arm: Remove gplugd board
Tom Rini
trini at konsulko.com
Sat May 22 14:47:09 CEST 2021
These boards have not been converted to CONFIG_DM_USB by the deadline
and is also missing conversion to CONFIG_DM. Remove it
Cc: Ajay Bhargav <contact at 8051projects.net>
Signed-off-by: Tom Rini <trini at konsulko.com>
---
arch/arm/Kconfig | 5 --
board/Marvell/gplugd/Kconfig | 15 ----
board/Marvell/gplugd/MAINTAINERS | 6 --
board/Marvell/gplugd/Makefile | 13 ---
board/Marvell/gplugd/gplugd.c | 134 -------------------------------
configs/gplugd_defconfig | 28 -------
include/configs/gplugd.h | 75 -----------------
7 files changed, 276 deletions(-)
delete mode 100644 board/Marvell/gplugd/Kconfig
delete mode 100644 board/Marvell/gplugd/MAINTAINERS
delete mode 100644 board/Marvell/gplugd/Makefile
delete mode 100644 board/Marvell/gplugd/gplugd.c
delete mode 100644 configs/gplugd_defconfig
delete mode 100644 include/configs/gplugd.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 01d4e68d5623..86d3168dc551 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -526,10 +526,6 @@ config TARGET_ASPENITE
bool "Support aspenite"
select CPU_ARM926EJS
-config TARGET_GPLUGD
- bool "Support gplugd"
- select CPU_ARM926EJS
-
config ARCH_DAVINCI
bool "TI DaVinci"
select CPU_ARM926EJS
@@ -1967,7 +1963,6 @@ source "board/bosch/shc/Kconfig"
source "board/bosch/guardian/Kconfig"
source "board/CarMediaLab/flea3/Kconfig"
source "board/Marvell/aspenite/Kconfig"
-source "board/Marvell/gplugd/Kconfig"
source "board/Marvell/octeontx/Kconfig"
source "board/Marvell/octeontx2/Kconfig"
source "board/armltd/vexpress64/Kconfig"
diff --git a/board/Marvell/gplugd/Kconfig b/board/Marvell/gplugd/Kconfig
deleted file mode 100644
index d94481650965..000000000000
--- a/board/Marvell/gplugd/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-if TARGET_GPLUGD
-
-config SYS_BOARD
- default "gplugd"
-
-config SYS_VENDOR
- default "Marvell"
-
-config SYS_SOC
- default "armada100"
-
-config SYS_CONFIG_NAME
- default "gplugd"
-
-endif
diff --git a/board/Marvell/gplugd/MAINTAINERS b/board/Marvell/gplugd/MAINTAINERS
deleted file mode 100644
index 197c6a01dd36..000000000000
--- a/board/Marvell/gplugd/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-GPLUGD BOARD
-M: Ajay Bhargav <contact at 8051projects.net>
-S: Maintained
-F: board/Marvell/gplugd/
-F: include/configs/gplugd.h
-F: configs/gplugd_defconfig
diff --git a/board/Marvell/gplugd/Makefile b/board/Marvell/gplugd/Makefile
deleted file mode 100644
index 6161bf1c841a..000000000000
--- a/board/Marvell/gplugd/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2011
-# eInfochips Ltd. <www.einfochips.com>
-# Written-by: Ajay Bhargav <contact at 8051projects.net>
-#
-# Based on Aspenite:
-# (C) Copyright 2010
-# Marvell Semiconductor <www.marvell.com>
-# Written-by: Prafulla Wadaskar <prafulla at marvell.com>
-# Contributor: Mahavir Jain <mjain at marvell.com>
-
-obj-y := gplugd.o
diff --git a/board/Marvell/gplugd/gplugd.c b/board/Marvell/gplugd/gplugd.c
deleted file mode 100644
index c6376cdf6a94..000000000000
--- a/board/Marvell/gplugd/gplugd.c
+++ /dev/null
@@ -1,134 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2011
- * eInfochips Ltd. <www.einfochips.com>
- * Written-by: Ajay Bhargav <contact at 8051projects.net>
- *
- * Based on Aspenite:
- * (C) Copyright 2010
- * Marvell Semiconductor <www.marvell.com>
- * Written-by: Prafulla Wadaskar <prafulla at marvell.com>
- * Contributor: Mahavir Jain <mjain at marvell.com>
- */
-
-#include <common.h>
-#include <init.h>
-#include <log.h>
-#include <mvmfp.h>
-#include <asm/arch/cpu.h>
-#include <asm/arch/mfp.h>
-#include <asm/arch/armada100.h>
-#include <asm/global_data.h>
-#include <asm/gpio.h>
-#include <miiphy.h>
-#include <asm/mach-types.h>
-#include <linux/delay.h>
-
-#ifdef CONFIG_ARMADA100_FEC
-#include <net.h>
-#include <netdev.h>
-#endif /* CONFIG_ARMADA100_FEC */
-
-DECLARE_GLOBAL_DATA_PTR;
-
-int board_early_init_f(void)
-{
- u32 mfp_cfg[] = {
- /* I2C */
- MFP105_CI2C_SDA,
- MFP106_CI2C_SCL,
-
- /* Enable Console on UART3 */
- MFPO8_UART3_TXD,
- MFPO9_UART3_RXD,
-
- /* Ethernet PHY Interface */
- MFP086_ETH_TXCLK,
- MFP087_ETH_TXEN,
- MFP088_ETH_TXDQ3,
- MFP089_ETH_TXDQ2,
- MFP090_ETH_TXDQ1,
- MFP091_ETH_TXDQ0,
- MFP092_ETH_CRS,
- MFP093_ETH_COL,
- MFP094_ETH_RXCLK,
- MFP095_ETH_RXER,
- MFP096_ETH_RXDQ3,
- MFP097_ETH_RXDQ2,
- MFP098_ETH_RXDQ1,
- MFP099_ETH_RXDQ0,
- MFP100_ETH_MDC,
- MFP101_ETH_MDIO,
- MFP103_ETH_RXDV,
-
- /* SSP2 */
- MFP107_SSP2_RXD,
- MFP108_SSP2_TXD,
- MFP110_SSP2_CS,
- MFP111_SSP2_CLK,
-
- MFP_EOC /*End of configuration*/
- };
- /* configure MFP's */
- mfp_config(mfp_cfg);
- return 0;
-}
-
-int board_init(void)
-{
- struct armd1apb2_registers *apb2_regs =
- (struct armd1apb2_registers *)ARMD1_APBC2_BASE;
-
- /* arch number of Board */
- gd->bd->bi_arch_number = MACH_TYPE_GPLUGD;
- /* adress of boot parameters */
- gd->bd->bi_boot_params = armd1_sdram_base(0) + 0x100;
- /* Assert PHY_RST# */
- gpio_direction_output(CONFIG_SYS_GPIO_PHY_RST, GPIO_LOW);
- udelay(10);
- /* Deassert PHY_RST# */
- gpio_set_value(CONFIG_SYS_GPIO_PHY_RST, GPIO_HIGH);
-
- /* Enable SSP2 clock */
- writel(SSP2_APBCLK | SSP2_FNCLK, &apb2_regs->ssp2_clkrst);
- return 0;
-}
-
-#ifdef CONFIG_ARMADA100_FEC
-int board_eth_init(struct bd_info *bis)
-{
- struct armd1apmu_registers *apmu_regs =
- (struct armd1apmu_registers *)ARMD1_APMU_BASE;
-
- /* Enable clock of ethernet controller */
- writel(FE_CLK_RST | FE_CLK_ENA, &apmu_regs->fecrc);
-
- return armada100_fec_register(ARMD1_FEC_BASE);
-}
-
-#ifdef CONFIG_RESET_PHY_R
-/* Configure and initialize PHY chip 88E3015 */
-void reset_phy(void)
-{
- u16 phy_adr;
- const char *name = "armd-fec0";
-
- if (miiphy_set_current_dev(name))
- return;
-
- /* command to read PHY dev address */
- if (miiphy_read(name, 0xff, 0xff, &phy_adr)) {
- printf("Err..%s could not read PHY dev address\n", __func__);
- return;
- }
-
- /* Set Ethernet LED in TX blink mode */
- miiphy_write(name, phy_adr, PHY_LED_MAN_REG, 0x00);
- miiphy_write(name, phy_adr, PHY_LED_PAR_SEL_REG, PHY_LED_VAL);
-
- /* reset the phy */
- miiphy_reset(name, phy_adr);
- debug("88E3015 Initialized on %s\n", name);
-}
-#endif /* CONFIG_RESET_PHY_R */
-#endif /* CONFIG_ARMADA100_FEC */
diff --git a/configs/gplugd_defconfig b/configs/gplugd_defconfig
deleted file mode 100644
index a4584b6d51cf..000000000000
--- a/configs/gplugd_defconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-CONFIG_ARM=y
-CONFIG_SYS_DCACHE_OFF=y
-CONFIG_ARCH_CPU_INIT=y
-CONFIG_TARGET_GPLUGD=y
-CONFIG_SYS_TEXT_BASE=0x00f00000
-CONFIG_NR_DRAM_BANKS=2
-CONFIG_ENV_SIZE=0x4000
-CONFIG_IDENT_STRING="\nMarvell-gplugD"
-CONFIG_BOOTDELAY=3
-CONFIG_USE_PREBOOT=y
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_BOARD_EARLY_INIT_F=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_FAT=y
-CONFIG_ISO_PARTITION=y
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_MMC is not set
-CONFIG_MII=y
-CONFIG_SYS_NS16550=y
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h
deleted file mode 100644
index a0554d7f8e5b..000000000000
--- a/include/configs/gplugd.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2011
- * eInfochips Ltd. <www.einfochips.com>
- * Written-by: Ajay Bhargav <contact at 8051projects.net>
- *
- * Based on Aspenite:
- * (C) Copyright 2010
- * Marvell Semiconductor <www.marvell.com>
- * Written-by: Prafulla Wadaskar <prafulla at marvell.com>
- * Contributor: Mahavir Jain <mjain at marvell.com>
- */
-
-#ifndef __CONFIG_GPLUGD_H
-#define __CONFIG_GPLUGD_H
-
-/*
- * High Level Configuration Options
- */
-#define CONFIG_SHEEVA_88SV331xV5 1 /* CPU Core subversion */
-#define CONFIG_ARMADA100 1 /* SOC Family Name */
-#define CONFIG_ARMADA168 1 /* SOC Used on this Board */
-#define CONFIG_MACH_TYPE MACH_TYPE_GPLUGD /* Machine type */
-#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
-
-/*
- * There is no internal RAM in ARMADA100, using DRAM
- * TBD: dcache to be used for this
- */
-#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE - 0x00200000)
-
-/* Network configuration */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_ARMADA100_FEC
-
-/* DHCP Support */
-#define CONFIG_BOOTP_DHCP_REQUEST_DELAY 50000
-#endif /* CONFIG_CMD_NET */
-
-/* GPIO Support */
-#define CONFIG_MARVELL_GPIO
-
-/* PHY configuration */
-#define CONFIG_RESET_PHY_R
-/* 88E3015 register definition */
-#define PHY_LED_PAR_SEL_REG 22
-#define PHY_LED_MAN_REG 25
-#define PHY_LED_VAL 0x5b /* LINK LED1, ACT LED2 */
-/* GPIO Configuration for PHY */
-#define CONFIG_SYS_GPIO_PHY_RST 104 /* GPIO104 */
-
-/* Flash Support */
-
-/*
- * mv-common.h should be defined after CMD configs since it used them
- * to enable certain macros
- */
-#include "mv-common.h"
-
-#ifdef CONFIG_SYS_NS16550_COM1
-#undef CONFIG_SYS_NS16550_COM1
-#endif /* CONFIG_SYS_NS16550_COM1 */
-
-#define CONFIG_SYS_NS16550_COM1 ARMD1_UART3_BASE
-
-/*
- * Environment variables configurations
- */
-
-#ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_ARMADA100
-#define CONFIG_EHCI_IS_TDI
-#endif /* CONFIG_CMD_USB */
-
-#endif /* __CONFIG_GPLUGD_H */
--
2.17.1
More information about the U-Boot
mailing list