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 'u-boot-ti/master' into 'u-boot-arm/master'
[platform/kernel/u-boot.git]
/
include
/
configs
/
pxm2.h
diff --git
a/include/configs/pxm2.h
b/include/configs/pxm2.h
index
7722f7b
..
d75d562
100644
(file)
--- a/
include/configs/pxm2.h
+++ b/
include/configs/pxm2.h
@@
-21,7
+21,7
@@
#include "siemens-am33x-common.h"
#define CONFIG_SYS_MPUCLK 720
#include "siemens-am33x-common.h"
#define CONFIG_SYS_MPUCLK 720
-#define D
XR2_IOCTRL_VAL
0x18b
+#define D
DR_IOCTRL_VAL
0x18b
#define DDR_PLL_FREQ 266
#define BOARD_DFU_BUTTON_GPIO 59
#define DDR_PLL_FREQ 266
#define BOARD_DFU_BUTTON_GPIO 59
@@
-44,7
+44,6
@@
#undef CONFIG_SPL_NET_VCI_STRING
#undef CONFIG_SPL_ETH_SUPPORT
#undef CONFIG_SPL_NET_VCI_STRING
#undef CONFIG_SPL_ETH_SUPPORT
-#define CONFIG_PHY_ADDR 0
#define CONFIG_PHY_ATHEROS
#define CONFIG_FACTORYSET
#define CONFIG_PHY_ATHEROS
#define CONFIG_FACTORYSET