Merge pull request #173 from apritzel/f1c100

Allwinner F1C100 support

3 files changed, 27 insertions, 55 deletions

diff --git a/tests/patches/a-star_kv49l.patch b/tests/patches/a-star_kv49l.patch
deleted file mode 100644
index 799ae1a..0000000
--- a/tests/patches/a-star_kv49l.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-See https://github.com/linux-sunxi/sunxi-boards/issues/51
-
---- orig/sunxi-boards/sys_config/a33/a-star_kv49l.fex
-+++ new/sunxi-boards/sys_config/a33/a-star_kv49l.fex
-@@ -830,25 +830,25 @@
- 
- [Vdevice]
- Vdevice_used = 0
--Vdevice_0 = port:P@00<0><0><0><0>
--Vdevice_1 = port:P@00<0><0><0><0>
-+;Vdevice_0 = port:P@00<0><0><0><0>
-+;Vdevice_1 = port:P@00<0><0><0><0>
- 
- [s_uart0]
- s_uart_used = 0
--s_uart_tx = port:P@00<0><0><0><0>
--s_uart_rx = port:P@00<0><0><0><0>
-+;s_uart_tx = port:P@00<0><0><0><0>
-+;s_uart_rx = port:P@00<0><0><0><0>
- 
- [s_rsb0]
- s_rsb_used = 0
--s_rsb_sck = port:P@00<0><0><0><0>
--s_rsb_sda = port:P@00<0><0><0><0>
-+;s_rsb_sck = port:P@00<0><0><0><0>
-+;s_rsb_sda = port:P@00<0><0><0><0>
- 
- [s_jtag0]
- s_jtag_used = 0
--s_jtag_tms = port:P@00<0><0><0><0>
--s_jtag_tck = port:P@00<0><0><0><0>
--s_jtag_tdo = port:P@00<0><0><0><0>
--s_jtag_tdi = port:P@00<0><0><0><0>
-+;s_jtag_tms = port:P@00<0><0><0><0>
-+;s_jtag_tck = port:P@00<0><0><0><0>
-+;s_jtag_tdo = port:P@00<0><0><0><0>
-+;s_jtag_tdi = port:P@00<0><0><0><0>
- 
- [s_powchk]
- s_powchk_used = 0
-@@ -875,9 +875,9 @@
- 
- [leds_para]
- leds_used = 0
--；red_led = port:P@00<0><0><0><0>
--；red_led_active_low = 0
--；green_led_active_low = 0
--；blue_led =
--；blue_led_active_low = 0
-+;red_led = port:P@00<0><0><0><0>
-+;red_led_active_low = 0
-+;green_led_active_low = 0
-+;blue_led =
-+;blue_led_active_low = 0
- 
diff --git a/tests/patches/temp_fex_fixes.patch b/tests/patches/temp_fex_fixes.patch
new file mode 100644
index 0000000..7708ab2
--- /dev/null
+++ b/tests/patches/temp_fex_fixes.patch
@@ -0,0 +1,23 @@
+diff --git a/sunxi-boards/sys_config/a31/mixtile_loftq.fex b/sunxi-boards/sys_config/a31/mixtile_loftq.fex
+index 583b02e..2310b18 100644
+--- a/sunxi-boards/sys_config/a31/mixtile_loftq.fex
++++ b/sunxi-boards/sys_config/a31/mixtile_loftq.fex
+@@ -87,7 +87,7 @@ dram_tpr2       = 0x39a70140
+ dram_tpr3       = 0xa092e74c
+ dram_tpr4       = 0x2948c209 
+ dram_tpr5       = 0x8944422c
+-dram_tpr6       = 0x300284800
++dram_tpr6       = 0x30028480
+ dram_tpr7       = 0x2a3279
+ dram_tpr8       = 0x5034fa8
+ dram_tpr9       = 0x36353d8
+diff --git a/sunxi-boards/sys_config/h6/pine64_h64.fex b/sunxi-boards/sys_config/h6/pine64_h64.fex
+index 9caaecc..eb585b7 100644
+--- a/sunxi-boards/sys_config/h6/pine64_h64.fex
++++ b/sunxi-boards/sys_config/h6/pine64_h64.fex
+@@ -1,4 +1,4 @@
+-gma;sun50iw6p1 application
++;sun50iw6p1 application
+ ;---------------------------------------------------------------------------------------------------------
+ ; 说明： 脚本中的字符串区分大小写，用户可以修改"="后面的数值，但是不要修改前面的字符串
+ ; 描述gpio的形式：Port:端口+组内序号<功能分配><内部电阻状态><驱动能力><输出电平状态>
diff --git a/tests/unify-fex.c b/tests/unify-fex.c
index a1ff548..57da1c2 100644
--- a/tests/unify-fex.c
+++ b/tests/unify-fex.c
@@ -127,6 +127,10 @@ int main(int argc, char **argv)
 						sprintf(p, "\"%s\"", c);
 						free(c);
 					}
+					/* Remove a trailing semicolon. */
+					c = strchr(p, 0);
+					if (*--c == ';')
+						*c = '\0';
 				}
 			}
 		}