From f2abff9da893f01c3c333f695df94aec7b0cb0de Mon Sep 17 00:00:00 2001
From: lakshmi Kailasanathan <lakshmi.kailasanathan@arm.com>
Date: Wed, 7 Oct 2020 09:54:55 +0100
Subject: [PATCH] arm-bsp/corstone700-mps3: Enabling NXP ISP1763 USB host
 controller in linux

This commit adds  usb host in the v5.6 kernel as a machine feature
to support the USB host controller and mass storage for MPS3 board.
The kernel binary size increase with this hence wks file updated.
The node for USB controller is added to device tree in the TF-A and
updated the sha to reflect it.

Change-Id: Iad3348f8dc599d5642ddfa0c5199485eeaca0991
Signed-off-by: lakshmi Kailasanathan <lakshmi.Kailasanathan@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 meta-arm-bsp/conf/machine/corstone700-mps3.conf           | 5 +++++
 .../trusted-firmware-a/trusted-firmware-a-corstone700.inc | 4 ++--
 .../bsp/arm-platforms/corstone700/usb_host.cfg            | 8 ++++++++
 .../recipes-kernel/linux/linux-stable-corstone700.inc     | 5 +++++
 meta-arm-bsp/wic/arm-reference-image.corstone700.wks      | 2 +-
 5 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/corstone700/usb_host.cfg

diff --git a/meta-arm-bsp/conf/machine/corstone700-mps3.conf b/meta-arm-bsp/conf/machine/corstone700-mps3.conf
index 88ef5c1f..9aaa17c4 100644
--- a/meta-arm-bsp/conf/machine/corstone700-mps3.conf
+++ b/meta-arm-bsp/conf/machine/corstone700-mps3.conf
@@ -9,4 +9,9 @@ require conf/machine/include/corstone700.inc
 # MACHINE_FEATURES_remove = "eth_lan9115"
 MACHINE_FEATURES += "eth_lan9115"
 
+# default feature used: usb_host
+# add the following line to local.conf to disable the feature:
+# MACHINE_FEATURES_remove = "usb_host"
+MACHINE_FEATURES += "usb_host"
+
 TFA_TARGET_PLATFORM = "fpga"
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone700.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone700.inc
index 175e333d..f48ac64a 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone700.inc
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone700.inc
@@ -10,8 +10,8 @@ TFA_INSTALL_TARGET = "fip.bin"
 LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
 
 # TF-A v2.3 is not used because the following commit is needed:
-# corstone700: splitting the platform support into FVP and FPGA
-SRCREV_tfa = "ef93cfa3a2591084307a41e64f1cbba327310749"
+# fdts: corstone700: add NXP isp1763 node to device tree
+SRCREV_tfa = "a6f65b11529b618ff04017f64054dc661c489068"
 
 PV = "2.3+git${SRCPV}"
 
diff --git a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/corstone700/usb_host.cfg b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/corstone700/usb_host.cfg
new file mode 100644
index 00000000..de4752e3
--- /dev/null
+++ b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/corstone700/usb_host.cfg
@@ -0,0 +1,8 @@
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_USB=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_ISP1760=y
+CONFIG_USB_ISP1760_HOST_ROLE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_MASS_STORAGE=y
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-stable-corstone700.inc b/meta-arm-bsp/recipes-kernel/linux/linux-stable-corstone700.inc
index 95a8bab7..975a93f7 100644
--- a/meta-arm-bsp/recipes-kernel/linux/linux-stable-corstone700.inc
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-stable-corstone700.inc
@@ -59,4 +59,9 @@ KERNEL_FEATURES_append_corstone700-mps3 = " \
                          'bsp/arm-platforms/corstone700/xip_dhcp_cmdline.cfg \
                           bsp/arm-platforms/corstone700/eth_lan9115.scc', \
                          'bsp/arm-platforms/corstone700/xip_cmdline.cfg', \
+                          d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES', \
+                         'usb_host', \
+                         'bsp/arm-platforms/corstone700/usb_host.cfg', \
+                        '', \
                           d)}"
diff --git a/meta-arm-bsp/wic/arm-reference-image.corstone700.wks b/meta-arm-bsp/wic/arm-reference-image.corstone700.wks
index 39c70cea..af03b058 100644
--- a/meta-arm-bsp/wic/arm-reference-image.corstone700.wks
+++ b/meta-arm-bsp/wic/arm-reference-image.corstone700.wks
@@ -19,4 +19,4 @@ part --source rawcopy --sourceparams="file=fip.bin-corstone700" --no-table --ali
 part --source rawcopy --sourceparams="file=${IMGDEPLOYDIR}/arm-reference-image-${MACHINE}.cramfs-xip" --no-table --fixed-size 2
 
 # Rawcopy of the kernel binary
-part --source rawcopy --sourceparams="file=xipImage" --no-table --fixed-size 3
+part --source rawcopy --sourceparams="file=xipImage" --no-table --fixed-size 4