diff --git a/srcpkgs/cubieboard2-uboot/files/cubieboard2.fex b/srcpkgs/cubieboard2-uboot/files/cubieboard2.fex
index 2dd7487d03..abed89dec8 100644
--- a/srcpkgs/cubieboard2-uboot/files/cubieboard2.fex
+++ b/srcpkgs/cubieboard2-uboot/files/cubieboard2.fex
@@ -12,8 +12,7 @@ dcdc3_vol = 1250
 ldo2_vol = 3000
 ldo3_vol = 2800
 ldo4_vol = 2800
-power_start = 0
-storage_type = 1
+storage_type = 0
 
 [clock]
 pll3 = 297
@@ -64,27 +63,27 @@ uart_debug_tx = port:PF02<4><1><default><default>
 uart_debug_rx = port:PF04<4><1><default><default>
 
 [jtag_para]
-jtag_enable = 1
+jtag_enable = 0
 jtag_ms = port:PB14<3><default><default><default>
 jtag_ck = port:PB15<3><default><default><default>
 jtag_do = port:PB16<3><default><default><default>
 jtag_di = port:PB17<3><default><default><default>
 
 [pm_para]
-standby_mode = 1
+standby_mode = 0
 
 [dram_para]
 dram_baseaddr = 0x40000000
 dram_clk = 432
 dram_type = 3
 dram_rank_num = 1
-dram_chip_density = 1
-dram_io_width = 1
-dram_bus_width = 1
+dram_chip_density = 4096
+dram_io_width = 16
+dram_bus_width = 32
 dram_cas = 9
 dram_zq = 0x7f
 dram_odt_en = 0
-dram_size = 1
+dram_size = 1024
 dram_tpr0 = 0x42d899b7
 dram_tpr1 = 0xa090
 dram_tpr2 = 0x22a00
@@ -126,25 +125,15 @@ twi0_scl = port:PB00<2><default><default><default>
 twi0_sda = port:PB01<2><default><default><default>
 
 [twi1_para]
-twi1_used = 1
+twi1_used = 0
 twi1_scl = port:PB18<2><default><default><default>
 twi1_sda = port:PB19<2><default><default><default>
 
 [twi2_para]
-twi2_used = 1
+twi2_used = 0
 twi2_scl = port:PB20<2><default><default><default>
 twi2_sda = port:PB21<2><default><default><default>
 
-[twi3_para]
-twi3_used = 1
-twi3_scl = port:PI00<3><default><default><default>
-twi3_sda = port:PI01<3><default><default><default>
-
-[twi4_para]
-twi4_used = 1
-twi4_scl = port:PI02<3><default><default><default>
-twi4_sda = port:PI03<3><default><default><default>
-
 [uart_para0]
 uart_used = 1
 uart_port = 0
@@ -166,7 +155,7 @@ uart_dcd = port:PA16<4><1><default><default>
 uart_ring = port:PA17<4><1><default><default>
 
 [uart_para2]
-uart_used = 1
+uart_used = 0
 uart_port = 2
 uart_type = 4
 uart_tx = port:PI18<3><1><default><default>
@@ -281,16 +270,9 @@ motor_shake = port:PB03<1><default><default><1>
 
 [gpio_para]
 gpio_used = 1
-gpio_num = 1
+gpio_num = 2
 gpio_pin_1 = port:PH20<1><default><default><1>
-
-[leds_para]
-leds_used = 1
-leds_num = 1
-leds_pin_1 = port:PH21<1><default><default><0>
-leds_name_1 = "blue:ph21:led2"
-leds_default_1 = 0
-leds_trigger_1 = "heartbeat"
+gpio_pin_2 = port:PH21<1><default><default><1>
 
 [nand_para]
 nand_used = 1
@@ -323,15 +305,15 @@ good_block_ratio = 0
 
 [disp_init]
 disp_init_enable = 1
-disp_mode = 4
+disp_mode = 0
 screen0_output_type = 3
 screen0_output_mode = 4
-screen1_output_type = 1
+screen1_output_type = 0
 screen1_output_mode = 4
 fb0_framebuffer_num = 2
 fb0_format = 10
 fb0_pixel_sequence = 0
-fb0_scaler_mode_enable = 1
+fb0_scaler_mode_enable = 0
 fb1_framebuffer_num = 2
 fb1_format = 10
 fb1_pixel_sequence = 0
@@ -348,21 +330,23 @@ lcd1_saturation = 57
 lcd1_hue = 50
 
 [lcd0_para]
-lcd_used = 1
-lcd_x = 800
-lcd_y = 480
-lcd_dclk_freq = 33
+lcd_used = 0
+lcd_x = 1024
+lcd_y = 600
+lcd_dclk_freq = 51
 lcd_pwm_not_used = 0
 lcd_pwm_ch = 0
 lcd_pwm_freq = 10000
-lcd_pwm_pol = 0
+lcd_pwm_pol = 1
+lcd_max_bright = 240
+lcd_min_bright = 64
 lcd_if = 0
-lcd_hbp = 46
-lcd_ht = 1055
-lcd_vbp = 23
-lcd_vt = 1050
-lcd_vspw = 0
-lcd_hspw = 0
+lcd_hbp = 158
+lcd_ht = 1344
+lcd_vbp = 25
+lcd_vt = 1270
+lcd_vspw = 3
+lcd_hspw = 20
 lcd_hv_if = 0
 lcd_hv_smode = 0
 lcd_hv_s888_if = 0
@@ -372,17 +356,17 @@ lcd_lvds_mode = 0
 lcd_lvds_bitwidth = 0
 lcd_lvds_io_cross = 0
 lcd_cpu_if = 0
-lcd_frm = 0
-lcd_io_cfg0 = 268435456
+lcd_frm = 1
+lcd_io_cfg0 = 0
 lcd_gamma_correction_en = 0
 lcd_gamma_tbl_0 = 0x0
 lcd_gamma_tbl_1 = 0x10101
 lcd_gamma_tbl_255 = 0xffffff
-lcd_bl_en_used = 1
+lcd_bl_en_used = 0
 lcd_bl_en = port:PH07<1><0><default><1>
-lcd_power_used = 1
+lcd_power_used = 0
 lcd_power = port:PH08<1><0><default><1>
-lcd_pwm_used = 1
+lcd_pwm_used = 0
 lcd_pwm = port:PB02<2><0><default><default>
 lcdd0 = port:PD00<2><0><default><default>
 lcdd1 = port:PD01<2><0><default><default>
@@ -422,6 +406,8 @@ lcd_pwm_not_used = 0
 lcd_pwm_ch = 1
 lcd_pwm_freq = 0
 lcd_pwm_pol = 0
+lcd_max_bright = 240
+lcd_min_bright = 64
 lcd_if = 0
 lcd_hbp = 0
 lcd_ht = 0
@@ -448,7 +434,7 @@ lcd_bl_en_used = 0
 lcd_bl_en =
 lcd_power_used = 0
 lcd_power =
-lcd_pwm_used = 1
+lcd_pwm_used = 0
 lcd_pwm = port:PI03<2><0><default><default>
 lcd_gpio_0 =
 lcd_gpio_1 =
@@ -484,7 +470,7 @@ lcdhsync = port:PH26<2><0><default><default>
 lcdvsync = port:PH27<2><0><default><default>
 
 [tv_out_dac_para]
-dac_used = 1
+dac_used = 0
 dac0_src = 4
 dac1_src = 5
 dac2_src = 6
@@ -494,10 +480,10 @@ dac3_src = 0
 hdmi_used = 1
 
 [camera_list_para]
-camera_list_para_used = 1
+camera_list_para_used = 0
 ov7670 = 0
 gc0308 = 1
-gt2005 = 0
+gt2005 = 1
 hi704 = 0
 sp0838 = 0
 mt9m112 = 0
@@ -506,7 +492,7 @@ ov2655 = 0
 hi253 = 0
 gc0307 = 0
 mt9d112 = 0
-ov5640 = 1
+ov5640 = 0
 gc2015 = 0
 ov2643 = 0
 gc0329 = 0
@@ -515,25 +501,38 @@ tvp5150 = 0
 s5k4ec = 0
 ov5650_mv9335 = 0
 siv121d = 0
+gc2035 = 0
 
 [csi0_para]
 csi_used = 0
-csi_dev_qty = 1
+csi_dev_qty = 2
 csi_stby_mode = 0
 csi_mname = "gc0308"
-csi_if = 0
-csi_iovdd = ""
-csi_avdd = ""
-csi_dvdd = ""
-csi_vol_iovdd =
-csi_vol_dvdd =
-csi_vol_avdd =
-csi_vflip = 0
-csi_hflip = 0
-csi_flash_pol = 0
-csi_facing = 0
 csi_twi_id = 1
 csi_twi_addr = 0x42
+csi_if = 0
+csi_vflip = 0
+csi_hflip = 0
+csi_iovdd = "axp20_pll"
+csi_avdd = ""
+csi_dvdd = ""
+csi_vol_iovdd = 2800
+csi_vol_dvdd =
+csi_vol_avdd =
+csi_flash_pol = 0
+csi_mname_b = "gt2005"
+csi_twi_id_b = 1
+csi_twi_addr_b = 0x78
+csi_if_b = 0
+csi_vflip_b = 0
+csi_hflip_b = 0
+csi_iovdd_b = "axp20_pll"
+csi_avdd_b = ""
+csi_dvdd_b = ""
+csi_vol_iovdd_b = 2800
+csi_vol_avdd_b =
+csi_vol_dvdd_b =
+csi_flash_pol_b = 0
 csi_pck = port:PE00<3><default><default><default>
 csi_ck = port:PE01<3><default><default><default>
 csi_hsync = port:PE02<3><default><default><default>
@@ -546,9 +545,16 @@ csi_d4 = port:PE08<3><default><default><default>
 csi_d5 = port:PE09<3><default><default><default>
 csi_d6 = port:PE10<3><default><default><default>
 csi_d7 = port:PE11<3><default><default><default>
-csi_reset = port:PH13<1><default><default><0>
-csi_power_en =
-csi_stby = port:PH16<1><default><default><0>
+csi_reset = port:PH14<1><default><default><0>
+csi_power_en = port:PH17<1><default><default><0>
+csi_stby = port:PH19<1><default><default><0>
+csi_flash =
+csi_af_en =
+csi_reset_b = port:PH14<1><default><default><0>
+csi_power_en_b = port:PH17<1><default><default><0>
+csi_stby_b = port:PH18<1><default><default><0>
+csi_flash_b =
+csi_af_en_b =
 
 [csi1_para]
 csi_used = 0
@@ -556,10 +562,10 @@ csi_dev_qty = 1
 csi_stby_mode = 0
 csi_mname = "gc0308"
 csi_if = 0
-csi_iovdd = ""
+csi_iovdd = "axp20_pll"
 csi_avdd = ""
 csi_dvdd = ""
-csi_vol_iovdd =
+csi_vol_iovdd = 2800
 csi_vol_dvdd =
 csi_vol_avdd =
 csi_vflip = 0
@@ -580,12 +586,12 @@ csi_d4 = port:PG08<3><default><default><default>
 csi_d5 = port:PG09<3><default><default><default>
 csi_d6 = port:PG10<3><default><default><default>
 csi_d7 = port:PG11<3><default><default><default>
-csi_reset = port:PH14<1><default><default><0>
-csi_power_en =
-csi_stby = port:PH17<1><default><default><0>
+csi_reset = port:PH13<1><default><default><0>
+csi_power_en = port:PH16<1><default><default><0>
+csi_stby = port:PH19<1><default><default><0>
 
 [tvout_para]
-tvout_used = 1
+tvout_used = 0
 tvout_channel_num = 1
 
 [tvin_para]
@@ -718,31 +724,30 @@ kp_out7 = port:PH27<4><1><default><default>
 
 [usbc0]
 usb_used = 1
-usb_port_type = 0
-usb_detect_type = 0
-usb_id_gpio =
-usb_det_vbus_gpio =
+usb_port_type = 2
+usb_detect_type = 1
+usb_id_gpio = port:PH04<0><1><default><default>
+usb_det_vbus_gpio = port:PH05<0><0><default><default>
 usb_drv_vbus_gpio = port:PB09<1><0><default><0>
-usb_restrict_gpio =
 usb_host_init_state = 0
 
 [usbc1]
 usb_used = 1
 usb_port_type = 1
 usb_detect_type = 0
+usb_id_gpio =
+usb_det_vbus_gpio =
 usb_drv_vbus_gpio = port:PH06<1><0><default><0>
-usb_restrict_gpio =
 usb_host_init_state = 1
-usb_restric_flag = 0
 
 [usbc2]
 usb_used = 1
 usb_port_type = 1
 usb_detect_type = 0
+usb_id_gpio =
+usb_det_vbus_gpio =
 usb_drv_vbus_gpio = port:PH03<1><0><default><0>
-usb_restrict_gpio =
 usb_host_init_state = 1
-usb_restric_flag = 0
 
 [usb_feature]
 vendor_id = 6353
@@ -793,7 +798,7 @@ gps_osc_en = port:PI14<1><default><default><0>
 gps_rx_en = port:PI15<1><default><default><0>
 
 [wifi_para]
-wifi_used = 1
+wifi_used = 0
 wifi_sdc_id = 3
 wifi_usbc_id = 2
 wifi_usbc_type = 1
@@ -805,9 +810,9 @@ rtk_rtl8723as_wl_host_wake = port:PH10<0><default><default><0>
 rtk_rtl8723as_bt_host_wake = port:PI21<0><default><default><0>
 ap6xxx_wl_regon = port:PH09<1><default><default><0>
 ap6xxx_wl_host_wake = port:PH10<0><default><default><0>
-ap6xxx_bt_regon = port:PH18<1><default><default><0>
-ap6xxx_bt_wake = port:PH24<1><default><default><0>
-ap6xxx_bt_host_wake = port:PH25<0><default><default><0>
+ap6xxx_bt_regon = port:PB05<1><default><default><0>
+ap6xxx_bt_wake = port:PI20<1><default><default><0>
+ap6xxx_bt_host_wake = port:PI21<0><default><default><0>
 
 [3g_para]
 3g_used = 0
@@ -863,14 +868,11 @@ spdif_din =
 
 [audio_para]
 audio_used = 1
-audio_pa_ctrl = port:PH15<1><default><default><0>
+capture_used = 1
+audio_pa_ctrl = port:PH15<1><default><default><1>
 
 [switch_para]
-switch_used = 1
-
-[ir_para]
-ir_used = 1
-ir_rx = port:PB04<2><default><default><default>
+switch_used = 0
 
 [leds_para]
 leds_used = 1
@@ -878,18 +880,23 @@ leds_num = 2
 leds_pin_1 = port:PH20<1><default><default><0>
 leds_name_1 = "green:ph20:led1"
 leds_default_1 = 1
+leds_trigger_1 = "mmc0"
 leds_pin_2 = port:PH21<1><default><default><0>
 leds_name_2 = "blue:ph21:led2"
 leds_default_2 = 0
 leds_trigger_2 = "heartbeat"
 
+[ir_para]
+ir_used = 1
+ir_rx = port:PB04<2><default><default><default>
+
 [pmu_para]
 pmu_used = 1
 pmu_twi_addr = 52
 pmu_twi_id = 0
 pmu_irq_id = 32
-pmu_battery_rdc = 100
-pmu_battery_cap = 3200
+pmu_battery_rdc = 120
+pmu_battery_cap = 2100
 pmu_init_chgcur = 300
 pmu_earlysuspend_chgcur = 600
 pmu_suspend_chgcur = 1000
@@ -907,23 +914,23 @@ pmu_bat_para2 = 0
 pmu_bat_para3 = 0
 pmu_bat_para4 = 0
 pmu_bat_para5 = 5
-pmu_bat_para6 = 8
-pmu_bat_para7 = 11
-pmu_bat_para8 = 22
-pmu_bat_para9 = 33
-pmu_bat_para10 = 43
+pmu_bat_para6 = 11
+pmu_bat_para7 = 13
+pmu_bat_para8 = 15
+pmu_bat_para9 = 19
+pmu_bat_para10 = 32
 pmu_bat_para11 = 50
-pmu_bat_para12 = 59
+pmu_bat_para12 = 58
 pmu_bat_para13 = 71
-pmu_bat_para14 = 83
-pmu_bat_para15 = 92
+pmu_bat_para14 = 81
+pmu_bat_para15 = 89
 pmu_bat_para16 = 100
 pmu_usbvol_limit = 1
 pmu_usbcur_limit = 0
 pmu_usbvol = 4000
 pmu_usbcur = 0
-pmu_usbvol_pc = 4400
-pmu_usbcur_pc = 500
+pmu_usbvol_pc = 4200
+pmu_usbcur_pc = 0
 pmu_pwroff_vol = 3300
 pmu_pwron_vol = 2900
 pmu_pekoff_time = 6000
@@ -945,11 +952,11 @@ pmu_batdeten = 1
 
 [recovery_key]
 key_min = 4
-key_max = 6
+key_max = 40
 
 [dvfs_table]
 max_freq = 912000000
-min_freq = 60000000
+min_freq = 400000000
 LV_count = 7
 LV1_freq = 1008000000
 LV1_volt = 1450
diff --git a/srcpkgs/cubieboard2-uboot/template b/srcpkgs/cubieboard2-uboot/template
index e0a3413402..fce57fda0c 100644
--- a/srcpkgs/cubieboard2-uboot/template
+++ b/srcpkgs/cubieboard2-uboot/template
@@ -1,7 +1,7 @@
 # Template file for 'cubieboard2-uboot'
 pkgname=cubieboard2-uboot
 version=v2013.10
-revision=1
+revision=2
 wrksrc="u-boot-sunxi-${version/v/}-sunxi"
 hostmakedepends="sunxi-tools"
 short_desc="Cubieboard2 U-Boot files for SD booting"