Merge branch 'develop'

kerberos-io · Apr 26, 2017 · c598984 · c598984
2 parents 80de400 + f7b051d
commit c598984
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 15 deletions.
diff --git a/board/common/overlay/etc/version b/board/common/overlay/etc/version
@@ -1,4 +1,4 @@
 os_name="Kerberos.io OS"
 os_short_name="kios"
 os_prefix="kios"
-os_version="2.2.1"
+os_version="2.3.0"
diff --git a/board/raspberrypi/config.txt b/board/raspberrypi/config.txt
@@ -1,4 +1,9 @@
 gpu_mem=128
 gpu_mem_256=128
 gpu_mem_512=128
-disable_camera_led=1
+disable_camera_led=1
+
+dtparam=i2c_arm=on
+dtparam=i2s=on
+dtparam=spi=on
+dtparam=audio=on
diff --git a/board/raspberrypi/postscript.sh b/board/raspberrypi/postscript.sh
@@ -9,7 +9,7 @@ cp $IMG_DIR/zImage $BOOT_DIR/kernel.img
 cp $IMG_DIR/bcm2708-rpi-b.dtb $BOOT_DIR
 cp $IMG_DIR/bcm2708-rpi-b-plus.dtb $BOOT_DIR
 cp $IMG_DIR/bcm2708-rpi-cm.dtb $BOOT_DIR
+cp $IMG_DIR/bcm2708-rpi-0-w.dtb $BOOT_DIR
 cp $RPI_FW_DIR/bootcode.bin $BOOT_DIR
 cp $RPI_FW_DIR/start.elf $BOOT_DIR
 cp $RPI_FW_DIR/fixup.dat $BOOT_DIR
-
diff --git a/board/raspberrypi2/config.txt b/board/raspberrypi2/config.txt
@@ -1,2 +1,7 @@
 gpu_mem=128
-disable_camera_led=1
+disable_camera_led=1
+
+dtparam=i2c_arm=on
+dtparam=i2s=on
+dtparam=spi=on
+dtparam=audio=on
diff --git a/board/raspberrypi3/config.txt b/board/raspberrypi3/config.txt
@@ -1 +1,7 @@
 gpu_mem=128
+disable_camera_led=1
+
+dtparam=i2c_arm=on
+dtparam=i2s=on
+dtparam=spi=on
+dtparam=audio=on
diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig
@@ -24,7 +24,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi2/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/a59ca8f1e8e068dd58bc453dc88295e7045dafcf.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/04c8e47067d4873c584395e5cb260b4f170a99ea.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_ZIMAGE=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -159,4 +159,4 @@ BR2_PACKAGE_KERBEROSIO_WEB=y
 BR2_PACKAGE_KERBEROSIO_MACHINERY=y
 BR2_PACKAGE_KERBEROSIO_MACHINERY_RPI=y
 BR2_PACKAGE_GDB=y
-BR2_PACKAGE_GDB_DEBUGGER=y
+BR2_PACKAGE_GDB_DEBUGGER=y
diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig
@@ -24,7 +24,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi3/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/a59ca8f1e8e068dd58bc453dc88295e7045dafcf.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/04c8e47067d4873c584395e5cb260b4f170a99ea.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_ZIMAGE=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -160,4 +160,4 @@ BR2_PACKAGE_KERBEROSIO_WEB=y
 BR2_PACKAGE_KERBEROSIO_MACHINERY=y
 BR2_PACKAGE_KERBEROSIO_MACHINERY_RPI=y
 BR2_PACKAGE_GDB=y
-BR2_PACKAGE_GDB_DEBUGGER=y
+BR2_PACKAGE_GDB_DEBUGGER=y
diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig
@@ -23,11 +23,11 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/a59ca8f1e8e068dd58bc453dc88295e7045dafcf.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/04c8e47067d4873c584395e5cb260b4f170a99ea.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 BR2_LINUX_KERNEL_ZIMAGE=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-0-w bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm"
 BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_GZIP=y
@@ -159,4 +159,4 @@ BR2_PACKAGE_KERBEROSIO_WEB=y
 BR2_PACKAGE_KERBEROSIO_MACHINERY=y
 BR2_PACKAGE_KERBEROSIO_MACHINERY_RPI=y
 BR2_PACKAGE_GDB=y
-BR2_PACKAGE_GDB_DEBUGGER=y
+BR2_PACKAGE_GDB_DEBUGGER=y
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = 597c662a613df1144a6bc43e5f4505d83bd748ca
+RPI_FIRMWARE_VERSION = b51046a2b2bb69771579a549d157205d9982f858
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
@@ -56,4 +56,4 @@ define HOST_RPI_FIRMWARE_INSTALL_CMDS
 endef
 
 $(eval $(generic-package))
-$(eval $(host-generic-package))
+$(eval $(host-generic-package))
diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = 2350bf2511fa49e177fb35c9613eef1b657a7506
+RPI_USERLAND_VERSION = cdb5da59f939eb4078e90ed0e3c231c498ba9957
 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE
@@ -29,4 +29,4 @@ define RPI_USERLAND_POST_TARGET_CLEANUP
 endef
 RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_POST_TARGET_CLEANUP
 
-$(eval $(cmake-package))
+$(eval $(cmake-package))