diff options
| author | Tom Rini <trini@konsulko.com> | 2015-06-10 10:55:49 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-06-10 10:55:49 -0400 |
| commit | b2016133edec9ece02dca7881e2e0c059d2b421c (patch) | |
| tree | d625b7cbb93cccebfd689b8931939e1083ece3a0 | |
| parent | 204bb1eab6df70884b2ef582db735f33a939d63e (diff) | |
| parent | 0751b138064db28f0866f0c2439afb8b3975180c (diff) | |
| download | talos-obmc-uboot-b2016133edec9ece02dca7881e2e0c059d2b421c.tar.gz talos-obmc-uboot-b2016133edec9ece02dca7881e2e0c059d2b421c.zip | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
| -rw-r--r-- | arch/arm/cpu/armv7/sunxi/board.c | 1 | ||||
| -rw-r--r-- | include/configs/sunxi-common.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/sunxi/board.c b/arch/arm/cpu/armv7/sunxi/board.c index a82c8b9d44..4b2494ea37 100644 --- a/arch/arm/cpu/armv7/sunxi/board.c +++ b/arch/arm/cpu/armv7/sunxi/board.c @@ -223,6 +223,7 @@ int cpu_eth_init(bd_t *bis) __maybe_unused int rc; #ifdef CONFIG_MACPWR + gpio_request(CONFIG_MACPWR, "macpwr"); gpio_direction_output(CONFIG_MACPWR, 1); mdelay(200); #endif diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 07db736d31..063abd56a9 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -126,6 +126,7 @@ #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SUNXI_AHCI +#define CONFIG_SYS_64BIT_LBA #define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 #define CONFIG_SYS_SCSI_MAX_LUN 1 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ |
