Files
+18 6b67702ad7 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
2020-01-28 09:35:36 -08:00

126 lines
4.3 KiB
Verilog

//
// Copyright 2013 Ettus Research LLC
// Copyright 2018 Ettus Research, a National Instruments Company
//
// SPDX-License-Identifier: LGPL-3.0-or-later
//
module zpu_bootram #(
parameter ADDR_WIDTH = 16,
parameter DATA_WIDTH = 32,
parameter MAX_ADDR = 16'h7FFC
) (
input clk,
input rst,
input mem_stb,
input mem_wea,
input [ADDR_WIDTH-1:0] mem_addra,
input [DATA_WIDTH-1:0] mem_dina,
output [DATA_WIDTH-1:0] mem_douta,
output reg mem_acka,
input ldr_stb,
input ldr_wea,
input [ADDR_WIDTH-1:0] ldr_addra,
input [DATA_WIDTH-1:0] ldr_dina,
output ldr_acka,
output reg zpu_rst
);
localparam SR_LDR_ADDR_REG = 4'h0;
localparam SR_LDR_DATA_REG = 4'h1;
//---------------------------------------------------------
// Mem ack logic
always @(posedge clk) begin
if (rst) mem_acka <= 0;
else mem_acka <= mem_stb & ~mem_acka;
end
//---------------------------------------------------------
// Instantiate 2 bootram modules
// They will both initialize with the pre-built ZPU firmware
//
wire ram0_ena, ram1_ena;
wire [3:0] ram0_wea, ram1_wea;
wire [12:0] ram0_addra, ram1_addra;
wire [31:0] ram0_dina, ram0_douta, ram1_dina, ram1_douta;
bootram sys_ram0(
.clka(clk),
.ena(ram0_ena),
.wea(ram0_wea),
.addra(ram0_addra),
.dina(ram0_dina),
.douta(ram0_douta));
bootram sys_ram1(
.clka(clk),
.ena(ram1_ena),
.wea(ram1_wea),
.addra(ram1_addra),
.dina(ram1_dina),
.douta(ram1_douta));
//---------------------------------------------------------
// Settings bus interface for bootloader
wire ldr_set_stb;
wire [3:0] ldr_set_addr;
wire [DATA_WIDTH-1:0] ldr_set_data;
//@TODO: This address truncation seems unclean. Maybe settings_bus can take a addr_width as a param.
wire [7:0] ldr_set_addr_w;
settings_bus #(.AWIDTH(ADDR_WIDTH), .DWIDTH(DATA_WIDTH)) ldr_settings_bus
(
.wb_clk(clk), .wb_rst(rst),
.wb_adr_i(ldr_addra), .wb_dat_i(ldr_dina),
.wb_stb_i(ldr_stb), .wb_we_i(ldr_wea), .wb_ack_o(ldr_acka),
.strobe(ldr_set_stb), .addr(ldr_set_addr_w), .data(ldr_set_data)
);
assign ldr_set_addr = ldr_set_addr_w[3:0];
//---------------------------------------------------------
// Selection logic
//
reg bootram_ptr;
reg [12:0] ldr_curr_wr_addr;
wire ldr_we_stb;
assign {ram0_ena, ram0_wea, ram0_addra, ram0_dina} = bootram_ptr ? {mem_stb, {4{(mem_wea & ~zpu_rst)}}, mem_addra[14:2], mem_dina} :
{ldr_we_stb, {4{ldr_we_stb}}, ldr_curr_wr_addr, ldr_set_data};
assign {ram1_ena, ram1_wea, ram1_addra, ram1_dina} = bootram_ptr ? {ldr_we_stb, {4{ldr_we_stb}}, ldr_curr_wr_addr, ldr_set_data} :
{mem_stb, {4{(mem_wea & ~zpu_rst)}}, mem_addra[14:2], mem_dina};
assign mem_douta = bootram_ptr ? ram0_douta : ram1_douta;
//---------------------------------------------------------
// Boot loader
//
assign ldr_we_stb = ~zpu_rst && ldr_set_stb && (ldr_set_addr == SR_LDR_DATA_REG);
always @(posedge clk) begin
if (rst) begin
zpu_rst <= 1;
bootram_ptr <= 1;
ldr_curr_wr_addr <= 13'h0;
end else if (ldr_set_stb & ~zpu_rst) begin
case (ldr_set_addr)
SR_LDR_ADDR_REG: begin
ldr_curr_wr_addr <= ldr_set_data[14:2];
end
SR_LDR_DATA_REG: begin
ldr_curr_wr_addr <= ldr_curr_wr_addr + 1;
if ({1'b0, ldr_curr_wr_addr, 2'b00} == MAX_ADDR) begin
zpu_rst <= 1;
bootram_ptr <= ~bootram_ptr;
end
end
endcase
end else begin
zpu_rst <= 0;
end
end
endmodule