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/mx31pdk.h | |
parent | 2931fa4db349c97f882ffda42e901208654b5ca9 (diff) | |
parent | 4611d5bab26f93471b84f6f33967cef69b3f723a (diff) | |
download | u-boot-imx-a891601ce51edbafa1a2750c96a618e4fcbca1c2.zip u-boot-imx-a891601ce51edbafa1a2750c96a618e4fcbca1c2.tar.gz u-boot-imx-a891601ce51edbafa1a2750c96a618e4fcbca1c2.tar.bz2 |
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/mx31pdk.h')
-rw-r--r-- | include/configs/mx31pdk.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index 8a11461..f223788 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -120,7 +120,6 @@ * Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_PROMPT "MX31PDK U-Boot > " #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ /* Print Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ |