Re: [PATCH 05/16] arm: Remove highbank board
On Fri, Feb 19, 2021 at 01:04:22PM +, André Przywara wrote: > On 10/02/2021 02:42, Tom Rini wrote: > > Hi Tom, > > > This board relies on using CONFIG_LIBATA but does not enable CONFIG_AHCI. > > The > > deadline for this conversion was the v2019.07 release. The use of > > CONFIG_AHCI > > requires CONFIG_DM. The deadline for this conversion was v2020.01. Remove > > this board. > > So I made a series a few months ago to bring highbank up to speed, it > converts everything over to DM, also starts using the DT provided by the > board for its own purposes. > I was facing one issue with SATA though, which made me drop the ball > there :-( > This is for the 2014.07 merge window, I guess? So if I manage to send > something before April, would you consider dropping this patch then? > Or do I need to start the series with a revert? Good question. I'm not likely to get everything dropped that I want to drop for v2021.04. Since you have everything but SATA/etc converted (which I guess is a driver needs conversion?) I'd like to see the base converted and you picking up the MAINTAINERS entry for it soon so I can review and take that. Thanks! -- Tom signature.asc Description: PGP signature
Re: [PATCH 05/16] arm: Remove highbank board
On 10/02/2021 02:42, Tom Rini wrote: Hi Tom, > This board relies on using CONFIG_LIBATA but does not enable CONFIG_AHCI. The > deadline for this conversion was the v2019.07 release. The use of CONFIG_AHCI > requires CONFIG_DM. The deadline for this conversion was v2020.01. Remove > this board. So I made a series a few months ago to bring highbank up to speed, it converts everything over to DM, also starts using the DT provided by the board for its own purposes. I was facing one issue with SATA though, which made me drop the ball there :-( This is for the 2014.07 merge window, I guess? So if I manage to send something before April, would you consider dropping this patch then? Or do I need to start the series with a revert? Cheers, Andre > > Cc: Rob Herring > Signed-off-by: Tom Rini > --- > arch/arm/Kconfig| 7 -- > arch/arm/Makefile | 1 - > arch/arm/mach-highbank/Kconfig | 12 -- > arch/arm/mach-highbank/Makefile | 6 - > arch/arm/mach-highbank/timer.c | 34 -- > board/highbank/MAINTAINERS | 6 - > board/highbank/Makefile | 6 - > board/highbank/ahci.c | 207 > board/highbank/highbank.c | 148 --- > configs/highbank_defconfig | 28 - > include/configs/highbank.h | 60 - > 11 files changed, 515 deletions(-) > delete mode 100644 arch/arm/mach-highbank/Kconfig > delete mode 100644 arch/arm/mach-highbank/Makefile > delete mode 100644 arch/arm/mach-highbank/timer.c > delete mode 100644 board/highbank/MAINTAINERS > delete mode 100644 board/highbank/Makefile > delete mode 100644 board/highbank/ahci.c > delete mode 100644 board/highbank/highbank.c > delete mode 100644 configs/highbank_defconfig > delete mode 100644 include/configs/highbank.h > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 95557d6ed6bd..6fa69d39be5b 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -750,11 +750,6 @@ config ARCH_S5PC1XX > select DM_SERIAL > imply CMD_DM > > -config ARCH_HIGHBANK > - bool "Calxeda Highbank" > - select CPU_V7A > - select PL011_SERIAL > - > config ARCH_INTEGRATOR > bool "ARM Ltd. Integrator family" > select DM > @@ -1873,8 +1868,6 @@ source "arch/arm/mach-davinci/Kconfig" > > source "arch/arm/mach-exynos/Kconfig" > > -source "arch/arm/mach-highbank/Kconfig" > - > source "arch/arm/mach-integrator/Kconfig" > > source "arch/arm/mach-ipq40xx/Kconfig" > diff --git a/arch/arm/Makefile b/arch/arm/Makefile > index 28b523b37c70..e1d266c3a4d8 100644 > --- a/arch/arm/Makefile > +++ b/arch/arm/Makefile > @@ -57,7 +57,6 @@ machine-$(CONFIG_ARCH_BCM283X) += bcm283x > machine-$(CONFIG_ARCH_BCMSTB)+= bcmstb > machine-$(CONFIG_ARCH_DAVINCI) += davinci > machine-$(CONFIG_ARCH_EXYNOS)+= exynos > -machine-$(CONFIG_ARCH_HIGHBANK) += highbank > machine-$(CONFIG_ARCH_IPQ40XX) += ipq40xx > machine-$(CONFIG_ARCH_K3)+= k3 > machine-$(CONFIG_ARCH_KEYSTONE) += keystone > diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig > deleted file mode 100644 > index 0e73c0414293.. > --- a/arch/arm/mach-highbank/Kconfig > +++ /dev/null > @@ -1,12 +0,0 @@ > -if ARCH_HIGHBANK > - > -config SYS_BOARD > - default "highbank" > - > -config SYS_SOC > - default "highbank" > - > -config SYS_CONFIG_NAME > - default "highbank" > - > -endif > diff --git a/arch/arm/mach-highbank/Makefile b/arch/arm/mach-highbank/Makefile > deleted file mode 100644 > index 029e266bedce.. > --- a/arch/arm/mach-highbank/Makefile > +++ /dev/null > @@ -1,6 +0,0 @@ > -# SPDX-License-Identifier: GPL-2.0+ > -# > -# (C) Copyright 2000-2006 > -# Wolfgang Denk, DENX Software Engineering, w...@denx.de. > - > -obj-y:= timer.o > diff --git a/arch/arm/mach-highbank/timer.c b/arch/arm/mach-highbank/timer.c > deleted file mode 100644 > index 2423a0e37855.. > --- a/arch/arm/mach-highbank/timer.c > +++ /dev/null > @@ -1,34 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0+ > -/* > - * Copyright 2010-2011 Calxeda, Inc. > - * > - * Based on arm926ejs/mx27/timer.c > - */ > - > -#include > -#include > -#include > -#include > - > -#undef SYSTIMER_BASE > -#define SYSTIMER_BASE0xFFF34000 /* Timer 0 and 1 base > */ > - > -static struct systimer *systimer_base = (struct systimer *)SYSTIMER_BASE; > - > -/* > - * Start the timer > - */ > -int timer_init(void) > -{ > - /* > - * Setup timer0 > - */ > - writel(0, _base->timer0control); > - writel(SYSTIMER_RELOAD, _base->timer0load); > - writel(SYSTIMER_RELOAD, _base->timer0value); > - writel(SYSTIMER_EN | SYSTIMER_32BIT | SYSTIMER_PRESC_256, > - _base->timer0control); > - > - return 0; > - > -} > diff --git a/board/highbank/MAINTAINERS
[PATCH 05/16] arm: Remove highbank board
This board relies on using CONFIG_LIBATA but does not enable CONFIG_AHCI. The deadline for this conversion was the v2019.07 release. The use of CONFIG_AHCI requires CONFIG_DM. The deadline for this conversion was v2020.01. Remove this board. Cc: Rob Herring Signed-off-by: Tom Rini --- arch/arm/Kconfig| 7 -- arch/arm/Makefile | 1 - arch/arm/mach-highbank/Kconfig | 12 -- arch/arm/mach-highbank/Makefile | 6 - arch/arm/mach-highbank/timer.c | 34 -- board/highbank/MAINTAINERS | 6 - board/highbank/Makefile | 6 - board/highbank/ahci.c | 207 board/highbank/highbank.c | 148 --- configs/highbank_defconfig | 28 - include/configs/highbank.h | 60 - 11 files changed, 515 deletions(-) delete mode 100644 arch/arm/mach-highbank/Kconfig delete mode 100644 arch/arm/mach-highbank/Makefile delete mode 100644 arch/arm/mach-highbank/timer.c delete mode 100644 board/highbank/MAINTAINERS delete mode 100644 board/highbank/Makefile delete mode 100644 board/highbank/ahci.c delete mode 100644 board/highbank/highbank.c delete mode 100644 configs/highbank_defconfig delete mode 100644 include/configs/highbank.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 95557d6ed6bd..6fa69d39be5b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -750,11 +750,6 @@ config ARCH_S5PC1XX select DM_SERIAL imply CMD_DM -config ARCH_HIGHBANK - bool "Calxeda Highbank" - select CPU_V7A - select PL011_SERIAL - config ARCH_INTEGRATOR bool "ARM Ltd. Integrator family" select DM @@ -1873,8 +1868,6 @@ source "arch/arm/mach-davinci/Kconfig" source "arch/arm/mach-exynos/Kconfig" -source "arch/arm/mach-highbank/Kconfig" - source "arch/arm/mach-integrator/Kconfig" source "arch/arm/mach-ipq40xx/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 28b523b37c70..e1d266c3a4d8 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -57,7 +57,6 @@ machine-$(CONFIG_ARCH_BCM283X)+= bcm283x machine-$(CONFIG_ARCH_BCMSTB) += bcmstb machine-$(CONFIG_ARCH_DAVINCI) += davinci machine-$(CONFIG_ARCH_EXYNOS) += exynos -machine-$(CONFIG_ARCH_HIGHBANK)+= highbank machine-$(CONFIG_ARCH_IPQ40XX) += ipq40xx machine-$(CONFIG_ARCH_K3) += k3 machine-$(CONFIG_ARCH_KEYSTONE)+= keystone diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig deleted file mode 100644 index 0e73c0414293.. --- a/arch/arm/mach-highbank/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if ARCH_HIGHBANK - -config SYS_BOARD - default "highbank" - -config SYS_SOC - default "highbank" - -config SYS_CONFIG_NAME - default "highbank" - -endif diff --git a/arch/arm/mach-highbank/Makefile b/arch/arm/mach-highbank/Makefile deleted file mode 100644 index 029e266bedce.. --- a/arch/arm/mach-highbank/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, w...@denx.de. - -obj-y := timer.o diff --git a/arch/arm/mach-highbank/timer.c b/arch/arm/mach-highbank/timer.c deleted file mode 100644 index 2423a0e37855.. --- a/arch/arm/mach-highbank/timer.c +++ /dev/null @@ -1,34 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright 2010-2011 Calxeda, Inc. - * - * Based on arm926ejs/mx27/timer.c - */ - -#include -#include -#include -#include - -#undef SYSTIMER_BASE -#define SYSTIMER_BASE 0xFFF34000 /* Timer 0 and 1 base */ - -static struct systimer *systimer_base = (struct systimer *)SYSTIMER_BASE; - -/* - * Start the timer - */ -int timer_init(void) -{ - /* -* Setup timer0 -*/ - writel(0, _base->timer0control); - writel(SYSTIMER_RELOAD, _base->timer0load); - writel(SYSTIMER_RELOAD, _base->timer0value); - writel(SYSTIMER_EN | SYSTIMER_32BIT | SYSTIMER_PRESC_256, - _base->timer0control); - - return 0; - -} diff --git a/board/highbank/MAINTAINERS b/board/highbank/MAINTAINERS deleted file mode 100644 index 69ddeddd6003.. --- a/board/highbank/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -HIGHBANK BOARD -M: Rob Herring -S: Maintained -F: board/highbank/ -F: include/configs/highbank.h -F: configs/highbank_defconfig diff --git a/board/highbank/Makefile b/board/highbank/Makefile deleted file mode 100644 index 57f7f2e2a658.. --- a/board/highbank/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, w...@denx.de. - -obj-y := highbank.o ahci.o diff --git a/board/highbank/ahci.c b/board/highbank/ahci.c deleted file mode 100644 index 9c057278ace1.. --- a/board/highbank/ahci.c +++