Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
targets: rename HDMI2Ethernet to HDMI2ETH
  • Loading branch information
enjoy-digital committed Oct 13, 2015
1 parent 80a6b7c commit f4fe9b7
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -22,7 +22,7 @@ env:
matrix:
- BOARD=atlys TARGET=base
- BOARD=atlys TARGET=hdmi2usb
- BOARD=atlys TARGET=hdmi2ethernet
- BOARD=atlys TARGET=hdmi2eth
- BOARD=opsis TARGET=base
- BOARD=opsis TARGET=hdmi2usb

Expand Down
8 changes: 4 additions & 4 deletions .travis/run.sh
Expand Up @@ -24,10 +24,10 @@ find | sort > /tmp/filelist.before
for BOARD in $BOARDS; do
if [ -z "$TARGET" ]; then
TARGETS="base hdmi2usb"
# FIXME: Get hdmi2ethernet working on the Opsis
# FIXME: Get hdmi2eth working on the Opsis
# https://github.com/timvideos/HDMI2USB-misoc-firmware/issues/51
if [ "$BOARD" = "atlys" ]; then
TARGETS="$TARGETS hdmi2ethernet"
TARGETS="$TARGETS hdmi2eth"
fi
else
TARGETS="$TARGET"
Expand Down Expand Up @@ -85,7 +85,7 @@ for BOARD in $BOARDS; do
PROG=$PROG BOARD=$BOARD TARGET=$TARGET make load || true
done
fi

# Copy built files
if [ -z $GH_TOKEN ]; then
# Only if run by travis display error
Expand Down Expand Up @@ -117,7 +117,7 @@ for BOARD in $BOARDS; do
echo "- Uploading built files to github.com/$COPY_REPO_OWNER/$COPY_REPO$COPY_DEST"
echo "---------------------------------------------"
rm -rf $COPY_REPO
git clone https://$GH_TOKEN@github.com/$COPY_REPO_OWNER/$COPY_REPO.git
git clone https://$GH_TOKEN@github.com/$COPY_REPO_OWNER/$COPY_REPO.git
cd $COPY_REPO
mkdir -p $COPY_DEST
# Not currently built so use .bit instead
Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Expand Up @@ -33,15 +33,15 @@ These label refers to issues which are related to the various firmware which exi

#### `hdmi2XXXX` Labels

These label refers to issues which are related to a **specific** board configuration.
These label refers to issues which are related to a **specific** board configuration.

* `hdmi2***` - This issue relates to all HDMI capture devices.
* `hdmi2usb` - This issue relates to capturing via the USB port.
* `hdmi2ethernet` - This issue relates to capturing via the Ethernet port.
* `hdmi2***` - This issue relates to all HDMI capture devices.
* `hdmi2usb` - This issue relates to capturing via the USB port.
* `hdmi2eth` - This issue relates to capturing via the Ethernet port.

#### `board-XXXX` Labels

These label refers to issues which are related to a **specific** board configuration.
These label refers to issues which are related to a **specific** board configuration.

* `board-***` - This issue relates to all boards.
* `board-atlys` - This issue relates to the Digilent Atlys board.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -48,7 +48,7 @@ endif
help:
@echo "Environment:"
@echo " BOARD=atlys OR opsis (current: $(BOARD))"
@echo " TARGET=base OR hdmi2usb OR hdmi2ethernet"
@echo " TARGET=base OR hdmi2usb OR hdmi2eth"
@echo " (current: $(TARGET))"
@echo " PROG=programmer (current: $(PROG))"
@echo ""
Expand Down
4 changes: 2 additions & 2 deletions README
Expand Up @@ -36,10 +36,10 @@ opsis_base:
* BaseSoC validated: CPU + DDR3 + UART
* MiniSoC validated: BaseSoC + 1Gbps Ethernet MAC handled by the CPU

atlys_hdmi2ethernet:
atlys_hdmi2eth:
* EtherboneSoC validated: BaseSoC + 10/100Mbps HW Ethernet UDP/IP stack and Etherbone
* VideomixerSoC validated: EtherboneSoC + HDMI in + HDMI out
* HDMI2EthernetSoC validated: VideomixerSoC + JPEG encoder + UDP streaming
* HDMI2ETHSoC validated: VideomixerSoC + JPEG encoder + UDP streaming

atlys_hdmi2usb:
* VideomixerSoC validated: MiniSoC + 2 x HDMI in + 2 x HDMI out
Expand Down
4 changes: 2 additions & 2 deletions targets/atlys_hdmi2ethernet.py → targets/atlys_hdmi2eth.py
Expand Up @@ -100,7 +100,7 @@ def __init__(self, platform, **kwargs):
for k, v in platform.hdmi_infos.items():
self.add_constant(k, v)

class HDMI2EthernetSoC(VideomixerSoC):
class HDMI2ETHSoC(VideomixerSoC):
csr_map = {
"encoder_reader": 26,
"encoder": 27,
Expand Down Expand Up @@ -130,4 +130,4 @@ def __init__(self, platform, **kwargs):
self.add_memory_region("encoder", self.mem_map["encoder"]+self.shadow_base, 0x2000)


default_subtarget = HDMI2EthernetSoC
default_subtarget = HDMI2ETHSoC

0 comments on commit f4fe9b7

Please sign in to comment.