From: Stefan Roese <sr@denx.de>
To: Tom Rini <trini@konsulko.com>, u-boot@lists.denx.de
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Subject: Re: [PATCH 2/6] arm: Remove aspenite board
Date: Thu, 9 Sep 2021 14:04:28 +0200 [thread overview]
Message-ID: <d6fa206a-ebd9-b1ea-d75d-6cdc1f17c12d@denx.de> (raw)
In-Reply-To: <20210909115453.5073-2-trini@konsulko.com>
On 09.09.21 13:54, Tom Rini wrote:
> This board has not been converted to CONFIG_DM by the deadline.
> Remove it.
>
> Cc: Prafulla Wadaskar <prafulla@marvell.com>
> Cc: Stefan Roese <sr@denx.de>
> Signed-off-by: Tom Rini <trini@konsulko.com>
Acked-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> ---
> arch/arm/Kconfig | 6 ----
> board/Marvell/aspenite/Kconfig | 15 ----------
> board/Marvell/aspenite/MAINTAINERS | 6 ----
> board/Marvell/aspenite/Makefile | 8 ------
> board/Marvell/aspenite/aspenite.c | 45 ------------------------------
> configs/aspenite_defconfig | 19 -------------
> drivers/mmc/mv_sdhci.c | 24 ----------------
> include/configs/aspenite.h | 30 --------------------
> 8 files changed, 153 deletions(-)
> delete mode 100644 board/Marvell/aspenite/Kconfig
> delete mode 100644 board/Marvell/aspenite/MAINTAINERS
> delete mode 100644 board/Marvell/aspenite/Makefile
> delete mode 100644 board/Marvell/aspenite/aspenite.c
> delete mode 100644 configs/aspenite_defconfig
> delete mode 100644 include/configs/aspenite.h
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 909a308970b7..9ef4f6519826 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -514,11 +514,6 @@ config ARCH_AT91
> select SPL_BOARD_INIT if SPL && !TARGET_SMARTWEB
> select SPL_SEPARATE_BSS if SPL
>
> -config TARGET_ASPENITE
> - bool "Support aspenite"
> - select CPU_ARM926EJS
> - select GPIO_EXTRA_HEADER
> -
> config ARCH_DAVINCI
> bool "TI DaVinci"
> select CPU_ARM926EJS
> @@ -2102,7 +2097,6 @@ source "board/armltd/total_compute/Kconfig"
>
> source "board/bosch/shc/Kconfig"
> source "board/bosch/guardian/Kconfig"
> -source "board/Marvell/aspenite/Kconfig"
> source "board/Marvell/octeontx/Kconfig"
> source "board/Marvell/octeontx2/Kconfig"
> source "board/armltd/vexpress64/Kconfig"
> diff --git a/board/Marvell/aspenite/Kconfig b/board/Marvell/aspenite/Kconfig
> deleted file mode 100644
> index 4dd49c4452b9..000000000000
> --- a/board/Marvell/aspenite/Kconfig
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -if TARGET_ASPENITE
> -
> -config SYS_BOARD
> - default "aspenite"
> -
> -config SYS_VENDOR
> - default "Marvell"
> -
> -config SYS_SOC
> - default "armada100"
> -
> -config SYS_CONFIG_NAME
> - default "aspenite"
> -
> -endif
> diff --git a/board/Marvell/aspenite/MAINTAINERS b/board/Marvell/aspenite/MAINTAINERS
> deleted file mode 100644
> index a77d30eb78ce..000000000000
> --- a/board/Marvell/aspenite/MAINTAINERS
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -ASPENITE BOARD
> -M: Prafulla Wadaskar <prafulla@marvell.com>
> -S: Maintained
> -F: board/Marvell/aspenite/
> -F: include/configs/aspenite.h
> -F: configs/aspenite_defconfig
> diff --git a/board/Marvell/aspenite/Makefile b/board/Marvell/aspenite/Makefile
> deleted file mode 100644
> index f67a978a12bc..000000000000
> --- a/board/Marvell/aspenite/Makefile
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -# SPDX-License-Identifier: GPL-2.0+
> -#
> -# (C) Copyright 2010
> -# Marvell Semiconductor <www.marvell.com>
> -# Written-by: Prafulla Wadaskar <prafulla@marvell.com>
> -# Contributor: Mahavir Jain <mjain@marvell.com>
> -
> -obj-y := aspenite.o
> diff --git a/board/Marvell/aspenite/aspenite.c b/board/Marvell/aspenite/aspenite.c
> deleted file mode 100644
> index 1f9389c0a7ab..000000000000
> --- a/board/Marvell/aspenite/aspenite.c
> +++ /dev/null
> @@ -1,45 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0+
> -/*
> - * (C) Copyright 2010
> - * Marvell Semiconductor <www.marvell.com>
> - * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
> - * Contributor: Mahavir Jain <mjain@marvell.com>
> - */
> -
> -#include <common.h>
> -#include <init.h>
> -#include <mvmfp.h>
> -#include <asm/global_data.h>
> -#include <asm/mach-types.h>
> -#include <asm/arch/cpu.h>
> -#include <asm/arch/mfp.h>
> -#include <asm/arch/armada100.h>
> -
> -DECLARE_GLOBAL_DATA_PTR;
> -
> -int board_early_init_f(void)
> -{
> - u32 mfp_cfg[] = {
> - /* I2C */
> - MFP105_CI2C_SDA,
> - MFP106_CI2C_SCL,
> -
> - /* Enable Console on UART1 */
> - MFP107_UART1_RXD,
> - MFP108_UART1_TXD,
> -
> - MFP_EOC /*End of configureation*/
> - };
> - /* configure MFP's */
> - mfp_config(mfp_cfg);
> - return 0;
> -}
> -
> -int board_init(void)
> -{
> - /* arch number of Board */
> - gd->bd->bi_arch_number = MACH_TYPE_ASPENITE;
> - /* adress of boot parameters */
> - gd->bd->bi_boot_params = armd1_sdram_base(0) + 0x100;
> - return 0;
> -}
> diff --git a/configs/aspenite_defconfig b/configs/aspenite_defconfig
> deleted file mode 100644
> index b85f7241b61d..000000000000
> --- a/configs/aspenite_defconfig
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -CONFIG_ARM=y
> -CONFIG_SKIP_LOWLEVEL_INIT=y
> -CONFIG_ARCH_CPU_INIT=y
> -CONFIG_TARGET_ASPENITE=y
> -CONFIG_SYS_TEXT_BASE=0x600000
> -CONFIG_NR_DRAM_BANKS=2
> -CONFIG_ENV_SIZE=0x20000
> -CONFIG_IDENT_STRING="\nMarvell-Aspenite DB"
> -CONFIG_SYS_LOAD_ADDR=0x800000
> -CONFIG_BOOTDELAY=3
> -CONFIG_USE_PREBOOT=y
> -# CONFIG_DISPLAY_BOARDINFO is not set
> -CONFIG_BOARD_EARLY_INIT_F=y
> -# CONFIG_CMD_SETEXPR is not set
> -CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> -# CONFIG_NET is not set
> -# CONFIG_MMC is not set
> -CONFIG_SYS_NS16550=y
> -CONFIG_OF_LIBFDT=y
> diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c
> index 591137f50e39..336ebf141026 100644
> --- a/drivers/mmc/mv_sdhci.c
> +++ b/drivers/mmc/mv_sdhci.c
> @@ -44,29 +44,6 @@ static void sdhci_mvebu_mbus_config(void __iomem *base)
>
> #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
> static struct sdhci_ops mv_ops;
> -
> -#if defined(CONFIG_SHEEVA_88SV331xV5)
> -#define SD_CE_ATA_2 0xEA
> -#define MMC_CARD 0x1000
> -#define MMC_WIDTH 0x0100
> -static inline void mv_sdhci_writeb(struct sdhci_host *host, u8 val, int reg)
> -{
> - struct mmc *mmc = host->mmc;
> - u32 ata = (unsigned long)host->ioaddr + SD_CE_ATA_2;
> -
> - if (!IS_SD(mmc) && reg == SDHCI_HOST_CONTROL) {
> - if (mmc->bus_width == 8)
> - writew(readw(ata) | (MMC_CARD | MMC_WIDTH), ata);
> - else
> - writew(readw(ata) & ~(MMC_CARD | MMC_WIDTH), ata);
> - }
> -
> - writeb(val, host->ioaddr + reg);
> -}
> -
> -#else
> -#define mv_sdhci_writeb NULL
> -#endif /* CONFIG_SHEEVA_88SV331xV5 */
> #endif /* CONFIG_MMC_SDHCI_IO_ACCESSORS */
>
> int mv_sdh_init(unsigned long regbase, u32 max_clk, u32 min_clk, u32 quirks)
> @@ -84,7 +61,6 @@ int mv_sdh_init(unsigned long regbase, u32 max_clk, u32 min_clk, u32 quirks)
> host->max_clk = max_clk;
> #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
> memset(&mv_ops, 0, sizeof(struct sdhci_ops));
> - mv_ops.write_b = mv_sdhci_writeb;
> host->ops = &mv_ops;
> #endif
>
> diff --git a/include/configs/aspenite.h b/include/configs/aspenite.h
> deleted file mode 100644
> index 4a25d5616531..000000000000
> --- a/include/configs/aspenite.h
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0+ */
> -/*
> - * (C) Copyright 2010
> - * Marvell Semiconductor <www.marvell.com>
> - * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
> - * Contributor: Mahavir Jain <mjain@marvell.com>
> - */
> -
> -#ifndef __CONFIG_ASPENITE_H
> -#define __CONFIG_ASPENITE_H
> -
> -/*
> - * High Level Configuration Options
> - */
> -#define CONFIG_SHEEVA_88SV331xV5 1 /* CPU Core subversion */
> -#define CONFIG_ARMADA100 1 /* SOC Family Name */
> -
> -/*
> - * 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)
> -
> -#include "mv-common.h"
> -
> -/*
> - * Environment variables configurations
> - */
> -
> -#endif /* __CONFIG_ASPENITE_H */
>
Viele Grüße,
Stefan
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
next prev parent reply other threads:[~2021-09-09 12:04 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-09 11:54 [PATCH 1/6] arm: Remove flea3 board Tom Rini
2021-09-09 11:54 ` [PATCH 2/6] arm: Remove aspenite board Tom Rini
2021-09-09 12:04 ` Stefan Roese [this message]
2021-09-09 11:54 ` [PATCH 3/6] arm: Remove zmx25 board and ARCH_MX25 Tom Rini
2021-10-02 21:08 ` Tom Rini
2021-09-09 11:54 ` [PATCH 4/6] arm: Remove bg0900 board Tom Rini
2021-10-02 21:08 ` Tom Rini
2021-09-09 11:54 ` [PATCH 5/6] arm: Remove edminiv2 board and orion5x support Tom Rini
2021-09-09 12:05 ` Stefan Roese
2021-09-09 22:54 ` Simon Guinot
2021-09-09 23:20 ` Tom Rini
2021-09-10 4:41 ` Stefan Roese
2021-09-14 8:37 ` Simon Guinot
2021-09-14 11:43 ` Tom Rini
2021-09-15 13:08 ` Simon Guinot
2021-09-09 11:54 ` [PATCH 6/6] ppc: Remove MPC8349EMDS board and ARCH_MPC8349 support Tom Rini
2021-10-02 21:09 ` Tom Rini
2021-09-09 14:44 ` [PATCH 1/6] arm: Remove flea3 board Stefano Babic
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=d6fa206a-ebd9-b1ea-d75d-6cdc1f17c12d@denx.de \
--to=sr@denx.de \
--cc=prafulla@marvell.com \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/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.