From 572f199cdfdfba9e5d6c7e5a10090974f72ffe88 Mon Sep 17 00:00:00 2001
From: silver2row <silver1row@cox.net>
Date: Fri, 8 Mar 2024 05:24:11 -0600
Subject: [PATCH] clean up!
---
.../mchp-fpga-tools-installation-guide.rst | 5 -----
1 file changed, 5 deletions(-)
diff --git a/boards/beaglev/fire/demos-and-tutorials/mchp-fpga-tools-installation-guide.rst b/boards/beaglev/fire/demos-and-tutorials/mchp-fpga-tools-installation-guide.rst
index 3f12313d..db68f45d 100644
--- a/boards/beaglev/fire/demos-and-tutorials/mchp-fpga-tools-installation-guide.rst
+++ b/boards/beaglev/fire/demos-and-tutorials/mchp-fpga-tools-installation-guide.rst
@@ -63,15 +63,12 @@ Perform the post installation steps as described in the html file opened when yo
Install the Libero licensing daemon
************************************
-<<<<<<< HEAD
Download the 64 bit Licensing Daemons from the `Microchip's daemons section <https://ww1.microchip.com/downloads/aemdocuments/documents/fpga/media-content/FPGA/daemons/Linux_Licensing_Daemon_11.16.1_64-bit.tar.gz>`_
=======
Download the 64 bit Licensing Daemons from the `Microchip's daemons section <https://www.microchip.com/en-us/products/fpgas-and-plds/fpga-and-soc-design-tools/fpga/licensing>`_
* `Linux_Licensing_Daemon_11.16.1_64-bit.tar.gz <https://ww1.microchip.com/downloads/aemdocuments/documents/fpga/media-content/FPGA/daemons/Linux_Licensing_Daemon_11.16.1_64-bit.tar.gz>`_
* `Windows_Licensing_Daemon_11.16.1_64-bit.zip <https://ww1.microchip.com/downloads/aemdocuments/documents/fpga/media-content/FPGA/daemons/Windows_Licensing_Daemon_11.16.1_64-bit.zip>`_
->>>>>>> 95060975020a6b3edf498dd56ea7ea68c6571f24
-
Copy the downloaded file to the Microchip directory within your home directory and untar it.
@@ -111,13 +108,11 @@ Execute tool setup script
Download the script:
-<<<<<<< HEAD
git clone https://git.beagleboard.org/beaglev-fire/Microchip-FPGA-Tools-Setup
=======
.. literalinclude:: ./setup-microchip-tools.sh
:caption: Libero environment and license setup script
:language: bash
->>>>>>> 95060975020a6b3edf498dd56ea7ea68c6571f24
:download:`setup-microchip-tools.sh <./setup-microchip-tools.sh>`
--
GitLab