From 1196ed1fefed1827b258b7aa2003167b3485ee9a Mon Sep 17 00:00:00 2001
From: Xianjun Jiao <xianjun.jiao@ugent.be>
Date: Mon, 5 Apr 2021 21:45:27 +0200
Subject: [PATCH] remove our customized xilinx_dma.c. the original xilinx_dma.c
 in kernel can be used now

---
 driver/make_all.sh           |  2 --
 driver/xilinx_dma/README.md  |  2 ++
 user_space/prepare_kernel.sh |  1 -
 user_space/update_sdcard.sh  |  9 ++-------
 user_space/wgd.sh            | 20 --------------------
 5 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/driver/make_all.sh b/driver/make_all.sh
index 44bd095..f90d063 100755
--- a/driver/make_all.sh
+++ b/driver/make_all.sh
@@ -72,7 +72,5 @@ cd $OPENWIFI_DIR/driver/xpu
 make KDIR=$LINUX_KERNEL_SRC_DIR ARCH=$ARCH CROSS_COMPILE=$CROSS_COMPILE
 cd $OPENWIFI_DIR/driver/ad9361
 make KDIR=$LINUX_KERNEL_SRC_DIR ARCH=$ARCH CROSS_COMPILE=$CROSS_COMPILE
-cd $OPENWIFI_DIR/driver/xilinx_dma
-./make_xilinx_dma.sh $OPENWIFI_DIR $XILINX_DIR $ARCH_OPTION
 
 cd $home_dir
diff --git a/driver/xilinx_dma/README.md b/driver/xilinx_dma/README.md
index cf65604..a2926f1 100644
--- a/driver/xilinx_dma/README.md
+++ b/driver/xilinx_dma/README.md
@@ -3,6 +3,8 @@ Author: Xianjun Jiao
 SPDX-FileCopyrightText: 2019 UGent
 SPDX-License-Identifier: AGPL-3.0-or-later
 -->
+We don't need modified xilinx_dma.c anymore!
+
 ===============Following are obsolete content=================
 
 Currently used driver xilinx_dma-orig.c is based on 552d3f11e374ca0d435aa93a571507819eabdda2 of https://github.com/Xilinx/linux-xlnx )
diff --git a/user_space/prepare_kernel.sh b/user_space/prepare_kernel.sh
index bcfba29..41e352d 100755
--- a/user_space/prepare_kernel.sh
+++ b/user_space/prepare_kernel.sh
@@ -60,7 +60,6 @@ cd $OPENWIFI_DIR/$LINUX_KERNEL_SRC_DIR_NAME
 git checkout 2019_R1
 git pull origin 2019_R1
 # git reset --hard 4fea7c5
-cp $OPENWIFI_DIR/driver/xilinx_dma/xilinx_dma.c $OPENWIFI_DIR/$LINUX_KERNEL_SRC_DIR_NAME/drivers/dma/xilinx/xilinx_dma.c
 cp $LINUX_KERNEL_CONFIG_FILE ./.config
 source $XILINX_DIR/SDK/2018.3/settings64.sh
 export ARCH=$ARCH_NAME
diff --git a/user_space/update_sdcard.sh b/user_space/update_sdcard.sh
index 7f0da70..dc51d4c 100755
--- a/user_space/update_sdcard.sh
+++ b/user_space/update_sdcard.sh
@@ -74,13 +74,8 @@ LINUX_KERNEL_SRC_DIR_NAME32=adi-linux
 LINUX_KERNEL_SRC_DIR_NAME64=adi-linux-64
 
 cd $OPENWIFI_DIR/user_space/
-# special case, we need our xilinx_dma.c is there when building kernel to avoid version issue
-cp $OPENWIFI_DIR/$LINUX_KERNEL_SRC_DIR_NAME32/drivers/dma/xilinx/xilinx_dma.c $OPENWIFI_DIR/$LINUX_KERNEL_SRC_DIR_NAME32/drivers/dma/xilinx/xilinx_dma.c.bak
-cp $OPENWIFI_DIR/driver/xilinx_dma/xilinx_dma.c $OPENWIFI_DIR/$LINUX_KERNEL_SRC_DIR_NAME32/drivers/dma/xilinx -rf
 ./prepare_kernel.sh $OPENWIFI_DIR $XILINX_DIR 32 build
 sudo true
-cp $OPENWIFI_DIR/$LINUX_KERNEL_SRC_DIR_NAME64/drivers/dma/xilinx/xilinx_dma.c $OPENWIFI_DIR/$LINUX_KERNEL_SRC_DIR_NAME64/drivers/dma/xilinx/xilinx_dma.c.bak
-cp $OPENWIFI_DIR/driver/xilinx_dma/xilinx_dma.c $OPENWIFI_DIR/$LINUX_KERNEL_SRC_DIR_NAME64/drivers/dma/xilinx -rf
 ./prepare_kernel.sh $OPENWIFI_DIR $XILINX_DIR 64 build
 sudo true
 
@@ -146,11 +141,11 @@ sudo mkdir $SDCARD_DIR/rootfs/lib/modules
 
 sudo mkdir $SDCARD_DIR/rootfs/lib/modules/$LINUX_KERNEL_SRC_DIR_NAME32
 sudo find $OPENWIFI_DIR/$LINUX_KERNEL_SRC_DIR_NAME32 -name \*.ko -exec cp {} $SDCARD_DIR/rootfs/lib/modules/$LINUX_KERNEL_SRC_DIR_NAME32/ \;
-sudo rm $SDCARD_DIR/rootfs/lib/modules/$LINUX_KERNEL_SRC_DIR_NAME32/{axidmatest.ko,xilinx_dma.ko,adi_axi_hdmi.ko,ad9361_drv.ko} -f
+sudo rm $SDCARD_DIR/rootfs/lib/modules/$LINUX_KERNEL_SRC_DIR_NAME32/{axidmatest.ko,adi_axi_hdmi.ko,ad9361_drv.ko} -f
 
 sudo mkdir $SDCARD_DIR/rootfs/lib/modules/$LINUX_KERNEL_SRC_DIR_NAME64
 sudo find $OPENWIFI_DIR/$LINUX_KERNEL_SRC_DIR_NAME64 -name \*.ko -exec cp {} $SDCARD_DIR/rootfs/lib/modules/$LINUX_KERNEL_SRC_DIR_NAME64/ \;
-sudo rm $SDCARD_DIR/rootfs/lib/modules/$LINUX_KERNEL_SRC_DIR_NAME64/{axidmatest.ko,xilinx_dma.ko,adi_axi_hdmi.ko,ad9361_drv.ko} -f
+sudo rm $SDCARD_DIR/rootfs/lib/modules/$LINUX_KERNEL_SRC_DIR_NAME64/{axidmatest.ko,adi_axi_hdmi.ko,ad9361_drv.ko} -f
 
 sudo rm $SDCARD_DIR/rootfs/etc/udev/rules.d/70-persistent-net.rules
 sudo cp $OPENWIFI_DIR/kernel_boot/70-persistent-net.rules $SDCARD_DIR/rootfs/etc/udev/rules.d/
diff --git a/user_space/wgd.sh b/user_space/wgd.sh
index 0b0b44a..351c792 100755
--- a/user_space/wgd.sh
+++ b/user_space/wgd.sh
@@ -46,26 +46,6 @@ modprobe mac80211
 PROG=sdr
 rmmod $PROG
 
-SUBMODULE=xilinx_dma
-if [ $last_input == "remote" ]
-  then
-    rm $SUBMODULE.ko
-    sync
-    wget ftp://192.168.10.1/driver/$SUBMODULE/$SUBMODULE.ko
-    sync
-fi
-rmmod $SUBMODULE
-insmod $SUBMODULE.ko
-
-#sleep 1
-
-echo check $SUBMODULE module is loaded or not
-checkModule $SUBMODULE
-if [ $? -eq 1 ]
-then
-  return
-fi
-
 # before drive ad9361, let's bring up duc and make sure dac is connected to ad9361 dma
 SUBMODULE=tx_intf
 if [ $last_input == "remote" ]