projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
include
/
configs
/
p1_twr.h
diff --git
a/include/configs/p1_twr.h
b/include/configs/p1_twr.h
index 9837100e3187d901f934f56504122a647e13b7e8..601bac72e0a0a8cf6900ed607e339e900a60120a 100644
(file)
--- a/
include/configs/p1_twr.h
+++ b/
include/configs/p1_twr.h
@@
-24,11
+24,11
@@
#define CONFIG_SYS_RAMBOOT
#define CONFIG_SYS_EXTRA_ENV_RELOC
#define CONFIG_SYS_TEXT_BASE 0x11000000
#define CONFIG_SYS_RAMBOOT
#define CONFIG_SYS_EXTRA_ENV_RELOC
#define CONFIG_SYS_TEXT_BASE 0x11000000
-#define CONFIG_RESET_VECTOR_ADDRESS 0x110
7
fffc
+#define CONFIG_RESET_VECTOR_ADDRESS 0x110
b
fffc
#endif
#ifndef CONFIG_SYS_TEXT_BASE
#endif
#ifndef CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_TEXT_BASE 0xeff
8
0000
+#define CONFIG_SYS_TEXT_BASE 0xeff
4
0000
#endif
#ifndef CONFIG_RESET_VECTOR_ADDRESS
#endif
#ifndef CONFIG_RESET_VECTOR_ADDRESS
@@
-42,7
+42,6
@@
/* High Level Configuration Options */
#define CONFIG_BOOKE
#define CONFIG_E500
/* High Level Configuration Options */
#define CONFIG_BOOKE
#define CONFIG_E500
-#define CONFIG_MPC85xx
#define CONFIG_MP
#define CONFIG_MP
@@
-407,11
+406,7
@@
extern unsigned long get_board_sys_clk(unsigned long dummy);
#endif
#else
#define CONFIG_ENV_IS_IN_FLASH
#endif
#else
#define CONFIG_ENV_IS_IN_FLASH
-#if CONFIG_SYS_MONITOR_BASE > 0xfff80000
-#define CONFIG_ENV_ADDR 0xfff80000
-#else
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
-#endif
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
#endif
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
#endif