Message ID | 1440983979-19521-44-git-send-email-sjg@chromium.org |
---|---|
State | Rejected |
Delegated to: | Tom Rini |
Headers | show |
Hi, On Sun, Aug 30, 2015 at 07:19:37PM -0600, Simon Glass wrote: > This board has not been converted to generic board by the deadline. > Remove it. > > Signed-off-by: Simon Glass <sjg@chromium.org> there are people using this and ti816x at least. > --- > > arch/arm/Kconfig | 6 -- > board/ti/ti814x/Kconfig | 15 --- > board/ti/ti814x/MAINTAINERS | 6 -- > board/ti/ti814x/Makefile | 13 --- > board/ti/ti814x/evm.c | 188 ----------------------------------- > board/ti/ti814x/evm.h | 8 -- > board/ti/ti814x/mux.c | 86 ---------------- > configs/ti814x_evm_defconfig | 7 -- > include/configs/ti814x_evm.h | 230 ------------------------------------------- > 9 files changed, 559 deletions(-) > delete mode 100644 board/ti/ti814x/Kconfig > delete mode 100644 board/ti/ti814x/MAINTAINERS > delete mode 100644 board/ti/ti814x/Makefile > delete mode 100644 board/ti/ti814x/evm.c > delete mode 100644 board/ti/ti814x/evm.h > delete mode 100644 board/ti/ti814x/mux.c > delete mode 100644 configs/ti814x_evm_defconfig > delete mode 100644 include/configs/ti814x_evm.h > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 8ef21a3..1a171d1 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -378,11 +378,6 @@ config TARGET_BAV335X > > For more information, visit: http://birdland.com/oem > > -config TARGET_TI814X_EVM > - bool "Support ti814x_evm" > - select CPU_V7 > - select SUPPORT_SPL > - > config TARGET_TI816X_EVM > bool "Support ti816x_evm" > select CPU_V7 > @@ -859,7 +854,6 @@ source "board/tbs/tbs2910/Kconfig" > source "board/ti/am335x/Kconfig" > source "board/ti/am43xx/Kconfig" > source "board/birdland/bav335x/Kconfig" > -source "board/ti/ti814x/Kconfig" > source "board/ti/ti816x/Kconfig" > source "board/timll/devkit3250/Kconfig" > source "board/toradex/colibri_pxa270/Kconfig" > diff --git a/board/ti/ti814x/Kconfig b/board/ti/ti814x/Kconfig > deleted file mode 100644 > index 2960099..0000000 > --- a/board/ti/ti814x/Kconfig > +++ /dev/null > @@ -1,15 +0,0 @@ > -if TARGET_TI814X_EVM > - > -config SYS_BOARD > - default "ti814x" > - > -config SYS_VENDOR > - default "ti" > - > -config SYS_SOC > - default "am33xx" > - > -config SYS_CONFIG_NAME > - default "ti814x_evm" > - > -endif > diff --git a/board/ti/ti814x/MAINTAINERS b/board/ti/ti814x/MAINTAINERS > deleted file mode 100644 > index e39b253..0000000 > --- a/board/ti/ti814x/MAINTAINERS > +++ /dev/null > @@ -1,6 +0,0 @@ > -TI814X BOARD > -M: Matt Porter <matt.porter@linaro.org> > -S: Maintained > -F: board/ti/ti814x/ > -F: include/configs/ti814x_evm.h > -F: configs/ti814x_evm_defconfig > diff --git a/board/ti/ti814x/Makefile b/board/ti/ti814x/Makefile > deleted file mode 100644 > index 93155de..0000000 > --- a/board/ti/ti814x/Makefile > +++ /dev/null > @@ -1,13 +0,0 @@ > -# > -# Makefile > -# > -# Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ > -# > -# SPDX-License-Identifier: GPL-2.0+ > -# > - > -ifdef CONFIG_SPL_BUILD > -obj-y := mux.o > -endif > - > -obj-y += evm.o > diff --git a/board/ti/ti814x/evm.c b/board/ti/ti814x/evm.c > deleted file mode 100644 > index e406dab..0000000 > --- a/board/ti/ti814x/evm.c > +++ /dev/null > @@ -1,188 +0,0 @@ > -/* > - * evm.c > - * > - * Board functions for TI814x EVM > - * > - * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ > - * > - * SPDX-License-Identifier: GPL-2.0+ > - */ > - > -#include <common.h> > -#include <cpsw.h> > -#include <errno.h> > -#include <spl.h> > -#include <asm/arch/cpu.h> > -#include <asm/arch/hardware.h> > -#include <asm/arch/omap.h> > -#include <asm/arch/ddr_defs.h> > -#include <asm/arch/clock.h> > -#include <asm/arch/gpio.h> > -#include <asm/arch/mmc_host_def.h> > -#include <asm/arch/sys_proto.h> > -#include <asm/io.h> > -#include <asm/emif.h> > -#include <asm/gpio.h> > -#include "evm.h" > - > -DECLARE_GLOBAL_DATA_PTR; > - > -static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE; > - > -/* UART Defines */ > -#ifdef CONFIG_SPL_BUILD > -static const struct cmd_control evm_ddr2_cctrl_data = { > - .cmd0csratio = 0x80, > - .cmd0iclkout = 0x00, > - > - .cmd1csratio = 0x80, > - .cmd1iclkout = 0x00, > - > - .cmd2csratio = 0x80, > - .cmd2iclkout = 0x00, > -}; > - > -static const struct emif_regs evm_ddr2_emif0_regs = { > - .sdram_config = 0x40801ab2, > - .ref_ctrl = 0x10000c30, > - .sdram_tim1 = 0x0aaaf552, > - .sdram_tim2 = 0x043631d2, > - .sdram_tim3 = 0x00000327, > - .emif_ddr_phy_ctlr_1 = 0x00000007 > -}; > - > -static const struct emif_regs evm_ddr2_emif1_regs = { > - .sdram_config = 0x40801ab2, > - .ref_ctrl = 0x10000c30, > - .sdram_tim1 = 0x0aaaf552, > - .sdram_tim2 = 0x043631d2, > - .sdram_tim3 = 0x00000327, > - .emif_ddr_phy_ctlr_1 = 0x00000007 > -}; > - > -const struct dmm_lisa_map_regs evm_lisa_map_regs = { > - .dmm_lisa_map_0 = 0x00000000, > - .dmm_lisa_map_1 = 0x00000000, > - .dmm_lisa_map_2 = 0x806c0300, > - .dmm_lisa_map_3 = 0x806c0300, > -}; > - > -static const struct ddr_data evm_ddr2_data = { > - .datardsratio0 = ((0x35<<10) | (0x35<<0)), > - .datawdsratio0 = ((0x20<<10) | (0x20<<0)), > - .datawiratio0 = ((0<<10) | (0<<0)), > - .datagiratio0 = ((0<<10) | (0<<0)), > - .datafwsratio0 = ((0x90<<10) | (0x90<<0)), > - .datawrsratio0 = ((0x50<<10) | (0x50<<0)), > -}; > - > -void set_uart_mux_conf(void) > -{ > - /* Set UART pins */ > - enable_uart0_pin_mux(); > -} > - > -void set_mux_conf_regs(void) > -{ > - /* Set MMC pins */ > - enable_mmc1_pin_mux(); > - > - /* Set Ethernet pins */ > - enable_enet_pin_mux(); > -} > - > -void sdram_init(void) > -{ > - config_dmm(&evm_lisa_map_regs); > - > - config_ddr(0, NULL, &evm_ddr2_data, &evm_ddr2_cctrl_data, > - &evm_ddr2_emif0_regs, 0); > - config_ddr(0, NULL, &evm_ddr2_data, &evm_ddr2_cctrl_data, > - &evm_ddr2_emif1_regs, 1); > -} > -#endif > - > -/* > - * Basic board specific setup. Pinmux has been handled already. > - */ > -int board_init(void) > -{ > - gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; > - return 0; > -} > - > -#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC) > -int board_mmc_init(bd_t *bis) > -{ > - omap_mmc_init(1, 0, 0, -1, -1); > - > - return 0; > -} > -#endif > - > -#ifdef CONFIG_DRIVER_TI_CPSW > -static void cpsw_control(int enabled) > -{ > - /* VTP can be added here */ > - > - return; > -} > - > -static struct cpsw_slave_data cpsw_slaves[] = { > - { > - .slave_reg_ofs = 0x50, > - .sliver_reg_ofs = 0x700, > - .phy_addr = 1, > - }, > - { > - .slave_reg_ofs = 0x90, > - .sliver_reg_ofs = 0x740, > - .phy_addr = 0, > - }, > -}; > - > -static struct cpsw_platform_data cpsw_data = { > - .mdio_base = CPSW_MDIO_BASE, > - .cpsw_base = CPSW_BASE, > - .mdio_div = 0xff, > - .channels = 8, > - .cpdma_reg_ofs = 0x100, > - .slaves = 1, > - .slave_data = cpsw_slaves, > - .ale_reg_ofs = 0x600, > - .ale_entries = 1024, > - .host_port_reg_ofs = 0x28, > - .hw_stats_reg_ofs = 0x400, > - .bd_ram_ofs = 0x2000, > - .mac_control = (1 << 5), > - .control = cpsw_control, > - .host_port_num = 0, > - .version = CPSW_CTRL_VERSION_1, > -}; > -#endif > - > -int board_eth_init(bd_t *bis) > -{ > - uint8_t mac_addr[6]; > - uint32_t mac_hi, mac_lo; > - > - if (!eth_getenv_enetaddr("ethaddr", mac_addr)) { > - printf("<ethaddr> not set. Reading from E-fuse\n"); > - /* try reading mac address from efuse */ > - mac_lo = readl(&cdev->macid0l); > - mac_hi = readl(&cdev->macid0h); > - mac_addr[0] = mac_hi & 0xFF; > - mac_addr[1] = (mac_hi & 0xFF00) >> 8; > - mac_addr[2] = (mac_hi & 0xFF0000) >> 16; > - mac_addr[3] = (mac_hi & 0xFF000000) >> 24; > - mac_addr[4] = mac_lo & 0xFF; > - mac_addr[5] = (mac_lo & 0xFF00) >> 8; > - > - if (is_valid_ethaddr(mac_addr)) > - eth_setenv_enetaddr("ethaddr", mac_addr); > - else > - printf("Unable to read MAC address. Set <ethaddr>\n"); > - } > - > - return cpsw_register(&cpsw_data); > -} > diff --git a/board/ti/ti814x/evm.h b/board/ti/ti814x/evm.h > deleted file mode 100644 > index 6aebec6..0000000 > --- a/board/ti/ti814x/evm.h > +++ /dev/null > @@ -1,8 +0,0 @@ > -#ifndef _EVM_H > -#define _EVM_H > - > -void enable_uart0_pin_mux(void); > -void enable_mmc1_pin_mux(void); > -void enable_enet_pin_mux(void); > - > -#endif /* _EVM_H */ > diff --git a/board/ti/ti814x/mux.c b/board/ti/ti814x/mux.c > deleted file mode 100644 > index fd9f364..0000000 > --- a/board/ti/ti814x/mux.c > +++ /dev/null > @@ -1,86 +0,0 @@ > -/* > - * mux.c > - * > - * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation version 2. > - * > - * This program is distributed "as is" WITHOUT ANY WARRANTY of any > - * kind, whether express or implied; without even the implied warranty > - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > - * GNU General Public License for more details. > - */ > - > -#include <common.h> > -#include <asm/arch/sys_proto.h> > -#include <asm/arch/hardware.h> > -#include <asm/arch/mux.h> > -#include <asm/io.h> > -#include <i2c.h> > -#include "evm.h" > - > -static struct module_pin_mux uart0_pin_mux[] = { > - {OFFSET(pincntl70), PULLUP_EN | MODE(0x01)}, /* UART0_RXD */ > - {OFFSET(pincntl71), PULLUP_EN | MODE(0x01)}, /* UART0_TXD */ > - {-1}, > -}; > - > -static struct module_pin_mux mmc1_pin_mux[] = { > - {OFFSET(pincntl1), PULLUP_EN | MODE(0x01)}, /* SD1_CLK */ > - {OFFSET(pincntl2), PULLUP_EN | MODE(0x01)}, /* SD1_CMD */ > - {OFFSET(pincntl3), PULLUP_EN | MODE(0x01)}, /* SD1_DAT[0] */ > - {OFFSET(pincntl4), PULLUP_EN | MODE(0x01)}, /* SD1_DAT[1] */ > - {OFFSET(pincntl5), PULLUP_EN | MODE(0x01)}, /* SD1_DAT[2] */ > - {OFFSET(pincntl6), PULLUP_EN | MODE(0x01)}, /* SD1_DAT[3] */ > - {OFFSET(pincntl74), PULLUP_EN | MODE(0x40)}, /* SD1_POW */ > - {OFFSET(pincntl75), MODE(0x40)}, /* SD1_SDWP */ > - {OFFSET(pincntl80), PULLUP_EN | MODE(0x02)}, /* SD1_SDCD */ > - {-1}, > -}; > - > -static struct module_pin_mux enet_pin_mux[] = { > - {OFFSET(pincntl232), MODE(0x01)}, /* EMAC_RMREFCLK */ > - {OFFSET(pincntl233), PULLUP_EN | MODE(0x01)}, /* MDCLK */ > - {OFFSET(pincntl234), PULLUP_EN | MODE(0x01)}, /* MDIO */ > - {OFFSET(pincntl235), MODE(0x01)}, /* EMAC[0]_MTCLK */ > - {OFFSET(pincntl236), MODE(0x01)}, /* EMAC[0]_MCOL */ > - {OFFSET(pincntl237), MODE(0x01)}, /* EMAC[0]_MCRS */ > - {OFFSET(pincntl238), MODE(0x01)}, /* EMAC[0]_MRXER */ > - {OFFSET(pincntl239), MODE(0x01)}, /* EMAC[0]_MRCLK */ > - {OFFSET(pincntl240), MODE(0x01)}, /* EMAC[0]_MRXD[0] */ > - {OFFSET(pincntl241), MODE(0x01)}, /* EMAC[0]_MRXD[1] */ > - {OFFSET(pincntl242), MODE(0x01)}, /* EMAC[0]_MRXD[2] */ > - {OFFSET(pincntl243), MODE(0x01)}, /* EMAC[0]_MRXD[3] */ > - {OFFSET(pincntl244), MODE(0x01)}, /* EMAC[0]_MRXD[4] */ > - {OFFSET(pincntl245), MODE(0x01)}, /* EMAC[0]_MRXD[5] */ > - {OFFSET(pincntl246), MODE(0x01)}, /* EMAC[0]_MRXD[6] */ > - {OFFSET(pincntl247), MODE(0x01)}, /* EMAC[0]_MRXD[7] */ > - {OFFSET(pincntl248), MODE(0x01)}, /* EMAC[0]_MRXDV */ > - {OFFSET(pincntl249), MODE(0x01)}, /* EMAC[0]_GMTCLK */ > - {OFFSET(pincntl250), MODE(0x01)}, /* EMAC[0]_MTXD[0] */ > - {OFFSET(pincntl251), MODE(0x01)}, /* EMAC[0]_MTXD[1] */ > - {OFFSET(pincntl252), MODE(0x01)}, /* EMAC[0]_MTXD[2] */ > - {OFFSET(pincntl253), MODE(0x01)}, /* EMAC[0]_MTXD[3] */ > - {OFFSET(pincntl254), MODE(0x01)}, /* EMAC[0]_MTXD[4] */ > - {OFFSET(pincntl255), MODE(0x01)}, /* EMAC[0]_MTXD[5] */ > - {OFFSET(pincntl256), MODE(0x01)}, /* EMAC[0]_MTXD[6] */ > - {OFFSET(pincntl257), MODE(0x01)}, /* EMAC[0]_MTXD[7] */ > - {OFFSET(pincntl258), MODE(0x01)}, /* EMAC[0]_MTXEN */ > -}; > - > -void enable_uart0_pin_mux(void) > -{ > - configure_module_pin_mux(uart0_pin_mux); > -} > - > -void enable_mmc1_pin_mux(void) > -{ > - configure_module_pin_mux(mmc1_pin_mux); > -} > - > -void enable_enet_pin_mux(void) > -{ > - configure_module_pin_mux(enet_pin_mux); > -} > diff --git a/configs/ti814x_evm_defconfig b/configs/ti814x_evm_defconfig > deleted file mode 100644 > index f7d1e11..0000000 > --- a/configs/ti814x_evm_defconfig > +++ /dev/null > @@ -1,7 +0,0 @@ > -CONFIG_ARM=y > -CONFIG_TARGET_TI814X_EVM=y > -CONFIG_SPL=y > -# CONFIG_CMD_IMLS is not set > -# CONFIG_CMD_FLASH is not set > -# CONFIG_CMD_SETEXPR is not set > -CONFIG_SYS_PROMPT="U-Boot# " > diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h > deleted file mode 100644 > index 7fa35a1..0000000 > --- a/include/configs/ti814x_evm.h > +++ /dev/null > @@ -1,230 +0,0 @@ > -/* > - * ti814x_evm.h > - * > - * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation version 2. > - * > - * This program is distributed "as is" WITHOUT ANY WARRANTY of any > - * kind, whether express or implied; without even the implied warranty > - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > - * GNU General Public License for more details. > - */ > - > -#ifndef __CONFIG_TI814X_EVM_H > -#define __CONFIG_TI814X_EVM_H > - > -#define CONFIG_TI81XX > -#define CONFIG_TI814X > -#define CONFIG_SYS_NO_FLASH > -#define CONFIG_OMAP > -#define CONFIG_OMAP_COMMON > - > -#include <asm/arch/omap.h> > - > -#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ > -#define CONFIG_SYS_MALLOC_LEN (1024 << 10) > -#define CONFIG_SYS_LONGHELP /* undef to save memory */ > -#define CONFIG_SYS_HUSH_PARSER /* Use HUSH for command parsing */ > -#define CONFIG_SYS_NO_FLASH > -#define CONFIG_MACH_TYPE MACH_TYPE_TI8148EVM > - > -#define CONFIG_OF_LIBFDT > -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ > -#define CONFIG_SETUP_MEMORY_TAGS > -#define CONFIG_INITRD_TAG /* for ramdisk support */ > - > -/* commands to include */ > -#define CONFIG_CMD_ASKENV > -#define CONFIG_VERSION_VARIABLE > - > -#define CONFIG_BOOTDELAY 1 /* negative for no autoboot */ > -#define CONFIG_ENV_VARS_UBOOT_CONFIG > -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG > -#define CONFIG_EXTRA_ENV_SETTINGS \ > - "loadaddr=0x80200000\0" \ > - "fdtaddr=0x80F80000\0" \ > - "rdaddr=0x81000000\0" \ > - "bootfile=/boot/uImage\0" \ > - "fdtfile=\0" \ > - "console=ttyO0,115200n8\0" \ > - "optargs=\0" \ > - "mmcdev=0\0" \ > - "mmcroot=/dev/mmcblk0p2 ro\0" \ > - "mmcrootfstype=ext4 rootwait\0" \ > - "ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${rdaddr},64M\0" \ > - "ramrootfstype=ext2\0" \ > - "mmcargs=setenv bootargs console=${console} " \ > - "${optargs} " \ > - "root=${mmcroot} " \ > - "rootfstype=${mmcrootfstype}\0" \ > - "bootenv=uEnv.txt\0" \ > - "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ > - "importbootenv=echo Importing environment from mmc ...; " \ > - "env import -t $loadaddr $filesize\0" \ > - "ramargs=setenv bootargs console=${console} " \ > - "${optargs} " \ > - "root=${ramroot} " \ > - "rootfstype=${ramrootfstype}\0" \ > - "loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ > - "loaduimagefat=fatload mmc ${mmcdev} ${loadaddr} ${bootfile}\0" \ > - "loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} ${bootfile}\0" \ > - "mmcboot=echo Booting from mmc ...; " \ > - "run mmcargs; " \ > - "bootm ${loadaddr}\0" \ > - "ramboot=echo Booting from ramdisk ...; " \ > - "run ramargs; " \ > - "bootm ${loadaddr}\0" \ > - "fdtfile=ti814x-evm.dtb\0" \ > - > -#define CONFIG_BOOTCOMMAND \ > - "mmc dev ${mmcdev}; if mmc rescan; then " \ > - "echo SD/MMC found on device ${mmcdev};" \ > - "if run loadbootenv; then " \ > - "echo Loaded environment from ${bootenv};" \ > - "run importbootenv;" \ > - "fi;" \ > - "if test -n $uenvcmd; then " \ > - "echo Running uenvcmd ...;" \ > - "run uenvcmd;" \ > - "fi;" \ > - "if run loaduimage; then " \ > - "run mmcboot;" \ > - "fi;" \ > - "fi;" \ > - > -/* Clock Defines */ > -#define V_OSCK 24000000 /* Clock output from T2 */ > -#define V_SCLK (V_OSCK >> 1) > - > -/* max number of command args */ > -#define CONFIG_SYS_MAXARGS 16 > - > -/* Console I/O Buffer Size */ > -#define CONFIG_SYS_CBSIZE 512 > - > -/* Print Buffer Size */ > -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \ > - + sizeof(CONFIG_SYS_PROMPT) + 16) > - > -/* Boot Argument Buffer Size */ > -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE > - > -#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE > -#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START \ > - + PHYS_DRAM_1_SIZE - (8 << 12)) > - > -#define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default */ > - > -#define CONFIG_OMAP_GPIO > -#define CONFIG_MMC > -#define CONFIG_GENERIC_MMC > -#define CONFIG_OMAP_HSMMC > -#define CONFIG_CMD_MMC > -#define CONFIG_DOS_PARTITION > -#define CONFIG_CMD_FAT > -#define CONFIG_CMD_EXT2 > - > -/** > - * Physical Memory Map > - */ > -#define CONFIG_NR_DRAM_BANKS 1 /* 1 banks of DRAM */ > -#define PHYS_DRAM_1_SIZE 0x20000000 /* 512MB */ > -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1024MB */ > - > -#define CONFIG_SYS_SDRAM_BASE 0x80000000 > -#define CONFIG_SYS_INIT_SP_ADDR (NON_SECURE_SRAM_END - \ > - GENERATED_GBL_DATA_SIZE) > - > -/** > - * Platform/Board specific defs > - */ > -#define CONFIG_SYS_TIMERBASE 0x4802E000 > -#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ > - > -/* NS16550 Configuration */ > -#define CONFIG_SYS_NS16550 > -#define CONFIG_SYS_NS16550_SERIAL > -#define CONFIG_SYS_NS16550_REG_SIZE (-4) > -#define CONFIG_SYS_NS16550_CLK (48000000) > -#define CONFIG_SYS_NS16550_COM1 0x48020000 /* Base EVM has UART0 */ > - > -#define CONFIG_BAUDRATE 115200 > - > -/* CPU */ > -#define CONFIG_ARCH_CPU_INIT > - > -#define CONFIG_ENV_OVERWRITE > -#define CONFIG_CONS_INDEX 1 > -#define CONFIG_SYS_CONSOLE_INFO_QUIET > - > -#define CONFIG_ENV_IS_NOWHERE > - > -/* Defines for SPL */ > -#define CONFIG_SPL_FRAMEWORK > -#define CONFIG_SPL_TEXT_BASE 0x40300000 > -#define CONFIG_SPL_MAX_SIZE ((128 - 18) * 1024) > - > -#define CONFIG_SPL_BSS_START_ADDR 0x80000000 > -#define CONFIG_SPL_BSS_MAX_SIZE 0x80000 /* 512 KB */ > - > -#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */ > -#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */ > -#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 > -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" > -#define CONFIG_SPL_MMC_SUPPORT > -#define CONFIG_SPL_FAT_SUPPORT > - > -#define CONFIG_SPL_LIBCOMMON_SUPPORT > -#define CONFIG_SPL_LIBDISK_SUPPORT > -#define CONFIG_SPL_LIBGENERIC_SUPPORT > -#define CONFIG_SPL_SERIAL_SUPPORT > -#define CONFIG_SPL_GPIO_SUPPORT > -#define CONFIG_SPL_YMODEM_SUPPORT > -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 > -#define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000 > -#define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds" > - > -#define CONFIG_SPL_BOARD_INIT > - > -/* > - * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM > - * 64 bytes before this address should be set aside for u-boot.img's > - * header. That is 0x800FFFC0--0x80800000 should not be used for any > - * other needs. > - */ > -#define CONFIG_SYS_TEXT_BASE 0x80800000 > -#define CONFIG_SYS_SPL_MALLOC_START 0x80208000 > -#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 > - > -/* > - * Since SPL did pll and ddr initialization for us, > - * we don't need to do it twice. > - */ > -#ifndef CONFIG_SPL_BUILD > -#define CONFIG_SKIP_LOWLEVEL_INIT > -#endif > - > -/* Unsupported features */ > -#undef CONFIG_USE_IRQ > - > -/* Ethernet */ > -#define CONFIG_CMD_DHCP > -#define CONFIG_CMD_PING > -#define CONFIG_CMD_MII > -#define CONFIG_DRIVER_TI_CPSW > -#define CONFIG_MII > -#define CONFIG_BOOTP_DNS > -#define CONFIG_BOOTP_DNS2 > -#define CONFIG_BOOTP_SEND_HOSTNAME > -#define CONFIG_BOOTP_GATEWAY > -#define CONFIG_BOOTP_SUBNETMASK > -#define CONFIG_NET_RETRY_COUNT 10 > -#define CONFIG_PHY_GIGE > -#define CONFIG_PHYLIB > -#define CONFIG_PHY_ET1011C > -#define CONFIG_PHY_ET1011C_TX_CLK_FIX > - > -#endif /* ! __CONFIG_TI814X_EVM_H */ > -- > 2.5.0.457.gab17608 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot
* Felipe Balbi <balbi@ti.com> [150831 07:54]: > Hi, > > On Sun, Aug 30, 2015 at 07:19:37PM -0600, Simon Glass wrote: > > This board has not been converted to generic board by the deadline. > > Remove it. > > > > Signed-off-by: Simon Glass <sjg@chromium.org> > > there are people using this and ti816x at least. Yes and it seems people will be using dm81xx with mainline kernel more.. Regards, Tony
Hi, On 31 August 2015 at 08:50, Felipe Balbi <balbi@ti.com> wrote: > Hi, > > On Sun, Aug 30, 2015 at 07:19:37PM -0600, Simon Glass wrote: >> This board has not been converted to generic board by the deadline. >> Remove it. >> >> Signed-off-by: Simon Glass <sjg@chromium.org> > > there are people using this and ti816x at least. OK - let's see if one of them can send a patch. > >> --- >> >> arch/arm/Kconfig | 6 -- >> board/ti/ti814x/Kconfig | 15 --- >> board/ti/ti814x/MAINTAINERS | 6 -- >> board/ti/ti814x/Makefile | 13 --- >> board/ti/ti814x/evm.c | 188 ----------------------------------- >> board/ti/ti814x/evm.h | 8 -- >> board/ti/ti814x/mux.c | 86 ---------------- >> configs/ti814x_evm_defconfig | 7 -- >> include/configs/ti814x_evm.h | 230 ------------------------------------------- >> 9 files changed, 559 deletions(-) >> delete mode 100644 board/ti/ti814x/Kconfig >> delete mode 100644 board/ti/ti814x/MAINTAINERS >> delete mode 100644 board/ti/ti814x/Makefile >> delete mode 100644 board/ti/ti814x/evm.c >> delete mode 100644 board/ti/ti814x/evm.h >> delete mode 100644 board/ti/ti814x/mux.c >> delete mode 100644 configs/ti814x_evm_defconfig >> delete mode 100644 include/configs/ti814x_evm.h >> Regards, Simon
On Sun, Aug 30, 2015 at 07:19:37PM -0600, Simon Glass wrote: > This board has not been converted to generic board by the deadline. > Remove it. > > Signed-off-by: Simon Glass <sjg@chromium.org> Nacked-by: Tom Rini <trini@konsulko.com> And I'll dig mine out, patch and post.
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 8ef21a3..1a171d1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -378,11 +378,6 @@ config TARGET_BAV335X For more information, visit: http://birdland.com/oem -config TARGET_TI814X_EVM - bool "Support ti814x_evm" - select CPU_V7 - select SUPPORT_SPL - config TARGET_TI816X_EVM bool "Support ti816x_evm" select CPU_V7 @@ -859,7 +854,6 @@ source "board/tbs/tbs2910/Kconfig" source "board/ti/am335x/Kconfig" source "board/ti/am43xx/Kconfig" source "board/birdland/bav335x/Kconfig" -source "board/ti/ti814x/Kconfig" source "board/ti/ti816x/Kconfig" source "board/timll/devkit3250/Kconfig" source "board/toradex/colibri_pxa270/Kconfig" diff --git a/board/ti/ti814x/Kconfig b/board/ti/ti814x/Kconfig deleted file mode 100644 index 2960099..0000000 --- a/board/ti/ti814x/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -if TARGET_TI814X_EVM - -config SYS_BOARD - default "ti814x" - -config SYS_VENDOR - default "ti" - -config SYS_SOC - default "am33xx" - -config SYS_CONFIG_NAME - default "ti814x_evm" - -endif diff --git a/board/ti/ti814x/MAINTAINERS b/board/ti/ti814x/MAINTAINERS deleted file mode 100644 index e39b253..0000000 --- a/board/ti/ti814x/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -TI814X BOARD -M: Matt Porter <matt.porter@linaro.org> -S: Maintained -F: board/ti/ti814x/ -F: include/configs/ti814x_evm.h -F: configs/ti814x_evm_defconfig diff --git a/board/ti/ti814x/Makefile b/board/ti/ti814x/Makefile deleted file mode 100644 index 93155de..0000000 --- a/board/ti/ti814x/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# -# Makefile -# -# Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ -# -# SPDX-License-Identifier: GPL-2.0+ -# - -ifdef CONFIG_SPL_BUILD -obj-y := mux.o -endif - -obj-y += evm.o diff --git a/board/ti/ti814x/evm.c b/board/ti/ti814x/evm.c deleted file mode 100644 index e406dab..0000000 --- a/board/ti/ti814x/evm.c +++ /dev/null @@ -1,188 +0,0 @@ -/* - * evm.c - * - * Board functions for TI814x EVM - * - * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include <common.h> -#include <cpsw.h> -#include <errno.h> -#include <spl.h> -#include <asm/arch/cpu.h> -#include <asm/arch/hardware.h> -#include <asm/arch/omap.h> -#include <asm/arch/ddr_defs.h> -#include <asm/arch/clock.h> -#include <asm/arch/gpio.h> -#include <asm/arch/mmc_host_def.h> -#include <asm/arch/sys_proto.h> -#include <asm/io.h> -#include <asm/emif.h> -#include <asm/gpio.h> -#include "evm.h" - -DECLARE_GLOBAL_DATA_PTR; - -static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE; - -/* UART Defines */ -#ifdef CONFIG_SPL_BUILD -static const struct cmd_control evm_ddr2_cctrl_data = { - .cmd0csratio = 0x80, - .cmd0iclkout = 0x00, - - .cmd1csratio = 0x80, - .cmd1iclkout = 0x00, - - .cmd2csratio = 0x80, - .cmd2iclkout = 0x00, -}; - -static const struct emif_regs evm_ddr2_emif0_regs = { - .sdram_config = 0x40801ab2, - .ref_ctrl = 0x10000c30, - .sdram_tim1 = 0x0aaaf552, - .sdram_tim2 = 0x043631d2, - .sdram_tim3 = 0x00000327, - .emif_ddr_phy_ctlr_1 = 0x00000007 -}; - -static const struct emif_regs evm_ddr2_emif1_regs = { - .sdram_config = 0x40801ab2, - .ref_ctrl = 0x10000c30, - .sdram_tim1 = 0x0aaaf552, - .sdram_tim2 = 0x043631d2, - .sdram_tim3 = 0x00000327, - .emif_ddr_phy_ctlr_1 = 0x00000007 -}; - -const struct dmm_lisa_map_regs evm_lisa_map_regs = { - .dmm_lisa_map_0 = 0x00000000, - .dmm_lisa_map_1 = 0x00000000, - .dmm_lisa_map_2 = 0x806c0300, - .dmm_lisa_map_3 = 0x806c0300, -}; - -static const struct ddr_data evm_ddr2_data = { - .datardsratio0 = ((0x35<<10) | (0x35<<0)), - .datawdsratio0 = ((0x20<<10) | (0x20<<0)), - .datawiratio0 = ((0<<10) | (0<<0)), - .datagiratio0 = ((0<<10) | (0<<0)), - .datafwsratio0 = ((0x90<<10) | (0x90<<0)), - .datawrsratio0 = ((0x50<<10) | (0x50<<0)), -}; - -void set_uart_mux_conf(void) -{ - /* Set UART pins */ - enable_uart0_pin_mux(); -} - -void set_mux_conf_regs(void) -{ - /* Set MMC pins */ - enable_mmc1_pin_mux(); - - /* Set Ethernet pins */ - enable_enet_pin_mux(); -} - -void sdram_init(void) -{ - config_dmm(&evm_lisa_map_regs); - - config_ddr(0, NULL, &evm_ddr2_data, &evm_ddr2_cctrl_data, - &evm_ddr2_emif0_regs, 0); - config_ddr(0, NULL, &evm_ddr2_data, &evm_ddr2_cctrl_data, - &evm_ddr2_emif1_regs, 1); -} -#endif - -/* - * Basic board specific setup. Pinmux has been handled already. - */ -int board_init(void) -{ - gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; - return 0; -} - -#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC) -int board_mmc_init(bd_t *bis) -{ - omap_mmc_init(1, 0, 0, -1, -1); - - return 0; -} -#endif - -#ifdef CONFIG_DRIVER_TI_CPSW -static void cpsw_control(int enabled) -{ - /* VTP can be added here */ - - return; -} - -static struct cpsw_slave_data cpsw_slaves[] = { - { - .slave_reg_ofs = 0x50, - .sliver_reg_ofs = 0x700, - .phy_addr = 1, - }, - { - .slave_reg_ofs = 0x90, - .sliver_reg_ofs = 0x740, - .phy_addr = 0, - }, -}; - -static struct cpsw_platform_data cpsw_data = { - .mdio_base = CPSW_MDIO_BASE, - .cpsw_base = CPSW_BASE, - .mdio_div = 0xff, - .channels = 8, - .cpdma_reg_ofs = 0x100, - .slaves = 1, - .slave_data = cpsw_slaves, - .ale_reg_ofs = 0x600, - .ale_entries = 1024, - .host_port_reg_ofs = 0x28, - .hw_stats_reg_ofs = 0x400, - .bd_ram_ofs = 0x2000, - .mac_control = (1 << 5), - .control = cpsw_control, - .host_port_num = 0, - .version = CPSW_CTRL_VERSION_1, -}; -#endif - -int board_eth_init(bd_t *bis) -{ - uint8_t mac_addr[6]; - uint32_t mac_hi, mac_lo; - - if (!eth_getenv_enetaddr("ethaddr", mac_addr)) { - printf("<ethaddr> not set. Reading from E-fuse\n"); - /* try reading mac address from efuse */ - mac_lo = readl(&cdev->macid0l); - mac_hi = readl(&cdev->macid0h); - mac_addr[0] = mac_hi & 0xFF; - mac_addr[1] = (mac_hi & 0xFF00) >> 8; - mac_addr[2] = (mac_hi & 0xFF0000) >> 16; - mac_addr[3] = (mac_hi & 0xFF000000) >> 24; - mac_addr[4] = mac_lo & 0xFF; - mac_addr[5] = (mac_lo & 0xFF00) >> 8; - - if (is_valid_ethaddr(mac_addr)) - eth_setenv_enetaddr("ethaddr", mac_addr); - else - printf("Unable to read MAC address. Set <ethaddr>\n"); - } - - return cpsw_register(&cpsw_data); -} diff --git a/board/ti/ti814x/evm.h b/board/ti/ti814x/evm.h deleted file mode 100644 index 6aebec6..0000000 --- a/board/ti/ti814x/evm.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _EVM_H -#define _EVM_H - -void enable_uart0_pin_mux(void); -void enable_mmc1_pin_mux(void); -void enable_enet_pin_mux(void); - -#endif /* _EVM_H */ diff --git a/board/ti/ti814x/mux.c b/board/ti/ti814x/mux.c deleted file mode 100644 index fd9f364..0000000 --- a/board/ti/ti814x/mux.c +++ /dev/null @@ -1,86 +0,0 @@ -/* - * mux.c - * - * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation version 2. - * - * This program is distributed "as is" WITHOUT ANY WARRANTY of any - * kind, whether express or implied; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <common.h> -#include <asm/arch/sys_proto.h> -#include <asm/arch/hardware.h> -#include <asm/arch/mux.h> -#include <asm/io.h> -#include <i2c.h> -#include "evm.h" - -static struct module_pin_mux uart0_pin_mux[] = { - {OFFSET(pincntl70), PULLUP_EN | MODE(0x01)}, /* UART0_RXD */ - {OFFSET(pincntl71), PULLUP_EN | MODE(0x01)}, /* UART0_TXD */ - {-1}, -}; - -static struct module_pin_mux mmc1_pin_mux[] = { - {OFFSET(pincntl1), PULLUP_EN | MODE(0x01)}, /* SD1_CLK */ - {OFFSET(pincntl2), PULLUP_EN | MODE(0x01)}, /* SD1_CMD */ - {OFFSET(pincntl3), PULLUP_EN | MODE(0x01)}, /* SD1_DAT[0] */ - {OFFSET(pincntl4), PULLUP_EN | MODE(0x01)}, /* SD1_DAT[1] */ - {OFFSET(pincntl5), PULLUP_EN | MODE(0x01)}, /* SD1_DAT[2] */ - {OFFSET(pincntl6), PULLUP_EN | MODE(0x01)}, /* SD1_DAT[3] */ - {OFFSET(pincntl74), PULLUP_EN | MODE(0x40)}, /* SD1_POW */ - {OFFSET(pincntl75), MODE(0x40)}, /* SD1_SDWP */ - {OFFSET(pincntl80), PULLUP_EN | MODE(0x02)}, /* SD1_SDCD */ - {-1}, -}; - -static struct module_pin_mux enet_pin_mux[] = { - {OFFSET(pincntl232), MODE(0x01)}, /* EMAC_RMREFCLK */ - {OFFSET(pincntl233), PULLUP_EN | MODE(0x01)}, /* MDCLK */ - {OFFSET(pincntl234), PULLUP_EN | MODE(0x01)}, /* MDIO */ - {OFFSET(pincntl235), MODE(0x01)}, /* EMAC[0]_MTCLK */ - {OFFSET(pincntl236), MODE(0x01)}, /* EMAC[0]_MCOL */ - {OFFSET(pincntl237), MODE(0x01)}, /* EMAC[0]_MCRS */ - {OFFSET(pincntl238), MODE(0x01)}, /* EMAC[0]_MRXER */ - {OFFSET(pincntl239), MODE(0x01)}, /* EMAC[0]_MRCLK */ - {OFFSET(pincntl240), MODE(0x01)}, /* EMAC[0]_MRXD[0] */ - {OFFSET(pincntl241), MODE(0x01)}, /* EMAC[0]_MRXD[1] */ - {OFFSET(pincntl242), MODE(0x01)}, /* EMAC[0]_MRXD[2] */ - {OFFSET(pincntl243), MODE(0x01)}, /* EMAC[0]_MRXD[3] */ - {OFFSET(pincntl244), MODE(0x01)}, /* EMAC[0]_MRXD[4] */ - {OFFSET(pincntl245), MODE(0x01)}, /* EMAC[0]_MRXD[5] */ - {OFFSET(pincntl246), MODE(0x01)}, /* EMAC[0]_MRXD[6] */ - {OFFSET(pincntl247), MODE(0x01)}, /* EMAC[0]_MRXD[7] */ - {OFFSET(pincntl248), MODE(0x01)}, /* EMAC[0]_MRXDV */ - {OFFSET(pincntl249), MODE(0x01)}, /* EMAC[0]_GMTCLK */ - {OFFSET(pincntl250), MODE(0x01)}, /* EMAC[0]_MTXD[0] */ - {OFFSET(pincntl251), MODE(0x01)}, /* EMAC[0]_MTXD[1] */ - {OFFSET(pincntl252), MODE(0x01)}, /* EMAC[0]_MTXD[2] */ - {OFFSET(pincntl253), MODE(0x01)}, /* EMAC[0]_MTXD[3] */ - {OFFSET(pincntl254), MODE(0x01)}, /* EMAC[0]_MTXD[4] */ - {OFFSET(pincntl255), MODE(0x01)}, /* EMAC[0]_MTXD[5] */ - {OFFSET(pincntl256), MODE(0x01)}, /* EMAC[0]_MTXD[6] */ - {OFFSET(pincntl257), MODE(0x01)}, /* EMAC[0]_MTXD[7] */ - {OFFSET(pincntl258), MODE(0x01)}, /* EMAC[0]_MTXEN */ -}; - -void enable_uart0_pin_mux(void) -{ - configure_module_pin_mux(uart0_pin_mux); -} - -void enable_mmc1_pin_mux(void) -{ - configure_module_pin_mux(mmc1_pin_mux); -} - -void enable_enet_pin_mux(void) -{ - configure_module_pin_mux(enet_pin_mux); -} diff --git a/configs/ti814x_evm_defconfig b/configs/ti814x_evm_defconfig deleted file mode 100644 index f7d1e11..0000000 --- a/configs/ti814x_evm_defconfig +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG_ARM=y -CONFIG_TARGET_TI814X_EVM=y -CONFIG_SPL=y -# CONFIG_CMD_IMLS is not set -# CONFIG_CMD_FLASH is not set -# CONFIG_CMD_SETEXPR is not set -CONFIG_SYS_PROMPT="U-Boot# " diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h deleted file mode 100644 index 7fa35a1..0000000 --- a/include/configs/ti814x_evm.h +++ /dev/null @@ -1,230 +0,0 @@ -/* - * ti814x_evm.h - * - * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation version 2. - * - * This program is distributed "as is" WITHOUT ANY WARRANTY of any - * kind, whether express or implied; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef __CONFIG_TI814X_EVM_H -#define __CONFIG_TI814X_EVM_H - -#define CONFIG_TI81XX -#define CONFIG_TI814X -#define CONFIG_SYS_NO_FLASH -#define CONFIG_OMAP -#define CONFIG_OMAP_COMMON - -#include <asm/arch/omap.h> - -#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ -#define CONFIG_SYS_MALLOC_LEN (1024 << 10) -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_HUSH_PARSER /* Use HUSH for command parsing */ -#define CONFIG_SYS_NO_FLASH -#define CONFIG_MACH_TYPE MACH_TYPE_TI8148EVM - -#define CONFIG_OF_LIBFDT -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG /* for ramdisk support */ - -/* commands to include */ -#define CONFIG_CMD_ASKENV -#define CONFIG_VERSION_VARIABLE - -#define CONFIG_BOOTDELAY 1 /* negative for no autoboot */ -#define CONFIG_ENV_VARS_UBOOT_CONFIG -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG -#define CONFIG_EXTRA_ENV_SETTINGS \ - "loadaddr=0x80200000\0" \ - "fdtaddr=0x80F80000\0" \ - "rdaddr=0x81000000\0" \ - "bootfile=/boot/uImage\0" \ - "fdtfile=\0" \ - "console=ttyO0,115200n8\0" \ - "optargs=\0" \ - "mmcdev=0\0" \ - "mmcroot=/dev/mmcblk0p2 ro\0" \ - "mmcrootfstype=ext4 rootwait\0" \ - "ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${rdaddr},64M\0" \ - "ramrootfstype=ext2\0" \ - "mmcargs=setenv bootargs console=${console} " \ - "${optargs} " \ - "root=${mmcroot} " \ - "rootfstype=${mmcrootfstype}\0" \ - "bootenv=uEnv.txt\0" \ - "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ - "importbootenv=echo Importing environment from mmc ...; " \ - "env import -t $loadaddr $filesize\0" \ - "ramargs=setenv bootargs console=${console} " \ - "${optargs} " \ - "root=${ramroot} " \ - "rootfstype=${ramrootfstype}\0" \ - "loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ - "loaduimagefat=fatload mmc ${mmcdev} ${loadaddr} ${bootfile}\0" \ - "loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} ${bootfile}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run mmcargs; " \ - "bootm ${loadaddr}\0" \ - "ramboot=echo Booting from ramdisk ...; " \ - "run ramargs; " \ - "bootm ${loadaddr}\0" \ - "fdtfile=ti814x-evm.dtb\0" \ - -#define CONFIG_BOOTCOMMAND \ - "mmc dev ${mmcdev}; if mmc rescan; then " \ - "echo SD/MMC found on device ${mmcdev};" \ - "if run loadbootenv; then " \ - "echo Loaded environment from ${bootenv};" \ - "run importbootenv;" \ - "fi;" \ - "if test -n $uenvcmd; then " \ - "echo Running uenvcmd ...;" \ - "run uenvcmd;" \ - "fi;" \ - "if run loaduimage; then " \ - "run mmcboot;" \ - "fi;" \ - "fi;" \ - -/* Clock Defines */ -#define V_OSCK 24000000 /* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) - -/* max number of command args */ -#define CONFIG_SYS_MAXARGS 16 - -/* Console I/O Buffer Size */ -#define CONFIG_SYS_CBSIZE 512 - -/* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \ - + sizeof(CONFIG_SYS_PROMPT) + 16) - -/* Boot Argument Buffer Size */ -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE - -#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE -#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START \ - + PHYS_DRAM_1_SIZE - (8 << 12)) - -#define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default */ - -#define CONFIG_OMAP_GPIO -#define CONFIG_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_OMAP_HSMMC -#define CONFIG_CMD_MMC -#define CONFIG_DOS_PARTITION -#define CONFIG_CMD_FAT -#define CONFIG_CMD_EXT2 - -/** - * Physical Memory Map - */ -#define CONFIG_NR_DRAM_BANKS 1 /* 1 banks of DRAM */ -#define PHYS_DRAM_1_SIZE 0x20000000 /* 512MB */ -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1024MB */ - -#define CONFIG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_SYS_INIT_SP_ADDR (NON_SECURE_SRAM_END - \ - GENERATED_GBL_DATA_SIZE) - -/** - * Platform/Board specific defs - */ -#define CONFIG_SYS_TIMERBASE 0x4802E000 -#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ - -/* NS16550 Configuration */ -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK (48000000) -#define CONFIG_SYS_NS16550_COM1 0x48020000 /* Base EVM has UART0 */ - -#define CONFIG_BAUDRATE 115200 - -/* CPU */ -#define CONFIG_ARCH_CPU_INIT - -#define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 -#define CONFIG_SYS_CONSOLE_INFO_QUIET - -#define CONFIG_ENV_IS_NOWHERE - -/* Defines for SPL */ -#define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_TEXT_BASE 0x40300000 -#define CONFIG_SPL_MAX_SIZE ((128 - 18) * 1024) - -#define CONFIG_SPL_BSS_START_ADDR 0x80000000 -#define CONFIG_SPL_BSS_MAX_SIZE 0x80000 /* 512 KB */ - -#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */ -#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */ -#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#define CONFIG_SPL_MMC_SUPPORT -#define CONFIG_SPL_FAT_SUPPORT - -#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBDISK_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_GPIO_SUPPORT -#define CONFIG_SPL_YMODEM_SUPPORT -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 -#define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000 -#define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds" - -#define CONFIG_SPL_BOARD_INIT - -/* - * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM - * 64 bytes before this address should be set aside for u-boot.img's - * header. That is 0x800FFFC0--0x80800000 should not be used for any - * other needs. - */ -#define CONFIG_SYS_TEXT_BASE 0x80800000 -#define CONFIG_SYS_SPL_MALLOC_START 0x80208000 -#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 - -/* - * Since SPL did pll and ddr initialization for us, - * we don't need to do it twice. - */ -#ifndef CONFIG_SPL_BUILD -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif - -/* Unsupported features */ -#undef CONFIG_USE_IRQ - -/* Ethernet */ -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_PING -#define CONFIG_CMD_MII -#define CONFIG_DRIVER_TI_CPSW -#define CONFIG_MII -#define CONFIG_BOOTP_DNS -#define CONFIG_BOOTP_DNS2 -#define CONFIG_BOOTP_SEND_HOSTNAME -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_SUBNETMASK -#define CONFIG_NET_RETRY_COUNT 10 -#define CONFIG_PHY_GIGE -#define CONFIG_PHYLIB -#define CONFIG_PHY_ET1011C -#define CONFIG_PHY_ET1011C_TX_CLK_FIX - -#endif /* ! __CONFIG_TI814X_EVM_H */
This board has not been converted to generic board by the deadline. Remove it. Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/arm/Kconfig | 6 -- board/ti/ti814x/Kconfig | 15 --- board/ti/ti814x/MAINTAINERS | 6 -- board/ti/ti814x/Makefile | 13 --- board/ti/ti814x/evm.c | 188 ----------------------------------- board/ti/ti814x/evm.h | 8 -- board/ti/ti814x/mux.c | 86 ---------------- configs/ti814x_evm_defconfig | 7 -- include/configs/ti814x_evm.h | 230 ------------------------------------------- 9 files changed, 559 deletions(-) delete mode 100644 board/ti/ti814x/Kconfig delete mode 100644 board/ti/ti814x/MAINTAINERS delete mode 100644 board/ti/ti814x/Makefile delete mode 100644 board/ti/ti814x/evm.c delete mode 100644 board/ti/ti814x/evm.h delete mode 100644 board/ti/ti814x/mux.c delete mode 100644 configs/ti814x_evm_defconfig delete mode 100644 include/configs/ti814x_evm.h