diff options
author | Andre Przywara <osp@andrep.de> | 2022-02-20 03:04:09 +0300 |
---|---|---|
committer | Andre Przywara <osp@andrep.de> | 2022-02-23 04:21:14 +0300 |
commit | e70b70eb45fe8c814db02f5aef686b1690d6dff7 (patch) | |
tree | 9b4ab5a7fd5b355d761c756767e7c7478643bbdd | |
parent | a8013395e63b8b9fad7895a791656bd400c931c8 (diff) |
checks: fix .fex files to pass checks
"make check" uses the .fex files in the sunxi-boards repository to
verify the validity of our FEX compiler.
To overcome an existing issue, there was one patch file applied to the
mainline repository content. However this was merged into mainline
sunxi-boards a while ago, so remove that patch file, as trying to apply
the patch actually fails the current test early.
Also some new files (H6 boards) have been added meanwhile, but they are
apparently buggy:
- pine64_h64.fex contains some apparently bogus characters before the
leading comment, possibly an artefact of its extraction.
- One DRAM TPR6 parameter seems to contain an extra trailing 0, making
the value larger than 32 bit, and not matching the TPR6 values for
other A31 boards. Just remove that, as the compiler rightfully
complains about that.
This allows the "make check" command to pass again.
Signed-off-by: Andre Przywara <osp@andrep.de>
-rw-r--r-- | tests/patches/a-star_kv49l.patch | 55 | ||||
-rw-r--r-- | tests/patches/temp_fex_fixes.patch | 23 |
2 files changed, 23 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:端口+组内序号<功能分配><内部电阻状态><驱动能力><输出电平状态> |