Merge FPGA repository back into UHD repository

The FPGA codebase was removed from the UHD repository in 2014 to reduce
the size of the repository. However, over the last half-decade, the
split between the repositories has proven more burdensome than it has
been helpful. By merging the FPGA code back, it will be possible to
create atomic commits that touch both FPGA and UHD codebases. Continuous
integration testing is also simplified by merging the repositories,
because it was previously difficult to automatically derive the correct
UHD branch when testing a feature branch on the FPGA repository.

This commit also updates the license files and paths therein.

We are therefore merging the repositories again. Future development for
FPGA code will happen in the same repository as the UHD host code and
MPM code.

== Original Codebase and Rebasing ==

The original FPGA repository will be hosted for the foreseeable future
at its original local location: https://github.com/EttusResearch/fpga/

It can be used for bisecting, reference, and a more detailed history.

The final commit from said repository to be merged here is
05003794e2da61cabf64dd278c45685a7abad7ec. This commit is tagged as
v4.0.0.0-pre-uhd-merge.

If you have changes in the FPGA repository that you want to rebase onto
the UHD repository, simply run the following commands:

- Create a directory to store patches (this should be an empty
  directory):

    mkdir ~/patches

- Now make sure that your FPGA codebase is based on the same state as
  the code that was merged:

    cd src/fpga # Or wherever your FPGA code is stored
    git rebase v4.0.0.0-pre-uhd-merge

  Note: The rebase command may look slightly different depending on what
  exactly you're trying to rebase.

- Create a patch set for your changes versus v4.0.0.0-pre-uhd-merge:

    git format-patch v4.0.0.0-pre-uhd-merge -o ~/patches

  Note: Make sure that only patches are stored in your output directory.
  It should otherwise be empty. Make sure that you picked the correct
  range of commits, and only commits you wanted to rebase were exported
  as patch files.

- Go to the UHD repository and apply the patches:

    cd src/uhd # Or wherever your UHD repository is stored
    git am --directory fpga ~/patches/*
    rm -rf ~/patches # This is for cleanup

== Contributors ==

The following people have contributed mainly to these files (this list
is not complete):

Co-authored-by: Alex Williams <alex.williams@ni.com>
Co-authored-by: Andrej Rode <andrej.rode@ettus.com>
Co-authored-by: Ashish Chaudhari <ashish@ettus.com>
Co-authored-by: Ben Hilburn <ben.hilburn@ettus.com>
Co-authored-by: Ciro Nishiguchi <ciro.nishiguchi@ni.com>
Co-authored-by: Daniel Jepson <daniel.jepson@ni.com>
Co-authored-by: Derek Kozel <derek.kozel@ettus.com>
Co-authored-by: EJ Kreinar <ej@he360.com>
Co-authored-by: Humberto Jimenez <humberto.jimenez@ni.com>
Co-authored-by: Ian Buckley <ian.buckley@gmail.com>
Co-authored-by: Jörg Hofrichter <joerg.hofrichter@ni.com>
Co-authored-by: Jon Kiser <jon.kiser@ni.com>
Co-authored-by: Josh Blum <josh@joshknows.com>
Co-authored-by: Jonathon Pendlum <jonathan.pendlum@ettus.com>
Co-authored-by: Martin Braun <martin.braun@ettus.com>
Co-authored-by: Matt Ettus <matt@ettus.com>
Co-authored-by: Michael West <michael.west@ettus.com>
Co-authored-by: Moritz Fischer <moritz.fischer@ettus.com>
Co-authored-by: Nick Foster <nick@ettus.com>
Co-authored-by: Nicolas Cuervo <nicolas.cuervo@ettus.com>
Co-authored-by: Paul Butler <paul.butler@ni.com>
Co-authored-by: Paul David <paul.david@ettus.com>
Co-authored-by: Ryan Marlow <ryan.marlow@ettus.com>
Co-authored-by: Sugandha Gupta <sugandha.gupta@ettus.com>
Co-authored-by: Sylvain Munaut <tnt@246tNt.com>
Co-authored-by: Trung Tran <trung.tran@ettus.com>
Co-authored-by: Vidush Vishwanath <vidush.vishwanath@ettus.com>
Co-authored-by: Wade Fife <wade.fife@ettus.com>


Original-commit: bafa9d95453387814ef25e6b6256ba8db2df612f
This commit is contained in:
Martin Braun
2020-01-28 09:35:36 -08:00
co-authored by Alex Williams Andrej Rode Ashish Chaudhari Ben Hilburn Ciro Nishiguchi Daniel Jepson Derek Kozel EJ Kreinar Humberto Jimenez Ian Buckley Jörg Hofrichter Jon Kiser Josh Blum Jonathon Pendlum Matt Ettus Michael West Moritz Fischer Nick Foster Nicolas Cuervo Paul Butler Paul David Ryan Marlow Sugandha Gupta Sylvain Munaut Trung Tran Vidush Vishwanath Wade Fife
parent 74893643ca
commit 6b67702ad7
2157 changed files with 1282567 additions and 0 deletions
+97
View File
@@ -0,0 +1,97 @@
# Function definitions
proc ::connect_server { {hostname localhost} {port 3121} } {
if { [string compare [current_hw_server -quiet] ""] != 0 } {
disconnect_server
}
connect_hw_server -url $hostname:$port
}
proc ::disconnect_server { } {
disconnect_hw_server [current_hw_server]
}
proc ::jtag_list {} {
# Iterate through all hardware targets
set hw_targets [get_hw_targets -of_objects [current_hw_server -quiet] -quiet]
set idx_t 0
foreach hw_target $hw_targets {
puts "== Target${idx_t}: $hw_target =="
open_hw_target $hw_target -quiet
# Iterate through all hardware devices
set hw_devices [get_hw_devices]
set idx_d 0
foreach hw_device $hw_devices {
puts "--- Device${idx_d}: $hw_device (Address = ${idx_t}:${idx_d})"
set idx_d [expr $idx_d + 1]
}
close_hw_target -quiet
set idx_t [expr $idx_t + 1]
}
}
proc ::jtag_program { filepath {serial "."} {address "0:0"} } {
set idx_t [lindex [split $address :] 0]
set idx_d [lindex [split $address :] 1]
set hw_targets [get_hw_targets -of_objects [current_hw_server]]
set hw_targets_regexp {}
foreach target $hw_targets {
if { [regexp $serial $target] } {
set hw_targets_regexp [concat $hw_targets_regexp $target]
}
}
set hw_target [lindex $hw_targets_regexp $idx_t]
if { [string compare $hw_target ""] == 0 } {
error "ERROR: Could not open hw_target $idx_t. Either the address $address is incorrect or the device is not connected."
} else {
open_hw_target $hw_target -quiet
}
set hw_device [lindex [get_hw_devices] $idx_d]
if { [string compare $hw_device ""] == 0 } {
close_hw_target -quiet
error "ERROR: Could not open hw_device $idx_d. Either the address $address is incorrect or the device is not connected."
} else {
puts "- Target: $hw_target"
puts "- Device: $hw_device"
puts "- Filename: $filepath"
puts "Programming..."
current_hw_device $hw_device
set_property PROBES.FILE {} [current_hw_device]
set_property PROGRAM.FILE $filepath [current_hw_device]
program_hw_devices [current_hw_device]
close_hw_target -quiet
puts "Programming DONE"
}
}
# Initialization sequence
open_hw
connect_server
if [expr $argc > 0] {
#Execute a command and exit
set cmd [lindex $argv 0]
if { [string compare $cmd "list"] == 0 } {
jtag_list
} elseif { [string compare $cmd "program"] == 0 } {
set filepath [lindex $argv 1]
if [expr $argc == 3] {
set serial [lindex $argv 2]
jtag_program $filepath $serial
} elseif [expr $argc > 3] {
set serial [lindex $argv 2]
set devaddr [lindex $argv 3]
jtag_program $filepath $serial $devaddr
} else {
jtag_program $filepath
}
} else {
error "Invalid command: $cmd"
}
disconnect_server
exit
}