Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/misoc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 10eb07526dd2
Choose a base ref
...
head repository: m-labs/misoc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c1ca928ec2be
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jul 4, 2015

  1. software/bios: call eth_mode only if we have an ethernet mac (we don'… 

    …t need to call it when we have a hardware UDP/IP stack)
    @enjoy-digital
    enjoy-digital committed Jul 4, 2015

    Verified

    This commit was signed with the committer’s verified signature.
    makenowjust Hiroya Fujinami
    GPG key ID: 9F4CB6A0CB6B6BE9
    Verified
    Learn about vigilant mode
    Copy the full SHA
    23541b5 View commit details

Commits on Jul 5, 2015

  1. liteeth: small logic optimizations on mac (eases timings on spartan6)

    @enjoy-digital
    enjoy-digital committed Jul 5, 2015
    2

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    chris-huxtable Chris Huxtable
    GPG key ID: DE38B1D1C2AB9B0E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c1ca928 View commit details
Showing with 13 additions and 5 deletions.
  1. +1 −2 misoclib/com/liteeth/core/mac/core/crc.py
  2. +11 −2 misoclib/com/liteeth/core/mac/core/preamble.py
  3. +1 −1 software/bios/main.c
3 changes: 1 addition & 2 deletions misoclib/com/liteeth/core/mac/core/crc.py
View file
Original file line number Diff line number Diff line change
@@ -258,15 +258,14 @@ def __init__(self, crc_class, description):
fifo.reset.eq(1),
NextState("IDLE"),
)
self.comb += crc.data.eq(sink.data)
fsm.act("IDLE",
crc.data.eq(sink.data),
If(sink.stb & sink.sop & sink.ack,
crc.ce.eq(1),
NextState("COPY")
)
)
fsm.act("COPY",
crc.data.eq(sink.data),
If(sink.stb & sink.ack,
crc.ce.eq(1),
If(sink.eop,
13 changes: 11 additions & 2 deletions misoclib/com/liteeth/core/mac/core/preamble.py
View file
Original file line number Diff line number Diff line change
@@ -41,8 +41,13 @@ def __init__(self, dw):
inc_cnt.eq(self.source.ack)
)
)

self.comb += [
self.source.data.eq(self.sink.data),
self.source.last_be.eq(self.sink.last_be)
]
fsm.act("COPY",
Record.connect(self.sink, self.source),
Record.connect(self.sink, self.source, leave_out=["data", "last_be"]),
self.source.sop.eq(0),

If(self.sink.stb & self.sink.eop & self.source.ack,
@@ -130,8 +135,12 @@ def __init__(self, dw):
)
)
)
self.comb += [
self.source.data.eq(self.sink.data),
self.source.last_be.eq(self.sink.last_be)
]
fsm.act("COPY",
Record.connect(self.sink, self.source),
Record.connect(self.sink, self.source, leave_out=["data", "last_be"]),
self.source.sop.eq(sop),
clr_sop.eq(self.source.stb & self.source.ack),

2 changes: 1 addition & 1 deletion software/bios/main.c
View file
Original file line number Diff line number Diff line change
@@ -508,10 +508,10 @@ static void boot_sequence(void)
flashboot();
#endif
serialboot();
#ifdef CSR_ETHMAC_BASE
#ifdef CSR_ETHPHY_MODE_DETECTION_MODE_ADDR
eth_mode();
#endif
#ifdef CSR_ETHMAC_BASE
netboot();
#endif
printf("No boot medium found\n");