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 git://www.denx.de/git/u-boot-marvell
[platform/kernel/u-boot.git]
/
include
/
configs
/
ls2080ardb.h
diff --git
a/include/configs/ls2080ardb.h
b/include/configs/ls2080ardb.h
index
5bec509
..
ee0f5fc
100644
(file)
--- a/
include/configs/ls2080ardb.h
+++ b/
include/configs/ls2080ardb.h
@@
-12,8
+12,6
@@
#undef CONFIG_CONS_INDEX
#define CONFIG_CONS_INDEX 2
#undef CONFIG_CONS_INDEX
#define CONFIG_CONS_INDEX 2
-#define CONFIG_DISPLAY_BOARDINFO
-
#define I2C_MUX_CH_VOL_MONITOR 0xa
#define I2C_VOL_MONITOR_ADDR 0x38
#define CONFIG_VOL_MONITOR_IR36021_READ
#define I2C_MUX_CH_VOL_MONITOR 0xa
#define I2C_VOL_MONITOR_ADDR 0x38
#define CONFIG_VOL_MONITOR_IR36021_READ
@@
-62,7
+60,7
@@
unsigned long get_board_sys_clk(void);
#define CONFIG_LIBATA
#define CONFIG_SCSI_AHCI
#define CONFIG_SCSI_AHCI_PLAT
#define CONFIG_LIBATA
#define CONFIG_SCSI_AHCI
#define CONFIG_SCSI_AHCI_PLAT
-#define CONFIG_
CMD_
SCSI
+#define CONFIG_SCSI
#define CONFIG_DOS_PARTITION
#define CONFIG_BOARD_LATE_INIT
#define CONFIG_DOS_PARTITION
#define CONFIG_BOARD_LATE_INIT
@@
-316,12
+314,9
@@
unsigned long get_board_sys_clk(void);
* USB
*/
#define CONFIG_HAS_FSL_XHCI_USB
* USB
*/
#define CONFIG_HAS_FSL_XHCI_USB
-#define CONFIG_USB_XHCI
#define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_XHCI_FSL
-#define CONFIG_USB_XHCI_DWC3
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
-#define CONFIG_USB_STORAGE
/* Initial environment variables */
#undef CONFIG_EXTRA_ENV_SETTINGS
/* Initial environment variables */
#undef CONFIG_EXTRA_ENV_SETTINGS
@@
-366,7
+361,7
@@
unsigned long get_board_sys_clk(void);
#define AQR405_IRQ_MASK 0x36
#define CONFIG_MII
#define AQR405_IRQ_MASK 0x36
#define CONFIG_MII
-#define CONFIG_ETHPRIME "DP
NI1
"
+#define CONFIG_ETHPRIME "DP
MAC1@xgmii
"
#define CONFIG_PHY_GIGE
#define CONFIG_PHY_AQUANTIA
#endif
#define CONFIG_PHY_GIGE
#define CONFIG_PHY_AQUANTIA
#endif