diff --git a/patches/svec.diff b/patches/svec.diff index 629e87743cc5174429c0cacbd35177267daccf18..361f69554897bb7ec702a1649e5ef04f8ed12e23 100644 --- a/patches/svec.diff +++ b/patches/svec.diff @@ -11,15 +11,3 @@ index 17949d3..4b35ebe 100644 ccflags-y += -I$(VMEBRIDGE_ABS)/include ccflags-y += -I$(FPGA_MGR_ABS)/include -diff --git a/software/kernel/svec-core.c b/software/kernel/svec-core.c -index d372a41..3c96157 100644 ---- a/software/kernel/svec-core.c -+++ b/software/kernel/svec-core.c -@@ -620,6 +620,6 @@ MODULE_LICENSE("GPL v2"); - MODULE_VERSION(VERSION); - MODULE_DESCRIPTION("Driver for the 'Simple VME FMC Carrier' a.k.a. SVEC"); - --MODULE_SOFTDEP("pre: htvic i2c_mux i2c_ohwr spi-ocores"); -+MODULE_SOFTDEP("pre: htvic i2c_mux i2c-ocores spi-ocores"); - - ADDITIONAL_VERSIONS; diff --git a/scripts/svec_carrier_build.sh b/scripts/svec_carrier_build.sh index b29fcc2a00e1b27ddaed56812491fa694cd6e629..79536f99d2ee9538e388614eb2adee2dfed7be2a 100644 --- a/scripts/svec_carrier_build.sh +++ b/scripts/svec_carrier_build.sh @@ -14,7 +14,7 @@ cd $BUILD_DIR [ -d $PROJECT ] || git clone https://ohwr.org/project/svec.git $PROJECT cd $PROJECT -git checkout -B release v1.4.3 +git checkout develop [ $SKIP_PATCH ] || [ -e $PATCH_DIR/$PROJECT.diff ] && patch -p1 < $PATCH_DIR/$PROJECT.diff export CHEBY="python $BUILD_DIR/cheby/proto/cheby.py" export FMC="$BUILD_DIR/fmc-sw"