All of lore.kernel.org
 help / color / mirror / Atom feed
* [Xenomai] [PATCH v3 1/2] ipipe: add support for multiarch drivers to genpatches script
@ 2017-02-08 21:40 Dmitriy Cherkasov
  2017-02-08 21:40 ` [Xenomai] [PATCH v3 2/2] ipipe: add support for arm64 " Dmitriy Cherkasov
  0 siblings, 1 reply; 3+ messages in thread
From: Dmitriy Cherkasov @ 2017-02-08 21:40 UTC (permalink / raw)
  To: xenomai

Previous versions of genpatches.sh only allow one architecture
per driver. Since some drivers are shared between arm and arm64,
this adds new functionality to the script, allowing multiple
architectures to be specified per driver as a space-separated list.

Signed-off-by: Dmitriy Cherkasov <dmitriy@mperpetuo.com>
---
 scripts/ipipe/genpatches.sh | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/scripts/ipipe/genpatches.sh b/scripts/ipipe/genpatches.sh
index 9392a41..4c21c9c 100755
--- a/scripts/ipipe/genpatches.sh
+++ b/scripts/ipipe/genpatches.sh
@@ -123,6 +123,7 @@ match($0, /^diff --git a\/arch\/([^ \t\/]*)/) {
     split(substr($0, RSTART, RLENGTH), arch, /\//)
     a=arch[3]
 
+    is_multiarch=0
     set_current_arch(a)
     print $0 >> current_file
     next
@@ -137,14 +138,25 @@ match($0, /^diff --git a\/drivers\/([^ \t]*)/) {
 	 print "Error unknown architecture for driver "f
 	 unknown_file_error=1
     } else {
-	 a = driver_arch[f]
-	 set_current_arch(a)
-	 print $0 >> current_file
-	 next
+        a = driver_arch[f]
+        if(index(a, " ")) {
+            is_multiarch = 1
+            split(a, multiarch, " ")
+            for(a in multiarch) {
+                set_current_arch(multiarch[a])
+                print $0 >> current_file
+            }
+        } else {
+            is_multiarch = 0
+            set_current_arch(a)
+            print $0 >> current_file
+        }
+        next
     }
 }
 
 /^diff --git a\/scripts\/ipipe\/genpatches.sh/ {
+    is_multiarch=0
     if (splitmode == "no") {
 	current_file="/dev/null"
 	current_arch="nullarch"
@@ -154,6 +166,7 @@ match($0, /^diff --git a\/drivers\/([^ \t]*)/) {
 
 /^diff --git/ {
     set_current_arch("noarch")
+    is_multiarch=0
     print $0 >> current_file
     next
 }
@@ -164,7 +177,14 @@ match ($0, /#define [I]PIPE_CORE_RELEASE[ \t]*([^ \t]*)/) {
 }
 
 {
-    print $0 >> current_file
+    if(is_multiarch) {
+        for(a in multiarch) {
+            set_current_arch(multiarch[a])
+            print $0 >> current_file
+        }
+    } else {
+        print $0 >> current_file
+    }
 }
 
 END {
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [Xenomai] [PATCH v3 2/2] ipipe: add support for arm64 to genpatches script
  2017-02-08 21:40 [Xenomai] [PATCH v3 1/2] ipipe: add support for multiarch drivers to genpatches script Dmitriy Cherkasov
@ 2017-02-08 21:40 ` Dmitriy Cherkasov
  2017-02-13 11:42   ` Philippe Gerum
  0 siblings, 1 reply; 3+ messages in thread
From: Dmitriy Cherkasov @ 2017-02-08 21:40 UTC (permalink / raw)
  To: xenomai

This adds support for properly generating arm64 patches.

Signed-off-by: Dmitriy Cherkasov <dmitriy@mperpetuo.com>
---
 scripts/ipipe/genpatches.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/ipipe/genpatches.sh b/scripts/ipipe/genpatches.sh
index 4c21c9c..3714c1b 100755
--- a/scripts/ipipe/genpatches.sh
+++ b/scripts/ipipe/genpatches.sh
@@ -62,7 +62,6 @@ BEGIN {
     driver_arch["iommu/irq_remapping.c"]="noarch"
 
     driver_arch["clk/mxs/clk-imx28.c"]="arm"
-    driver_arch["clocksource/arm_arch_timer.c"]="arm"
     driver_arch["clocksource/mxs_timer.c"]="arm"
     driver_arch["clocksource/arm_global_timer.c"]="arm"
     driver_arch["clocksource/pxa_timer.c"]="arm"
@@ -81,7 +80,6 @@ BEGIN {
     driver_arch["irqchip/spear-shirq.c"]="arm"
     driver_arch["irqchip/irq-mxs.c"]="arm"
     driver_arch["irqchip/irq-s3c24xx.c"]="arm"
-    driver_arch["irqchip/irq-gic.c"]="arm"
     driver_arch["irqchip/irq-vic.c"]="arm"
     driver_arch["irqchip/irq-atmel-aic.c"]="arm"
     driver_arch["irqchip/irq-atmel-aic5.c"]="arm"
@@ -89,7 +87,6 @@ BEGIN {
     driver_arch["irqchip/irq-bcm7120-l2.c"]="arm"
     driver_arch["irqchip/irq-brcmstb-l2.c"]="arm"
     driver_arch["irqchip/irq-dw-apb-ictl.c"]="arm"
-    driver_arch["irqchip/irq-gic-v3.c"]="arm"
     driver_arch["irqchip/irq-sunxi-nmi.c"]="arm"
     driver_arch["irqchip/irq-crossbar.c"]="arm"
     driver_arch["mfd/twl4030-irq.c"]="arm"
@@ -105,6 +102,10 @@ BEGIN {
     driver_arch["pinctrl/pinctrl-single.c"]="arm"
     driver_arch["tty/serial/xilinx_uartps.c"]="arm"
 
+    driver_arch["irqchip/irq-gic.c"]="arm arm64"
+    driver_arch["irqchip/irq-gic-v3.c"]="arm arm64"
+    driver_arch["clocksource/arm_arch_timer.c"]="arm arm64"
+
     driver_arch["tty/serial/amba-pl011.c"]="arm64"
     driver_arch["gpio/gpio-pl061.c"]="arm64"
 
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [Xenomai] [PATCH v3 2/2] ipipe: add support for arm64 to genpatches script
  2017-02-08 21:40 ` [Xenomai] [PATCH v3 2/2] ipipe: add support for arm64 " Dmitriy Cherkasov
@ 2017-02-13 11:42   ` Philippe Gerum
  0 siblings, 0 replies; 3+ messages in thread
From: Philippe Gerum @ 2017-02-13 11:42 UTC (permalink / raw)
  To: Dmitriy Cherkasov, xenomai

On 02/08/2017 10:40 PM, Dmitriy Cherkasov wrote:
> This adds support for properly generating arm64 patches.
> 

Merged, thanks.

-- 
Philippe.


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2017-02-13 11:42 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-08 21:40 [Xenomai] [PATCH v3 1/2] ipipe: add support for multiarch drivers to genpatches script Dmitriy Cherkasov
2017-02-08 21:40 ` [Xenomai] [PATCH v3 2/2] ipipe: add support for arm64 " Dmitriy Cherkasov
2017-02-13 11:42   ` Philippe Gerum

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.