diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-08 13:15:45 +0100 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-08 13:15:45 +0100 |
commit | 79f38777947ac7685e2cef8bd977f954ab198c0e (patch) | |
tree | 6fe053ef751b1c424ec50be338844197b6421d74 /board/ti/am335x/board.c | |
parent | 96764df1b47ddebfb50fadf5af72530b07b5fc89 (diff) | |
parent | 9bd5c1ad0db802c9f8d49d72b443f03431cf6a89 (diff) | |
download | u-boot-imx-79f38777947ac7685e2cef8bd977f954ab198c0e.zip u-boot-imx-79f38777947ac7685e2cef8bd977f954ab198c0e.tar.gz u-boot-imx-79f38777947ac7685e2cef8bd977f954ab198c0e.tar.bz2 |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
This required manual merging drivers/mtd/nand/Makefile
and adding am335x_evm support for CONFIG_SPL_NAND_DRIVERS
Diffstat (limited to 'board/ti/am335x/board.c')
-rw-r--r-- | board/ti/am335x/board.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index f0eca54..ed4229e 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -44,7 +44,7 @@ static struct uart_sys *uart_base = (struct uart_sys *)DEFAULT_UART_BASE; /* MII mode defines */ #define MII_MODE_ENABLE 0x0 -#define RGMII_MODE_ENABLE 0xA +#define RGMII_MODE_ENABLE 0x3A /* GPIO that controls power to DDR on EVM-SK */ #define GPIO_DDR_VTT_EN 7 @@ -318,6 +318,8 @@ int board_init(void) gd->bd->bi_boot_params = PHYS_DRAM_1 + 0x100; + gpmc_init(); + return 0; } |