enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #259 from ThomasKaiser/master

Browse Source 
A few BPi M2+ legacy fixes
This commit is contained in:
Igor Pečovnik 2016-04-07 06:52:10 +02:00
commit 9dbe6c507b
6 changed files with 72 additions and 5608 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common.sh
View File

@ -398,9 +398,11 @@ _EOF_
fi
# h3disp for sun8i/3.4.x
if [ "$BOARD" = "orangepiplus" -o "$BOARD" = "orangepih3" ]; then
# h3disp/sun8i-corekeeper.sh for sun8i/3.4.x
if [ "${LINUXFAMILY}" = "sun8i" -a "${BRANCH}" = "default" ]; then
install -m 755 "$SRC/lib/scripts/h3disp" "$CACHEDIR/sdcard/usr/local/bin"
install -m 755 "$SRC/lib/scripts/sun8i-corekeeper.sh" "$CACHEDIR/sdcard/usr/local/bin"
sed -i 's|^exit\ 0$|/usr/local/bin/sun8i-corekeeper.sh \&\n\n&|' "$CACHEDIR/sdcard/etc/rc.local"
fi
}

70
config/bananapim2plus.fex
View File

@ -370,9 +370,7 @@ gpio_pin_28 = port:PL03<0><default><default><1>
[leds_para]
leds_used = 1
green_led = port:PL10<1><default><default><1>
green_led_active_low = 0
red_led = port:PA15<1><default><default><0>
red_led = port:PL10<1><default><default><1>
red_led_active_low = 0
;----------------------------------------------------------------------------------
@ -390,8 +388,8 @@ red_led_active_low = 0
[ths_para]
ths_used = 1
ths_trip1_count = 6
ths_trip1_0 = 70
ths_trip1_1 = 80
ths_trip1_0 = 60
ths_trip1_1 = 75
ths_trip1_2 = 85
ths_trip1_3 = 90
ths_trip1_4 = 95
@ -420,11 +418,13 @@ ths_trip2_0 = 105
;----------------------------------------------------------------------------------
[cooler_table]
cooler_count = 4
cooler_count = 6
cooler0 = "1200000 4 4294967295 0"
cooler1 = "1008000 4 4294967295 0"
cooler2 = "816000 4 4294967295 0"
cooler3 = "648000 1 4294967295 0"
cooler1 = "912000 4 4294967295 0"
cooler2 = "720000 4 4294967295 0"
cooler3 = "648000 4 4294967295 0"
cooler4 = "480000 2 4294967295 0"
cooler5 = "240000 1 4294967295 0"
[nand0_para]
nand_support_2ch = 0
@ -625,12 +625,12 @@ vip_csi_sda = port:PE13<2><default><default><default>
vip_dev0_mname = "ov5640"
vip_dev0_pos = "rear"
vip_dev0_lane = 1
vip_dev0_twi_id = 0
vip_dev0_lane = 4
vip_dev0_twi_id = 2
vip_dev0_twi_addr = 0x78
vip_dev0_isp_used = 0
vip_dev0_fmt = 0
vip_dev0_stby_mode = 0
vip_dev0_isp_used = 1
vip_dev0_fmt = 1
vip_dev0_stby_mode = 1
vip_dev0_vflip = 0
vip_dev0_hflip = 0
vip_dev0_iovdd = ""
@ -641,9 +641,9 @@ vip_dev0_dvdd = ""
vip_dev0_dvdd_vol = 1500000
vip_dev0_afvdd = ""
vip_dev0_afvdd_vol = 2800000
vip_dev0_power_en = port:PD14<1><default><default><1>
vip_dev0_reset = port:PE14<1><default><default><1>
vip_dev0_pwdn = port:PE15<1><default><default><0>
vip_dev0_power_en = port:PD14<1><default><default><default>
vip_dev0_reset = port:PE14<1><default><default><default>
vip_dev0_pwdn = port:PE15<1><default><default><default>
vip_dev0_flash_en =
vip_dev0_flash_mode =
vip_dev0_af_pwdn =
@ -818,7 +818,7 @@ usb_used = 1
usb_port_type = 1
usb_detect_type = 0
usb_id_gpio = port:PL06<0><1><default><default>
usb_det_vbus_gpio = port:PL06<0><1><default><default>
usb_det_vbus_gpio = "axp_ctrl"
usb_drv_vbus_gpio = port:PD11<1><0><default><0>
usb_host_init_state = 1
usb_restrict_gpio =
@ -908,16 +908,16 @@ serial_unique = 0
;--------------------------------------------------------------------------------
[module_para]
module_num = 4
module_power0 = "vcc-wifi-33"
module_power0 =
module_power0_vol = 0
module_power1 =
module_power1_vol =
module_power1 =
module_power1_vol = 1
module_power2 =
module_power2_vol =
module_power3 =
module_power3_vol =
chip_en =
lpo_use_apclk =
lpo_use_apclk = "losc_out"
;--------------------------------------------------------------------------------
;wifi configuration
@ -932,8 +932,8 @@ lpo_use_apclk =
[wifi_para]
wifi_used = 1
wifi_sdc_id = 1
;wifi_usbc_id = 2
;wifi_usbc_type = 1
wifi_usbc_id = 1
wifi_usbc_type = 1
wl_reg_on = port:PL07<1><default><default><0>
wl_host_wake = port:PG10<0><default><default><0>
wl_host_wake_invert = 0
@ -953,9 +953,9 @@ wl_host_wake_invert = 0
bt_used = 1
bt_uart_id = 1
bt_uart_baud = 1500000
bt_rst_n = port:PG12<0><default><default><0>
bt_wake = port:PG13<0><default><default><0>
bt_host_wake = port:PG11<1><default><default><0>
bt_rst_n = port:PG12<1><default><default><0>
bt_wake = port:PG13<1><default><default><0>
bt_host_wake = port:PG11<0><default><default><0>
bt_host_wake_invert = 0
;--------------------------------------------------------------------------------
@ -1037,14 +1037,14 @@ i2s_din = port:PG13<2><1><default><default>
[audio0]
audio_used = 1
lineout_vol = 0x1f
cap_vol = 0x5
audio_hp_ldo = "none"
adcagc_used = 0
adcdrc_used = 0
dacdrc_used = 0
adchpf_used = 0
dachpf_used = 0
lineout_vol = 0x1f
cap_vol = 0x5
audio_hp_ldo = "none"
adcagc_used = 0
adcdrc_used = 0
dacdrc_used = 0
adchpf_used = 0
dachpf_used = 0
audio_pa_ctrl = port:PA16<1><default><default><0>
[spdif0]

6
config/linux-sun8i-default.config
View File

@ -1512,6 +1512,11 @@ CONFIG_ATH6KL_USB=m
# CONFIG_B43 is not set
# CONFIG_B43LEGACY is not set
# CONFIG_BCMDHD is not set
CONFIG_AP6210=m
CONFIG_AP6210_FW_PATH="/lib/firmware/ap6210/fw_bcmxxxx.bin"
CONFIG_AP6210_NVRAM_PATH="/lib/firmware/ap6210/nvram_apxxxx.txt"
CONFIG_AP6210_OOB=y
# CONFIG_AP6210_SDIO_IRQ is not set
CONFIG_BRCMUTIL=m
CONFIG_BRCMFMAC=m
CONFIG_BRCMFMAC_SDIO=y
@ -2517,6 +2522,7 @@ CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m
CONFIG_DVB_USB_MXL111SF=m
CONFIG_DVB_USB_RTL28XXU=m
# CONFIG_DVB_USB_RTL2832U is not set
CONFIG_SMS_SIANO_MDTV=m
#

2
configuration.sh
View File

@ -261,7 +261,7 @@ case $BOARD in
BOOTCONFIG="orangepi_plus_defconfig"
MODULES="#gpio_sunxi #w1-sunxi #w1-gpio #w1-therm #ap6211"
MODULES_NEXT="brcmfmac"
CPUMIN="648000"
CPUMIN="240000"
CPUMAX="1200000"
GOVERNOR="interactive"
CLI_TARGET="%,%"

5570
patch/kernel/sunxi-dev/bananapi-r1-switch-driver.patch.disabled
View File

File diff suppressed because it is too large Load Diff

26
scripts/sun8i-corekeeper.sh Executable file
View File

@ -0,0 +1,26 @@
#!/bin/sh
#
# Simple script to enable CPU cores automatically again if cooling state is
# 3 or lower.
#
set -e
get_cooling_state() {
echo $(cat /sys/devices/virtual/thermal/cooling_device0/cur_state)
}
enable_cpu() {
if [ $(cat /sys/devices/system/cpu/cpu$1/online) = 0 ]; then
echo 1 > /sys/devices/system/cpu/cpu$1/online || true
fi
}
while true; do
for c in 0 1 2 3; do
if [ $(get_cooling_state) -le 3 ]; then
enable_cpu $c
fi
done
sleep 5
done