From 79b6a4bd3cabf6ae711e1e8f82ce43f717696cf4 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 13 Mar 2021 19:07:09 +0000 Subject: [PATCH] uboot-mediatek: import fix for AHCI and enable SATA Import patch form Frank Wunderlich to fix build of MediaTek AHCI SATA driver. Enable that driver on Bananapi BPi-R64. Signed-off-by: Daniel Golle --- ...iatek-fix-missing-dev_err-definition.patch | 24 +++++++++++++++++++ .../403-add-bananapi_bpi-r64_defconfigs.patch | 4 ++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 package/boot/uboot-mediatek/patches/010-ahci-mediatek-fix-missing-dev_err-definition.patch 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 index 00000000000..5e2b4aa39bc --- /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 +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 + #include + #include ++#include + + #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 5a7101a7fed..9d52cc4feb0 100644 --- 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 -- 2.30.2