This board has not been converted to CONFIG_DM_BLK by the deadline. Remove it.
Signed-off-by: Simon Glass sjg@chromium.org ---
arch/arm/mach-at91/Kconfig | 1 - board/l+g/vinco/Kconfig | 12 -- board/l+g/vinco/MAINTAINERS | 6 - board/l+g/vinco/Makefile | 1 - board/l+g/vinco/vinco.c | 212 ------------------------------------ configs/vinco_defconfig | 40 ------- include/configs/vinco.h | 118 -------------------- 7 files changed, 390 deletions(-) delete mode 100644 board/l+g/vinco/Kconfig delete mode 100644 board/l+g/vinco/MAINTAINERS delete mode 100644 board/l+g/vinco/Makefile delete mode 100644 board/l+g/vinco/vinco.c delete mode 100644 configs/vinco_defconfig delete mode 100644 include/configs/vinco.h
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index a879e79af2d..5c1791681fb 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -281,7 +281,6 @@ source "board/atmel/sama5d4ek/Kconfig" source "board/calao/usb_a9263/Kconfig" source "board/egnite/ethernut5/Kconfig" source "board/esd/meesc/Kconfig" -source "board/l+g/vinco/Kconfig" source "board/mini-box/picosam9g45/Kconfig" source "board/ronetix/pm9261/Kconfig" source "board/ronetix/pm9263/Kconfig" diff --git a/board/l+g/vinco/Kconfig b/board/l+g/vinco/Kconfig deleted file mode 100644 index 229b5ea129f..00000000000 --- a/board/l+g/vinco/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_VINCO - -config SYS_BOARD - default "vinco" - -config SYS_VENDOR - default "l+g" - -config SYS_CONFIG_NAME - default "vinco" - -endif diff --git a/board/l+g/vinco/MAINTAINERS b/board/l+g/vinco/MAINTAINERS deleted file mode 100644 index 0cd6044172a..00000000000 --- a/board/l+g/vinco/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -VInCo Platform -M: Gregory CLEMENT gregory.clement@free-electrons.com -S: Maintained -F: board/l+g/vinco -F: include/configs/vinco.h -F: configs/vinco_defconfig diff --git a/board/l+g/vinco/Makefile b/board/l+g/vinco/Makefile deleted file mode 100644 index a2b8a2bc4a4..00000000000 --- a/board/l+g/vinco/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-y += vinco.o diff --git a/board/l+g/vinco/vinco.c b/board/l+g/vinco/vinco.c deleted file mode 100644 index 029ab123918..00000000000 --- a/board/l+g/vinco/vinco.c +++ /dev/null @@ -1,212 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Board file for the VInCo platform - * Based on the the SAMA5-EK board file - * Configuration settings for the VInCo platform. - * Copyright (C) 2014 Atmel - * Bo Shen voice.shen@atmel.com - * Copyright (C) 2015 Free Electrons - * Gregory CLEMENT gregory.clement@free-electrons.com - */ - -#include <common.h> -#include <asm/io.h> -#include <asm/arch/at91_common.h> -#include <asm/arch/at91_pmc.h> -#include <asm/arch/at91_rstc.h> -#include <asm/arch/atmel_mpddrc.h> -#include <asm/arch/atmel_usba_udc.h> -#include <asm/arch/gpio.h> -#include <asm/arch/clk.h> -#include <asm/arch/sama5d3_smc.h> -#include <asm/arch/sama5d4.h> -#include <atmel_hlcdc.h> -#include <atmel_mci.h> -#include <lcd.h> -#include <mmc.h> -#include <net.h> -#include <netdev.h> -#include <nand.h> -#include <spi.h> -#include <version.h> - -DECLARE_GLOBAL_DATA_PTR; - -/* FIXME gpio code here need to handle through DM_GPIO */ -#ifndef CONFIG_DM_SPI -int spi_cs_is_valid(unsigned int bus, unsigned int cs) -{ - return bus == 0 && cs == 0; -} - -void spi_cs_activate(struct spi_slave *slave) -{ - at91_set_pio_output(AT91_PIO_PORTC, 3, 0); -} - -void spi_cs_deactivate(struct spi_slave *slave) -{ - at91_set_pio_output(AT91_PIO_PORTC, 3, 1); -} - -static void vinco_spi0_hw_init(void) -{ - at91_pio3_set_a_periph(AT91_PIO_PORTC, 0, 0); /* SPI0_MISO */ - at91_pio3_set_a_periph(AT91_PIO_PORTC, 1, 0); /* SPI0_MOSI */ - at91_pio3_set_a_periph(AT91_PIO_PORTC, 2, 0); /* SPI0_SPCK */ - - at91_set_pio_output(AT91_PIO_PORTC, 3, 1); /* SPI0_CS0 */ - - /* Enable clock */ - at91_periph_clk_enable(ATMEL_ID_SPI0); -} -#endif /* CONFIG_ATMEL_SPI */ - - -#ifdef CONFIG_CMD_USB -static void vinco_usb_hw_init(void) -{ - at91_set_pio_output(AT91_PIO_PORTE, 11, 0); - at91_set_pio_output(AT91_PIO_PORTE, 12, 0); - at91_set_pio_output(AT91_PIO_PORTE, 10, 0); -} -#endif - - -#ifdef CONFIG_GENERIC_ATMEL_MCI -void vinco_mci0_hw_init(void) -{ - at91_pio3_set_b_periph(AT91_PIO_PORTC, 5, 1); /* MCI0 CDA */ - at91_pio3_set_b_periph(AT91_PIO_PORTC, 6, 1); /* MCI0 DA0 */ - at91_pio3_set_b_periph(AT91_PIO_PORTC, 7, 1); /* MCI0 DA1 */ - at91_pio3_set_b_periph(AT91_PIO_PORTC, 8, 1); /* MCI0 DA2 */ - at91_pio3_set_b_periph(AT91_PIO_PORTC, 9, 1); /* MCI0 DA3 */ - at91_pio3_set_b_periph(AT91_PIO_PORTC, 10, 1); /* MCI0 DA4 */ - at91_pio3_set_b_periph(AT91_PIO_PORTC, 11, 1); /* MCI0 DA5 */ - at91_pio3_set_b_periph(AT91_PIO_PORTC, 12, 1); /* MCI0 DA6 */ - at91_pio3_set_b_periph(AT91_PIO_PORTC, 13, 1); /* MCI0 DA7 */ - at91_pio3_set_b_periph(AT91_PIO_PORTC, 4, 0); /* MCI0 CLK */ - - /* - * As the mci io internal pull down is too strong, so if the io needs - * external pull up, the pull up resistor will be very small, if so - * the power consumption will increase, so disable the interanl pull - * down to save the power. - */ - at91_pio3_set_pio_pulldown(AT91_PIO_PORTC, 4, 0); - at91_pio3_set_pio_pulldown(AT91_PIO_PORTC, 5, 0); - at91_pio3_set_pio_pulldown(AT91_PIO_PORTC, 6, 0); - at91_pio3_set_pio_pulldown(AT91_PIO_PORTC, 7, 0); - at91_pio3_set_pio_pulldown(AT91_PIO_PORTC, 8, 0); - at91_pio3_set_pio_pulldown(AT91_PIO_PORTC, 9, 0); - at91_pio3_set_pio_pulldown(AT91_PIO_PORTC, 10, 0); - at91_pio3_set_pio_pulldown(AT91_PIO_PORTC, 11, 0); - at91_pio3_set_pio_pulldown(AT91_PIO_PORTC, 12, 0); - at91_pio3_set_pio_pulldown(AT91_PIO_PORTC, 13, 0); - - /* Enable clock */ - at91_periph_clk_enable(ATMEL_ID_MCI0); -} - -int board_mmc_init(bd_t *bis) -{ - /* Enable power for MCI0 interface */ - at91_set_pio_output(AT91_PIO_PORTE, 7, 1); - - return atmel_mci_init((void *)ATMEL_BASE_MCI0); -} -#endif /* CONFIG_GENERIC_ATMEL_MCI */ - -#ifdef CONFIG_MACB -void vinco_macb0_hw_init(void) -{ - at91_pio3_set_a_periph(AT91_PIO_PORTB, 0, 0); /* ETXCK_EREFCK */ - at91_pio3_set_a_periph(AT91_PIO_PORTB, 6, 0); /* ERXDV */ - at91_pio3_set_a_periph(AT91_PIO_PORTB, 8, 0); /* ERX0 */ - at91_pio3_set_a_periph(AT91_PIO_PORTB, 9, 0); /* ERX1 */ - at91_pio3_set_a_periph(AT91_PIO_PORTB, 7, 0); /* ERXER */ - at91_pio3_set_a_periph(AT91_PIO_PORTB, 2, 0); /* ETXEN */ - at91_pio3_set_a_periph(AT91_PIO_PORTB, 12, 0); /* ETX0 */ - at91_pio3_set_a_periph(AT91_PIO_PORTB, 13, 0); /* ETX1 */ - at91_pio3_set_a_periph(AT91_PIO_PORTB, 17, 0); /* EMDIO */ - at91_pio3_set_a_periph(AT91_PIO_PORTB, 16, 0); /* EMDC */ - - /* Enable clock */ - at91_periph_clk_enable(ATMEL_ID_GMAC0); - - /* Enable Phy*/ - at91_set_pio_output(AT91_PIO_PORTE, 8, 1); -} -#endif - -static void vinco_serial3_hw_init(void) -{ - at91_pio3_set_b_periph(AT91_PIO_PORTE, 17, 1); /* TXD3 */ - at91_pio3_set_b_periph(AT91_PIO_PORTE, 16, 0); /* RXD3 */ - - /* Enable clock */ - at91_periph_clk_enable(ATMEL_ID_USART3); -} - -int board_early_init_f(void) -{ - at91_periph_clk_enable(ATMEL_ID_PIOA); - at91_periph_clk_enable(ATMEL_ID_PIOB); - at91_periph_clk_enable(ATMEL_ID_PIOC); - at91_periph_clk_enable(ATMEL_ID_PIOD); - at91_periph_clk_enable(ATMEL_ID_PIOE); - - vinco_serial3_hw_init(); - - return 0; -} - -int board_init(void) -{ - /* adress of boot parameters */ - gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; - -#ifndef CONFIG_DM_SPI - vinco_spi0_hw_init(); -#endif - -#ifdef CONFIG_GENERIC_ATMEL_MCI - vinco_mci0_hw_init(); -#endif -#ifdef CONFIG_MACB - vinco_macb0_hw_init(); -#endif -#ifdef CONFIG_CMD_USB - vinco_usb_hw_init(); -#endif -#ifdef CONFIG_USB_GADGET_ATMEL_USBA - at91_udp_hw_init(); -#endif - - return 0; -} - -int dram_init(void) -{ - gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE, - CONFIG_SYS_SDRAM_SIZE); - return 0; -} - -int board_eth_init(bd_t *bis) -{ - int rc = 0; - -#ifdef CONFIG_MACB - rc = macb_eth_initialize(0, (void *)ATMEL_BASE_GMAC0, 0x00); -#endif - -#ifdef CONFIG_USB_GADGET_ATMEL_USBA - usba_udc_probe(&pdata); -#ifdef CONFIG_USB_ETH_RNDIS - usb_eth_initialize(bis); -#endif -#endif - - return rc; -} diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig deleted file mode 100644 index 0130ad43377..00000000000 --- a/configs/vinco_defconfig +++ /dev/null @@ -1,40 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x20f00000 -CONFIG_TARGET_VINCO=y -CONFIG_ENV_VARS_UBOOT_CONFIG=y -CONFIG_NR_DRAM_BANKS=1 -CONFIG_SPI_BOOT=y -CONFIG_BOOTDELAY=3 -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk rw root=/dev/mmcblk0p2 rootfstype=ext4 rootwait quiet lpj=1990656" -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_HUSH_PARSER=y -CONFIG_SYS_PROMPT="vinco => " -CONFIG_CMD_BOOTZ=y -# CONFIG_CMD_IMI is not set -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_GPT=y -# CONFIG_CMD_LOADS is not set -CONFIG_CMD_MMC=y -CONFIG_CMD_SF=y -CONFIG_CMD_USB=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_FAT=y -CONFIG_OF_CONTROL=y -CONFIG_DEFAULT_DEVICE_TREE="at91-vinco" -CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_SPI_FLASH=y -CONFIG_ETH_DESIGNWARE=y -CONFIG_USB=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="L+G VInCo" -CONFIG_USB_GADGET_ATMEL_USBA=y -CONFIG_USB_ETHER=y -CONFIG_USB_HOST_ETHER=y -CONFIG_USB_ETHER_SMSC95XX=y diff --git a/include/configs/vinco.h b/include/configs/vinco.h deleted file mode 100644 index 9d6001ff03c..00000000000 --- a/include/configs/vinco.h +++ /dev/null @@ -1,118 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Configuration settings for the VInCo platform. - * - * Based on the settings for the SAMA5-EK board - * Copyright (C) 2014 Atmel - * Bo Shen voice.shen@atmel.com - * Copyright (C) 2015 Free Electrons - * Gregory CLEMENT gregory.clement@free-electrons.com - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#include "at91-sama5_common.h" - -/* The value in the common file is too far away for the VInCo platform */ - -/* serial console */ -#define CONFIG_ATMEL_USART -#define CONFIG_USART_BASE 0xfc00c000 -#define CONFIG_USART_ID 30 - -/* Timer */ -#define CONFIG_SYS_TIMER_COUNTER 0xfc06863c - -/* SDRAM */ -#define CONFIG_SYS_SDRAM_BASE 0x20000000 -#define CONFIG_SYS_SDRAM_SIZE 0x4000000 - -#define CONFIG_SYS_INIT_SP_ADDR \ - (CONFIG_SYS_SDRAM_BASE + 4 * 1024 - GENERATED_GBL_DATA_SIZE) - -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - -/* SerialFlash */ - -#ifdef CONFIG_CMD_SF -#define CONFIG_ATMEL_SPI0 -#define CONFIG_SPI_FLASH_STMICRO -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 50000000 -#define CONFIG_ENV_SPI_MAX_HZ 50000000 -#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) -#define CONFIG_ENV_SPI_MODE (SPI_MODE_0) -#endif - -/* MMC */ - -#ifdef CONFIG_CMD_MMC -#define CONFIG_SUPPORT_EMMC_BOOT -#define CONFIG_GENERIC_ATMEL_MCI -#define ATMEL_BASE_MMCI 0xfc000000 -#define CONFIG_SYS_MMC_CLK_OD 500000 - -/* For generating MMC partitions */ - -#endif - -/* USB device */ - -/* Ethernet Hardware */ -#define CONFIG_PHY_SMSC -#define CONFIG_MACB -#define CONFIG_RMII -#define CONFIG_NET_RETRY_COUNT 20 -#define CONFIG_MACB_SEARCH_PHY - -#ifdef CONFIG_SPI_BOOT -/* bootstrap + u-boot + env + linux in serial flash */ -#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS -#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS -/* Use our own mapping for the VInCo platform */ -#undef CONFIG_ENV_OFFSET -#undef CONFIG_ENV_SIZE - -#define CONFIG_ENV_OFFSET 0x10000 -#define CONFIG_ENV_SIZE 0x10000 - -/* Update the bootcommand according to our mapping for the VInCo platform */ -#undef CONFIG_BOOTCOMMAND -#define CONFIG_BOOTCOMMAND "mmc dev 0 0;" \ - "mmc read ${loadaddr} ${k_offset} ${k_blksize};" \ - "mmc read ${oftaddr} ${dtb_offset} ${dtb_blksize};" \ - "bootz ${loadaddr} - ${oftaddr}" - -#define CONFIG_EXTRA_ENV_SETTINGS \ - "kernel_start=0x20000\0" \ - "kernel_size=0x800000\0" \ - "mmcblksize=0x200\0" \ - "oftaddr=0x21000000\0" \ - "loadaddr=0x22000000\0" \ - "update_uboot=tftp ${loadaddr} u-boot.bin;sf probe 0;" \ - "sf erase 0x20000 0x4B000; sf write ${loadaddr} 0x20000 0x4B000\0" \ - "create_partition=setexpr dtb_start ${kernel_start} + 0x400000;" \ - "setexpr rootfs_start ${kernel_start} + ${kernel_size};" \ - "setenv partitions 'name=kernel,size=${kernel_size}," \ - "start=${kernel_start};name=rootfs,size=-';" \ - "gpt write mmc 0 ${partitions} \0"\ - "f2blk_size=setexpr fileblksize ${filesize} / ${mmcblksize};" \ - "setexpr fileblksize ${fileblksize} + 1\0" \ - "store_kernel=tftp ${loadaddr} zImage; run f2blk_size;" \ - "setexpr k_blksize ${fileblksize};" \ - "setexpr k_offset ${kernel_start} / ${mmcblksize};" \ - "mmc write ${fileaddr} ${k_offset} ${fileblksize}\0" \ - "store_dtb=tftp ${loadaddr} at91-vinco.dtb; run f2blk_size;" \ - "setexpr dtb_blksize ${fileblksize};" \ - "setexpr dtb_offset ${dtb_start} / ${mmcblksize};" \ - "mmc write ${fileaddr} ${dtb_offset} ${fileblksize}\0" \ - "store_rootfs=tftp ${loadaddr} vinco-gateway-image-vinco.ext4;" \ - "setexpr rootfs_offset ${rootfs_start} / ${mmcblksize};" \ - "mmc write ${fileaddr} ${rootfs_offset} ${fileblksize}\0" \ - "bootdelay=0\0" - -#endif - -#endif