diff --git a/patch.sh b/patch.sh
index 5bce21637e708c5f69c8da49d801acffe2099ae7..86a7ff6bdd1dd2773e1315da90466cfbcd971ea7 100644
--- a/patch.sh
+++ b/patch.sh
@@ -74,27 +74,6 @@ local_patch () {
#external_git
#local_patch
-overlay () {
- echo "dir: overlay"
- #regenerate="enable"
- if [ "x${regenerate}" = "xenable" ] ; then
- start_cleanup
- fi
-
- ${git} "${DIR}/patches/overlay/0001-of-Custom-printk-format-specifier-for-device-node.patch"
- ${git} "${DIR}/patches/overlay/0002-arm-of-Add-a-DT-quirk-method-after-unflattening.patch"
- ${git} "${DIR}/patches/overlay/0003-of-DT-quirks-infrastructure.patch"
- ${git} "${DIR}/patches/overlay/0004-arm-am33xx-DT-quirks-for-am33xx-based-beaglebone-var.patch"
- ${git} "${DIR}/patches/overlay/0005-arm-dts-Common-Black-White-Beaglebone-DTS-using-quir.patch"
-
- if [ "x${regenerate}" = "xenable" ] ; then
- number=5
- cleanup
- fi
-
-
-}
-
dt () {
echo "dir: dt/gpiohog"
#regenerate="enable"
@@ -196,9 +175,20 @@ beaglebone () {
fi
echo "dir: beaglebone/capes"
+ #regenerate="enable"
+ if [ "x${regenerate}" = "xenable" ] ; then
+ start_cleanup
+ fi
+
${git} "${DIR}/patches/beaglebone/capes/0001-cape-Argus-UPS-cape-support.patch"
- ${git} "${DIR}/patches/beaglebone/capes/0002-cape-Replicape-add-cape-support.patch"
+ ${git} "${DIR}/patches/beaglebone/capes/0002-Added-support-for-Replicape.patch"
+ if [ "x${regenerate}" = "xenable" ] ; then
+ number=2
+ cleanup
+ fi
+
+ #This has to be last...
echo "dir: beaglebone/dtbs"
#regenerate="enable"
if [ "x${regenerate}" = "xenable" ] ; then
@@ -211,50 +201,24 @@ beaglebone () {
#dtb makefile
#regenerate="enable"
if [ "x${regenerate}" = "xenable" ] ; then
- device="am335x-bone-can0.dtb"
- dtb_makefile_append
-
- device="am335x-bone-can1.dtb"
- dtb_makefile_append
+ device="am335x-bone-can0.dtb" ; dtb_makefile_append
+ device="am335x-bone-can1.dtb" ; dtb_makefile_append
device="am335x-bone-cape-bone-argus.dtb" ; dtb_makefile_append
-
- device="am335x-bone-ttyO1.dtb"
- dtb_makefile_append
-
- device="am335x-bone-ttyO2.dtb"
- dtb_makefile_append
-
- device="am335x-bone-ttyO4.dtb"
- dtb_makefile_append
-
- device="am335x-bone-ttyO5.dtb"
- dtb_makefile_append
+ device="am335x-bone-ttyO1.dtb" ; dtb_makefile_append
+ device="am335x-bone-ttyO2.dtb" ; dtb_makefile_append
+ device="am335x-bone-ttyO4.dtb" ; dtb_makefile_append
+ device="am335x-bone-ttyO5.dtb" ; dtb_makefile_append
device="am335x-boneblack-bbb-exp-c.dtb" ; dtb_makefile_append
-
- device="am335x-boneblack-can0.dtb"
- dtb_makefile_append
-
- device="am335x-boneblack-can1.dtb"
- dtb_makefile_append
-
+ device="am335x-boneblack-can0.dtb" ; dtb_makefile_append
+ device="am335x-boneblack-can1.dtb" ; dtb_makefile_append
device="am335x-boneblack-cape-bone-argus.dtb" ; dtb_makefile_append
-
- device="am335x-boneblack-ttyO1.dtb"
- dtb_makefile_append
-
- device="am335x-boneblack-ttyO2.dtb"
- dtb_makefile_append
-
- device="am335x-boneblack-ttyO4.dtb"
- dtb_makefile_append
-
- device="am335x-boneblack-ttyO5.dtb"
- dtb_makefile_append
-
- device="am335x-boneblack-replicape.dtb"
- dtb_makefile_append
+ device="am335x-boneblack-ttyO1.dtb" ; dtb_makefile_append
+ device="am335x-boneblack-ttyO2.dtb" ; dtb_makefile_append
+ device="am335x-boneblack-ttyO4.dtb" ; dtb_makefile_append
+ device="am335x-boneblack-ttyO5.dtb" ; dtb_makefile_append
+ device="am335x-boneblack-replicape.dtb" ; dtb_makefile_append
git commit -a -m 'auto generated: capes: add dtbs to makefile' -s
git format-patch -1 -o ../patches/beaglebone/generated/
@@ -301,7 +265,6 @@ sgx () {
###
-#overlay
dt
#dts
#wand
diff --git a/patches/beaglebone/capes/0001-cape-Argus-UPS-cape-support.patch b/patches/beaglebone/capes/0001-cape-Argus-UPS-cape-support.patch
index 3e912cc4e9323cdfac3ae274a211978d14908c92..e013751fd7dbf3036f61dc6ef61c0f293bb44614 100644
--- a/patches/beaglebone/capes/0001-cape-Argus-UPS-cape-support.patch
+++ b/patches/beaglebone/capes/0001-cape-Argus-UPS-cape-support.patch
@@ -1,4 +1,4 @@
-From d395c24246164cb4bb335ee86a427a7e99eadf51 Mon Sep 17 00:00:00 2001
+From 1715e95ef70f498d351053cd351629cf8dee1c45 Mon Sep 17 00:00:00 2001
From: Dave Lambert <dave@lambsys.com>
Date: Mon, 16 Jun 2014 14:19:17 -0500
Subject: [PATCH 1/2] cape: Argus UPS cape support
@@ -22,7 +22,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
diff --git a/arch/arm/boot/dts/am335x-bone-argus.dtsi b/arch/arm/boot/dts/am335x-bone-argus.dtsi
new file mode 100644
-index 0000000..b6d4946
+index 0000000..0bbe050
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-bone-argus.dtsi
@@ -0,0 +1,85 @@
diff --git a/patches/beaglebone/capes/0002-cape-Replicape-add-cape-support.patch b/patches/beaglebone/capes/0002-Added-support-for-Replicape.patch
similarity index 94%
rename from patches/beaglebone/capes/0002-cape-Replicape-add-cape-support.patch
rename to patches/beaglebone/capes/0002-Added-support-for-Replicape.patch
index b46f79e3c6aad27ed0a1b54f189db48b59c75533..ce64e781f2736977a070502c5f90c7e70a1b01ad 100644
--- a/patches/beaglebone/capes/0002-cape-Replicape-add-cape-support.patch
+++ b/patches/beaglebone/capes/0002-Added-support-for-Replicape.patch
@@ -1,21 +1,21 @@
-From c0843905eb47ea4c1022aa53314fa63a368048c7 Mon Sep 17 00:00:00 2001
+From c6134d2059f2a11e6d73e5cc8315cdeae6d09a59 Mon Sep 17 00:00:00 2001
From: Elias Bakken <elias@iagent.no>
Date: Fri, 10 Apr 2015 11:30:39 +0200
-Subject: [PATCH 27/27] Added support for Replicape
+Subject: [PATCH 2/2] Added support for Replicape
---
- arch/arm/boot/dts/am335x-bone-replicape.dtsi | 295 +++++++++++++++++++++++
+ arch/arm/boot/dts/am335x-bone-replicape.dtsi | 293 +++++++++++++++++++++++
arch/arm/boot/dts/am335x-boneblack-replicape.dts | 48 ++++
- 3 files changed, 602 insertions(+)
+ 2 files changed, 341 insertions(+)
create mode 100644 arch/arm/boot/dts/am335x-bone-replicape.dtsi
create mode 100644 arch/arm/boot/dts/am335x-boneblack-replicape.dts
diff --git a/arch/arm/boot/dts/am335x-bone-replicape.dtsi b/arch/arm/boot/dts/am335x-bone-replicape.dtsi
new file mode 100644
-index 0000000..dc586e3
+index 0000000..207fb00
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-bone-replicape.dtsi
-@@ -0,0 +1,295 @@
+@@ -0,0 +1,293 @@
+
+
+/ {
@@ -36,7 +36,7 @@ index 0000000..dc586e3
+ P8_26_pinmux {status = "disabled"; }; /* DIR_X */
+
+ P9_11_pinmux {status = "disabled"; }; /* END_STOP_X2 */
-+ P9_12_pinmux {status = "disabled"; }; /* STEP_EXT_1 */
++ P9_12_pinmux {status = "disabled"; }; /* STEP_EXT_1 */
+ P9_13_pinmux {status = "disabled"; }; /* END_STOP_Z1 */
+ P9_16_pinmux {status = "disabled"; }; /* END_STOP_Y2 */
+ P9_18_pinmux {status = "disabled"; }; /* END_STOP_Z2 */
@@ -45,7 +45,7 @@ index 0000000..dc586e3
+ P9_24_pinmux {status = "disabled"; }; /* FAULT_Z */
+ P9_25_pinmux {status = "disabled"; }; /* END_STOP_X1 */
+ P9_28_pinmux {status = "disabled"; }; /* SPI1_CS0 */
-+ P9_29_pinmux {status = "disabled"; }; /* SPI1_MISO */
++ P9_29_pinmux {status = "disabled"; }; /* SPI1_MISO */
+ P9_30_pinmux {status = "disabled"; }; /* SPI1_MOSI */
+ P9_31_pinmux {status = "disabled"; }; /* SPI1_SCLK */
+ P9_33_pinmux {status = "disabled"; }; /* AIN4 */
@@ -70,7 +70,7 @@ index 0000000..dc586e3
+ linux,code = <112>;
+ gpios = <&gpio3 21 0x5>;
+ gpio-key,wakeup;
-+ };
++ };
+ switch_x2 {
+ label = "Replic:End-stop-X2";
+ debounce_interval = <50>;
@@ -84,62 +84,62 @@ index 0000000..dc586e3
+ linux,code = <114>;
+ gpios = <&gpio1 17 0x5>;
+ gpio-key,wakeup;
-+ };
++ };
+ switch_y2 {
+ label = "Replic:End-stop-Y2";
+ debounce_interval = <50>;
+ linux,code = <115>;
+ gpios = <&gpio1 19 0x5>;
+ gpio-key,wakeup;
-+ };
++ };
+ switch_z1 {
+ label = "Replic:End-stop-Z1";
+ debounce_interval = <50>;
+ linux,code = <116>;
+ gpios = <&gpio0 31 0x5>;
+ gpio-key,wakeup;
-+ };
++ };
+ switch_z2 {
+ label = "Replic:End-stop-Z2";
+ debounce_interval = <50>;
+ linux,code = <117>;
+ gpios = <&gpio0 4 0x5>;
+ gpio-key,wakeup;
-+ };
++ };
+ fault_x {
+ label = "Replic:Fault-X";
+ debounce_interval = <50>;
+ linux,code = <90>;
+ gpios = <&gpio2 4 0x5>;
-+ gpio-key,wakeup;
++ gpio-key,wakeup;
+ };
+ fault_y {
+ label = "Replic:Fault-Y";
+ debounce_interval = <50>;
+ linux,code = <91>;
+ gpios = <&gpio2 5 0x5>;
-+ gpio-key,wakeup;
++ gpio-key,wakeup;
+ };
+ fault_z {
+ label = "Replic:Fault-Z";
+ debounce_interval = <50>;
+ linux,code = <92>;
+ gpios = <&gpio0 15 0x5>;
-+ gpio-key,wakeup;
++ gpio-key,wakeup;
+ };
+ fault_ext_1 {
+ label = "Replic:Fault-Ext-1";
+ debounce_interval = <50>;
+ linux,code = <93>;
+ gpios = <&gpio2 1 0x5>;
-+ gpio-key,wakeup;
++ gpio-key,wakeup;
+ };
+ fault_ext_2 {
+ label = "Replic:Fault-Ext-2";
+ debounce_interval = <50>;
+ linux,code = <94>;
+ gpios = <&gpio2 3 0x5>;
-+ gpio-key,wakeup;
++ gpio-key,wakeup;
+ };
+ };
+
@@ -309,11 +309,9 @@ index 0000000..dc586e3
+ &gpio1 14 0>;
+ };
+};
-+
-+
diff --git a/arch/arm/boot/dts/am335x-boneblack-replicape.dts b/arch/arm/boot/dts/am335x-boneblack-replicape.dts
new file mode 100644
-index 0000000..d161635
+index 0000000..fe5bdc7
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-boneblack-replicape.dts
@@ -0,0 +1,48 @@
@@ -366,5 +364,5 @@ index 0000000..d161635
+
+#include "am335x-bone-replicape.dtsi"
--
-2.1.0
+2.1.4