LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am335x: changes after bringup 

This changes were made to bringup nbhw16.
This commit is contained in:
Stefan Eichenberger 2016-06-22 13:09:16 +02:00
parent f3366b72db
commit e0c59bc1fa
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
board/ti/am335x/board.c
View File

@ -118,10 +118,10 @@ static const struct ddr_data ddr3_beagleblack_data = {
static const struct ddr_data ddr3_netbird_data = {
/* Ratios were optimized by DDR3 training software from TI */
.datardsratio0 = 0x35, /* From RatioSeed_AM335x_boards.xlsx / Beaglebone uses 0x38 */
.datawdsratio0 = 0x96, /* From RatioSeed_AM335x_boards.xlsx / Beaglebone uses 0x44 */
.datafwsratio0 = 0x40, /* From RatioSeed_AM335x_boards.xlsx / Beaglebone uses 0x94 */
.datawrsratio0 = 0x79,
.datardsratio0 = 0x40, /* From RatioSeed_AM335x_boards.xlsx / Beaglebone uses 0x38 */
.datawdsratio0 = 0x64, /* From RatioSeed_AM335x_boards.xlsx / Beaglebone uses 0x44 */
.datafwsratio0 = 0x02, /* From RatioSeed_AM335x_boards.xlsx / Beaglebone uses 0x94 */
.datawrsratio0 = 0x80,
};
static const struct ddr_data ddr3_evm_data = {
@ -217,12 +217,9 @@ static struct emif_regs ddr3_beagleblack_emif_reg_data = {
static struct emif_regs ddr3_netbird_emif_reg_data = {
.sdram_config = MT41K256M16HA125E_EMIF_SDCFG,
.ref_ctrl = MT41K256M16HA125E_EMIF_SDREF,
/*.sdram_tim1 = 0x0aaae53f,*/ /* From AM335x_DDR_register_calc_tool.xls rp=5, rcd=5, wr=5, ras=14, rc=20, rrd=3, wtr=3 */
.sdram_tim1 = 0x0aaae51b, /* From AM335x_DDR_register_calc_tool.xls rp=5, rcd=5, wr=5, ras=14, rc=20, rrd=3, wtr=3 */
/*.sdram_tim2 = 0x24437fda,*/ /* From AM335x_DDR_register_calc_tool.xls xp=2, odt=3, xsnr=67, xsrd=511, rtp=3, cke=2 */
.sdram_tim2 = 0x26437fda, /* From AM335x_DDR_register_calc_tool.xls xp=2, odt=3, xsnr=67, xsrd=511, rtp=3, cke=2 */
/* .sdram_tim3 = 0x50ffe3ff,*/ /* From AM335x_DDR_register_calc_tool.xls pdll_ul=5, zqcs=63, rfc=63, ras_max=15 */
.sdram_tim3 = 0x501f83ff, /* From AM335x_DDR_register_calc_tool.xls pdll_ul=5, zqcs=63, rfc=63, ras_max=15 */
.sdram_tim1 = 0x0aaae51b, /* From AM335x_DDR_register_calc_tool.xls */
.sdram_tim2 = 0x24437fda, /* From AM335x_DDR_register_calc_tool.xls */
.sdram_tim3 = 0x50ffe3ff, /* From AM335x_DDR_register_calc_tool.xls */
.zq_config = MT41K256M16HA125E_ZQ_CFG,
.emif_ddr_phy_ctlr_1 = MT41K256M16HA125E_EMIF_READ_LATENCY,
};
@ -630,6 +627,11 @@ int board_init(void)
REQUEST_AND_SET_GPIO(NETBIRD_GPIO_RST_GSM_N);
REQUEST_AND_SET_GPIO(NETBIRD_GPIO_WLAN_EN);
REQUEST_AND_SET_GPIO(NETBIRD_GPIO_BT_EN);
/* There are two funcions on the same mux mode for MMC2_DAT7 we want
* to use RMII2_CRS_DV so we need to set SMA2 Register to 1
* See SPRS717J site 49 (10)*/
#define SMA2_REGISTER (CTRL_BASE + 0x1320)
writel(0x01, SMA2_REGISTER); /* Select RMII2_CRS_DV instead of MMC2_DAT7 */
}
return 0;

4
board/ti/am335x/board.h
View File

@ -23,7 +23,9 @@ static inline int board_is_bone_lt(void)
static inline int board_is_nbhw16(void)
{
return board_ti_is("NBHW16");
/* TODO: make this dynamic */
return 1;
/*return board_ti_is("NBHW16");*/
}
static inline int board_is_bbg1(void)

10
include/configs/am335x_netbird.h
View File

@ -18,6 +18,11 @@
#include <configs/ti_am335x_common.h>
#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC
#undef CONFIG_HW_WATCHDOG
#undef CONFIG_OMPAP_WATCHDOG
#undef CONFIG_SPL_WATCHDOG_SUPPORT
#ifndef CONFIG_SPL_BUILD
# define CONFIG_TIMESTAMP
# define CONFIG_LZO
@ -127,11 +132,6 @@
#define CONFIG_SPL_POWER_SUPPORT
#define CONFIG_SPL_YMODEM_SUPPORT
/* Bootcount using the RTC block */
#define CONFIG_BOOTCOUNT_LIMIT
#define CONFIG_BOOTCOUNT_AM33XX
#define CONFIG_SYS_BOOTCOUNT_BE
/* USB gadget RNDIS */
#define CONFIG_SPL_MUSB_NEW_SUPPORT