arm: Remove bcm28155_ap board
authorTom Rini <trini@konsulko.com>
Sun, 21 Feb 2021 01:05:54 +0000 (20:05 -0500)
committerTom Rini <trini@konsulko.com>
Sat, 10 Apr 2021 12:01:09 +0000 (08:01 -0400)
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.

Cc: Steve Rae <steve.rae@raedomain.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
arch/arm/Kconfig
board/broadcom/bcm28155_ap/Kconfig [deleted file]
board/broadcom/bcm28155_ap/MAINTAINERS [deleted file]
board/broadcom/bcm28155_ap/Makefile [deleted file]
board/broadcom/bcm28155_ap/bcm28155_ap.c [deleted file]
configs/bcm11130_defconfig [deleted file]
configs/bcm11130_nand_defconfig [deleted file]
configs/bcm28155_ap_defconfig [deleted file]
configs/bcm28155_w1d_defconfig [deleted file]
include/configs/bcm28155_ap.h [deleted file]

index 43143911b8bf5d89953629a9c4bd996afebdf449..779e8ca55d72b2ad221fca6eda11bde10835c1f8 100644 (file)
@@ -662,12 +662,6 @@ config TARGET_BCM23550_W1D
        imply CRC32_VERIFY
        imply FAT_WRITE
 
-config TARGET_BCM28155_AP
-       bool "Support bcm28155_ap"
-       select CPU_V7A
-       imply CRC32_VERIFY
-       imply FAT_WRITE
-
 config TARGET_BCMCYGNUS
        bool "Support bcmcygnus"
        select CPU_V7A
@@ -1945,7 +1939,6 @@ source "board/Marvell/octeontx2/Kconfig"
 source "board/armltd/vexpress64/Kconfig"
 source "board/cortina/presidio-asic/Kconfig"
 source "board/broadcom/bcm23550_w1d/Kconfig"
-source "board/broadcom/bcm28155_ap/Kconfig"
 source "board/broadcom/bcm963158/Kconfig"
 source "board/broadcom/bcm968360bg/Kconfig"
 source "board/broadcom/bcm968580xref/Kconfig"
diff --git a/board/broadcom/bcm28155_ap/Kconfig b/board/broadcom/bcm28155_ap/Kconfig
deleted file mode 100644 (file)
index f1b4e08..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-if TARGET_BCM28155_AP
-
-config SYS_BOARD
-       default "bcm28155_ap"
-
-config SYS_VENDOR
-       default "broadcom"
-
-config SYS_SOC
-       default "bcm281xx"
-
-config SYS_CONFIG_NAME
-       default "bcm28155_ap"
-
-endif
diff --git a/board/broadcom/bcm28155_ap/MAINTAINERS b/board/broadcom/bcm28155_ap/MAINTAINERS
deleted file mode 100644 (file)
index e1e99d0..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-BCM28155_AP BOARD
-M:     Steve Rae <steve.rae@raedomain.com>
-S:     Maintained
-F:     board/broadcom/bcm28155_ap/
-F:     include/configs/bcm28155_ap.h
-F:     configs/bcm28155_ap_defconfig
diff --git a/board/broadcom/bcm28155_ap/Makefile b/board/broadcom/bcm28155_ap/Makefile
deleted file mode 100644 (file)
index 06eba8f..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright 2013 Broadcom Corporation.
-
-obj-y  += bcm28155_ap.o
diff --git a/board/broadcom/bcm28155_ap/bcm28155_ap.c b/board/broadcom/bcm28155_ap/bcm28155_ap.c
deleted file mode 100644 (file)
index 43726f7..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2013 Broadcom Corporation.
- */
-
-#include <common.h>
-#include <init.h>
-#include <log.h>
-#include <asm/global_data.h>
-#include <asm/io.h>
-#include <asm/mach-types.h>
-#include <env.h>
-#include <mmc.h>
-#include <asm/kona-common/kona_sdhci.h>
-#include <asm/kona-common/clk.h>
-#include <asm/arch/sysmap.h>
-
-#include <usb.h>
-#include <usb/dwc2_udc.h>
-#include <g_dnl.h>
-
-#define SECWATCHDOG_SDOGCR_OFFSET      0x00000000
-#define SECWATCHDOG_SDOGCR_EN_SHIFT    27
-#define SECWATCHDOG_SDOGCR_SRSTEN_SHIFT        26
-#define SECWATCHDOG_SDOGCR_CLKS_SHIFT  20
-#define SECWATCHDOG_SDOGCR_LD_SHIFT    0
-
-#ifndef CONFIG_USB_SERIALNO
-#define CONFIG_USB_SERIALNO "1234567890"
-#endif
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * board_init - early hardware init
- */
-int board_init(void)
-{
-       printf("Relocation Offset is: %08lx\n", gd->reloc_off);
-
-       /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
-       clk_init();
-
-       return 0;
-}
-
-/*
- * misc_init_r - miscellaneous platform dependent initializations
- */
-int misc_init_r(void)
-{
-       /* Disable watchdog reset - watchdog unused */
-       writel((0 << SECWATCHDOG_SDOGCR_EN_SHIFT) |
-              (0 << SECWATCHDOG_SDOGCR_SRSTEN_SHIFT) |
-              (4 << SECWATCHDOG_SDOGCR_CLKS_SHIFT) |
-              (0x5a0 << SECWATCHDOG_SDOGCR_LD_SHIFT),
-              (SECWD_BASE_ADDR + SECWATCHDOG_SDOGCR_OFFSET));
-
-       return 0;
-}
-
-/*
- * dram_init - sets uboots idea of sdram size
- */
-int dram_init(void)
-{
-       gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
-                                   CONFIG_SYS_SDRAM_SIZE);
-       return 0;
-}
-
-/* This is called after dram_init() so use get_ram_size result */
-int dram_init_banksize(void)
-{
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
-       gd->bd->bi_dram[0].size = gd->ram_size;
-
-       return 0;
-}
-
-#ifdef CONFIG_MMC_SDHCI_KONA
-/*
- * mmc_init - Initializes mmc
- */
-int board_mmc_init(struct bd_info *bis)
-{
-       int ret = 0;
-
-       /* Register eMMC - SDIO2 */
-       ret = kona_sdhci_init(1, 400000, 0);
-       if (ret)
-               return ret;
-
-       /* Register SD Card - SDIO4 kona_mmc_init assumes 0 based index */
-       ret = kona_sdhci_init(3, 400000, 0);
-       return ret;
-}
-#endif
-
-#ifdef CONFIG_USB_GADGET
-static struct dwc2_plat_otg_data bcm_otg_data = {
-       .regs_otg       = HSOTG_BASE_ADDR
-};
-
-int board_usb_init(int index, enum usb_init_type init)
-{
-       debug("%s: performing dwc2_udc_probe\n", __func__);
-       return dwc2_udc_probe(&bcm_otg_data);
-}
-
-int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
-{
-       debug("%s\n", __func__);
-       if (!env_get("serial#"))
-               g_dnl_set_serialnumber(CONFIG_USB_SERIALNO);
-       return 0;
-}
-
-int g_dnl_get_board_bcd_device_number(int gcnum)
-{
-       debug("%s\n", __func__);
-       return 1;
-}
-
-int board_usb_cleanup(int index, enum usb_init_type init)
-{
-       debug("%s\n", __func__);
-       return 0;
-}
-#endif
diff --git a/configs/bcm11130_defconfig b/configs/bcm11130_defconfig
deleted file mode 100644 (file)
index fd30942..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-CONFIG_ARM=y
-CONFIG_TARGET_BCM28155_AP=y
-CONFIG_SYS_TEXT_BASE=0xae000000
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_ENV_SIZE=0x1000
-CONFIG_ENV_OFFSET=0x2340000
-# CONFIG_AUTOBOOT is not set
-# CONFIG_DISPLAY_CPUINFO is not set
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_MISC_INIT_R=y
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_ASKENV=y
-CONFIG_CMD_MX_CYCLIC=y
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_MMC=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_FAT=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_PARTITION_UUIDS is not set
-CONFIG_ENV_IS_IN_MMC=y
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_SDMA=y
-CONFIG_MMC_SDHCI_KONA=y
-CONFIG_SYS_NS16550=y
-CONFIG_USB=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Broadcom Corporation"
-CONFIG_USB_GADGET_VENDOR_NUM=0x18d1
-CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02
-CONFIG_USB_GADGET_DWC2_OTG=y
-CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
-CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/bcm11130_nand_defconfig b/configs/bcm11130_nand_defconfig
deleted file mode 100644 (file)
index 441a55b..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-CONFIG_ARM=y
-CONFIG_TARGET_BCM28155_AP=y
-CONFIG_SYS_TEXT_BASE=0xae000000
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_ENV_SIZE=0x1000
-CONFIG_ENV_OFFSET=0x2340000
-# CONFIG_AUTOBOOT is not set
-# CONFIG_DISPLAY_CPUINFO is not set
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_MISC_INIT_R=y
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_ASKENV=y
-CONFIG_CMD_MX_CYCLIC=y
-# CONFIG_CMD_FLASH is not set
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_MMC=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_FAT=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_PARTITION_UUIDS is not set
-CONFIG_ENV_IS_IN_MMC=y
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_SDMA=y
-CONFIG_MMC_SDHCI_KONA=y
-CONFIG_MTD=y
-CONFIG_SYS_NS16550=y
-CONFIG_USB=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Broadcom Corporation"
-CONFIG_USB_GADGET_VENDOR_NUM=0x18d1
-CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02
-CONFIG_USB_GADGET_DWC2_OTG=y
-CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
-CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig
deleted file mode 100644 (file)
index b4b9d3e..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y
-CONFIG_TARGET_BCM28155_AP=y
-CONFIG_SYS_TEXT_BASE=0xae000000
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_ENV_SIZE=0x1000
-CONFIG_ENV_OFFSET=0x2340000
-# CONFIG_ANDROID_BOOT_IMAGE is not set
-# CONFIG_AUTOBOOT is not set
-# CONFIG_DISPLAY_CPUINFO is not set
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_MISC_INIT_R=y
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_ASKENV=y
-CONFIG_CMD_MX_CYCLIC=y
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_MMC=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_FAT=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_PARTITION_UUIDS is not set
-CONFIG_ENV_IS_IN_MMC=y
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_VERSION_VARIABLE=y
-# CONFIG_NET is not set
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_FASTBOOT_BUF_ADDR=0x80000000
-CONFIG_FASTBOOT_BUF_SIZE=0x7FF00000
-CONFIG_FASTBOOT_FLASH=y
-CONFIG_FASTBOOT_FLASH_MMC_DEV=0
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_SDMA=y
-CONFIG_MMC_SDHCI_KONA=y
-CONFIG_SYS_NS16550=y
-CONFIG_USB=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Broadcom Corporation"
-CONFIG_USB_GADGET_VENDOR_NUM=0x18d1
-CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02
-CONFIG_USB_GADGET_BCM_UDC_OTG_PHY=y
-CONFIG_USB_GADGET_DWC2_OTG=y
-CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/bcm28155_w1d_defconfig b/configs/bcm28155_w1d_defconfig
deleted file mode 100644 (file)
index e1e854f..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y
-CONFIG_TARGET_BCM28155_AP=y
-CONFIG_SYS_TEXT_BASE=0xae000000
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_ENV_SIZE=0x1000
-CONFIG_ENV_OFFSET=0x2340000
-# CONFIG_AUTOBOOT is not set
-# CONFIG_DISPLAY_CPUINFO is not set
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_MISC_INIT_R=y
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_ASKENV=y
-CONFIG_CMD_MX_CYCLIC=y
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_MMC=y
-# CONFIG_CMD_SETEXPR is not set
-# CONFIG_CMD_NFS is not set
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_FAT=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_PARTITION_UUIDS is not set
-CONFIG_ENV_IS_IN_MMC=y
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_VERSION_VARIABLE=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_SDMA=y
-CONFIG_MMC_SDHCI_KONA=y
-CONFIG_BCM_SF2_ETH=y
-CONFIG_BCM_SF2_ETH_GMAC=y
-CONFIG_SYS_NS16550=y
-CONFIG_USB=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Broadcom Corporation"
-CONFIG_USB_GADGET_VENDOR_NUM=0x18d1
-CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02
-CONFIG_USB_GADGET_DWC2_OTG=y
-CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
-CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h
deleted file mode 100644 (file)
index c84a5ca..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright 2013 Broadcom Corporation.
- */
-
-#ifndef __BCM28155_AP_H
-#define __BCM28155_AP_H
-
-#include <linux/sizes.h>
-#include <asm/arch/sysmap.h>
-
-/* CPU, chip, mach, etc */
-#define CONFIG_KONA
-#define CONFIG_SKIP_LOWLEVEL_INIT
-
-/*
- * Memory configuration
- */
-
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
-#define CONFIG_SYS_SDRAM_SIZE          0x80000000
-
-#define CONFIG_SYS_MALLOC_LEN          SZ_4M   /* see armv7/start.S. */
-
-/* GPIO Driver */
-#define CONFIG_KONA_GPIO
-
-/* MMC/SD Driver */
-#define CONFIG_SYS_SDIO_BASE0 SDIO1_BASE_ADDR
-#define CONFIG_SYS_SDIO_BASE1 SDIO2_BASE_ADDR
-#define CONFIG_SYS_SDIO_BASE2 SDIO3_BASE_ADDR
-#define CONFIG_SYS_SDIO_BASE3 SDIO4_BASE_ADDR
-#define CONFIG_SYS_SDIO0_MAX_CLK 48000000
-#define CONFIG_SYS_SDIO1_MAX_CLK 48000000
-#define CONFIG_SYS_SDIO2_MAX_CLK 48000000
-#define CONFIG_SYS_SDIO3_MAX_CLK 48000000
-#define CONFIG_SYS_SDIO0 "sdio1"
-#define CONFIG_SYS_SDIO1 "sdio2"
-#define CONFIG_SYS_SDIO2 "sdio3"
-#define CONFIG_SYS_SDIO3 "sdio4"
-
-/* I2C Driver */
-#define CONFIG_SYS_I2C
-#define CONFIG_SYS_I2C_KONA
-#define CONFIG_SYS_SPD_BUS_NUM 3       /* Start with PMU bus */
-#define CONFIG_SYS_MAX_I2C_BUS 4
-#define CONFIG_SYS_I2C_BASE0   BSC1_BASE_ADDR
-#define CONFIG_SYS_I2C_BASE1   BSC2_BASE_ADDR
-#define CONFIG_SYS_I2C_BASE2   BSC3_BASE_ADDR
-#define CONFIG_SYS_I2C_BASE3   PMU_BSC_BASE_ADDR
-
-/* Timer Driver */
-#define CONFIG_SYS_TIMER_RATE          32000
-#define CONFIG_SYS_TIMER_COUNTER       (TIMER_BASE_ADDR + 4) /* STCLO offset */
-
-/* Init functions */
-
-/* Some commands use this as the default load address */
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE
-
-/* No mtest functions as recommended */
-
-/*
- * This is the initial SP which is used only briefly for relocating the u-boot
- * image to the top of SDRAM. After relocation u-boot moves the stack to the
- * proper place.
- */
-#define CONFIG_SYS_INIT_SP_ADDR                CONFIG_SYS_TEXT_BASE
-
-/* Serial Info */
-#define CONFIG_SYS_NS16550_SERIAL
-/* Post pad 3 bytes after each reg addr */
-#define CONFIG_SYS_NS16550_REG_SIZE    (-4)
-#define CONFIG_SYS_NS16550_CLK         13000000
-#define CONFIG_SYS_NS16550_COM1                0x3e000000
-
-/* must fit into GPT:u-boot-env partition */
-
-/* console configuration */
-#define CONFIG_SYS_CBSIZE              1024    /* Console buffer size */
-#define CONFIG_SYS_MAXARGS             64
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
-
-/*
- * One partition type must be defined for part.c
- * This is necessary for the fatls command to work on an SD card
- * for example.
- */
-
-/* version string, parser, etc */
-
-/* Initial upstream - boot to cmd prompt only */
-#define CONFIG_BOOTCOMMAND             ""
-
-#define CONFIG_USBID_ADDR              0x34052c46
-
-#endif /* __BCM28155_AP_H */