From eef30204b270e6d16b4a56c653194dde59a139e3 Mon Sep 17 00:00:00 2001 From: ThomasKaiser Date: Wed, 23 Mar 2016 13:26:29 +0100 Subject: [PATCH] Adjusted NanoPi M1 fex to Armbian defaults --- config/nanopim1.fex | 87 +++++++++++++++++++++++++---------------- config/orangepi2.fex | 4 +- config/orangepilite.fex | 4 +- config/orangepione.fex | 4 +- config/orangepipc.fex | 4 +- config/orangepiplus.fex | 4 +- 6 files changed, 63 insertions(+), 44 deletions(-) diff --git a/config/nanopim1.fex b/config/nanopim1.fex index 893698736a..71051d5892 100644 --- a/config/nanopim1.fex +++ b/config/nanopim1.fex @@ -36,7 +36,7 @@ led_state = 0 [boot_init_gpio] used = 1 -gpio0 = port:PA10<1><1> +gpio0 = port:PL10<1><1> gpio1 = port:PG11<1><1> [recovery_para] @@ -166,14 +166,14 @@ uart_rx = port:PA05<2><1> [uart1] uart_used = 0 uart_port = 1 -uart_type = 2 +uart_type = 4 uart_tx = port:PG06<2><1> uart_rx = port:PG07<2><1> uart_rts = port:PG08<2><1> uart_cts = port:PG09<2><1> [uart2] -uart_used = 1 +uart_used = 0 uart_port = 2 uart_type = 4 uart_tx = port:PA00<2><1> @@ -182,7 +182,7 @@ uart_rts = port:PA02<2><1> uart_cts = port:PA03<2><1> [uart3] -uart_used = 1 +uart_used = 0 uart_port = 3 uart_type = 4 uart_tx = port:PA13<3><1> @@ -250,13 +250,13 @@ blue_led_active_low = 0 [ths_para] ths_used = 1 -ths_trip1_count = 5 +ths_trip1_count = 6 ths_trip1_0 = 70 ths_trip1_1 = 80 -ths_trip1_2 = 90 -ths_trip1_3 = 100 -ths_trip1_4 = 105 -ths_trip1_5 = 0 +ths_trip1_2 = 85 +ths_trip1_3 = 90 +ths_trip1_4 = 95 +ths_trip1_5 = 100 ths_trip1_6 = 0 ths_trip1_7 = 0 ths_trip1_0_min = 0 @@ -268,9 +268,9 @@ ths_trip1_2_max = 3 ths_trip1_3_min = 3 ths_trip1_3_max = 4 ths_trip1_4_min = 4 -ths_trip1_4_max = 4 -ths_trip1_5_min = 0 -ths_trip1_5_max = 0 +ths_trip1_4_max = 5 +ths_trip1_5_min = 5 +ths_trip1_5_max = 5 ths_trip1_6_min = 0 ths_trip1_6_max = 0 ths_trip2_count = 1 @@ -281,8 +281,8 @@ cooler_count = 5 cooler0 = "1200000 4 4294967295 0" cooler1 = "1008000 4 4294967295 0" cooler2 = "816000 4 4294967295 0" -cooler3 = "504000 4 4294967295 0" -cooler4 = "504000 1 4294967295 0" +cooler3 = "648000 2 4294967295 0" +cooler3 = "480000 1 4294967295 0" [nand0_para] nand_support_2ch = 0 @@ -320,9 +320,9 @@ hdmi_mode_check = 1 disp_init_enable = 1 disp_mode = 0 screen0_output_type = 3 -screen0_output_mode = 10 -screen1_output_type = 2 -screen1_output_mode = 14 +screen0_output_mode = 5 +screen1_output_type = 3 +screen1_output_mode = 5 fb0_format = 0 fb0_width = 0 fb0_height = 0 @@ -493,7 +493,7 @@ sdc_ddrmode = 1 [usbc0] usb_used = 1 usb_port_type = 2 -usb_detect_type = 1 +usb_detect_type = 0 usb_id_gpio = port:PG12<0><1> usb_det_vbus_gpio = port:PG12<0><1> usb_drv_vbus_gpio = port:PL02<1><0><0> @@ -654,6 +654,32 @@ hdmi_used = 1 [s_cir0] ir_used = 1 ir_rx = port:PL11<2><1> +ir_power_key_code0 = 87 +ir_addr_code0 = 40704 +ir_power_key_code1 = 26 +ir_addr_code1 = 64260 +ir_power_key_code2 = 20 +ir_addr_code2 = 32640 +ir_power_key_code3 = 21 +ir_addr_code3 = 32640 +ir_power_key_code4 = 11 +ir_addr_code4 = 63240 +ir_power_key_code5 = 3 +ir_addr_code5 = 239 +ir_power_key_code6 = 159 +ir_addr_code6 = 19635 +ir_power_key_code7 = 10 +ir_addr_code7 = 30536 +ir_power_key_code8 = 69 +ir_addr_code8 = 48386 +ir_power_key_code9 = 77 +ir_addr_code9 = 56865 +ir_power_key_code10 = 24 +ir_addr_code10 = 65025 +ir_power_key_code11 = 87 +ir_addr_code11 = 65280 +ir_power_key_code12 = 77 +ir_addr_code12 = 65344 [cir] ir_used = 0 @@ -669,24 +695,11 @@ pmu_level0 = 11300 pmu_level1 = 1100 max_freq = 1200000000 min_freq = 480000000 -boot_freq = 1008000000 -LV_count = 8 +LV_count = 2 LV1_freq = 1200000000 LV1_volt = 1300 -LV2_freq = 1008000000 -LV2_volt = 1200 -LV3_freq = 0 -LV3_volt = 1100 -LV4_freq = 0 -LV4_volt = 1100 -LV5_freq = 0 -LV5_volt = 1100 -LV6_freq = 0 -LV6_volt = 1100 -LV7_freq = 0 -LV7_volt = 1100 -LV8_freq = 0 -LV8_volt = 1100 +LV2_freq = 480000000 +LV2_volt = 1100 [gpu_dvfs_table] G_LV_count = 3 @@ -758,12 +771,18 @@ din_gpio = port:PD00<1><1> clk_gpio = port:PD01<1><1> stb_gpio = port:PD02<1><1> +;---------------------------------------------------------------------------------- +;mali parameters +;---------------------------------------------------------------------------------- [mali_para] mali_used = 1 mali_clkdiv = 1 mali_extreme_freq = 600 mali_extreme_vol = 1400 +;---------------------------------------------------------------------------------- +;1wire parameters (default - PA20) +;---------------------------------------------------------------------------------- [w1_para] w1_used = 1 gpio = 20 diff --git a/config/orangepi2.fex b/config/orangepi2.fex index f4dfd5ed91..86333586b8 100644 --- a/config/orangepi2.fex +++ b/config/orangepi2.fex @@ -57,7 +57,7 @@ fel_key_min =02 logical_start = 40960 sprite_work_delay = 500 sprite_err_delay = 200 -sprite_gpio0 = port:PA15<1> +sprite_gpio0 = port:PL10<1> next_work = 3 ;--------------------------------------------------------------------------------- @@ -85,7 +85,7 @@ led_state = 0 ;------------------------------------------------------------------------------- [boot_init_gpio] used = 1 -gpio0 = port:PA15<1><1> +gpio0 = port:PL10<1><1> gpio1 = port:PG11<1><1> ;---------------------------------------------------------------------------------- diff --git a/config/orangepilite.fex b/config/orangepilite.fex index 56ca5336a5..08786ae8eb 100644 --- a/config/orangepilite.fex +++ b/config/orangepilite.fex @@ -22,7 +22,7 @@ fel_key_min = 2 logical_start = 40960 sprite_work_delay = 500 sprite_err_delay = 200 -sprite_gpio0 = port:PA15<1> +sprite_gpio0 = port:PL10<1> next_work = 3 [box_start_os] @@ -36,7 +36,7 @@ led_state = 0 [boot_init_gpio] used = 1 -gpio0 = port:PA15<1><1> +gpio0 = port:PL10<1><1> gpio1 = port:PG11<1><1> [recovery_para] diff --git a/config/orangepione.fex b/config/orangepione.fex index 83f42f117c..cf43b5d2cc 100644 --- a/config/orangepione.fex +++ b/config/orangepione.fex @@ -22,7 +22,7 @@ fel_key_min = 2 logical_start = 40960 sprite_work_delay = 500 sprite_err_delay = 200 -sprite_gpio0 = port:PA15<1> +sprite_gpio0 = port:PL10<1> next_work = 3 [box_start_os] @@ -36,7 +36,7 @@ led_state = 0 [boot_init_gpio] used = 1 -gpio0 = port:PA15<1><1> +gpio0 = port:PL10<1><1> gpio1 = port:PG11<1><1> [recovery_para] diff --git a/config/orangepipc.fex b/config/orangepipc.fex index 1ae9f6f751..f0aa6bbdf9 100644 --- a/config/orangepipc.fex +++ b/config/orangepipc.fex @@ -22,7 +22,7 @@ fel_key_min = 2 logical_start = 40960 sprite_work_delay = 500 sprite_err_delay = 200 -sprite_gpio0 = port:PA15<1> +sprite_gpio0 = port:PL10<1> next_work = 3 [box_start_os] @@ -36,7 +36,7 @@ led_state = 0 [boot_init_gpio] used = 1 -gpio0 = port:PA15<1><1> +gpio0 = port:PL10<1><1> gpio1 = port:PG11<1><1> [recovery_para] diff --git a/config/orangepiplus.fex b/config/orangepiplus.fex index 44f964ea02..ea04c7098a 100644 --- a/config/orangepiplus.fex +++ b/config/orangepiplus.fex @@ -59,7 +59,7 @@ fel_key_min =02 logical_start = 40960 sprite_work_delay = 500 sprite_err_delay = 200 -sprite_gpio0 = port:PA15<1> +sprite_gpio0 = port:PL10<1> next_work = 3 ;--------------------------------------------------------------------------------- @@ -87,7 +87,7 @@ led_state = 0 ;------------------------------------------------------------------------------- [boot_init_gpio] used = 1 -gpio0 = port:PA15<1><1> +gpio0 = port:PL10<1><1> gpio1 = port:PG11<1><1> ;----------------------------------------------------------------------------------