SATA on Cubox-i and Hummingboard, Hummingboard 2 (Gate/Edge) support, Marvell ESPRESSOBin board support

This commit is contained in:
Peter Robinson 2017-03-06 12:22:38 +00:00
parent 31beb56b4d
commit e37941d681
4 changed files with 1848 additions and 2 deletions

View File

@ -2,6 +2,7 @@ dragonboard410c
espresso7420
evb-rk3399
hikey
mvebu_espressobin-88f3720
odroid-c2
p2371-2180
pine64_plus

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,74 @@
From ee16d90048ee985df6199c987e64daeac3378777 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sat, 4 Mar 2017 14:26:19 +0000
Subject: [PATCH] v2 mx6cuboxi: Add support for sata
The Cubox-i and Hummingboard series of devices have an option of
SATA on board, and depending on how the fuses are blown even the
option to boot SPL from SATA. So enable support for it so it can
be used to boot the OS from if people desire.
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
board/solidrun/mx6cuboxi/mx6cuboxi.c | 7 +++++++
include/configs/mx6cuboxi.h | 12 ++++++++++++
2 files changed, 19 insertions(+)
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
index 285588d..59a78df 100644
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -22,6 +22,7 @@
#include <linux/errno.h>
#include <asm/gpio.h>
#include <asm/imx-common/iomux-v3.h>
+#include <asm/imx-common/sata.h>
#include <asm/imx-common/video.h>
#include <mmc.h>
#include <fsl_esdhc.h>
@@ -314,6 +315,12 @@ int board_early_init_f(void)
ret = setup_display();
#endif
+#ifdef CONFIG_CMD_SATA
+ /* Only mx6q/mx6q has SATA */
+ if (is_mx6dq())
+ setup_sata();
+#endif
+
#ifdef CONFIG_USB_EHCI_MX6
setup_usb();
#endif
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 2782911..cec626a 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -21,6 +21,17 @@
/* MMC Configs */
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
+/* SATA Configuration */
+#define CONFIG_CMD_SATA
+#ifdef CONFIG_CMD_SATA
+#define CONFIG_DWC_AHSATA
+#define CONFIG_SYS_SATA_MAX_DEVICE 1
+#define CONFIG_DWC_AHSATA_PORT_ID 0
+#define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR
+#define CONFIG_LBA48
+#define CONFIG_LIBATA
+#endif
+
/* Ethernet Configuration */
#define CONFIG_FEC_MXC
#define CONFIG_MII
@@ -119,6 +130,7 @@
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \
+ func(SATA, sata, 0) \
func(USB, usb, 0) \
func(PXE, pxe, na) \
func(DHCP, dhcp, na)
--
2.9.3

View File

@ -2,7 +2,7 @@
Name: uboot-tools
Version: 2017.03
Release: 0.6%{?candidate:.%{candidate}}%{?dist}
Release: 0.7%{?candidate:.%{candidate}}%{?dist}
Summary: U-Boot utilities
Group: Development/Tools
@ -16,8 +16,11 @@ Patch1: add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
Patch2: U-Boot-1-2-rsa-Fix-build-with-OpenSSL-1.1.x.patch
Patch3: U-Boot-2-2-rsa-Fix-deprecated-warnings-for-OpenSSL-1.1.x.patch
Patch4: tools-kwbimage-fix-build-with-OpenSSL-1.1.x.patch
Patch5: mx6cuboxi-Add-support-for-sata.patch
Patch6: mx6-Initial-Hummingboard-2-support.patch
Patch7: mvebu-ESPRESSOBin-board.patch
# Patch5: 0001-arm-mvebu-enable-generic-distro-boot-config.patch
# Patch9: 0001-arm-mvebu-enable-generic-distro-boot-config.patch
BuildRequires: bc
BuildRequires: dtc
@ -252,6 +255,11 @@ cp -p board/rockchip/evb_rk3399/README doc/README.evb_rk3399
%endif
%changelog
* Mon Mar 6 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2017.03-0.7.rc3
- Add support for SATA on Cubox-i and Hummingboard
- Add initial Hummingboard 2 (Gate/Edge) support
- Add initial Marvell ESPRESSOBin board support
* Tue Feb 28 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2017.03-0.6.rc3
- 2017.03 RC3