Merge pull request #46 from kipr/version-bump-v17

[RFR] Version bump v17
kipr · Apr 1, 2016 · c82fa41 · c82fa41
2 parents e614f54 + 1d433ae
commit c82fa41
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 8 deletions.
diff --git a/recipes-apps/botui/botui_git.bb b/recipes-apps/botui/botui_git.bb
@@ -1,9 +1,9 @@
 inherit qt4x11 cmake
 
 PN="botui"
-PR="26"
+PR="29"
 
-SRCREV = "51c537f95f462006bbc02f1bff8d49d535000d6d"
+SRCREV = "76c9b77bbb8e591488a86b23e17e4b9e229ce8a3"
 
 SRC_URI="git://github.com/kipr/botui.git;branch=master \
 	file://botui.desktop \
@@ -49,6 +49,6 @@ do_install() {
   ln -sf ${WORKDIR}/alsa.service ${D}/lib/systemd/system/basic.target.wants/
 }
 
-FILES_${PN} += "/usr/lib/*.so /usr/local/lib/*.so /lib /etc/botui /usr/local/bin /etc/xdg/autostart"
+FILES_${PN} += "/usr/lib/*.so /usr/local/lib/*.so /lib /lib/systemd/system/alsa.service /etc/botui /usr/local/bin /etc/xdg/autostart"
 FILES_${PN}-dev = "/usr/include"
 FILES_${PN}-dbg += "/usr/bin/botui/.debug"
diff --git a/recipes-kernel/linux/linux-kipr-3.18/0046-arm-Make-Switch2-An-Unregistered-GPIO.patch b/recipes-kernel/linux/linux-kipr-3.18/0046-arm-Make-Switch2-An-Unregistered-GPIO.patch
@@ -0,0 +1,32 @@
+--- a/arch/arm/boot/dts/am335x-botball.dtsi
++++ b/arch/arm/boot/dts/am335x-botball.dtsi
+@@ -11,7 +11,7 @@
+ / {
+ 	/* Pin-muxes not otherwise associated with a device */
+ 	pinctrl-names = "default";
+-	pinctrl-0 = <&gpio_bridge_pins &m4_gpio_pins>;
++	pinctrl-0 = <&gpio_bridge_pins &m4_gpio_pins &user_buttons_pins>;
+
+ 	cpus {
+ 		cpu@0 {
+@@ -24,20 +24,6 @@
+ 		reg = <0x80000000 0x20000000>; /* 512 MB */
+ 	};
+
+-	buttons: user_buttons {
+-		compatible = "gpio-keys";
+-		pinctrl-names = "default";
+-		pinctrl-0 = <&user_buttons_pins>;
+-
+-		button@0 {
+-			/* S2 */
+-			label = "power";
+-			linux,code = <KEY_POWER>;
+-			gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
+-			gpio-key,wakeup;
+-		};
+-	};
+-
+ 	leds: user_leds {
+ 		compatible = "gpio-leds";
+ 		pinctrl-names = "default";
diff --git a/recipes-kernel/linux/linux-kipr_3.18.bb b/recipes-kernel/linux/linux-kipr_3.18.bb
@@ -90,6 +90,7 @@ SRC_URI = " \
     file://0044-drm-tilcdc-Defer-TFP410-probing-for-i2c.patch \
     file://0045-arm-Add-Gumstix-Botball-HDMI-and-LCD-board.patch \
     file://0001-tfp410-RGB888-not-RGB565-color-mapping-for-botball.patch \
+    file://0046-arm-Make-Switch2-An-Unregistered-GPIO.patch \
     file://defconfig \
     file://${BOOT_SPLASH} \
 "
diff --git a/recipes-support/botball-versions/botball-versions_1.0.bb b/recipes-support/botball-versions/botball-versions_1.0.bb
@@ -1,6 +1,6 @@
 S = "${WORKDIR}"
 
-PR="12"
+PR="13"
 
 SRC_URI = "file://board_fw_version.txt \
            file://LICENSE \

diff --git a/recipes-support/botball-versions/files/board_fw_version.txt b/recipes-support/botball-versions/files/board_fw_version.txt
@@ -1 +1 @@
-16
+17
diff --git a/recipes-support/libwallaby/libwallaby_git.bb b/recipes-support/libwallaby/libwallaby_git.bb
@@ -1,11 +1,11 @@
 inherit cmake
 
 PN="libwallaby"
-PR="114"
+PR="120"
 
-SRCREV = "a156a0aac05453c133f0c246c097f6531709d462"
+SRCREV = "14a893d196abce1a59c8fa8f227acd028dd4a8bb"
 
-SRC_URI="git://github.com/kipr/libwallaby.git;branch=update-16"
+SRC_URI="git://github.com/kipr/libwallaby.git;branch=update-17"
 
 EXTRA_OECMAKE += "-DBITBAKE_BS=1 -DCMAKE_SYSROOT=${D} -DBUILD_DOCUMENTATION=OFF"