projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of ../next
[platform/kernel/u-boot.git]
/
include
/
configs
/
MPC8541CDS.h
diff --git
a/include/configs/MPC8541CDS.h
b/include/configs/MPC8541CDS.h
index
a8f206f
..
e945da2
100644
(file)
--- a/
include/configs/MPC8541CDS.h
+++ b/
include/configs/MPC8541CDS.h
@@
-46,13
+46,6
@@
#define CONFIG_FSL_VIA
#define CONFIG_FSL_VIA
-/*
- * When initializing flash, if we cannot find the manufacturer ID,
- * assume this is the AMD flash associated with the CDS board.
- * This allows booting from a promjet.
- */
-#define CONFIG_ASSUME_AMD_FLASH
-
#ifndef __ASSEMBLY__
extern unsigned long get_clock_freq(void);
#endif
#ifndef __ASSEMBLY__
extern unsigned long get_clock_freq(void);
#endif
@@
-293,9
+286,6
@@
extern unsigned long get_clock_freq(void);
#define CONFIG_OF_BOARD_SETUP 1
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
#define CONFIG_OF_BOARD_SETUP 1
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
-#define CONFIG_SYS_64BIT_VSPRINTF 1
-#define CONFIG_SYS_64BIT_STRTOUL 1
-
/*
* I2C
*/
/*
* I2C
*/