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: timvideos/HDMI2USB-litex-firmware
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a5ff108491b5
Choose a base ref
...
head repository: timvideos/HDMI2USB-litex-firmware
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2a7b47daa13c
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on Jan 23, 2016

  1. makefiles: Adding a Makefile which quickly tests all targets. 

    Use as follows;
```shell
make -f Makefile.all firmware
make -f Makefile.all gateware
make -f Makefile.all all
```
    @mithro
    mithro committed Jan 23, 2016
    Copy the full SHA
    b23f109 View commit details

  2. makefiles: Split gateware into generate and build steps.

    @mithro
    mithro committed Jan 23, 2016
    Copy the full SHA
    43ef247 View commit details

  3. Merge pull request #173 from mithro/makefile-all 

    makefiles: Adding Makefile to quickly test all targets.
    @enjoy-digital
    enjoy-digital committed Jan 23, 2016
    Copy the full SHA
    2a7b47d View commit details
Showing with 59 additions and 3 deletions.
  1. +12 −1 Makefile
  2. +39 −0 Makefile.all
  3. +4 −1 Makefile.fx2
  4. +4 −1 Makefile.lm32
13 changes: 12 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -76,14 +76,25 @@ third_party/%/.git: .gitmodules

# Gateware
MODULES=migen misoc liteeth litescope
gateware: $(addprefix gateware-,$(TARGETS)) $(addsuffix /.git,$(addprefix third_party/,$(MODULES)))
gateware-generate: $(addprefix gateware-generate-,$(TARGETS)) $(addsuffix /.git,$(addprefix third_party/,$(MODULES)))
ifneq ($(OS),Windows_NT)
cd $(MSCDIR) && $(CMD) -Ob run False --csr_csv $(HDMI2USBDIR)/test/csr.csv build-csr-csv build-bitstream \
| $(FILTER) $(PWD)/build/output.$(DATE).log; (exit $${PIPESTATUS[0]})
else
cd $(MSCDIR) && $(CMD) -Ob run False --csr_csv $(HDMI2USBDIR)/test/csr.csv build-csr-csv build-bitstream
endif

gateware-build: $(addprefix gateware-build-,$(TARGETS)) $(addsuffix /.git,$(addprefix third_party/,$(MODULES)))
ifneq ($(OS),Windows_NT)
cd $(MSCDIR) && $(CMD) --csr_csv $(HDMI2USBDIR)/test/csr.csv build-csr-csv build-bitstream \
| $(FILTER) $(PWD)/build/output.$(DATE).log; (exit $${PIPESTATUS[0]})
else
cd $(MSCDIR) && $(CMD) --csr_csv $(HDMI2USBDIR)/test/csr.csv build-csr-csv build-bitstream
endif

gateware: gateware-generate gateware-build
@true

# Firmware
firmware: $(addprefix firmware-,$(TARGETS))
@true
39 changes: 39 additions & 0 deletions Makefile.all
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@

ifneq ($(OS),Windows_NT)
ifneq "$(HDMI2USB_ENV)" "1"
$(error "Please 'source scripts/setup-env.sh'")
endif
endif

# Turn off Python's hash randomization
export PYTHONHASHSEED=0

gateware-generate:
BOARD=atlys TARGET=base make gateware-generate
BOARD=atlys TARGET=hdmi2usb make gateware-generate
BOARD=atlys TARGET=hdmi2eth make gateware-generate
BOARD=opsis TARGET=base make gateware-generate
BOARD=opsis TARGET=hdmi2usb make gateware-generate
BOARD=pipistrello TARGET=base make gateware-generate

gateware-build:
BOARD=atlys TARGET=base make gateware-build
BOARD=atlys TARGET=hdmi2usb make gateware-build
BOARD=atlys TARGET=hdmi2eth make gateware-build
BOARD=opsis TARGET=base make gateware-build
BOARD=opsis TARGET=hdmi2usb make gateware-build
BOARD=pipistrello TARGET=base make gateware-build

firmware:
BOARD=atlys TARGET=base make firmware
BOARD=atlys TARGET=hdmi2usb make firmware
BOARD=atlys TARGET=hdmi2eth make firmware
BOARD=opsis TARGET=base make firmware
BOARD=opsis TARGET=hdmi2usb make firmware
BOARD=pipistrello TARGET=base make firmware

all: firmware gateware
true

.DEFAULT_GOAL := all
.PHONY: all load-gateware load flash gateware firmware third_party/*
5 changes: 4 additions & 1 deletion Makefile.fx2
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,10 @@ help-fx2:
@echo " make load-fx2"
@echo " make view"

gateware-fx2:
gateware-generate-fx2:
@true

gateware-build-fx2:
cp gateware/encoder/vhdl/header.hex $(MSCDIR)/build/header.hex

# Firmware for the Cypress FX2
5 changes: 4 additions & 1 deletion Makefile.lm32
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,10 @@ help-lm32:
@echo " make connect-lm32"

# The gateware embeds the lm32 firmware, so we need to build that first.
gateware-lm32: firmware-lm32
gateware-generate-lm32:
@true

gateware-build-lm32: firmware-lm32
@true

ifeq ($(TARGET),hdmi2usb)