diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-06 08:49:58 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-06 08:49:58 +0100 |
| commit | a891601ce51edbafa1a2750c96a618e4fcbca1c2 (patch) | |
| tree | 9a5d44eb1fcca45dfd30557318f786b66392a8f3 /include/configs/mx53loco.h | |
| parent | 2931fa4db349c97f882ffda42e901208654b5ca9 (diff) | |
| parent | 4611d5bab26f93471b84f6f33967cef69b3f723a (diff) | |
| download | u-boot-a891601ce51edbafa1a2750c96a618e4fcbca1c2.tar.gz | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts:
include/micrel.h
The conflict above was trivial, caused by four lines being
added in both branches with different whitepace.
Diffstat (limited to 'include/configs/mx53loco.h')
| -rw-r--r-- | include/configs/mx53loco.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index ab55fbea2c..ae43ea3c1f 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -73,7 +73,6 @@ /* I2C Configs */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC -#define CONFIG_SYS_SPD_BUS_NUM 0 /* I2C1 */ /* PMIC Controller */ #define CONFIG_POWER @@ -177,7 +176,6 @@ /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ -#define CONFIG_SYS_PROMPT "MX53LOCO U-Boot > " #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ |