uboot-mediatek: import fix for AHCI and enable SATA

Import patch form Frank Wunderlich <frank-w@public-files.de> to fix
build of MediaTek AHCI SATA driver.
Enable that driver on Bananapi BPi-R64.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/package/boot/uboot-mediatek/patches/010-ahci-mediatek-fix-missing-dev_err-definition.patch b/package/boot/uboot-mediatek/patches/010-ahci-mediatek-fix-missing-dev_err-definition.patch
new file mode 100644 (file)
index 0000000..5e2b4aa
--- /dev/null
+++ b/package/boot/uboot-mediatek/patches/010-ahci-mediatek-fix-missing-dev_err-definition.patch
@@ -0,0 +1,24 @@
+From 7089c413216f1c0e374d71187030fe41ae4b3071 Mon Sep 17 00:00:00 2001
+From: Frank Wunderlich <frank-w@public-files.de>
+Date: Tue, 3 Nov 2020 19:45:30 +0100
+Subject: [PATCH] ahci: mediatek: fix missing dev_err definition
+
+---
+ drivers/ata/mtk_ahci.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/ata/mtk_ahci.c b/drivers/ata/mtk_ahci.c
+index 554175bc00..2c5227df30 100644
+--- a/drivers/ata/mtk_ahci.c
++++ b/drivers/ata/mtk_ahci.c
+@@ -21,6 +21,7 @@
+ #include <sata.h>
+ #include <scsi.h>
+ #include <syscon.h>
++#include <dm/device_compat.h>
+ 
+ #define SYS_CFG                       0x14
+ #define SYS_CFG_SATA_MSK      GENMASK(31, 30)
+-- 
+2.30.2
+

diff --git a/package/boot/uboot-mediatek/patches/403-add-bananapi_bpi-r64_defconfigs.patch b/package/boot/uboot-mediatek/patches/403-add-bananapi_bpi-r64_defconfigs.patch
index 5a7101a7fed881ae7c7ee3301c2856e194f3edee..9d52cc4feb0345d0459da8b3dfb78de913167b09 100644 (file)
--- a/package/boot/uboot-mediatek/patches/403-add-bananapi_bpi-r64_defconfigs.patch
+++ b/package/boot/uboot-mediatek/patches/403-add-bananapi_bpi-r64_defconfigs.patch
@@ -111,7 +111,7 @@
 +CONFIG_PHY=y
 +CONFIG_PHY_MTK_TPHY=y
 +CONFIG_PHY_FIXED=y
-+# CONFIG_MTK_AHCI is not set
++CONFIG_MTK_AHCI=y
 +CONFIG_DM_ETH=y
 +CONFIG_MEDIATEK_ETH=y
 +CONFIG_PCI=y
@@ -315,7 +315,7 @@
 +CONFIG_PHY=y
 +CONFIG_PHY_MTK_TPHY=y
 +CONFIG_PHY_FIXED=y
-+# CONFIG_MTK_AHCI is not set
++CONFIG_MTK_AHCI=y
 +CONFIG_DM_ETH=y
 +CONFIG_MEDIATEK_ETH=y
 +CONFIG_PCI=y