Commit 0b1ebecc authored Apr 20, 2016 by Mikhail Karpenko

Merge branch 'circbuf'

Conflicts resolved:
	.gitignore
	src/drivers/elphel/Kconfig
	src/drivers/elphel/Makefile
	src/include/elphel/driver_numbers.h

parents 4c01ada9 9408d96d

.gitignore

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,6 +9,7 @@ sysroots
	.externalToolBuilders		.externalToolBuilders
	.settings		.settings
	.pydevproject		.pydevproject

	# auto-generated files from x393 project		# auto-generated files from x393 project
	src/drivers/elphel/x393.c		src/drivers/elphel/x393.c
	src/drivers/elphel/x393.h		src/drivers/elphel/x393.h

run_bitbake.sh

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5,7 +5,7 @@ while (( "$#" )); do
	done		done
	DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"		DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
	echo "Launching bitbake $args"		echo "Launching bitbake $args"
	cd $DIR/..		cd $DIR/../poky
	. ./oe-init-build-env		. ./oe-init-build-env
	bitbake $args \| sed -u 's@\| @@'		bitbake $args \| sed -u 's@\| @@'
	exit 0		exit 0

src/drivers/elphel/Kconfig

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26,5 +26,4 @@ config ELPHEL393_EXTERNAL
	default m		default m
	help		help
	If unsure, say Y.		If unsure, say Y.

	endmenu		endmenu

src/drivers/elphel/Makefile

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6,9 +6,16 @@ obj-$(CONFIG_ELPHEL393) += elphel393-pwr.o
	obj-$(CONFIG_ELPHEL393) += elphel393-mem.o		obj-$(CONFIG_ELPHEL393) += elphel393-mem.o
	obj-$(CONFIG_ELPHELDRVONMICROZED) += elphel393-mem.o		obj-$(CONFIG_ELPHELDRVONMICROZED) += elphel393-mem.o
	obj-$(CONFIG_ELPHEL393_INIT) += elphel393-init.o		obj-$(CONFIG_ELPHEL393_INIT) += elphel393-init.o

	obj-$(CONFIG_ELPHEL393) += x393.o		obj-$(CONFIG_ELPHEL393) += x393.o
	obj-$(CONFIG_ELPHEL393) += sensor_i2c.o		obj-$(CONFIG_ELPHEL393) += sensor_i2c.o
	obj-$(CONFIG_ELPHEL393) += fpgajtag353.o		obj-$(CONFIG_ELPHEL393) += fpgajtag353.o
	obj-$(CONFIG_ELPHEL393) += clock10359.o		obj-$(CONFIG_ELPHEL393) += clock10359.o
	#fpgajtag-y := fpgajtag353.o x393.o		#fpgajtag-y := fpgajtag353.o x393.o
	#obj-$(CONFIG_ELPHEL393_EXTERNAL) += fpgajtag.o		#obj-$(CONFIG_ELPHEL393_EXTERNAL) += fpgajtag.o

			obj-$(CONFIG_ELPHEL393) += framepars.o
			obj-$(CONFIG_ELPHEL393) += sensor_common.o x393.o
			obj-$(CONFIG_ELPHEL393) += quantization_tables.o
			obj-$(CONFIG_ELPHEL393) += circbuf.o jpeghead.o