Hi Simon,
On Mon, Nov 19, 2018 at 4:55 PM Simon Glass sjg@chromium.org wrote:
This board has not been converted to CONFIG_DM_BLK by the deadline. Remove it.
I've sent a fix: https://lists.denx.de/pipermail/u-boot/2018-November/348319.html
Best Regards, Yegor
Signed-off-by: Simon Glass sjg@chromium.org
arch/arm/Kconfig | 1 - board/vscom/baltos/Kconfig | 15 - board/vscom/baltos/MAINTAINERS | 6 - board/vscom/baltos/Makefile | 11 - board/vscom/baltos/README | 1 - board/vscom/baltos/board.c | 493 -------------------------------- board/vscom/baltos/board.h | 34 --- board/vscom/baltos/mux.c | 125 -------- board/vscom/baltos/u-boot.lds | 128 --------- configs/am335x_baltos_defconfig | 65 ----- include/configs/baltos.h | 276 ------------------ 11 files changed, 1155 deletions(-) delete mode 100644 board/vscom/baltos/Kconfig delete mode 100644 board/vscom/baltos/MAINTAINERS delete mode 100644 board/vscom/baltos/Makefile delete mode 100644 board/vscom/baltos/README delete mode 100644 board/vscom/baltos/board.c delete mode 100644 board/vscom/baltos/board.h delete mode 100644 board/vscom/baltos/mux.c delete mode 100644 board/vscom/baltos/u-boot.lds delete mode 100644 configs/am335x_baltos_defconfig delete mode 100644 include/configs/baltos.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b1eeb39d919..6cadd96378b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1528,7 +1528,6 @@ source "board/spear/x600/Kconfig" source "board/st/stv0991/Kconfig" source "board/tcl/sl50/Kconfig" source "board/ucRobotics/bubblegum_96/Kconfig" -source "board/vscom/baltos/Kconfig" source "board/woodburn/Kconfig" source "board/xilinx/Kconfig" source "board/xilinx/zynq/Kconfig" diff --git a/board/vscom/baltos/Kconfig b/board/vscom/baltos/Kconfig deleted file mode 100644 index b721ed19d80..00000000000 --- a/board/vscom/baltos/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -if TARGET_AM335X_BALTOS
-config SYS_BOARD
default "baltos"-config SYS_VENDOR
default "vscom"-config SYS_SOC
default "am33xx"-config SYS_CONFIG_NAME
default "baltos"-endif diff --git a/board/vscom/baltos/MAINTAINERS b/board/vscom/baltos/MAINTAINERS deleted file mode 100644 index e82acfed161..00000000000 --- a/board/vscom/baltos/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -BALTOS BOARD -M: Yegor Yefremov yegorslists@googlemail.com -S: Maintained -F: board/vscom/baltos/ -F: include/configs/baltos.h -F: configs/am335x_baltos_defconfig diff --git a/board/vscom/baltos/Makefile b/board/vscom/baltos/Makefile deleted file mode 100644 index c34b9b1dd8a..00000000000 --- a/board/vscom/baltos/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Makefile -# -# Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-ifeq ($(CONFIG_SKIP_LOWLEVEL_INIT),) -obj-y := mux.o -endif
-obj-y += board.o diff --git a/board/vscom/baltos/README b/board/vscom/baltos/README deleted file mode 100644 index f744ace9972..00000000000 --- a/board/vscom/baltos/README +++ /dev/null @@ -1 +0,0 @@ -BSP for VScom OnRISC Balios family devices, like Balios iR 5221. diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c deleted file mode 100644 index df0a2d2b7a6..00000000000 --- a/board/vscom/baltos/board.c +++ /dev/null @@ -1,493 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/*
- board.c
- Board functions for TI AM335X based boards
- Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
- */
-#include <common.h> -#include <errno.h> -#include <linux/libfdt.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/arch/mem.h> -#include <asm/arch/mux.h> -#include <asm/io.h> -#include <asm/emif.h> -#include <asm/gpio.h> -#include <i2c.h> -#include <miiphy.h> -#include <cpsw.h> -#include <power/tps65217.h> -#include <power/tps65910.h> -#include <environment.h> -#include <watchdog.h> -#include "board.h"
-DECLARE_GLOBAL_DATA_PTR;
-/* GPIO that controls power to DDR on EVM-SK */ -#define GPIO_DDR_VTT_EN 7 -#define DIP_S1 44 -#define MPCIE_SW 100
-static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;
-static int baltos_set_console(void) -{
int val, i, dips = 0;char buf[7];for (i = 0; i < 4; i++) {sprintf(buf, "dip_s%d", i + 1);if (gpio_request(DIP_S1 + i, buf)) {printf("failed to export GPIO %d\n", DIP_S1 + i);return 0;}if (gpio_direction_input(DIP_S1 + i)) {printf("failed to set GPIO %d direction\n", DIP_S1 + i);return 0;}val = gpio_get_value(DIP_S1 + i);dips |= val << i;}printf("DIPs: 0x%1x\n", (~dips) & 0xf);if ((dips & 0xf) == 0xe)env_set("console", "ttyUSB0,115200n8");return 0;-}
-static int read_eeprom(BSP_VS_HWPARAM *header) -{
i2c_set_bus_num(1);/* Check if baseboard eeprom is available */if (i2c_probe(CONFIG_SYS_I2C_EEPROM_ADDR)) {puts("Could not probe the EEPROM; something fundamentally ""wrong on the I2C bus.\n");return -ENODEV;}/* read the eeprom using i2c */if (i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, 0, 1, (uchar *)header,sizeof(BSP_VS_HWPARAM))) {puts("Could not read the EEPROM; something fundamentally"" wrong on the I2C bus.\n");return -EIO;}if (header->Magic != 0xDEADBEEF) {printf("Incorrect magic number (0x%x) in EEPROM\n",header->Magic);/* fill default values */header->SystemId = 211;header->MAC1[0] = 0x00;header->MAC1[1] = 0x00;header->MAC1[2] = 0x00;header->MAC1[3] = 0x00;header->MAC1[4] = 0x00;header->MAC1[5] = 0x01;header->MAC2[0] = 0x00;header->MAC2[1] = 0x00;header->MAC2[2] = 0x00;header->MAC2[3] = 0x00;header->MAC2[4] = 0x00;header->MAC2[5] = 0x02;header->MAC3[0] = 0x00;header->MAC3[1] = 0x00;header->MAC3[2] = 0x00;header->MAC3[3] = 0x00;header->MAC3[4] = 0x00;header->MAC3[5] = 0x03;}return 0;-}
-#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_NOR_BOOT)
-static const struct ddr_data ddr3_baltos_data = {
.datardsratio0 = MT41K256M16HA125E_RD_DQS,.datawdsratio0 = MT41K256M16HA125E_WR_DQS,.datafwsratio0 = MT41K256M16HA125E_PHY_FIFO_WE,.datawrsratio0 = MT41K256M16HA125E_PHY_WR_DATA,-};
-static const struct cmd_control ddr3_baltos_cmd_ctrl_data = {
.cmd0csratio = MT41K256M16HA125E_RATIO,.cmd0iclkout = MT41K256M16HA125E_INVERT_CLKOUT,.cmd1csratio = MT41K256M16HA125E_RATIO,.cmd1iclkout = MT41K256M16HA125E_INVERT_CLKOUT,.cmd2csratio = MT41K256M16HA125E_RATIO,.cmd2iclkout = MT41K256M16HA125E_INVERT_CLKOUT,-};
-static struct emif_regs ddr3_baltos_emif_reg_data = {
.sdram_config = MT41K256M16HA125E_EMIF_SDCFG,.ref_ctrl = MT41K256M16HA125E_EMIF_SDREF,.sdram_tim1 = MT41K256M16HA125E_EMIF_TIM1,.sdram_tim2 = MT41K256M16HA125E_EMIF_TIM2,.sdram_tim3 = MT41K256M16HA125E_EMIF_TIM3,.zq_config = MT41K256M16HA125E_ZQ_CFG,.emif_ddr_phy_ctlr_1 = MT41K256M16HA125E_EMIF_READ_LATENCY,-};
-#ifdef CONFIG_SPL_OS_BOOT -int spl_start_uboot(void) -{
/* break into full u-boot on 'c' */return (serial_tstc() && serial_getc() == 'c');-} -#endif
-#define OSC (V_OSCK/1000000) -const struct dpll_params dpll_ddr = {
266, OSC-1, 1, -1, -1, -1, -1};-const struct dpll_params dpll_ddr_evm_sk = {
303, OSC-1, 1, -1, -1, -1, -1};-const struct dpll_params dpll_ddr_baltos = {
400, OSC-1, 1, -1, -1, -1, -1};-void am33xx_spl_board_init(void) -{
int mpu_vdd;int sil_rev;/* Get the frequency */dpll_mpu_opp100.m = am335x_get_efuse_mpu_max_freq(cdev);/** The GP EVM, IDK and EVM SK use a TPS65910 PMIC. For all* MPU frequencies we support we use a CORE voltage of* 1.1375V. For MPU voltage we need to switch based on* the frequency we are running at.*/i2c_set_bus_num(1);printf("I2C speed: %d Hz\n", CONFIG_SYS_OMAP24_I2C_SPEED);if (i2c_probe(TPS65910_CTRL_I2C_ADDR)) {puts("i2c: cannot access TPS65910\n");return;}/** Depending on MPU clock and PG we will need a different* VDD to drive at that speed.*/sil_rev = readl(&cdev->deviceid) >> 28;mpu_vdd = am335x_get_tps65910_mpu_vdd(sil_rev,dpll_mpu_opp100.m);/* Tell the TPS65910 to use i2c */tps65910_set_i2c_control();/* First update MPU voltage. */if (tps65910_voltage_update(MPU, mpu_vdd))return;/* Second, update the CORE voltage. */if (tps65910_voltage_update(CORE, TPS65910_OP_REG_SEL_1_1_3))return;/* Set CORE Frequencies to OPP100 */do_setup_dpll(&dpll_core_regs, &dpll_core_opp100);/* Set MPU Frequency to what we detected now that voltages are set */do_setup_dpll(&dpll_mpu_regs, &dpll_mpu_opp100);writel(0x000010ff, PRM_DEVICE_INST + 4);-}
-const struct dpll_params *get_dpll_ddr_params(void) -{
enable_i2c1_pin_mux();i2c_set_bus_num(1);return &dpll_ddr_baltos;-}
-void set_uart_mux_conf(void) -{
enable_uart0_pin_mux();-}
-void set_mux_conf_regs(void) -{
enable_board_pin_mux();-}
-const struct ctrl_ioregs ioregs_baltos = {
.cm0ioctl = MT41K256M16HA125E_IOCTRL_VALUE,.cm1ioctl = MT41K256M16HA125E_IOCTRL_VALUE,.cm2ioctl = MT41K256M16HA125E_IOCTRL_VALUE,.dt0ioctl = MT41K256M16HA125E_IOCTRL_VALUE,.dt1ioctl = MT41K256M16HA125E_IOCTRL_VALUE,-};
-void sdram_init(void) -{
gpio_request(GPIO_DDR_VTT_EN, "ddr_vtt_en");gpio_direction_output(GPIO_DDR_VTT_EN, 1);config_ddr(400, &ioregs_baltos,&ddr3_baltos_data,&ddr3_baltos_cmd_ctrl_data,&ddr3_baltos_emif_reg_data, 0);-} -#endif
-/*
- Basic board specific setup. Pinmux has been handled already.
- */
-int board_init(void) -{ -#if defined(CONFIG_HW_WATCHDOG)
hw_watchdog_init();-#endif
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;-#if defined(CONFIG_NOR) || defined(CONFIG_NAND)
gpmc_init();-#endif
return 0;-}
-int ft_board_setup(void *blob, bd_t *bd) -{
int node, ret;unsigned char mac_addr[6];BSP_VS_HWPARAM header;/* get production data */if (read_eeprom(&header))return 0;/* setup MAC1 */mac_addr[0] = header.MAC1[0];mac_addr[1] = header.MAC1[1];mac_addr[2] = header.MAC1[2];mac_addr[3] = header.MAC1[3];mac_addr[4] = header.MAC1[4];mac_addr[5] = header.MAC1[5];node = fdt_path_offset(blob, "/ocp/ethernet/slave@4a100200");if (node < 0) {printf("no /soc/fman/ethernet path offset\n");return -ENODEV;}ret = fdt_setprop(blob, node, "mac-address", &mac_addr, 6);if (ret) {printf("error setting local-mac-address property\n");return -ENODEV;}/* setup MAC2 */mac_addr[0] = header.MAC2[0];mac_addr[1] = header.MAC2[1];mac_addr[2] = header.MAC2[2];mac_addr[3] = header.MAC2[3];mac_addr[4] = header.MAC2[4];mac_addr[5] = header.MAC2[5];node = fdt_path_offset(blob, "/ocp/ethernet/slave@4a100300");if (node < 0) {printf("no /soc/fman/ethernet path offset\n");return -ENODEV;}ret = fdt_setprop(blob, node, "mac-address", &mac_addr, 6);if (ret) {printf("error setting local-mac-address property\n");return -ENODEV;}printf("\nFDT was successfully setup\n");return 0;-}
-static struct module_pin_mux pcie_sw_pin_mux[] = {
{OFFSET(mii1_rxdv), (MODE(7) | PULLUDEN )}, /* GPIO3_4 */{-1},-};
-static struct module_pin_mux dip_pin_mux[] = {
{OFFSET(gpmc_ad12), (MODE(7) | RXACTIVE )}, /* GPIO1_12 */{OFFSET(gpmc_ad13), (MODE(7) | RXACTIVE )}, /* GPIO1_13 */{OFFSET(gpmc_ad14), (MODE(7) | RXACTIVE )}, /* GPIO1_14 */{OFFSET(gpmc_ad15), (MODE(7) | RXACTIVE )}, /* GPIO1_15 */{-1},-};
-#ifdef CONFIG_BOARD_LATE_INIT -int board_late_init(void) -{ -#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
BSP_VS_HWPARAM header;char model[4];/* get production data */if (read_eeprom(&header)) {strcpy(model, "211");} else {sprintf(model, "%d", header.SystemId);if (header.SystemId == 215) {configure_module_pin_mux(dip_pin_mux);baltos_set_console();}}/* turn power for the mPCIe slot */configure_module_pin_mux(pcie_sw_pin_mux);if (gpio_request(MPCIE_SW, "mpcie_sw")) {printf("failed to export GPIO %d\n", MPCIE_SW);return -ENODEV;}if (gpio_direction_output(MPCIE_SW, 1)) {printf("failed to set GPIO %d direction\n", MPCIE_SW);return -ENODEV;}env_set("board_name", model);-#endif
return 0;-} -#endif
-#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))-static void cpsw_control(int enabled) -{
/* VTP can be added here */return;-}
-static struct cpsw_slave_data cpsw_slaves[] = {
{.slave_reg_ofs = 0x208,.sliver_reg_ofs = 0xd80,.phy_addr = 0,},{.slave_reg_ofs = 0x308,.sliver_reg_ofs = 0xdc0,.phy_addr = 7,},-};
-static struct cpsw_platform_data cpsw_data = {
.mdio_base = CPSW_MDIO_BASE,.cpsw_base = CPSW_BASE,.mdio_div = 0xff,.channels = 8,.cpdma_reg_ofs = 0x800,.slaves = 2,.slave_data = cpsw_slaves,.active_slave = 1,.ale_reg_ofs = 0xd00,.ale_entries = 1024,.host_port_reg_ofs = 0x108,.hw_stats_reg_ofs = 0x900,.bd_ram_ofs = 0x2000,.mac_control = (1 << 5),.control = cpsw_control,.host_port_num = 0,.version = CPSW_CTRL_VERSION_2,-}; -#endif
-#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)) \
&& defined(CONFIG_SPL_BUILD)) || \((defined(CONFIG_DRIVER_TI_CPSW) || \defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)) && \!defined(CONFIG_SPL_BUILD))-int board_eth_init(bd_t *bis) -{
int rv, n = 0;uint8_t mac_addr[6];uint32_t mac_hi, mac_lo;/** Note here that we're using CPSW1 since that has a 1Gbit PHY while* CSPW0 has a 100Mbit PHY.** On product, CPSW1 maps to port labeled WAN.*//* try reading mac address from efuse */mac_lo = readl(&cdev->macid1l);mac_hi = readl(&cdev->macid1h);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 (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))if (!env_get("ethaddr")) {printf("<ethaddr> not set. Validating first E-fuse MAC\n");if (is_valid_ethaddr(mac_addr))eth_env_set_enetaddr("ethaddr", mac_addr);}-#ifdef CONFIG_DRIVER_TI_CPSW
writel((GMII1_SEL_RMII | GMII2_SEL_RGMII | RGMII2_IDMODE), &cdev->miisel);cpsw_slaves[1].phy_if = PHY_INTERFACE_MODE_RGMII;rv = cpsw_register(&cpsw_data);if (rv < 0)printf("Error %d registering CPSW switch\n", rv);elsen += rv;-#endif
/*** CPSW RGMII Internal Delay Mode is not supported in all PVT* operating points. So we must set the TX clock delay feature* in the AR8051 PHY. Since we only support a single ethernet* device in U-Boot, we only do this for the first instance.*/-#define AR8051_PHY_DEBUG_ADDR_REG 0x1d -#define AR8051_PHY_DEBUG_DATA_REG 0x1e -#define AR8051_DEBUG_RGMII_CLK_DLY_REG 0x5 -#define AR8051_RGMII_TX_CLK_DLY 0x100
const char *devname;devname = miiphy_get_current_dev();miiphy_write(devname, 0x7, AR8051_PHY_DEBUG_ADDR_REG,AR8051_DEBUG_RGMII_CLK_DLY_REG);miiphy_write(devname, 0x7, AR8051_PHY_DEBUG_DATA_REG,AR8051_RGMII_TX_CLK_DLY);-#endif
return n;-} -#endif diff --git a/board/vscom/baltos/board.h b/board/vscom/baltos/board.h deleted file mode 100644 index 630c9bba73b..00000000000 --- a/board/vscom/baltos/board.h +++ /dev/null @@ -1,34 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/*
- board.h
- TI AM335x boards information header
- Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
- */
-#ifndef _BOARD_H_ -#define _BOARD_H_
-typedef struct _BSP_VS_HWPARAM // v1.0 -{
uint32_t Magic;uint32_t HwRev;uint32_t SerialNumber;char PrdDate[11]; // as a string ie. "01.01.2006"uint16_t SystemId;uint8_t MAC1[6]; // internal EMACuint8_t MAC2[6]; // SMSC9514uint8_t MAC3[6]; // WL1271 WLAN-} __attribute__ ((packed)) BSP_VS_HWPARAM;
-/*
- We have three pin mux functions that must exist. We must be able to enable
- uart0, for initial output and i2c0 to read the main EEPROM. We then have a
- main pinmux function that can be overridden to enable all other pinmux that
- is required on the board.
- */
-void enable_uart0_pin_mux(void); -void enable_i2c1_pin_mux(void); -void enable_board_pin_mux(void); -#endif diff --git a/board/vscom/baltos/mux.c b/board/vscom/baltos/mux.c deleted file mode 100644 index 94410ae35e6..00000000000 --- a/board/vscom/baltos/mux.c +++ /dev/null @@ -1,125 +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 "board.h"
-static struct module_pin_mux uart0_pin_mux[] = {
{OFFSET(uart0_rxd), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* UART0_RXD */{OFFSET(uart0_txd), (MODE(0) | PULLUDEN)}, /* UART0_TXD */{-1},-};
-static struct module_pin_mux mmc0_pin_mux[] = {
{OFFSET(mmc0_dat3), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* MMC0_DAT3 */{OFFSET(mmc0_dat2), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* MMC0_DAT2 */{OFFSET(mmc0_dat1), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* MMC0_DAT1 */{OFFSET(mmc0_dat0), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* MMC0_DAT0 */{OFFSET(mmc0_clk), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* MMC0_CLK */{OFFSET(mmc0_cmd), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* MMC0_CMD *///{OFFSET(spi0_cs1), (MODE(5) | RXACTIVE | PULLUP_EN)}, /* MMC0_CD */{-1},-};
-static struct module_pin_mux i2c1_pin_mux[] = {
{OFFSET(spi0_d1), (MODE(2) | RXACTIVE |PULLUDEN | SLEWCTRL)}, /* I2C_DATA */{OFFSET(spi0_cs0), (MODE(2) | RXACTIVE |PULLUDEN | SLEWCTRL)}, /* I2C_SCLK */{-1},-};
-static struct module_pin_mux gpio0_7_pin_mux[] = {
{OFFSET(ecap0_in_pwm0_out), (MODE(7) | PULLUDEN)}, /* GPIO0_7 */{-1},-};
-static struct module_pin_mux rmii1_pin_mux[] = {
{OFFSET(mii1_crs), MODE(1) | RXACTIVE}, /* RGMII1_TCTL */{OFFSET(mii1_txen), MODE(1)}, /* RGMII1_TCTL */{OFFSET(mii1_txd1), MODE(1)}, /* RGMII1_TCTL */{OFFSET(mii1_txd0), MODE(1)}, /* RGMII1_TCTL */{OFFSET(mii1_rxd1), MODE(1) | RXACTIVE}, /* RGMII1_TCTL */{OFFSET(mii1_rxd0), MODE(1) | RXACTIVE}, /* RGMII1_TCTL */{OFFSET(rmii1_refclk), MODE(0) | RXACTIVE}, /* RGMII1_TCTL */{OFFSET(mdio_data), MODE(0) | RXACTIVE | PULLUP_EN},/* MDIO_DATA */{OFFSET(mdio_clk), MODE(0) | PULLUP_EN}, /* MDIO_CLK */{-1},-};
-static struct module_pin_mux rgmii2_pin_mux[] = {
{OFFSET(gpmc_a0), MODE(2)}, /* RGMII1_TCTL */{OFFSET(gpmc_a1), MODE(2) | RXACTIVE}, /* RGMII1_RCTL */{OFFSET(gpmc_a2), MODE(2)}, /* RGMII1_TD3 */{OFFSET(gpmc_a3), MODE(2)}, /* RGMII1_TD2 */{OFFSET(gpmc_a4), MODE(2)}, /* RGMII1_TD1 */{OFFSET(gpmc_a5), MODE(2)}, /* RGMII1_TD0 */{OFFSET(gpmc_a6), MODE(2)}, /* RGMII1_TCLK */{OFFSET(gpmc_a7), MODE(2) | RXACTIVE}, /* RGMII1_RCLK */{OFFSET(gpmc_a8), MODE(2) | RXACTIVE}, /* RGMII1_RD3 */{OFFSET(gpmc_a9), MODE(2) | RXACTIVE}, /* RGMII1_RD2 */{OFFSET(gpmc_a10), MODE(2) | RXACTIVE}, /* RGMII1_RD1 */{OFFSET(gpmc_a11), MODE(2) | RXACTIVE}, /* RGMII1_RD0 */{OFFSET(mdio_data), MODE(0) | RXACTIVE | PULLUP_EN},/* MDIO_DATA */{OFFSET(mdio_clk), MODE(0) | PULLUP_EN}, /* MDIO_CLK */{-1},-};
-static struct module_pin_mux nand_pin_mux[] = {
{OFFSET(gpmc_ad0), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD0 */{OFFSET(gpmc_ad1), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD1 */{OFFSET(gpmc_ad2), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD2 */{OFFSET(gpmc_ad3), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD3 */{OFFSET(gpmc_ad4), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD4 */{OFFSET(gpmc_ad5), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD5 */{OFFSET(gpmc_ad6), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD6 */{OFFSET(gpmc_ad7), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD7 */{OFFSET(gpmc_wait0), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* NAND WAIT */{OFFSET(gpmc_wpn), (MODE(7) | PULLUP_EN | RXACTIVE)}, /* NAND_WPN */{OFFSET(gpmc_csn0), (MODE(0) | PULLUDEN)}, /* NAND_CS0 */{OFFSET(gpmc_advn_ale), (MODE(0) | PULLUDEN)}, /* NAND_ADV_ALE */{OFFSET(gpmc_oen_ren), (MODE(0) | PULLUDEN)}, /* NAND_OE */{OFFSET(gpmc_wen), (MODE(0) | PULLUDEN)}, /* NAND_WEN */{OFFSET(gpmc_be0n_cle), (MODE(0) | PULLUDEN)}, /* NAND_BE_CLE */{-1},-};
-void enable_uart0_pin_mux(void) -{
configure_module_pin_mux(uart0_pin_mux);-}
-void enable_i2c1_pin_mux(void) -{
configure_module_pin_mux(i2c1_pin_mux);-}
-void enable_board_pin_mux() -{
configure_module_pin_mux(i2c1_pin_mux);configure_module_pin_mux(gpio0_7_pin_mux);configure_module_pin_mux(rgmii2_pin_mux);configure_module_pin_mux(rmii1_pin_mux);configure_module_pin_mux(mmc0_pin_mux);-#if defined(CONFIG_NAND)
configure_module_pin_mux(nand_pin_mux);-#endif -} diff --git a/board/vscom/baltos/u-boot.lds b/board/vscom/baltos/u-boot.lds deleted file mode 100644 index 315ba5b99a7..00000000000 --- a/board/vscom/baltos/u-boot.lds +++ /dev/null @@ -1,128 +0,0 @@ -/*
- Copyright (c) 2004-2008 Texas Instruments
- (C) Copyright 2002
- Gary Jennejohn, DENX Software Engineering, garyj@denx.de
- See file CREDITS for list of people who contributed to this
- project.
- 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; either version 2 of
- the License, or (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- MA 02111-1307 USA
- */
-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") -OUTPUT_ARCH(arm) -ENTRY(_start) -SECTIONS -{
. = 0x00000000;. = ALIGN(4);.text :{*(.__image_copy_start)*(.vectors)CPUDIR/start.o (.text*)board/vscom/baltos/built-in.o (.text*)*(.text*)}. = ALIGN(4);.rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }. = ALIGN(4);.data : {*(.data*)}. = ALIGN(4);. = .;. = ALIGN(4);.u_boot_list : {KEEP(*(SORT(.u_boot_list*)));}. = ALIGN(4);.image_copy_end :{*(.__image_copy_end)}.rel_dyn_start :{*(.__rel_dyn_start)}.rel.dyn : {*(.rel*)}.rel_dyn_end :{*(.__rel_dyn_end)}.hash : { *(.hash*) }.end :{*(.__end)}_image_binary_end = .;/** Deprecated: this MMU section is used by pxa at present but* should not be used by new boards/CPUs.*/. = ALIGN(4096);.mmutable : {*(.mmutable)}-/*
- Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c
- __bss_base and __bss_limit are for linker only (overlay ordering)
- */
.bss_start __rel_dyn_start (OVERLAY) : {KEEP(*(.__bss_start));__bss_base = .;}.bss __bss_base (OVERLAY) : {*(.bss*). = ALIGN(4);__bss_limit = .;}.bss_end __bss_limit (OVERLAY) : {KEEP(*(.__bss_end));}.dynsym _image_binary_end : { *(.dynsym) }.dynbss : { *(.dynbss) }.dynstr : { *(.dynstr*) }.dynamic : { *(.dynamic*) }.gnu.hash : { *(.gnu.hash) }.plt : { *(.plt*) }.interp : { *(.interp*) }.gnu : { *(.gnu*) }.ARM.exidx : { *(.ARM.exidx*) }-} diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig deleted file mode 100644 index a61b13b6fc9..00000000000 --- a/configs/am335x_baltos_defconfig +++ /dev/null @@ -1,65 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_OMAP2PLUS=y -CONFIG_SPL_GPIO_SUPPORT=y -CONFIG_SPL_LIBCOMMON_SUPPORT=y -CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_AM33XX=y -CONFIG_TARGET_AM335X_BALTOS=y -CONFIG_SPL_MMC_SUPPORT=y -CONFIG_SPL_SERIAL_SUPPORT=y -CONFIG_SPL=y -CONFIG_SPL_FAT_SUPPORT=y -CONFIG_SPL_LIBDISK_SUPPORT=y -CONFIG_DISTRO_DEFAULTS=y -CONFIG_FIT_VERBOSE=y -CONFIG_OF_BOARD_SETUP=y -# CONFIG_USE_BOOTCOMMAND is not set -CONFIG_SYS_CONSOLE_INFO_QUIET=y -CONFIG_VERSION_VARIABLE=y -CONFIG_ARCH_MISC_INIT=y -CONFIG_SPL_EXT_SUPPORT=y -CONFIG_SPL_I2C_SUPPORT=y -CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y -CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SPL_YMODEM_SUPPORT=y -CONFIG_CMD_ASKENV=y -CONFIG_CMD_EEPROM=y -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_GPIO=y -CONFIG_CMD_GPT=y -CONFIG_CMD_I2C=y -CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y -CONFIG_CMD_SPI=y -CONFIG_CMD_USB=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_MTDPARTS=y -CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(SPL),128k(SPL.backup1),128k(SPL.backup2),128k(SPL.backup3),1920k(u-boot),-(UBI)" -CONFIG_CMD_UBI=y -CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y -CONFIG_BOOTCOUNT_LIMIT=y -CONFIG_SYS_OMAP24_I2C_SPEED=1000 -CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y -CONFIG_PHY_ADDR_ENABLE=y -CONFIG_DRIVER_TI_CPSW=y -CONFIG_MII=y -CONFIG_SPI=y -CONFIG_OMAP3_SPI=y -CONFIG_USB=y -CONFIG_USB_MUSB_HOST=y -CONFIG_USB_MUSB_GADGET=y -CONFIG_USB_MUSB_DSPS=y -CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" -CONFIG_USB_GADGET_VENDOR_NUM=0x0403 -CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00 -CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_USB_ETHER=y -CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" -CONFIG_FAT_WRITE=y -CONFIG_OF_LIBFDT=y diff --git a/include/configs/baltos.h b/include/configs/baltos.h deleted file mode 100644 index 006b049d09d..00000000000 --- a/include/configs/baltos.h +++ /dev/null @@ -1,276 +0,0 @@ -/*
- am335x_evm.h
- 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.
- */
-#ifndef __CONFIG_BALTOS_H -#define __CONFIG_BALTOS_H
-#include <linux/sizes.h> -#include <configs/ti_am335x_common.h>
-#define CONFIG_MACH_TYPE MACH_TYPE_AM335XEVM
-/* Clock Defines */ -#define V_OSCK 24000000 /* Clock output from T2 */ -#define V_SCLK (V_OSCK)
-/* Custom script for NOR */ -#define CONFIG_SYS_LDSCRIPT "board/vscom/baltos/u-boot.lds"
-/* Always 128 KiB env size */ -#define CONFIG_ENV_SIZE (128 << 10)
-/* FIT support */ -#define CONFIG_SYS_BOOTM_LEN SZ_64M
-/* UBI Support */
-/* I2C configuration */
-#ifdef CONFIG_NAND -#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00080000 -#ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ -#endif -#define NANDARGS \
"mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \"nandargs=setenv bootargs console=${console} " \"${optargs} " \"${mtdparts} " \"root=${nandroot} " \"rootfstype=${nandrootfstype}\0" \"nandroot=ubi0:rootfs rw ubi.mtd=5\0" \"nandrootfstype=ubifs rootwait=1\0" \"nandboot=echo Booting from nand ...; " \"run nandargs; " \"setenv loadaddr 0x84000000; " \"ubi part UBI; " \"ubifsmount ubi0:kernel; " \"ubifsload $loadaddr kernel-fit.itb;" \"ubifsumount; " \"bootm ${loadaddr}#conf${board_name}; " \"if test $? -ne 0; then echo Using default FIT config; " \"bootm ${loadaddr}; fi;\0"-#else -#define NANDARGS "" -#endif
-#ifndef CONFIG_SPL_BUILD -#define CONFIG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \"boot_fdt=try\0" \"bootpart=0:2\0" \"bootdir=/boot\0" \"bootfile=zImage\0" \"fdtfile=undefined\0" \"console=ttyO0,115200n8\0" \"partitions=" \"uuid_disk=${uuid_gpt_disk};" \"name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \"optargs=\0" \"mmcdev=0\0" \"mmcroot=/dev/mmcblk0p2 ro\0" \"usbroot=/dev/sda2 ro\0" \"mmcrootfstype=ext4 rootwait\0" \"usbrootfstype=ext4 rootwait\0" \"rootpath=/export/rootfs\0" \"nfsopts=nolock\0" \"static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \"::off\0" \"ramroot=/dev/ram0 rw\0" \"ramrootfstype=ext2\0" \"mmcargs=setenv bootargs console=${console} " \"${optargs} " \"${mtdparts} " \"root=${mmcroot} " \"rootfstype=${mmcrootfstype}\0" \"usbargs=setenv bootargs console=${console} " \"${optargs} " \"${mtdparts} " \"root=${usbroot} " \"rootfstype=${usbrootfstype}\0" \"spiroot=/dev/mtdblock4 rw\0" \"spirootfstype=jffs2\0" \"spisrcaddr=0xe0000\0" \"spiimgsize=0x362000\0" \"spibusno=0\0" \"spiargs=setenv bootargs console=${console} " \"${optargs} " \"root=${spiroot} " \"rootfstype=${spirootfstype}\0" \"netargs=setenv bootargs console=${console} " \"${optargs} " \"root=/dev/nfs " \"nfsroot=${serverip}:${rootpath},${nfsopts} rw " \"ip=dhcp\0" \"bootenv=uEnv.txt\0" \"loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \"usbloadbootenv=load usb 0:1 ${loadaddr} ${bootenv}\0" \"importbootenv=echo Importing environment from mmc ...; " \"env import -t $loadaddr $filesize\0" \"usbimportbootenv=echo Importing environment from USB ...; " \"env import -t $loadaddr $filesize\0" \"ramargs=setenv bootargs console=${console} " \"${optargs} " \"root=${ramroot} " \"rootfstype=${ramrootfstype}\0" \"loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \"usbloadimage=load usb 0:1 ${loadaddr} kernel-fit.itb\0" \"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \"usbloados=run usbargs; " \"bootm ${loadaddr}#conf${board_name}; " \"if test $? -ne 0; then " \"echo Using default FIT configuration; " \"bootm ${loadaddr}; " \"fi;\0" \"mmcloados=run mmcargs; " \"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \"if run loadfdt; then " \"bootz ${loadaddr} - ${fdtaddr}; " \"else " \"if test ${boot_fdt} = try; then " \"bootz; " \"else " \"echo WARN: Cannot load the DT; " \"fi; " \"fi; " \"else " \"bootz; " \"fi;\0" \"usbboot=usb reset; " \"if usb storage; then " \"echo USB drive found;" \"if run usbloadbootenv; then " \"echo Loaded environment from ${bootenv};" \"run usbimportbootenv;" \"fi;" \"if test -n $uenvcmd; then " \"echo Running uenvcmd ...;" \"run uenvcmd;" \"fi;" \"if run usbloadimage; then " \"run usbloados;" \"fi;" \"fi;\0" \"mmcboot=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 loadimage; then " \"run mmcloados;" \"fi;" \"fi;\0" \"spiboot=echo Booting from spi ...; " \"run spiargs; " \"sf probe ${spibusno}:0; " \"sf read ${loadaddr} ${spisrcaddr} ${spiimgsize}; " \"bootz ${loadaddr}\0" \"netboot=echo Booting from network ...; " \"setenv autoload no; " \"dhcp; " \"tftp ${loadaddr} ${bootfile}; " \"tftp ${fdtaddr} ${fdtfile}; " \"run netargs; " \"bootz ${loadaddr} - ${fdtaddr}\0" \"ramboot=echo Booting from ramdisk ...; " \"run ramargs; " \"bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \"findfdt=setenv fdtfile am335x-baltos.dtb\0" \NANDARGS/*DFUARGS*/-#endif
-#define CONFIG_BOOTCOMMAND \
"run findfdt; " \"run usbboot;" \"run mmcboot;" \"setenv mmcdev 1; " \"setenv bootpart 1:2; " \"run mmcboot;" \"run nandboot;"-/* NS16550 Configuration */ -#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ -#define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */ -#define CONFIG_SYS_NS16550_COM3 0x48024000 /* UART2 */ -#define CONFIG_SYS_NS16550_COM4 0x481a6000 /* UART3 */ -#define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ -#define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
-#define CONFIG_ENV_EEPROM_IS_ON_I2C -#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ -#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
-/* PMIC support */ -#define CONFIG_POWER_TPS65910
-/* SPL */ -#ifndef CONFIG_NOR_BOOT
-#ifdef CONFIG_NAND -#define CONFIG_SYS_NAND_5_ADDR_CYCLE -#define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \
CONFIG_SYS_NAND_PAGE_SIZE)-#define CONFIG_SYS_NAND_PAGE_SIZE 2048 -#define CONFIG_SYS_NAND_OOBSIZE 64 -#define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) -#define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS -#define CONFIG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, \
10, 11, 12, 13, 14, 15, 16, 17, \18, 19, 20, 21, 22, 23, 24, 25, \26, 27, 28, 29, 30, 31, 32, 33, \34, 35, 36, 37, 38, 39, 40, 41, \42, 43, 44, 45, 46, 47, 48, 49, \50, 51, 52, 53, 54, 55, 56, 57, }-#define CONFIG_SYS_NAND_ECCSIZE 512 -#define CONFIG_SYS_NAND_ECCBYTES 14 -#define CONFIG_SYS_NAND_ONFI_DETECTION -#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW -#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE -#endif -#endif
-/*
- USB configuration. We enable MUSB support, both for host and for
- gadget. We set USB0 as peripheral and USB1 as host, based on the
- board schematic and physical port wired to each. Then for host we
- add mass storage support and for gadget we add both RNDIS ethernet
- and DFU.
- */
-#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT -#define CONFIG_AM335X_USB0 -#define CONFIG_AM335X_USB0_MODE MUSB_HOST -#define CONFIG_AM335X_USB1 -#define CONFIG_AM335X_USB1_MODE MUSB_OTG
-/* Network. */ -#define CONFIG_PHY_SMSC -#define CONFIG_PHY_ATHEROS
-/* NAND support */ -#ifdef CONFIG_NAND -#define GPMC_NAND_ECC_LP_x8_LAYOUT 1 -#endif
-#endif /* ! __CONFIG_BALTOS_H */
2.19.1.1215.g8438c0b245-goog