mirror of
https://github.com/open-sdr/openwifi.git
synced 2025-06-20 16:10:29 +00:00
remove our customized xilinx_dma.c. the original xilinx_dma.c in kernel can be used now
This commit is contained in:
@ -72,7 +72,5 @@ cd $OPENWIFI_DIR/driver/xpu
|
|||||||
make KDIR=$LINUX_KERNEL_SRC_DIR ARCH=$ARCH CROSS_COMPILE=$CROSS_COMPILE
|
make KDIR=$LINUX_KERNEL_SRC_DIR ARCH=$ARCH CROSS_COMPILE=$CROSS_COMPILE
|
||||||
cd $OPENWIFI_DIR/driver/ad9361
|
cd $OPENWIFI_DIR/driver/ad9361
|
||||||
make KDIR=$LINUX_KERNEL_SRC_DIR ARCH=$ARCH CROSS_COMPILE=$CROSS_COMPILE
|
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
|
cd $home_dir
|
||||||
|
@ -3,6 +3,8 @@ Author: Xianjun Jiao
|
|||||||
SPDX-FileCopyrightText: 2019 UGent
|
SPDX-FileCopyrightText: 2019 UGent
|
||||||
SPDX-License-Identifier: AGPL-3.0-or-later
|
SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
-->
|
-->
|
||||||
|
We don't need modified xilinx_dma.c anymore!
|
||||||
|
|
||||||
===============Following are obsolete content=================
|
===============Following are obsolete content=================
|
||||||
|
|
||||||
Currently used driver xilinx_dma-orig.c is based on 552d3f11e374ca0d435aa93a571507819eabdda2 of https://github.com/Xilinx/linux-xlnx )
|
Currently used driver xilinx_dma-orig.c is based on 552d3f11e374ca0d435aa93a571507819eabdda2 of https://github.com/Xilinx/linux-xlnx )
|
||||||
|
@ -60,7 +60,6 @@ cd $OPENWIFI_DIR/$LINUX_KERNEL_SRC_DIR_NAME
|
|||||||
git checkout 2019_R1
|
git checkout 2019_R1
|
||||||
git pull origin 2019_R1
|
git pull origin 2019_R1
|
||||||
# git reset --hard 4fea7c5
|
# 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
|
cp $LINUX_KERNEL_CONFIG_FILE ./.config
|
||||||
source $XILINX_DIR/SDK/2018.3/settings64.sh
|
source $XILINX_DIR/SDK/2018.3/settings64.sh
|
||||||
export ARCH=$ARCH_NAME
|
export ARCH=$ARCH_NAME
|
||||||
|
@ -74,13 +74,8 @@ LINUX_KERNEL_SRC_DIR_NAME32=adi-linux
|
|||||||
LINUX_KERNEL_SRC_DIR_NAME64=adi-linux-64
|
LINUX_KERNEL_SRC_DIR_NAME64=adi-linux-64
|
||||||
|
|
||||||
cd $OPENWIFI_DIR/user_space/
|
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
|
./prepare_kernel.sh $OPENWIFI_DIR $XILINX_DIR 32 build
|
||||||
sudo true
|
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
|
./prepare_kernel.sh $OPENWIFI_DIR $XILINX_DIR 64 build
|
||||||
sudo true
|
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 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 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 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 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 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/
|
sudo cp $OPENWIFI_DIR/kernel_boot/70-persistent-net.rules $SDCARD_DIR/rootfs/etc/udev/rules.d/
|
||||||
|
@ -46,26 +46,6 @@ modprobe mac80211
|
|||||||
PROG=sdr
|
PROG=sdr
|
||||||
rmmod $PROG
|
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
|
# before drive ad9361, let's bring up duc and make sure dac is connected to ad9361 dma
|
||||||
SUBMODULE=tx_intf
|
SUBMODULE=tx_intf
|
||||||
if [ $last_input == "remote" ]
|
if [ $last_input == "remote" ]
|
||||||
|
Reference in New Issue
Block a user