This board has not been converted to CONFIG_DM_BLK by the deadline. Remove it.
Signed-off-by: Simon Glass sjg@chromium.org ---
board/kobol/helios4/MAINTAINERS | 6 -- board/kobol/helios4/Makefile | 5 - board/kobol/helios4/README | 46 --------- board/kobol/helios4/helios4.c | 163 ------------------------------ configs/helios4_defconfig | 60 ----------- include/configs/helios4.h | 172 -------------------------------- 6 files changed, 452 deletions(-) delete mode 100644 board/kobol/helios4/MAINTAINERS delete mode 100644 board/kobol/helios4/Makefile delete mode 100644 board/kobol/helios4/README delete mode 100644 board/kobol/helios4/helios4.c delete mode 100644 configs/helios4_defconfig delete mode 100644 include/configs/helios4.h
diff --git a/board/kobol/helios4/MAINTAINERS b/board/kobol/helios4/MAINTAINERS deleted file mode 100644 index c9610deee76..00000000000 --- a/board/kobol/helios4/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -HELIOS4 BOARD -M: Dennis Gilmore dgilmore@redhat.com -S: Maintained -F: board/kobol/helios4/ -F: include/configs/helios4.h -F: configs/helios4_defconfig diff --git a/board/kobol/helios4/Makefile b/board/kobol/helios4/Makefile deleted file mode 100644 index 63f0796397c..00000000000 --- a/board/kobol/helios4/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2018 Dennis Gilmore dgilmore@redhat.com - -obj-y := helios4.o diff --git a/board/kobol/helios4/README b/board/kobol/helios4/README deleted file mode 100644 index 749f0482782..00000000000 --- a/board/kobol/helios4/README +++ /dev/null @@ -1,46 +0,0 @@ -Update from original Marvell U-Boot to mainline U-Boot: -------------------------------------------------------- - -Generate the U-Boot image with these commands: - -$ make helios4_defconfig -$ make - -The resulting image including the SPL binary with the -full DDR setup is "u-boot-spl.kwb". - -Now all you need to do is copy this image on a SD card. -For example with this command: - -$ sudo dd if=u-boot-spl.kwb of=/dev/sdX bs=512 seek=1 - -Please use the correct device node for your setup instead -of "/dev/sdX" here! - -Boot selection: ---------------- - -Before powering up the board, boot selection should be done via the SW1 dip -switch (0: OFF, 1: ON): - - - SPI: 00010 - - SD/eMMC: 00111 - - SATA1: 11100 - - UART: 11110 - -Boot from UART: ---------------- - -Connect the on-board micro-USB (CF Pro: CON11, CF Base: CON5) -to your host. - -Set the SW1 DIP switches to UART boot (see above). - -Run the following command to initiate U-Boot download: - - ./tools/kwboot -p -b u-boot-spl.kwb /dev/ttyUSBX - -Use the correct UART device node for /dev/ttyUSBX. - -When download finishes start your favorite terminal emulator -on /dev/ttyUSBX. diff --git a/board/kobol/helios4/helios4.c b/board/kobol/helios4/helios4.c deleted file mode 100644 index 341678319a4..00000000000 --- a/board/kobol/helios4/helios4.c +++ /dev/null @@ -1,163 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2018 Dennis Gilmore dgilmore@redhat.com - * based on board/solidrun/clearfog/clearfog.c - */ - -#include <common.h> -#include <i2c.h> -#include <miiphy.h> -#include <netdev.h> -#include <asm/io.h> -#include <asm/arch/cpu.h> -#include <asm/arch/soc.h> - -#include "../drivers/ddr/marvell/a38x/ddr3_init.h" -#include <../serdes/a38x/high_speed_env_spec.h> - -DECLARE_GLOBAL_DATA_PTR; - -#define ETH_PHY_CTRL_REG 0 -#define ETH_PHY_CTRL_POWER_DOWN_BIT 11 -#define ETH_PHY_CTRL_POWER_DOWN_MASK BIT(ETH_PHY_CTRL_POWER_DOWN_BIT) - -/* - * Those values and defines are taken from the Marvell U-Boot version - * "u-boot-2013.01-15t1-helios4" as well as the upstream config for clearfog - */ -#define BOARD_GPP_OUT_ENA_LOW 0xffffffff -#define BOARD_GPP_OUT_ENA_MID 0xffffffff - -#define BOARD_GPP_OUT_VAL_LOW 0x0 -#define BOARD_GPP_OUT_VAL_MID 0x0 -#define BOARD_GPP_POL_LOW 0x0 -#define BOARD_GPP_POL_MID 0x0 - -/* IO expander on Marvell GP board includes e.g. fan enabling */ -struct marvell_io_exp { - u8 addr; - u8 val; -}; - -static struct marvell_io_exp io_exp[] = { - {6, 0xf9}, - {2, 0x46}, /* Assert reset signals and enable USB3 current limiter */ - {6, 0xb9} -}; - -static struct serdes_map board_serdes_map[] = { - {SATA0, SERDES_SPEED_6_GBPS, SERDES_DEFAULT_MODE, 0, 0}, - {USB3_HOST0, SERDES_SPEED_5_GBPS, SERDES_DEFAULT_MODE, 0, 0}, - {SATA1, SERDES_SPEED_6_GBPS, SERDES_DEFAULT_MODE, 0, 0}, - {SATA3, SERDES_SPEED_6_GBPS, SERDES_DEFAULT_MODE, 0, 0}, - {SATA2, SERDES_SPEED_6_GBPS, SERDES_DEFAULT_MODE, 0, 0}, - {USB3_HOST1, SERDES_SPEED_5_GBPS, SERDES_DEFAULT_MODE, 0, 0}, -}; - -int hws_board_topology_load(struct serdes_map **serdes_map_array, u8 *count) -{ - *serdes_map_array = board_serdes_map; - *count = ARRAY_SIZE(board_serdes_map); - return 0; -} - -/* - * Define the DDR layout / topology here in the board file. This will - * be used by the DDR3 init code in the SPL U-Boot version to configure - * the DDR3 controller. - */ -static struct mv_ddr_topology_map board_topology_map = { - DEBUG_LEVEL_ERROR, - 0x1, /* active interfaces */ - /* cs_mask, mirror, dqs_swap, ck_swap X PUPs */ - { { { {0x1, 0, 0, 0}, - {0x1, 0, 0, 0}, - {0x1, 0, 0, 0}, - {0x1, 0, 0, 0}, - {0x1, 0, 0, 0} }, - SPEED_BIN_DDR_1600K, /* speed_bin */ - MV_DDR_DEV_WIDTH_16BIT, /* memory_width */ - MV_DDR_DIE_CAP_8GBIT, /* mem_size */ - DDR_FREQ_800, /* frequency */ - 0, 0, /* cas_wl cas_l */ - MV_DDR_TEMP_LOW, /* temperature */ - MV_DDR_TIM_DEFAULT} }, /* timing */ - BUS_MASK_32BIT_ECC, /* Busses mask */ - MV_DDR_CFG_DEFAULT, /* ddr configuration data source */ - { {0} }, /* raw spd data */ - {0} /* timing parameters */ -}; - -struct mv_ddr_topology_map *mv_ddr_topology_map_get(void) -{ - /* Return the board topology as defined in the board code */ - return &board_topology_map; -} - -int board_early_init_f(void) -{ - /* Configure MPP */ - writel(0x11111111, MVEBU_MPP_BASE + 0x00); - writel(0x11111111, MVEBU_MPP_BASE + 0x04); - writel(0x10400011, MVEBU_MPP_BASE + 0x08); - writel(0x22043333, MVEBU_MPP_BASE + 0x0c); - writel(0x44400002, MVEBU_MPP_BASE + 0x10); - writel(0x41144004, MVEBU_MPP_BASE + 0x14); - writel(0x40333333, MVEBU_MPP_BASE + 0x18); - writel(0x00004444, MVEBU_MPP_BASE + 0x1c); - - /* Set GPP Out value */ - writel(BOARD_GPP_OUT_VAL_LOW, MVEBU_GPIO0_BASE + 0x00); - writel(BOARD_GPP_OUT_VAL_MID, MVEBU_GPIO1_BASE + 0x00); - - /* Set GPP Polarity */ - writel(BOARD_GPP_POL_LOW, MVEBU_GPIO0_BASE + 0x0c); - writel(BOARD_GPP_POL_MID, MVEBU_GPIO1_BASE + 0x0c); - - /* Set GPP Out Enable */ - writel(BOARD_GPP_OUT_ENA_LOW, MVEBU_GPIO0_BASE + 0x04); - writel(BOARD_GPP_OUT_ENA_MID, MVEBU_GPIO1_BASE + 0x04); - - return 0; -} - -int board_init(void) -{ - int i; - - /* Address of boot parameters */ - gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100; - - /* Init I2C IO expanders */ - for (i = 0; i < ARRAY_SIZE(io_exp); i++) { - struct udevice *dev; - int ret; - - ret = i2c_get_chip_for_busnum(0, io_exp[i].addr, 1, &dev); - if (ret) { - printf("Cannot find I2C: %d\n", ret); - return 0; - } - - ret = dm_i2c_write(dev, io_exp[i].val, &io_exp[i].val, 1); - if (ret) { - printf("Failed to set IO expander via I2C\n"); - return -EIO; - } - } - - return 0; -} - -int checkboard(void) -{ - puts("Board: Helios4\n"); - - return 0; -} - -int board_eth_init(bd_t *bis) -{ - cpu_eth_init(bis); /* Built in controller(s) come first */ - return pci_eth_init(bis); -} diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig deleted file mode 100644 index e30eb3d41cc..00000000000 --- a/configs/helios4_defconfig +++ /dev/null @@ -1,60 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00800000 -CONFIG_SPL_LIBCOMMON_SUPPORT=y -CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_TARGET_HELIOS4=y -CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y -CONFIG_SPL_MMC_SUPPORT=y -CONFIG_SPL_SERIAL_SUPPORT=y -CONFIG_SPL=y -CONFIG_DEBUG_UART_BASE=0xd0012000 -CONFIG_DEBUG_UART_CLOCK=250000000 -CONFIG_DEBUG_UART=y -CONFIG_AHCI=y -CONFIG_DISTRO_DEFAULTS=y -CONFIG_NR_DRAM_BANKS=2 -CONFIG_BOOTDELAY=3 -CONFIG_SYS_CONSOLE_INFO_QUIET=y -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_DISPLAY_BOARDINFO_LATE=y -CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x141 -CONFIG_SPL_I2C_SUPPORT=y -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_I2C=y -CONFIG_CMD_MMC=y -CONFIG_CMD_PCI=y -CONFIG_CMD_SF=y -CONFIG_CMD_SPI=y -CONFIG_CMD_USB=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_TFTPPUT=y -CONFIG_CMD_CACHE=y -CONFIG_CMD_TIME=y -# CONFIG_SPL_PARTITION_UUIDS is not set -CONFIG_DEFAULT_DEVICE_TREE="armada-388-helios4" -CONFIG_ENV_IS_IN_MMC=y -CONFIG_NET_RANDOM_ETHADDR=y -CONFIG_SPL_OF_TRANSLATE=y -CONFIG_SCSI_AHCI=y -CONFIG_DM_I2C=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_SDMA=y -CONFIG_MMC_SDHCI_MV=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_BAR=y -CONFIG_SPI_FLASH_WINBOND=y -CONFIG_SPI_FLASH_MTD=y -CONFIG_PHY_GIGE=y -CONFIG_MVNETA=y -CONFIG_MII=y -CONFIG_PCI=y -CONFIG_SCSI=y -CONFIG_DEBUG_UART_SHIFT=2 -CONFIG_SYS_NS16550=y -CONFIG_KIRKWOOD_SPI=y -CONFIG_USB=y -CONFIG_DM_USB=y -CONFIG_USB_XHCI_HCD=y -CONFIG_USB_STORAGE=y diff --git a/include/configs/helios4.h b/include/configs/helios4.h deleted file mode 100644 index ce912ea3241..00000000000 --- a/include/configs/helios4.h +++ /dev/null @@ -1,172 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2018 Dennis Gilmore dgilmore@redhat.com - */ - -#ifndef _CONFIG_HELIOS4_H -#define _CONFIG_HELIOS4_H - -/* - * High Level Configuration Options (easy to change) - */ - -/* - * TEXT_BASE needs to be below 16MiB, since this area is scrubbed - * for DDR ECC byte filling in the SPL before loading the main - * U-Boot into it. - */ -#define CONFIG_SYS_TCLK 250000000 /* 250MHz */ - -/* - * Commands configuration - */ - -/* SPI NOR flash default params, used by sf commands */ -#define CONFIG_SF_DEFAULT_BUS 1 - -/* - * SDIO/MMC Card Configuration - */ -#define CONFIG_SYS_MMC_BASE MVEBU_SDIO_BASE - -/* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI - -#define CONFIG_ENV_MIN_ENTRIES 128 - -/* - * SATA/SCSI/AHCI configuration - */ -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 2 -#define CONFIG_SYS_SCSI_MAX_LUN 2 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) - -/* Environment in MMC */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_ENV_SECT_SIZE 0x200 -#define CONFIG_ENV_SIZE 0x10000 -/* - * For SD - reserve 1 LBA for MBR + 1M for u-boot image. The MMC/eMMC - * boot image starts @ LBA-0. - * As result in MMC/eMMC case it will be a 1 sector gap between u-boot - * image and environment - */ -#define CONFIG_ENV_OFFSET 0xf0000 -#define CONFIG_ENV_ADDR CONFIG_ENV_OFFSET - -#define CONFIG_PHY_MARVELL /* there is a marvell phy */ -#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ - -/* PCIe support */ -#ifndef CONFIG_SPL_BUILD -#define CONFIG_PCI_MVEBU -#define CONFIG_PCI_SCAN_SHOW -#endif - -/* Keep device tree and initrd in lower memory so the kernel can access them */ -#define RELOCATION_LIMITS_ENV_SETTINGS \ - "fdt_high=0x10000000\0" \ - "initrd_high=0x10000000\0" - -/* SPL */ -/* - * Select the boot device here - * - * Currently supported are: - * SPL_BOOT_SPI_NOR_FLASH - Booting via SPI NOR flash - * SPL_BOOT_SDIO_MMC_CARD - Booting via SDIO/MMC card (partition 1) - */ -#define SPL_BOOT_SPI_NOR_FLASH 1 -#define SPL_BOOT_SDIO_MMC_CARD 2 -#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SDIO_MMC_CARD - -/* Defines for SPL */ -#define CONFIG_SPL_SIZE (140 << 10) -#define CONFIG_SPL_TEXT_BASE 0x40000030 -#define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - 0x0030) - -#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE) -#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10) - -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_MALLOC_SIMPLE -#endif - -#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10)) -#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) - -#if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH -/* SPL related SPI defines */ -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 -#define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS -#endif - -#if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SDIO_MMC_CARD -/* SPL related MMC defines */ -#define CONFIG_SYS_MMC_U_BOOT_OFFS (160 << 10) -#define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_MMC_U_BOOT_OFFS -#ifdef CONFIG_SPL_BUILD -#define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000 /* in SDRAM */ -#endif -#endif -/* - * mv-common.h should be defined after CMD configs since it used them - * to enable certain macros - */ -#include "mv-common.h" - -/* Include the common distro boot environment */ -#ifndef CONFIG_SPL_BUILD - -#ifdef CONFIG_MMC -#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0) -#else -#define BOOT_TARGET_DEVICES_MMC(func) -#endif - -#ifdef CONFIG_USB_STORAGE -#define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0) -#else -#define BOOT_TARGET_DEVICES_USB(func) -#endif - -#ifdef CONFIG_SATA -#define BOOT_TARGET_DEVICES_SATA(func) func(SATA, sata, 0) -#else -#define BOOT_TARGET_DEVICES_SATA(func) -#endif - -#define BOOT_TARGET_DEVICES(func) \ - BOOT_TARGET_DEVICES_MMC(func) \ - BOOT_TARGET_DEVICES_USB(func) \ - BOOT_TARGET_DEVICES_SATA(func) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) - -#define KERNEL_ADDR_R __stringify(0x800000) -#define FDT_ADDR_R __stringify(0x100000) -#define RAMDISK_ADDR_R __stringify(0x1800000) -#define SCRIPT_ADDR_R __stringify(0x200000) -#define PXEFILE_ADDR_R __stringify(0x300000) - -#define LOAD_ADDRESS_ENV_SETTINGS \ - "kernel_addr_r=" KERNEL_ADDR_R "\0" \ - "fdt_addr_r=" FDT_ADDR_R "\0" \ - "ramdisk_addr_r=" RAMDISK_ADDR_R "\0" \ - "scriptaddr=" SCRIPT_ADDR_R "\0" \ - "pxefile_addr_r=" PXEFILE_ADDR_R "\0" - -#include <config_distro_bootcmd.h> - -#define CONFIG_EXTRA_ENV_SETTINGS \ - RELOCATION_LIMITS_ENV_SETTINGS \ - LOAD_ADDRESS_ENV_SETTINGS \ - "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ - "console=ttyS0,115200\0" \ - BOOTENV - -#endif /* CONFIG_SPL_BUILD */ - -#endif /* _CONFIG_HELIOS4_H */