LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.denx.de/u-boot-sunxi

This commit is contained in:
Tom Rini 2015-06-10 10:55:49 -04:00
parent 204bb1eab6 0751b13806
commit b2016133ed
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/cpu/armv7/sunxi/board.c
View File

@ -223,6 +223,7 @@ int cpu_eth_init(bd_t *bis)
__maybe_unused int rc; __maybe_unused int rc;
#ifdef CONFIG_MACPWR #ifdef CONFIG_MACPWR
gpio_request(CONFIG_MACPWR, "macpwr");
gpio_direction_output(CONFIG_MACPWR, 1); gpio_direction_output(CONFIG_MACPWR, 1);
mdelay(200); mdelay(200);
#endif #endif

1
include/configs/sunxi-common.h
View File

@ -126,6 +126,7 @@
#define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI
#define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SCSI_AHCI_PLAT
#define CONFIG_SUNXI_AHCI #define CONFIG_SUNXI_AHCI
#define CONFIG_SYS_64BIT_LBA
#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 #define CONFIG_SYS_SCSI_MAX_SCSI_ID 1
#define CONFIG_SYS_SCSI_MAX_LUN 1 #define CONFIG_SYS_SCSI_MAX_LUN 1
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \