October 2015 - U-Boot

[U-Boot] [PATCH] net/arp: account for ARP delay, avoid duplicate packets on timeout
by Stefan Brüns 29 Oct '15

29 Oct '15

eth_rx() in the main reception loop may trigger sending a packet which is already timed out (or will immediately) upon reception of an ARP reply. As long as the ARP reply is pending, the timeout handler of a packet should be postponed. Happens on TFTP with bad network (e.g. WLAN). Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- net/arp.c | 5 +++-- net/arp.h | 2 +- net/net.c | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/net/arp.c b/net/arp.c index b1f12bf..824d2e9 100644 --- a/net/arp.c +++ b/net/arp.c @@ -96,12 +96,12 @@ void arp_request(void) arp_raw_request(net_ip, net_null_ethaddr, net_arp_wait_reply_ip); } -void arp_timeout_check(void) +int arp_timeout_check(void) { ulong t; if (!net_arp_wait_packet_ip.s_addr) - return; + return 0; t = get_timer(0); @@ -118,6 +118,7 @@ void arp_timeout_check(void) arp_request(); } } + return 1; } void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) diff --git a/net/arp.h b/net/arp.h index 43c6296..a288d61 100644 --- a/net/arp.h +++ b/net/arp.h @@ -25,7 +25,7 @@ void arp_init(void); void arp_request(void); void arp_raw_request(struct in_addr source_ip, const uchar *targetEther, struct in_addr target_ip); -void arp_timeout_check(void); +int arp_timeout_check(void); void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len); #endif /* __ARP_H__ */ diff --git a/net/net.c b/net/net.c index 2a6efd8..6c56e52 100644 --- a/net/net.c +++ b/net/net.c @@ -569,7 +569,9 @@ restart: goto done; } - arp_timeout_check(); + if (arp_timeout_check() > 0) { + time_start = get_timer(0); + } /* * Check for a timeout, and run the timeout handler -- 2.1.4

2 2

[U-Boot] [PATCH] net/arp: Do not run net_start_again() on timeout
by Stefan Brüns 29 Oct '15

29 Oct '15

net_start_again() will be called from net_loop() if state is NETLOOP_FAIL. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- net/arp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/arp.c b/net/arp.c index b865570..b1f12bf 100644 --- a/net/arp.c +++ b/net/arp.c @@ -112,7 +112,7 @@ void arp_timeout_check(void) if (arp_wait_try >= ARP_TIMEOUT_COUNT) { puts("\nARP Retry count exceeded; starting again\n"); arp_wait_try = 0; - net_start_again(); + net_set_state(NETLOOP_FAIL); } else { arp_wait_timer_start = t; arp_request(); -- 2.1.4

2 2

[U-Boot] [PATCH] net: Fix parsing of Bootp/DHCP option 0 (Pad)
by Stefan Brüns 29 Oct '15

29 Oct '15

Pad has no len byte, so the normal parsing code fails. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- net/bootp.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/net/bootp.c b/net/bootp.c index 9700e95..7fd29ee 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -774,6 +774,9 @@ static void dhcp_process_options(uchar *popt, struct bootp_hdr *bp) while (popt < end && *popt != 0xff) { oplen = *(popt + 1); switch (*popt) { + case 0: + oplen = -1; /* Pad omits len byte */ + break; case 1: net_copy_ip(&net_netmask, (popt + 2)); break; @@ -877,7 +880,13 @@ static int dhcp_message_type(unsigned char *popt) while (*popt != 0xff) { if (*popt == 53) /* DHCP Message Type */ return *(popt + 2); - popt += *(popt + 1) + 2; /* Scan through all options */ + if (*popt == 0) { + /* Pad */ + popt += 1; + } else { + /* Scan through all options */ + popt += *(popt + 1) + 2; + } } return -1; } -- 2.1.4

2 2

[U-Boot] [PATCH 2/2] net: send RFC1542 compliant value for bootp requests
by Stefan Brüns 29 Oct '15

29 Oct '15

RFC1542, 3.2: "The 'secs' field of a BOOTREQUEST message SHOULD represent the elapsed time, in seconds, since the client sent its first BOOTREQUEST message. Note that this implies that the 'secs' field of the first BOOTREQUEST message SHOULD be set to zero." Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- net/bootp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net/bootp.c b/net/bootp.c index e6eba12..9700e95 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -709,7 +709,11 @@ void bootp_request(void) bp->bp_htype = HWT_ETHER; bp->bp_hlen = HWL_ETHER; bp->bp_hops = 0; - bp->bp_secs = htons(get_timer(0) / 1000); + /* + * according to RFC1542, should be 0 on first request, secs since + * first request otherwise + */ + bp->bp_secs = htons(get_timer(bootp_start) / 1000); zero_ip.s_addr = 0; net_write_ip(&bp->bp_ciaddr, zero_ip); net_write_ip(&bp->bp_yiaddr, zero_ip); @@ -903,7 +907,7 @@ static void dhcp_send_request_packet(struct bootp_hdr *bp_offer) bp->bp_htype = HWT_ETHER; bp->bp_hlen = HWL_ETHER; bp->bp_hops = 0; - bp->bp_secs = htons(get_timer(0) / 1000); + bp->bp_secs = htons(get_timer(bootp_start) / 1000); /* Do not set the client IP, your IP, or server IP yet, since it * hasn't been ACK'ed by the server yet */ -- 2.1.4

2 2

[U-Boot] [PATCH 1/2] net: reject Bootp/DHCP packets with bad OP value
by Stefan Brüns 29 Oct '15

29 Oct '15

Rename check_packet to check_reply_packet to make its function more obvious. The check for DHCP_* values is completely off, as it should compare against DHCP option 53 (Message Type). Only valid value for any Bootp/DHCP reply is BOOTREPLY. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- net/bootp.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/net/bootp.c b/net/bootp.c index 43466af..e6eba12 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -109,7 +109,8 @@ static bool bootp_match_id(ulong id) return false; } -static int check_packet(uchar *pkt, unsigned dest, unsigned src, unsigned len) +static int check_reply_packet(uchar *pkt, unsigned dest, unsigned src, + unsigned len) { struct bootp_hdr *bp = (struct bootp_hdr *)pkt; int retval = 0; @@ -118,11 +119,7 @@ static int check_packet(uchar *pkt, unsigned dest, unsigned src, unsigned len) retval = -1; else if (len < sizeof(struct bootp_hdr) - OPT_FIELD_SIZE) retval = -2; - else if (bp->bp_op != OP_BOOTREQUEST && - bp->bp_op != OP_BOOTREPLY && - bp->bp_op != DHCP_OFFER && - bp->bp_op != DHCP_ACK && - bp->bp_op != DHCP_NAK) + else if (bp->bp_op != OP_BOOTREPLY) retval = -3; else if (bp->bp_htype != HWT_ETHER) retval = -4; @@ -343,7 +340,7 @@ static void bootp_handler(uchar *pkt, unsigned dest, struct in_addr sip, bp = (struct bootp_hdr *)pkt; /* Filter out pkts we don't want */ - if (check_packet(pkt, dest, src, len)) + if (check_reply_packet(pkt, dest, src, len)) return; /* @@ -958,7 +955,7 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip, src, dest, len, dhcp_state); /* Filter out pkts we don't want */ - if (check_packet(pkt, dest, src, len)) + if (check_reply_packet(pkt, dest, src, len)) return; debug("DHCPHandler: got DHCP packet: (src=%d, dst=%d, len=%d) state: " -- 2.1.4

2 2

[U-Boot] [PATCH] smsc95xx: Fetch whole burst with 1 URB, avoid framing errors
by Stefan Brüns 29 Oct '15

29 Oct '15

smsc95xx_recv() does not reassemble bursts spread over multiple URBs. If there is a lot of broadcast traffic, the fifo will fill up to the burst cap limit. Lowering the burst cap to the URB size ensures no packet spans multiple urbs. Caveat, lower limit for working burst cap is 5/33 HS/FS packets. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- drivers/usb/eth/smsc95xx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c index 63ba8bc..d449b72 100644 --- a/drivers/usb/eth/smsc95xx.c +++ b/drivers/usb/eth/smsc95xx.c @@ -120,8 +120,9 @@ /* Some extra defines */ #define HS_USB_PKT_SIZE 512 #define FS_USB_PKT_SIZE 64 -#define DEFAULT_HS_BURST_CAP_SIZE (16 * 1024 + 5 * HS_USB_PKT_SIZE) -#define DEFAULT_FS_BURST_CAP_SIZE (6 * 1024 + 33 * FS_USB_PKT_SIZE) +/* 5/33 is lower limit for BURST_CAP to work */ +#define DEFAULT_HS_BURST_CAP_SIZE (5 * HS_USB_PKT_SIZE) +#define DEFAULT_FS_BURST_CAP_SIZE (33 * FS_USB_PKT_SIZE) #define DEFAULT_BULK_IN_DELAY 0x00002000 #define MAX_SINGLE_PACKET_SIZE 2048 #define EEPROM_MAC_OFFSET 0x01 @@ -135,7 +136,7 @@ #define USB_BULK_SEND_TIMEOUT 5000 #define USB_BULK_RECV_TIMEOUT 5000 -#define RX_URB_SIZE 2048 +#define RX_URB_SIZE DEFAULT_HS_BURST_CAP_SIZE #define PHY_CONNECT_TIMEOUT 5000 #define TURBO_MODE -- 2.1.4

2 2

[U-Boot] [PATCH] net: protect status led access in bootp
by Thomas Chou 29 Oct '15

29 Oct '15

This fixes the error when STATUS_LED_BOOT is not defined. Signed-off-by: Thomas Chou <thomas(a)wytron.com.tw> --- net/bootp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/bootp.c b/net/bootp.c index 43466af..ab17869 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -349,7 +349,7 @@ static void bootp_handler(uchar *pkt, unsigned dest, struct in_addr sip, /* * Got a good BOOTP reply. Copy the data into our variables. */ -#ifdef CONFIG_STATUS_LED +#if defined(CONFIG_STATUS_LED) && defined(STATUS_LED_BOOT) status_led_set(STATUS_LED_BOOT, STATUS_LED_OFF); #endif -- 2.1.4

2 2

[U-Boot] [PATCH v1] ARM: omap-common: Add support for EEPROM
by Steve Kipisz 29 Oct '15

29 Oct '15

From: Lokesh Vutla <lokeshvutla(a)ti.com> Add support for EEPROM init and read. The am57xx boards have EEPROMs that have board name, version, serial data and other data. The init routine will initialize an i2c bus and then probe for the EEPROM device. The read routine will read data from the EEPROM and store it in an omap_eeprom structure. The data read will be used later in board detection of TI EVMs. This code is in omap-common since it can be reused by other TI EVMs that have EEPROMs that use the same format. The onboard EEPROM on the Beaglebone Black, Bealgebone, AM335x EVM, AM34x GP EVM, DRA-74 EVM also follows the same format. So its better to define a common function, insted of redefining everywhere. Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> Signed-off-by: Steve Kipisz <s-kipisz2(a)ti.com> --- arch/arm/cpu/armv7/omap-common/Makefile | 1 + arch/arm/cpu/armv7/omap-common/omap_eeprom.c | 54 +++++++++++++++++++++++++++ arch/arm/include/asm/omap_common.h | 55 ++++++++++++++++++++++++++++ include/configs/am57xx_evm.h | 10 +++++ 4 files changed, 120 insertions(+) create mode 100644 arch/arm/cpu/armv7/omap-common/omap_eeprom.c diff --git a/arch/arm/cpu/armv7/omap-common/Makefile b/arch/arm/cpu/armv7/omap-common/Makefile index 464a5d1..99ea897 100644 --- a/arch/arm/cpu/armv7/omap-common/Makefile +++ b/arch/arm/cpu/armv7/omap-common/Makefile @@ -30,3 +30,4 @@ obj-y += boot-common.o obj-y += lowlevel_init.o obj-y += mem-common.o +obj-$(CONFIG_ENV_EEPROM_IS_ON_I2C) += omap_eeprom.o diff --git a/arch/arm/cpu/armv7/omap-common/omap_eeprom.c b/arch/arm/cpu/armv7/omap-common/omap_eeprom.c new file mode 100644 index 0000000..98de51e --- /dev/null +++ b/arch/arm/cpu/armv7/omap-common/omap_eeprom.c @@ -0,0 +1,54 @@ +/* + * omap_eeprom.c + * + * Copyright (C) 2015 Texas Instruments Incorporated - + * http://www.ti.com/ + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <i2c.h> +#include <asm/omap_common.h> + +int omap_eeprom_init(int i2c_bus, int dev_addr) +{ + int rc = 0; + + rc = i2c_set_bus_num(i2c_bus); + if (rc) { + printf("I2C bus %d Initialization failed err=%d\n", + i2c_bus, rc); + return -1; + } + + rc = i2c_probe(dev_addr); + if (rc) { + printf("I2c probe at address %d on bus %d failed err=%d\n", + dev_addr, i2c_bus, rc); + return -1; + } + + return 0; +} + +int omap_eeprom_read(int dev_addr, int offset, struct omap_eeprom *ep) +{ + int ret = 0; + + ret = i2c_read(dev_addr, offset, 2, (uchar *)ep, + sizeof(struct omap_eeprom)); + + if (!ret) { + /* + * Return error if proper header + * is not found. + */ + if (ep->header != OMAP_EEPROM_HEADER) + ret = -1; + } else { + printf("i2c read error err=%d\n", ret); + } + + return ret; +} diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h index d7b81c1..9a9b154 100644 --- a/arch/arm/include/asm/omap_common.h +++ b/arch/arm/include/asm/omap_common.h @@ -552,6 +552,61 @@ struct vcores_data { struct volts iva; }; +/* + * TI AM57xx EVMs define a system EEPROM that defines certain sub-fields. + * We use these fields to in turn see what board we are on, and what + * that might require us to set or not set. + */ + +#define HDR_NO_OF_MAC_ADDR 3 +#define HDR_ETH_ALEN 6 +#define HDR_NAME_LEN 8 +#define OMAP_EEPROM_HEADER 0xEE3355AA + +/** + * struct omap_eeprom - This structure holds data read in from the + * EEPROM. + * @header: This holds the magic number + * @name: The name of the board + * @version: Board revision + * @serail: Board serial number + * @config: Reserved + * @mac_addr: Any MAC addresses written in the EEPROM + * + * The data is this struction is read from the EEPROM on the board. + * It is used for board detection which is based on name. It is used + * to configure specific TI boards. This allows booting of multible + * TI boards with a single MLO and u-boot. + */ +struct omap_eeprom { + unsigned int header; + char name[HDR_NAME_LEN]; + char version[4]; + char serial[12]; + char config[32]; + char mac_addr[HDR_NO_OF_MAC_ADDR][HDR_ETH_ALEN]; +}; + +/** + * omap_eeprom_init - Initialize an i2c bus and probe for a device + * @i2c_bus: i2c bus number to initialize + * @dev_addr: Device address to probe for + * + * Return: 0 on success or -1 on failure. + */ +int omap_eeprom_init(int i2c_bus, int dev_addr); + +/** + * omap_eeprom_read - Read data from an EEPROM + * @dev_addr: The device address of the EEPROM + * @offset: Offset to start reading in the EEPROM + * @ep: Pointer to the omap_eeprom structure to read into + * + * Return: 0 on success, -1 if the header is invalid, or the non-zero + * return code of a failed i2c_read + */ +int omap_eeprom_read(int dev_addr, int offset, struct omap_eeprom *ep); + extern struct prcm_regs const **prcm; extern struct prcm_regs const omap5_es1_prcm; extern struct prcm_regs const omap5_es2_prcm; diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 6308cab..1b70923 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -87,5 +87,15 @@ #define CONFIG_SYS_SCSI_MAX_LUN 1 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) +/* EEPROM Support */ +#undef CONFIG_SPI +#define CONFIG_CMD_EEPROM +#define CONFIG_ENV_EEPROM_IS_ON_I2C +#define CONFIG_SYS_I2C_MULTI_EEPROMS +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 +#define CONFIG_EEPROM_CHIP_ADDR 0x50 + +#define CONFIG_SYS_OMAP_I2C0 0 +#define CONFIG_SYS_OMAP24_I2C_SPEED4 400000 #endif /* __CONFIG_AM57XX_EVM_H */ -- 1.9.1

2 1

[U-Boot] [PATCH v1] board: ti: am57xx Add board detection logic
by Steve Kipisz 29 Oct '15

29 Oct '15

Add board detection logic for the Beagleboard-x15. This patch takes advantage of recent infrastructure to allow common means of board detection. - Read the EEPROM only once in MLO and store the board name and revision in scratchpad memory so it is also available in u-boot. - Use the board name to detect the Beagleboard-x15 board and set it up accordingly. Signed-off-by: Steve Kipisz <s-kipisz2(a)ti.com> --- arch/arm/include/asm/omap_common.h | 10 +++++++++- board/ti/am57xx/board.c | 29 ++++++++++++++++++++++++++--- board/ti/am57xx/board.h | 29 +++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 board/ti/am57xx/board.h diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h index 9a9b154..7e6ac0b 100644 --- a/arch/arm/include/asm/omap_common.h +++ b/arch/arm/include/asm/omap_common.h @@ -765,7 +765,15 @@ static inline u8 is_dra72x(void) #define OMAP_SRAM_SCRATCH_VCORES_PTR (SRAM_SCRATCH_SPACE_ADDR + 0x1C) #define OMAP_SRAM_SCRATCH_SYS_CTRL (SRAM_SCRATCH_SPACE_ADDR + 0x20) #define OMAP_SRAM_SCRATCH_BOOT_PARAMS (SRAM_SCRATCH_SPACE_ADDR + 0x24) -#define OMAP5_SRAM_SCRATCH_SPACE_END (SRAM_SCRATCH_SPACE_ADDR + 0x28) +#ifdef CONFIG_AM57XX +#define AM57XX_BOARD_NAME_START (SRAM_SCRATCH_SPACE_ADDR + 0x28) +#define AM57XX_BOARD_NAME_END (SRAM_SCRATCH_SPACE_ADDR + 0x34) +#define AM57XX_BOARD_VERSION_START (SRAM_SCRATCH_SPACE_ADDR + 0x35) +#define AM57XX_BOARD_VERSION_END (SRAM_SCRATCH_SPACE_ADDR + 0x49) +#define OMAP5_SRAM_SCRATCH_SPACE_END (SRAM_SCRATCH_SPACE_ADDR + 0x4D) +#else +#define OMAP5_SRAM_SCRATCH_SPACE_END (SRAM_SCRATCH_SPACE_ADDR + 0x28) +#endif /* Boot parameters */ #define DEVICE_DATA_OFFSET 0x18 diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 042f9ab..869bbe7 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -31,6 +31,7 @@ #include <ti-usb-phy-uboot.h> #include "mux_data.h" +#include "board.h" #ifdef CONFIG_DRIVER_TI_CPSW #include <cpsw.h> @@ -270,6 +271,13 @@ int board_late_init(void) * This is the POWERHOLD-in-Low behavior. */ palmas_i2c_write_u8(TPS65903X_CHIP_P1, 0xA0, 0x1); + + /* + * Set board_name based on the name in the EEPROM. + */ + if (board_is_x15()) + setenv("board_name", "beagle_x15"); + return 0; } @@ -282,9 +290,24 @@ void set_muxconf_regs_essential(void) #ifdef CONFIG_IODELAY_RECALIBRATION void recalibrate_iodelay(void) { - __recalibrate_iodelay(core_padconf_array_essential, - ARRAY_SIZE(core_padconf_array_essential), - iodelay_cfg_array, ARRAY_SIZE(iodelay_cfg_array)); + struct omap_eeprom ep; + + /* + * omap_eeprom_init and omap_eeprom_read print a message + * to the console if they failed. + */ + if (!omap_eeprom_init(CONFIG_SYS_OMAP_I2C0, CONFIG_EEPROM_CHIP_ADDR)) { + if (!omap_eeprom_read(CONFIG_EEPROM_CHIP_ADDR, 0, &ep)) { + strncpy(am57xx_board_name, (char *)ep.name, + sizeof(ep.name)); + am57xx_board_name[sizeof(ep.name)] = 0; + } + } + + if (board_is_x15()) + __recalibrate_iodelay(core_padconf_array_essential, + ARRAY_SIZE(core_padconf_array_essential), + iodelay_cfg_array, ARRAY_SIZE(iodelay_cfg_array)); } #endif diff --git a/board/ti/am57xx/board.h b/board/ti/am57xx/board.h new file mode 100644 index 0000000..55719ce --- /dev/null +++ b/board/ti/am57xx/board.h @@ -0,0 +1,29 @@ +/* + * board.h + * + * TI AM57xx boards information header + * + * Copyright (C) 2015, Texas Instruments, Incorporated - http://www.ti.com/ + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _BOARD_H_ +#define _BOARD_H_ + +#include <asm/arch/omap.h> + +static char *const am57xx_board_name = (char *)AM57XX_BOARD_NAME_START; +static char *const am57xx_board_rev = (char *)AM57XX_BOARD_VERSION_START; + +/* + * TI AM57xx parts define a system EEPROM that defines certain sub-fields. + * We use these fields to in turn see what board we are on, and what + * that might require us to set or not set. + */ + +static inline int board_is_x15(void) +{ + return !strncmp(am57xx_board_name, "BBRDX15_", HDR_NAME_LEN); +} +#endif -- 1.9.1

2 1

[U-Boot] [PATCH v1] board: ti: am57xx: Add board detection logic for am57xx evm
by Steve Kipisz 29 Oct '15

29 Oct '15

Add board detection logic for the AM57xx EVM. More information about the EVM can be found here http://www.ti.com/tool/tmdxevm5728 The AM572x Evaluation Module provides an affordable platform to quickly start evaluation of Sitara. ARM Cortex-A15 AM57x Processors (AM5728, AM5726, AM5718, AM5716) and accelerate development for HMI, machine vision, networking, medical imaging and many other industrial applications. It is a development platform based on the dual ARM Cortex-A15, dual C66x DSP processor that is integrated with tons of connectivity such as PCIe, SATA, HDMI, USB 3.0/2.0, Dual Gigabit Ethernet, and more. The AM572x Evaluation Module also integrates video and 3D/2D graphics acceleration, as well as a quad-core Programmable Real-time Unit (PRU) and dual ARM Cortex-M4 cores. Signed-off-by: Steve Kipisz <s-kipisz2(a)ti.com> --- board/ti/am57xx/board.c | 4 +++- board/ti/am57xx/board.h | 5 +++++ include/configs/ti_omap5_common.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 869bbe7..d075a49 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -277,6 +277,8 @@ int board_late_init(void) */ if (board_is_x15()) setenv("board_name", "beagle_x15"); + if (board_is_evm()) + setenv("board_name", "am57xx_evm"); return 0; } @@ -304,7 +306,7 @@ void recalibrate_iodelay(void) } } - if (board_is_x15()) + if ((board_is_x15() || board_is_evm())) __recalibrate_iodelay(core_padconf_array_essential, ARRAY_SIZE(core_padconf_array_essential), iodelay_cfg_array, ARRAY_SIZE(iodelay_cfg_array)); diff --git a/board/ti/am57xx/board.h b/board/ti/am57xx/board.h index 55719ce..a380a58 100644 --- a/board/ti/am57xx/board.h +++ b/board/ti/am57xx/board.h @@ -26,4 +26,9 @@ static inline int board_is_x15(void) { return !strncmp(am57xx_board_name, "BBRDX15_", HDR_NAME_LEN); } + +static inline int board_is_evm(void) +{ + return !strncmp(am57xx_board_name, "AM572PM_", HDR_NAME_LEN); +} #endif diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 5acbc92..ae6e2a5 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -120,6 +120,8 @@ "setenv fdtfile dra72-evm.dtb; fi;" \ "if test $board_name = beagle_x15; then " \ "setenv fdtfile am57xx-beagle-x15.dtb; fi;" \ + "if test $board_name = am57xx_evm; then " \ + "setenv fdtfile am57xx-evm.dtb; fi;" \ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine device tree to use; fi; \0" \ "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile};\0" \ -- 1.9.1

2 1