From 60e935b34e3ed8b2ed14cf812fc30b08506b1651 Mon Sep 17 00:00:00 2001 From: Thomas Kaiser Date: Tue, 14 Jun 2016 17:38:04 +0200 Subject: [PATCH] Fix eMMC & leds on Beelink X2 Checked all settings individually and removed conflicting stuff. Now led behaviour as usual and able to access the and boot from eMMC --- config/fex/beelinkx2.fex | 96 ++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 49 deletions(-) diff --git a/config/fex/beelinkx2.fex b/config/fex/beelinkx2.fex index c98e8f4f5..76f1dbbb7 100644 --- a/config/fex/beelinkx2.fex +++ b/config/fex/beelinkx2.fex @@ -15,8 +15,10 @@ machine = "Beelink X2" ;--------------------------------------------------------------------------------------------------------- [platform] debug_mode = 1 -eraseflag = 1 -next_work = 2 +eraseflag = 1 +next_work = 3 +secure_without_OS = 1 +secure_bit = 0 ;---------------------------------------------------------------------------------- ;[target] system bootup configuration @@ -25,8 +27,8 @@ next_work = 2 ;---------------------------------------------------------------------------------- [target] boot_clock = 1008 -storage_type = -1 -burn_key = 0 +storage_type = 2 +burn_key = 0 ;--------------------------------------------------------------------------------- ; uboot key detect enable @@ -42,8 +44,8 @@ keyen_flag = 0 ; fel_key_min用于配置按键的最小键值 ;--------------------------------------------------------------------------------- [fel_key] -fel_key_max =07 -fel_key_min =02 +fel_key_max = 7 +fel_key_min = 2 ;---------------------------------------------------------------------------------- ;card boot @@ -60,7 +62,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 ;--------------------------------------------------------------------------------- @@ -79,7 +81,7 @@ irkey_used = 1 pmukey_used = 1 pmukey_num = 3 led_power = 0 -led_state = 1 +led_state = 0 ;------------------------------------------------------------------------------- ; boot阶段上电初始化GPIO @@ -90,7 +92,7 @@ led_state = 1 [boot_init_gpio] used = 1 gpio0 = port:PL10<1><1> -gpio1 = port:PA15<1><0> +gpio1 = port:PG11<1><0> ;---------------------------------------------------------------------------------- ; used: 模块使能端 1：开启模块 0：关闭模块 @@ -98,8 +100,8 @@ gpio1 = port:PA15<1><0> ; recovery_key ： 按键配置 （例如：recovery_key= port:PH16<0>） ;---------------------------------------------------------------------------------- [recovery_para] -used = 0 -mode = 2 +used = 1 +mode = 2 recovery_key = port:PL04<0> @@ -136,7 +138,7 @@ sdc_d5 = port:PC13<3><1><2> sdc_d6 = port:PC14<3><1><2> sdc_d7 = port:PC15<3><1><2> sdc_2xmode = 1 -;sdc_ddrmode = 1 +sdc_ddrmode = 1 [twi_para] twi_port = 0 @@ -154,7 +156,7 @@ force_uart_tx = port:PF02<3><1> force_uart_rx = port:PF04<3><1> [jtag_para] -jtag_enable = 1 +jtag_enable = 0 jtag_ms = port:PA00<3> jtag_ck = port:PA01<3> jtag_do = port:PA02<3> @@ -233,8 +235,9 @@ cpu_freq = 48 pll_ratio = 0x111 dram_selfresh_en = 1 dram_freq = 36 -wakeup_src0 = port:PL03<6><0> -wakeup_src_bt = +wakeup_src0 = +wakeup_src_wl = port:PG10<4><0> +wakeup_src_bt = port:PL03<6><0> ;---------------------------------------------------------------------------------- ;i2c configuration @@ -266,7 +269,7 @@ uart_tx = port:PA04<2><1> uart_rx = port:PA05<2><1> [uart1] -uart_used = 1 +uart_used = 0 uart_port = 1 uart_type = 4 uart_tx = port:PG06<2><1> @@ -275,7 +278,7 @@ 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> @@ -328,14 +331,24 @@ mode = 0 ;userspace gpio interface for android ;---------------------------------------------------------------------------------- [gpio_para] -gpio_used = 1 -gpio_num = 2 -gpio_pin_1 = port:PL10<1><1> -gpio_pin_2 = port:PA15<1><0> +;gpio_used = 0 +;gpio_num = 2 +;gpio_pin_1 = port:PL10<1><1> +;gpio_pin_2 = port:PA15<1><0> +; +;[led_assign] +;normal_led = "gpio_pin_1" +;standby_led = "gpio_pin_2" -[led_assign] -normal_led = "gpio_pin_1" -standby_led = "gpio_pin_2" +;---------------------------------------------------------------------------------- +;sunxi led configuration +;---------------------------------------------------------------------------------- +[leds_para] +leds_used = 1 +green_led = port:PL10<1><1> +green_led_active_low = 0 +red_led = port:PA15<1><0> +red_led_active_low = 0 ;---------------------------------------------------------------------------------- ;thermal configuration @@ -398,7 +411,7 @@ cooler10 = "240000 1 4294967295 0" [nand0_para] nand_support_2ch = 0 -nand0_used = 1 +nand0_used = 0 nand0_we = port:PC00<2><0><1> nand0_ale = port:PC01<2><0><1> nand0_cle = port:PC02<2><0><1> @@ -455,10 +468,10 @@ disp_init_enable = 1 disp_mode = 0 screen0_output_type = 3 -screen0_output_mode = 4 +screen0_output_mode = 5 screen1_output_type = 3 -screen1_output_mode = 4 +screen1_output_mode = 5 fb0_format = 0 fb0_width = 0 @@ -564,12 +577,10 @@ gmac_power1 = ;-------------------------------------------------------------------------------- [csi0] - vip_used = 0 vip_mode = 0 vip_dev_qty = 1 vip_define_sensor_list = 0 - vip_csi_pck = port:PE00<2> vip_csi_mck = port:PE01<2> vip_csi_hsync = port:PE02<2> @@ -584,7 +595,6 @@ vip_csi_d6 = port:PE10<2> vip_csi_d7 = port:PE11<2> vip_csi_sck = port:PE12<2> vip_csi_sda = port:PE13<2> - vip_dev0_mname = "ov5640" vip_dev0_pos = "rear" vip_dev0_lane = 1 @@ -609,12 +619,9 @@ vip_dev0_pwdn = vip_dev0_flash_en = vip_dev0_flash_mode = vip_dev0_af_pwdn = - vip_dev0_act_used = 0 vip_dev0_act_name = "ad5820_act" vip_dev0_act_slave = 0x18 - - vip_dev1_mname = "" vip_dev1_pos = "front" vip_dev1_lane = 1 @@ -640,7 +647,6 @@ vip_dev1_flash_en = vip_dev1_flash_mode = vip_dev1_af_pwdn = - ;-------------------------------------------------------------------------------- ;tv configuration ; @@ -658,7 +664,7 @@ tvin_channel_num = ;DE-Interlace configuration ;---------------------------------------------------------------------------------- [di_para] -di_used = 1 +di_used = 0 ;-------------------------------------------------------------------------------- ; SDMMC PINS MAPPING | @@ -688,7 +694,7 @@ di_used = 1 ;-------------------------------------------------------------------------------- [mmc0_para] sdc_used = 1 -sdc_detmode = 1 +sdc_detmode = 3 sdc_buswidth = 4 sdc_clk = port:PF02<2><1><2> sdc_cmd = port:PF03<2><1><2> @@ -723,7 +729,7 @@ sdc_2xmode = 1 sdc_ddrmode = 1 [mmc2_para] -sdc_used = 0 +sdc_used = 1 sdc_detmode = 3 sdc_buswidth = 8 sdc_clk = port:PC05<3><1><2> @@ -750,7 +756,7 @@ sdc_ddrmode = 1 ; sim card configuration ;-------------------------------------------------------------------------------- [smc_para] -smc_used = +smc_used = 0 smc_rst = port:PA09<2> smc_vppen = port:PA20<3> smc_vppp = port:PA21<3> @@ -837,7 +843,6 @@ usb_not_suspend = 0 vendor_id = 0x18D1 mass_storage_id = 0x0001 adb_id = 0x0002 - manufacturer_name = "USB Developer" product_name = "Android" serial_number = "20080411" @@ -851,7 +856,6 @@ luns = 3 [serial_feature] serial_unique = 0 - ;-------------------------------------------------------------------------------- ;wifi/bt/fm/gps/nfc modules configuration ;module_power0: axp used by module, "axp22_dldo1" - use dldo1, not use keep it empty @@ -902,7 +906,7 @@ wl_host_wake_invert = 0 ; 0: not used, 1: used ;-------------------------------------------------------------------------------- [bt_para] -bt_used = 1 +bt_used = 0 bt_uart_id = 1 bt_uart_baud = 1500000 bt_rst_n = port:PG12<1><0> @@ -1049,7 +1053,7 @@ ir_addr_code13 = 0xdd22 ;ir tx--- infra remote configuration ;---------------------------------------------------------------------------------- [cir] -ir_used = 0 +ir_used = 1 ir_tx = port:PH07<2> @@ -1092,15 +1096,11 @@ LV2_freq = 648000000 LV2_volt = 1300 [gpu_dvfs_table] - G_LV_count = 3 - G_LV0_freq = 312000000 G_LV0_volt = 1200000 - G_LV1_freq = 384000000 G_LV1_volt = 1200000 - G_LV2_freq = 456000000 G_LV2_volt = 1200000 @@ -1181,14 +1181,13 @@ s_system_power = 50 ;scr configuration ;---------------------------------------------------------------------------------- [sim0] -scr_used = 1 +scr_used = 0 scr_vccen = port:PA06<2> scr_slk = port:PA07<2> scr_sda = port:PA08<2> scr_rst = port:PA09<2> scr_det = port:PA10<2> - ;-------------------------------------------------------------------------------- ;tsc configuration ;-------------------------------------------------------------------------------- @@ -1232,7 +1231,6 @@ key3_vol = 666 key4_vol = 857 key5_vol = 2000 - ;---------------------------------------------------------------------------------- ;display seven segment para ;----------------------------------------------------------------------------------