Thomas Petazzoni 1c8dda3e43 Merge branch 'next' ... This merges the next branch accumulated during the 2017.11 release cycle back into the master branch. A few conflicts had to be resolved: - In the DEVELOPERS file, because Fabrice Fontaine was added as a developer for libupnp in master, and for libupnp18 in next. Resolution is simple: add him for both. - linux/Config.in, because we updated the 4.13.x release used by default in master, while we moved to 4.14 in next. Resolution: use 4.14. - package/libupnp/libupnp.hash: a hash for the license file was added in master, while the package was bumped into next. Resolution: keep the hash for the license file, and keep the hash for the newest version of libupnp. - package/linux-headers/Config.in.host: default version of the kernel headers for 4.13 was bumped to the latest 4.13.x in master, but was changed to 4.14 in next. Resolution: use 4.14. - package/samba4/: samba was bumped to 4.6.11 in master for security reasons, but was bumped to 4.7.3 in next. Resolution: keep 4.7.3. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>		2017-12-01 21:56:44 +01:00
..
acmesystems	configs/acmesystems_arietta_g25: update kernel and at91bootstrap3	2016-09-23 08:06:34 +02:00
altera/socrates_cyclone5	configs/socrates_cyclone5: new defconfig	2017-08-02 21:45:26 +02:00
arcturus/ppc-ucp1020	board/arcturus/ppc-ucp1020: add patch to fix build with gcc 6.x.	2017-07-15 10:14:59 +02:00
arm	configs/arm_juno: add the bootloader build	2016-10-15 14:13:59 +02:00
armadeus	configs/armadeus_apf28: bump kernel version to latest 4.9 LTS	2017-11-23 20:58:58 +01:00
atmel	configs/at91: refactor to use genimage.sh	2017-11-11 23:29:23 +01:00
avnet/s6lx9_microboard	zynq: unify readme.txt for all Zynq boards	2016-07-30 18:15:26 +02:00
bananapi/bananapi-m1	board: bananapi-m1: Fix to use dtb instead of dts	2017-11-18 21:03:04 +01:00
beagleboardx15	BeagleBoard X15: new board	2016-12-18 23:07:03 +01:00
beaglebone	board/beaglebone: skip bonegreen.dtb if not built	2017-08-11 22:36:39 +02:00
boundarydevices/common	board/boundarydevices: add mac parameter for BD-SDMAC in bootscript	2017-08-19 15:18:32 +02:00
chromebook/snow	chromebook snow: remove $(HOST_DIR)/usr reference from README	2017-07-05 16:06:21 +02:00
ci20	Add a defconfig for MIPS Creator CI20	2014-11-28 23:36:29 +01:00
ci40	Add defconfig for MIPS Creator ci40	2017-04-27 22:58:54 +02:00
csky	board/csky: remove host/usr reference from readme.txt	2017-07-05 16:06:36 +02:00
cubietech/cubieboard2	configs/cubieboard2_defconfig: use U-Boot boot script generation logic	2017-06-22 13:06:51 +02:00
digilent/zybo	board: fix indentation in zybo readme.txt	2016-10-26 12:30:14 +02:00
embest/riotboard	board/riotboard: readme: Update description	2015-04-18 19:08:28 +02:00
engicam	boarde: icorem6: clarify the common vs. board-specific things in readme.txt	2017-10-06 22:14:07 +02:00
firefly/firefly-rk3288	boards: replace $HOST_DIR/usr/ with $HOST_DIR/ in scripts	2017-07-05 15:23:13 +02:00
freescale	configs/imx6ulevk: Add new defconfig	2017-11-23 21:12:20 +01:00
friendlyarm	board: Add support for nanopi-m1-plus	2017-07-23 11:30:14 +02:00
gdb	board/gdb/bfin-bf512: remove host/usr reference from readme.txt	2017-07-05 16:06:34 +02:00
grinn	configs/liteboard: Bump to kernel 4.10	2017-02-21 16:11:05 +01:00
hardkernel/odroidc2	configs/odroidc2: update boot.ini to 5ce6bcc6d8048ba5ff351516b751d52f5cda6981	2017-02-06 14:03:55 +01:00
intel/galileo	configs/galileo: add CONFIG_LBDAF=y in the kernel configuration	2017-09-02 20:14:14 +02:00
lego/ev3	board/lego/ev3: update to 4.14 kernel and 2017.11 U-Boot	2017-11-22 21:47:48 +01:00
lemaker/bananapro	configs/bananapro: bump Linux kernel to 4.12.1	2017-07-15 17:34:25 +02:00
linksprite/pcduino	boards: replace $HOST_DIR/usr/ with $HOST_DIR/ in scripts	2017-07-05 15:23:13 +02:00
minnowboard	minnowboard_max: bump to kernel 4.12.2	2017-07-16 09:59:15 +02:00
nexbox/a95x	configs: nexbox_a95x_defconfig: bump to kernel 4.12	2017-07-12 18:38:32 +02:00
olimex	boards: replace $HOST_DIR/usr/ with $HOST_DIR/ in scripts	2017-07-05 15:23:13 +02:00
openblocks/a6	openblocks_a6_defconfig: improve/fix configuration	2017-06-17 10:48:05 +02:00
orangepi	boards: replace $HOST_DIR/usr/ with $HOST_DIR/ in scripts	2017-07-05 15:23:13 +02:00
pandaboard	pandabord: use genimage to generate sdcard image	2016-02-26 15:56:12 +01:00
pc	board/pc: add documentation for testing with qemu	2017-10-22 16:29:07 +02:00
qemu	Merge branch 'next'	2017-12-01 21:56:44 +01:00
raspberrypi	raspberrypi: post-image.sh fix gpu_mem option	2017-10-21 21:37:10 +02:00
roseapplepi	roseapplepi: backport upstream patches to fix build with gcc 6	2017-06-20 21:27:54 +02:00
sinovoip/m2-plus	Added support for Sinovoip BananaPi M2 Plus board.	2017-09-22 23:11:01 +02:00
solidrun/mx6cubox	boards: replace $HOST_DIR/usr/ with $HOST_DIR/ in scripts	2017-07-05 15:23:13 +02:00
stmicroelectronics	stm32f469-disco: replace $HOST_DIR/usr with $HOST_DIR in flash script	2017-07-05 16:06:25 +02:00
synopsys	board/synopsys: remove patch for linux vdk defconfig	2017-04-18 17:41:56 +02:00
technexion	configs/imx7dpico: Bump to 4.13 kernel	2017-09-07 21:59:14 +02:00
technologic	configs: add defconfig for TS-7680	2017-08-24 23:15:26 +02:00
telit/evk-pro3	configs/telit_evk_pro3: bump linux kernel to 3.9.11	2017-04-13 22:06:18 +02:00
toradex/apalis-imx6	configs/toradex_apalis_imx6_defconfig: new board	2016-06-15 23:23:41 +02:00
udoo	configs/mx6udoo: Bump kernel and U-Boot versions	2017-10-15 15:54:04 +02:00
wandboard	wandboard: genimage: Pass an offset for the rootfs	2017-09-26 23:52:15 +02:00
warp7	configs/warp7: Bump U-Boot and kernel versions	2017-07-25 20:44:27 +02:00
zynq	zynq: document how to use custom ps7_init files	2016-10-09 22:45:58 +02:00
raspberrypi0	boards/raspberrypi0: new board	2016-05-08 15:54:30 +02:00
raspberrypi2	boards/raspberrypi: update instructions for Raspberry Pi 2	2015-02-26 22:43:37 +01:00
raspberrypi3	configs: add Raspberry Pi 3 defconfig	2016-04-25 14:07:58 +02:00
raspberrypi3-64	configs: add raspberrypi3 64bits defconfig	2017-05-04 09:25:20 +02:00