eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Browse Source 
Conflicts:
	drivers/serial/serial.c

The conflict above was a trivial case of adding one init
function in each branch, and manually resolved in merge.
This commit is contained in:
Albert ARIBAUD
2013-09-05 11:15:26 +02:00
parent e62d5fb0da 8467faef7f
commit 19d829fa60
33 changed files with 3692 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/configs/mxs.h
View File

@@ -119,11 +119,16 @@
/* GPIO */
#define CONFIG_MXS_GPIO
/* DUART Serial Driver */
/*
* DUART Serial Driver.
* Conflicts with AUART driver which can be set by board.
*/
#ifndef CONFIG_MXS_AUART
#define CONFIG_PL011_SERIAL
#define CONFIG_PL011_CLOCK 24000000
#define CONFIG_PL01x_PORTS { (void *)MXS_UARTDBG_BASE }
#define CONFIG_CONS_INDEX 0
#endif
/* Default baudrate can be overriden by board! */
#ifndef CONFIG_BAUDRATE
#define CONFIG_BAUDRATE 115200

1
include/image.h
View File

@@ -212,6 +212,7 @@ struct lmb;
#define IH_TYPE_AISIMAGE 13 /* TI Davinci AIS Image */
#define IH_TYPE_KERNEL_NOLOAD 14 /* OS Kernel Image, can run from any load address */
#define IH_TYPE_PBLIMAGE 15 /* Freescale PBL Boot Image */
#define IH_TYPE_MXSIMAGE 16 /* Freescale MXSBoot Image */
/*
* Compression Types