[PATCH 13/57] arm: Remove bcm958712k board

Tom Rini trini at konsulko.com
Sun Feb 21 02:05:50 CET 2021


This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.

Cc: Jon Mason <jon.mason at broadcom.com>
Signed-off-by: Tom Rini <trini at konsulko.com>
---
 arch/arm/Kconfig                      |  1 -
 board/broadcom/bcm958712k/MAINTAINERS |  6 ---
 board/broadcom/bcmns2/Kconfig         | 15 -------
 board/broadcom/bcmns2/Makefile        |  5 ---
 board/broadcom/bcmns2/northstar2.c    | 63 ---------------------------
 configs/bcm958712k_defconfig          | 14 ------
 include/configs/bcm_northstar2.h      | 42 ------------------
 7 files changed, 146 deletions(-)
 delete mode 100644 board/broadcom/bcm958712k/MAINTAINERS
 delete mode 100644 board/broadcom/bcmns2/Kconfig
 delete mode 100644 board/broadcom/bcmns2/Makefile
 delete mode 100644 board/broadcom/bcmns2/northstar2.c
 delete mode 100644 configs/bcm958712k_defconfig
 delete mode 100644 include/configs/bcm_northstar2.h

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 31eefc340923..cc05393771fd 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1938,7 +1938,6 @@ source "board/broadcom/bcm968360bg/Kconfig"
 source "board/broadcom/bcm968580xref/Kconfig"
 source "board/broadcom/bcmcygnus/Kconfig"
 source "board/broadcom/bcmnsp/Kconfig"
-source "board/broadcom/bcmns2/Kconfig"
 source "board/broadcom/bcmns3/Kconfig"
 source "board/cavium/thunderx/Kconfig"
 source "board/cirrus/edb93xx/Kconfig"
diff --git a/board/broadcom/bcm958712k/MAINTAINERS b/board/broadcom/bcm958712k/MAINTAINERS
deleted file mode 100644
index 024fb1447d23..000000000000
--- a/board/broadcom/bcm958712k/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-BCM958712K BOARD
-M:	Jon Mason <jon.mason at broadcom.com>
-S:	Maintained
-F:	board/broadcom/bcmns2/
-F:	include/configs/bcm_northstar2.h
-F:	configs/bcm958712k_defconfig
diff --git a/board/broadcom/bcmns2/Kconfig b/board/broadcom/bcmns2/Kconfig
deleted file mode 100644
index 3ac67249c4d7..000000000000
--- a/board/broadcom/bcmns2/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-if TARGET_BCMNS2
-
-config SYS_BOARD
-	default "bcmns2"
-
-config SYS_VENDOR
-	default "broadcom"
-
-config SYS_SOC
-	default "ns2"
-
-config SYS_CONFIG_NAME
-	default "bcm_northstar2"
-
-endif
diff --git a/board/broadcom/bcmns2/Makefile b/board/broadcom/bcmns2/Makefile
deleted file mode 100644
index 29274bd106ce..000000000000
--- a/board/broadcom/bcmns2/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright 2016 Broadcom Ltd.
-
-obj-y	:= northstar2.o
diff --git a/board/broadcom/bcmns2/northstar2.c b/board/broadcom/bcmns2/northstar2.c
deleted file mode 100644
index 494e457ff65b..000000000000
--- a/board/broadcom/bcmns2/northstar2.c
+++ /dev/null
@@ -1,63 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2016 Broadcom Ltd.
- */
-#include <common.h>
-#include <cpu_func.h>
-#include <init.h>
-#include <asm/cache.h>
-#include <asm/global_data.h>
-#include <asm/system.h>
-#include <asm/armv8/mmu.h>
-
-static struct mm_region ns2_mem_map[] = {
-	{
-		.virt = 0x0UL,
-		.phys = 0x0UL,
-		.size = 0x80000000UL,
-		.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
-			 PTE_BLOCK_NON_SHARE |
-			 PTE_BLOCK_PXN | PTE_BLOCK_UXN
-	}, {
-		.virt = 0x80000000UL,
-		.phys = 0x80000000UL,
-		.size = 0xff80000000UL,
-		.attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
-			 PTE_BLOCK_INNER_SHARE
-	}, {
-		/* List terminator */
-		0,
-	}
-};
-
-struct mm_region *mem_map = ns2_mem_map;
-
-DECLARE_GLOBAL_DATA_PTR;
-
-int board_init(void)
-{
-	return 0;
-}
-
-int dram_init(void)
-{
-	gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
-				    PHYS_SDRAM_1_SIZE + PHYS_SDRAM_2_SIZE);
-	return 0;
-}
-
-int dram_init_banksize(void)
-{
-	gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
-	gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-
-	gd->bd->bi_dram[1].start = CONFIG_SYS_SDRAM_BASE + PHYS_SDRAM_1_SIZE;
-	gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
-
-	return 0;
-}
-
-void reset_cpu(ulong addr)
-{
-	psci_system_reset();
-}
diff --git a/configs/bcm958712k_defconfig b/configs/bcm958712k_defconfig
deleted file mode 100644
index 74070f555b65..000000000000
--- a/configs/bcm958712k_defconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-CONFIG_ARM=y
-CONFIG_TARGET_BCMNS2=y
-CONFIG_SYS_TEXT_BASE=0x85000000
-CONFIG_NR_DRAM_BANKS=2
-CONFIG_ENV_SIZE=0x2000
-CONFIG_IDENT_STRING=" Broadcom Northstar 2"
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_BOOTDELAY=5
-# CONFIG_DISPLAY_CPUINFO is not set
-CONFIG_SYS_PROMPT="u-boot> "
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_CONS_INDEX=4
-CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
diff --git a/include/configs/bcm_northstar2.h b/include/configs/bcm_northstar2.h
deleted file mode 100644
index fbfab288b372..000000000000
--- a/include/configs/bcm_northstar2.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Configuration for Broadcom NS2.
- */
-
-#ifndef __BCM_NORTHSTAR2_H
-#define __BCM_NORTHSTAR2_H
-
-#include <linux/sizes.h>
-
-#define CONFIG_HOSTNAME				"northstar2"
-
-/* Physical Memory Map */
-#define V2M_BASE				0x80000000
-#define PHYS_SDRAM_1				V2M_BASE
-
-#define PHYS_SDRAM_1_SIZE			(4UL * SZ_1G)
-#define PHYS_SDRAM_2_SIZE			(4UL * SZ_1G)
-#define CONFIG_SYS_SDRAM_BASE			PHYS_SDRAM_1
-
-/* define text_base for U-boot image */
-#define CONFIG_SYS_INIT_SP_ADDR			(PHYS_SDRAM_1 + 0x7ff00)
-#define CONFIG_SYS_LOAD_ADDR			0x90000000
-#define CONFIG_SYS_MALLOC_LEN			SZ_16M
-
-/* Serial Configuration */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE		(-4)
-#define CONFIG_SYS_NS16550_CLK			25000000
-#define CONFIG_SYS_NS16550_COM1			0x66100000
-#define CONFIG_SYS_NS16550_COM2			0x66110000
-#define CONFIG_SYS_NS16550_COM3			0x66120000
-#define CONFIG_SYS_NS16550_COM4			0x66130000
-
-/* console configuration */
-#define CONFIG_SYS_CBSIZE			SZ_1K
-#define CONFIG_SYS_MAXARGS			64
-#define CONFIG_SYS_BARGSIZE			CONFIG_SYS_CBSIZE
-
-/* version string, parser, etc */
-
-#endif /* __BCM_NORTHSTAR2_H */
-- 
2.17.1



More information about the U-Boot mailing list