Skip to contentSkip to conversation

ipipe: add support for multiarch drivers to genpatches script

PATCH Applied Dmitriy Cherkasov 2 participants 3 messages Feb 8, 2017 – Feb 13, 2017

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/2 ipipe: add support for multiarch drivers to genpatches script

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.

---
 scripts/ipipe/genpatches.sh | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)
scripts/ipipe/genpatches.sh +25 -5
index 9392a41..4c21c9c 100755
@@ -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 {
Signature · 1 line
1.9.1
#1 lore raw

PATCH v3 2/2 ipipe: add support for arm64 to genpatches script

This adds support for properly generating arm64 patches.

---
 scripts/ipipe/genpatches.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
scripts/ipipe/genpatches.sh +4 -3
index 4c21c9c..3714c1b 100755
@@ -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"
 
Signature · 1 line
1.9.1
#2 lore raw

Re: [Xenomai] [PATCH v3 2/2] ipipe: add support for arm64 to genpatches script

Quoted 2 lines · Dmitriy Cherkasov

This adds support for properly generating arm64 patches.

Merged, thanks.

Signature · 1 line
Philippe.