| Message ID | 1428660114-11967-1-git-send-email-gwenj@trabucayre.com |
|---|---|
| State | Accepted |
| Headers | show |
up? On Fri, 10 Apr 2015 12:01:54 +0200 Gwenhael Goavec-Merou <gwenj@trabucayre.com> wrote: > From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > > GNURadio provides a set of processing blocks like analog or digital > communication, filters, ... > > Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > [build-tested only] > --- > Changes v2 -> v3: > * merge comment about fftw depends. > * change prompt content. > * suppress 'GNU Radio' in help messages. > Changes v1 -> v2: > * supress hidden variable and use direct depends on > BR2_PACKAGE_FFTW_PRECISION_SINGLE. > * use a single if BR2_PACKAGE_FFTW_PRECISION_SINGLE for all options that need > this. > --- > package/gnuradio/Config.in | 60 ++++++++++++++++++++++++++++++++++++++++++++ > package/gnuradio/gnuradio.mk | 55 ++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 115 insertions(+) > > diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in > index a33deeb..4f0088d 100644 > --- a/package/gnuradio/Config.in > +++ b/package/gnuradio/Config.in > @@ -37,6 +37,12 @@ config BR2_PACKAGE_GNURADIO_BLOCKS > help > GNU Radio basic block library > > +config BR2_PACKAGE_GNURADIO_FEC > + bool "gr-fec support" > + select BR2_PACKAGE_GNURADIO_BLOCKS > + help > + FEC signal processing blocks > + > config BR2_PACKAGE_GNURADIO_PYTHON > bool "python support" > select BR2_PACKAGE_BOOST_PYTHON > @@ -44,4 +50,58 @@ config BR2_PACKAGE_GNURADIO_PYTHON > help > Enable python component > > +config BR2_PACKAGE_GNURADIO_UTILS > + bool "gr-utils support" > + select BR2_PACKAGE_GNURADIO_PYTHON > + help > + Misc python utilities > + > +comment "gr-fft, -filter, -analog, -channels, -digital, -trellis, -pager depends fftw's single precision" > + depends on !BR2_PACKAGE_FFTW_PRECISION_SINGLE > + > +if BR2_PACKAGE_FFTW_PRECISION_SINGLE > + > +config BR2_PACKAGE_GNURADIO_ANALOG > + bool "gr-analog support" > + select BR2_PACKAGE_GNURADIO_FILTER > + help > + Analog communications blocks > + > +config BR2_PACKAGE_GNURADIO_CHANNELS > + bool "gr-channels support" > + select BR2_PACKAGE_GNURADIO_ANALOG > + help > + Channel model blocks > + > +config BR2_PACKAGE_GNURADIO_DIGITAL > + bool "gr-digital support" > + select BR2_PACKAGE_GNURADIO_ANALOG > + help > + Digital communications blocks > + > +config BR2_PACKAGE_GNURADIO_FFT > + bool "gr-fft support" > + select BR2_PACKAGE_GNURADIO_BLOCKS > + help > + FFT signal processing blocks > + > +config BR2_PACKAGE_GNURADIO_FILTER > + bool "gr-filter support" > + select BR2_PACKAGE_GNURADIO_FFT > + help > + Filter signal processing blocks > + > +config BR2_PACKAGE_GNURADIO_PAGER > + bool "gr-flex support" > + select BR2_PACKAGE_GNURADIO_ANALOG > + help > + FLEX pager decoder implementation blocks > + > +config BR2_PACKAGE_GNURADIO_TRELLIS > + bool "gr-trellis support" > + select BR2_PACKAGE_GNURADIO_DIGITAL > + help > + Trellis coded modulation blocks > + > +endif > endif > diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk > index e58c7dc..fc5cd1f 100644 > --- a/package/gnuradio/gnuradio.mk > +++ b/package/gnuradio/gnuradio.mk > @@ -42,12 +42,49 @@ ifeq ($(BR2_ARM_CPU_HAS_NEON),) > GNURADIO_CONF_OPTS += -Dhave_mfpu_neon=0 > endif > > +ifeq ($(BR2_PACKAGE_GNURADIO_ANALOG),y) > +GNURADIO_CONF_OPTS += -DENABLE_GR_ANALOG=ON > +else > +GNURADIO_CONF_OPTS += -DENABLE_GR_ANALOG=OFF > +endif > + > ifeq ($(BR2_PACKAGE_GNURADIO_BLOCKS),y) > GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=ON > else > GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=OFF > endif > > +ifeq ($(BR2_PACKAGE_GNURADIO_CHANNELS),y) > +GNURADIO_CONF_OPTS += -DENABLE_GR_CHANNELS=ON > +else > +GNURADIO_CONF_OPTS += -DENABLE_GR_CHANNELS=OFF > +endif > + > +ifeq ($(BR2_PACKAGE_GNURADIO_DIGITAL),y) > +GNURADIO_CONF_OPTS += -DENABLE_GR_DIGITAL=ON > +else > +GNURADIO_CONF_OPTS += -DENABLE_GR_DIGITAL=OFF > +endif > + > +ifeq ($(BR2_PACKAGE_GNURADIO_FEC),y) > +GNURADIO_CONF_OPTS += -DENABLE_GR_FEC=ON > +else > +GNURADIO_CONF_OPTS += -DENABLE_GR_FEC=OFF > +endif > + > +ifeq ($(BR2_PACKAGE_GNURADIO_FFT),y) > +GNURADIO_DEPENDENCIES += fftw > +GNURADIO_CONF_OPTS += -DENABLE_GR_FFT=ON > +else > +GNURADIO_CONF_OPTS += -DENABLE_GR_FFT=OFF > +endif > + > +ifeq ($(BR2_PACKAGE_GNURADIO_FILTER),y) > +GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=ON > +else > +GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF > +endif > + > ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) > GNURADIO_DEPENDENCIES += python > GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON > @@ -55,4 +92,22 @@ else > GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF > endif > > +ifeq ($(BR2_PACKAGE_GNURADIO_PAGER),y) > +GNURADIO_CONF_OPTS += -DENABLE_PAGER=ON > +else > +GNURADIO_CONF_OPTS += -DENABLE_PAGER=OFF > +endif > + > +ifeq ($(BR2_PACKAGE_GNURADIO_TRELLIS),y) > +GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=ON > +else > +GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=OFF > +endif > + > +ifeq ($(BR2_PACKAGE_GNURADIO_UTILS),y) > +GNURADIO_CONF_OPTS += -DENABLE_GR_UTILS=ON > +else > +GNURADIO_CONF_OPTS += -DENABLE_GR_UTILS=OFF > +endif > + > $(eval $(cmake-package)) > -- > 2.0.5 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
up? On Fri, 10 Apr 2015 12:01:54 +0200 Gwenhael Goavec-Merou <gwenj@trabucayre.com> wrote: > From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > > GNURadio provides a set of processing blocks like analog or digital > communication, filters, ... > > Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > [build-tested only] > --- > Changes v2 -> v3: > * merge comment about fftw depends. > * change prompt content. > * suppress 'GNU Radio' in help messages. > Changes v1 -> v2: > * supress hidden variable and use direct depends on > BR2_PACKAGE_FFTW_PRECISION_SINGLE. > * use a single if BR2_PACKAGE_FFTW_PRECISION_SINGLE for all options that need > this. > --- > package/gnuradio/Config.in | 60 ++++++++++++++++++++++++++++++++++++++++++++ > package/gnuradio/gnuradio.mk | 55 ++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 115 insertions(+) > > diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in > index a33deeb..4f0088d 100644 > --- a/package/gnuradio/Config.in > +++ b/package/gnuradio/Config.in > @@ -37,6 +37,12 @@ config BR2_PACKAGE_GNURADIO_BLOCKS > help > GNU Radio basic block library > > +config BR2_PACKAGE_GNURADIO_FEC > + bool "gr-fec support" > + select BR2_PACKAGE_GNURADIO_BLOCKS > + help > + FEC signal processing blocks > + > config BR2_PACKAGE_GNURADIO_PYTHON > bool "python support" > select BR2_PACKAGE_BOOST_PYTHON > @@ -44,4 +50,58 @@ config BR2_PACKAGE_GNURADIO_PYTHON > help > Enable python component > > +config BR2_PACKAGE_GNURADIO_UTILS > + bool "gr-utils support" > + select BR2_PACKAGE_GNURADIO_PYTHON > + help > + Misc python utilities > + > +comment "gr-fft, -filter, -analog, -channels, -digital, -trellis, -pager depends fftw's single precision" > + depends on !BR2_PACKAGE_FFTW_PRECISION_SINGLE > + > +if BR2_PACKAGE_FFTW_PRECISION_SINGLE > + > +config BR2_PACKAGE_GNURADIO_ANALOG > + bool "gr-analog support" > + select BR2_PACKAGE_GNURADIO_FILTER > + help > + Analog communications blocks > + > +config BR2_PACKAGE_GNURADIO_CHANNELS > + bool "gr-channels support" > + select BR2_PACKAGE_GNURADIO_ANALOG > + help > + Channel model blocks > + > +config BR2_PACKAGE_GNURADIO_DIGITAL > + bool "gr-digital support" > + select BR2_PACKAGE_GNURADIO_ANALOG > + help > + Digital communications blocks > + > +config BR2_PACKAGE_GNURADIO_FFT > + bool "gr-fft support" > + select BR2_PACKAGE_GNURADIO_BLOCKS > + help > + FFT signal processing blocks > + > +config BR2_PACKAGE_GNURADIO_FILTER > + bool "gr-filter support" > + select BR2_PACKAGE_GNURADIO_FFT > + help > + Filter signal processing blocks > + > +config BR2_PACKAGE_GNURADIO_PAGER > + bool "gr-flex support" > + select BR2_PACKAGE_GNURADIO_ANALOG > + help > + FLEX pager decoder implementation blocks > + > +config BR2_PACKAGE_GNURADIO_TRELLIS > + bool "gr-trellis support" > + select BR2_PACKAGE_GNURADIO_DIGITAL > + help > + Trellis coded modulation blocks > + > +endif > endif > diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk > index e58c7dc..fc5cd1f 100644 > --- a/package/gnuradio/gnuradio.mk > +++ b/package/gnuradio/gnuradio.mk > @@ -42,12 +42,49 @@ ifeq ($(BR2_ARM_CPU_HAS_NEON),) > GNURADIO_CONF_OPTS += -Dhave_mfpu_neon=0 > endif > > +ifeq ($(BR2_PACKAGE_GNURADIO_ANALOG),y) > +GNURADIO_CONF_OPTS += -DENABLE_GR_ANALOG=ON > +else > +GNURADIO_CONF_OPTS += -DENABLE_GR_ANALOG=OFF > +endif > + > ifeq ($(BR2_PACKAGE_GNURADIO_BLOCKS),y) > GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=ON > else > GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=OFF > endif > > +ifeq ($(BR2_PACKAGE_GNURADIO_CHANNELS),y) > +GNURADIO_CONF_OPTS += -DENABLE_GR_CHANNELS=ON > +else > +GNURADIO_CONF_OPTS += -DENABLE_GR_CHANNELS=OFF > +endif > + > +ifeq ($(BR2_PACKAGE_GNURADIO_DIGITAL),y) > +GNURADIO_CONF_OPTS += -DENABLE_GR_DIGITAL=ON > +else > +GNURADIO_CONF_OPTS += -DENABLE_GR_DIGITAL=OFF > +endif > + > +ifeq ($(BR2_PACKAGE_GNURADIO_FEC),y) > +GNURADIO_CONF_OPTS += -DENABLE_GR_FEC=ON > +else > +GNURADIO_CONF_OPTS += -DENABLE_GR_FEC=OFF > +endif > + > +ifeq ($(BR2_PACKAGE_GNURADIO_FFT),y) > +GNURADIO_DEPENDENCIES += fftw > +GNURADIO_CONF_OPTS += -DENABLE_GR_FFT=ON > +else > +GNURADIO_CONF_OPTS += -DENABLE_GR_FFT=OFF > +endif > + > +ifeq ($(BR2_PACKAGE_GNURADIO_FILTER),y) > +GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=ON > +else > +GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF > +endif > + > ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) > GNURADIO_DEPENDENCIES += python > GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON > @@ -55,4 +92,22 @@ else > GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF > endif > > +ifeq ($(BR2_PACKAGE_GNURADIO_PAGER),y) > +GNURADIO_CONF_OPTS += -DENABLE_PAGER=ON > +else > +GNURADIO_CONF_OPTS += -DENABLE_PAGER=OFF > +endif > + > +ifeq ($(BR2_PACKAGE_GNURADIO_TRELLIS),y) > +GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=ON > +else > +GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=OFF > +endif > + > +ifeq ($(BR2_PACKAGE_GNURADIO_UTILS),y) > +GNURADIO_CONF_OPTS += -DENABLE_GR_UTILS=ON > +else > +GNURADIO_CONF_OPTS += -DENABLE_GR_UTILS=OFF > +endif > + > $(eval $(cmake-package)) > -- > 2.0.5 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
On 04/10/15 12:01, Gwenhael Goavec-Merou wrote: > From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > > GNURadio provides a set of processing blocks like analog or digital > communication, filters, ... > > Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > [build-tested only] Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> [build-test only] About time this one got committed... Regards, Arnout
Dear Gwenhael Goavec-Merou, On Fri, 10 Apr 2015 12:01:54 +0200, Gwenhael Goavec-Merou wrote: > From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > > GNURadio provides a set of processing blocks like analog or digital > communication, filters, ... > > Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > [build-tested only] > --- > Changes v2 -> v3: > * merge comment about fftw depends. > * change prompt content. > * suppress 'GNU Radio' in help messages. > Changes v1 -> v2: > * supress hidden variable and use direct depends on > BR2_PACKAGE_FFTW_PRECISION_SINGLE. > * use a single if BR2_PACKAGE_FFTW_PRECISION_SINGLE for all options that need > this. > --- > package/gnuradio/Config.in | 60 ++++++++++++++++++++++++++++++++++++++++++++ > package/gnuradio/gnuradio.mk | 55 ++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 115 insertions(+) Applied, thanks. Thomas
diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index a33deeb..4f0088d 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -37,6 +37,12 @@ config BR2_PACKAGE_GNURADIO_BLOCKS help GNU Radio basic block library +config BR2_PACKAGE_GNURADIO_FEC + bool "gr-fec support" + select BR2_PACKAGE_GNURADIO_BLOCKS + help + FEC signal processing blocks + config BR2_PACKAGE_GNURADIO_PYTHON bool "python support" select BR2_PACKAGE_BOOST_PYTHON @@ -44,4 +50,58 @@ config BR2_PACKAGE_GNURADIO_PYTHON help Enable python component +config BR2_PACKAGE_GNURADIO_UTILS + bool "gr-utils support" + select BR2_PACKAGE_GNURADIO_PYTHON + help + Misc python utilities + +comment "gr-fft, -filter, -analog, -channels, -digital, -trellis, -pager depends fftw's single precision" + depends on !BR2_PACKAGE_FFTW_PRECISION_SINGLE + +if BR2_PACKAGE_FFTW_PRECISION_SINGLE + +config BR2_PACKAGE_GNURADIO_ANALOG + bool "gr-analog support" + select BR2_PACKAGE_GNURADIO_FILTER + help + Analog communications blocks + +config BR2_PACKAGE_GNURADIO_CHANNELS + bool "gr-channels support" + select BR2_PACKAGE_GNURADIO_ANALOG + help + Channel model blocks + +config BR2_PACKAGE_GNURADIO_DIGITAL + bool "gr-digital support" + select BR2_PACKAGE_GNURADIO_ANALOG + help + Digital communications blocks + +config BR2_PACKAGE_GNURADIO_FFT + bool "gr-fft support" + select BR2_PACKAGE_GNURADIO_BLOCKS + help + FFT signal processing blocks + +config BR2_PACKAGE_GNURADIO_FILTER + bool "gr-filter support" + select BR2_PACKAGE_GNURADIO_FFT + help + Filter signal processing blocks + +config BR2_PACKAGE_GNURADIO_PAGER + bool "gr-flex support" + select BR2_PACKAGE_GNURADIO_ANALOG + help + FLEX pager decoder implementation blocks + +config BR2_PACKAGE_GNURADIO_TRELLIS + bool "gr-trellis support" + select BR2_PACKAGE_GNURADIO_DIGITAL + help + Trellis coded modulation blocks + +endif endif diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index e58c7dc..fc5cd1f 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -42,12 +42,49 @@ ifeq ($(BR2_ARM_CPU_HAS_NEON),) GNURADIO_CONF_OPTS += -Dhave_mfpu_neon=0 endif +ifeq ($(BR2_PACKAGE_GNURADIO_ANALOG),y) +GNURADIO_CONF_OPTS += -DENABLE_GR_ANALOG=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_ANALOG=OFF +endif + ifeq ($(BR2_PACKAGE_GNURADIO_BLOCKS),y) GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=ON else GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=OFF endif +ifeq ($(BR2_PACKAGE_GNURADIO_CHANNELS),y) +GNURADIO_CONF_OPTS += -DENABLE_GR_CHANNELS=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_CHANNELS=OFF +endif + +ifeq ($(BR2_PACKAGE_GNURADIO_DIGITAL),y) +GNURADIO_CONF_OPTS += -DENABLE_GR_DIGITAL=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_DIGITAL=OFF +endif + +ifeq ($(BR2_PACKAGE_GNURADIO_FEC),y) +GNURADIO_CONF_OPTS += -DENABLE_GR_FEC=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_FEC=OFF +endif + +ifeq ($(BR2_PACKAGE_GNURADIO_FFT),y) +GNURADIO_DEPENDENCIES += fftw +GNURADIO_CONF_OPTS += -DENABLE_GR_FFT=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_FFT=OFF +endif + +ifeq ($(BR2_PACKAGE_GNURADIO_FILTER),y) +GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF +endif + ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) GNURADIO_DEPENDENCIES += python GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON @@ -55,4 +92,22 @@ else GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF endif +ifeq ($(BR2_PACKAGE_GNURADIO_PAGER),y) +GNURADIO_CONF_OPTS += -DENABLE_PAGER=ON +else +GNURADIO_CONF_OPTS += -DENABLE_PAGER=OFF +endif + +ifeq ($(BR2_PACKAGE_GNURADIO_TRELLIS),y) +GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=OFF +endif + +ifeq ($(BR2_PACKAGE_GNURADIO_UTILS),y) +GNURADIO_CONF_OPTS += -DENABLE_GR_UTILS=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_UTILS=OFF +endif + $(eval $(cmake-package))