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: b61239a1fda9
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: 0eab7302da75
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on Oct 5, 2018

  1. travis: Always create the strace files.

    @mithro
    mithro committed Oct 5, 2018
    Copy the full SHA
    8475ce5 View commit details

  2. scripts: Better Xilinx toolchain output.

    @mithro
    mithro committed Oct 5, 2018
    Copy the full SHA
    b23ac0f View commit details

  3. travis: Echo entering the environment.

    @mithro
    mithro committed Oct 5, 2018
    Copy the full SHA
    a10be20 View commit details

  4. Merge pull request #86 from mithro/toolchain-gen-fixes 

    Fixes to CI toolchain generation
    @mithro
    mithro authored Oct 5, 2018
    Copy the full SHA
    0eab730 View commit details
Showing with 10 additions and 4 deletions.
  1. +3 −0 .travis/build.sh
  2. +1 −4 .travis/package-xilinx-step2-create-tar.sh
  3. +3 −0 scripts/download-env.sh
  4. +3 −0 scripts/enter-env.sh
3 changes: 3 additions & 0 deletions .travis/build.sh
View file
Original file line number Diff line number Diff line change
@@ -59,7 +59,10 @@ function build() {

(
# Imports TARGET, PLATFORM, CPU and TARGET_BUILD_DIR from Makefile
echo "- Entering environment"
echo "---------------------------------------------"
source scripts/enter-env.sh || exit 1
echo "============================================="
echo ""
echo ""
echo ""
5 changes: 1 addition & 4 deletions .travis/package-xilinx-step2-create-tar.sh
View file
Original file line number Diff line number Diff line change
@@ -31,10 +31,7 @@ if [ ! -f $STRACE_LOG ]; then
fi

STRACE_FILES=$BASE/strace.files.log
if [ ! -f $STRACE_LOG ]; then
#cat $STRACE_LOG | python $SETUP_DIR/package-xilinx-filter-strace.py $PREFIX > $STRACE_FILES
$SETUP_DIR/package-xilinx-cluefs-filter.py $STRACE_LOG > $STRACE_FILES
fi
$SETUP_DIR/package-xilinx-cluefs-filter.py $STRACE_LOG > $STRACE_FILES

XILINX_DIR=$BASE/xilinx-stripped
if [ -d $XILINX_DIR ]; then
3 changes: 3 additions & 0 deletions scripts/download-env.sh
View file
Original file line number Diff line number Diff line change
@@ -214,6 +214,7 @@ case $PLATFORM_TOOLCHAIN in
echo ""
export HAVE_XILINX_ISE=1
else
echo " - *No* Xilinx ISE toolchain found"
export HAVE_XILINX_ISE=0
fi
if [ ${#XILINX_SETTINGS_VIVADO[@]} -gt 0 ]; then
@@ -224,12 +225,14 @@ case $PLATFORM_TOOLCHAIN in
echo ""
export HAVE_XILINX_VIVADO=1
else
echo " - *No* Xilinx Vivado toolchain found!"
export HAVE_XILINX_VIVADO=0
fi
if [ $HAVE_XILINX_ISE -eq 1 -o $HAVE_XILINX_VIVADO -eq 1 ]; then
export HAVE_XILINX_TOOLCHAIN=1
export HAVE_FPGA_TOOLCHAIN=1
else
echo " - *No* Xilinx toolchain found!"
export HAVE_XILINX_TOOLCHAIN=0
export HAVE_FPGA_TOOLCHAIN=0
fi
3 changes: 3 additions & 0 deletions scripts/enter-env.sh
View file
Original file line number Diff line number Diff line change
@@ -201,6 +201,7 @@ case $PLATFORM_TOOLCHAIN in
echo ""
export HAVE_XILINX_ISE=1
else
echo " - *No* Xilinx ISE toolchain found"
export HAVE_XILINX_ISE=0
fi
if [ ${#XILINX_SETTINGS_VIVADO[@]} -gt 0 ]; then
@@ -211,12 +212,14 @@ case $PLATFORM_TOOLCHAIN in
echo ""
export HAVE_XILINX_VIVADO=1
else
echo " - *No* Xilinx Vivado toolchain found!"
export HAVE_XILINX_VIVADO=0
fi
if [ $HAVE_XILINX_ISE -eq 1 -o $HAVE_XILINX_VIVADO -eq 1 ]; then
export HAVE_XILINX_TOOLCHAIN=1
export HAVE_FPGA_TOOLCHAIN=1
else
echo " - *No* Xilinx toolchain found!"
export HAVE_XILINX_TOOLCHAIN=0
export HAVE_FPGA_TOOLCHAIN=0
fi