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

Fixed setting CPUMAX in rockchip64 / rk3399 families (#2134)

Browse Source 
Additionally enabled possibility to override default values for CPUMIN and CPUMAX per board.
This commit is contained in:
Piotr Szczepanik 2020-08-07 10:06:24 +02:00 committed by GitHub
parent 54e58e34d3
commit d7cc374235
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/boards/nanopi-r2s.conf
View File

@ -9,4 +9,3 @@ MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima"
SERIALCON="ttyS2:1500000,ttyGS0"
BUILD_DESKTOP="no"
BOOT_FDT_FILE="rockchip/rk3328-nanopi-r2-rev00.dtb"
CPUMAX="1296000"

1
config/boards/nanopineo3.wip
View File

@ -9,4 +9,3 @@ MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima"
SERIALCON="ttyS2:1500000,ttyGS0"
BUILD_DESKTOP="no"
BOOT_FDT_FILE="rockchip/rk3328-nanopi-r2-rev00.dtb"
CPUMAX="1296000"

1
config/boards/renegade.conf
View File

@ -4,4 +4,3 @@ BOARDFAMILY="rockchip64"
BOOTCONFIG="roc-rk3328-cc_defconfig"
KERNEL_TARGET="legacy,current,dev"
FULL_DESKTOP="yes"
CPUMAX="1296000"

1
config/boards/rock64.conf
View File

@ -4,4 +4,3 @@ BOARDFAMILY="rockchip64"
BOOTCONFIG="rock64-rk3328_defconfig"
KERNEL_TARGET="legacy,current,dev"
FULL_DESKTOP="yes"
CPUMAX="1296000"

1
config/boards/rockpi-e.conf
View File

@ -6,4 +6,3 @@ KERNEL_TARGET="current,dev"
DEFAULT_CONSOLE="serial"
MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima"
BUILD_DESKTOP="no"
CPUMAX="1296000"

1
config/boards/z28pro.tvb
View File

@ -5,5 +5,4 @@ BOOTCONFIG="rock64-rk3328_defconfig"
BOOT_FDT_FILE="rockchip/rk3328-z28pro.dtb"
KERNEL_TARGET="legacy,current"
FULL_DESKTOP="yes"
CPUMAX="1296000"
BOOT_LOGO="desktop"

16
config/sources/families/include/rockchip64_common.inc
View File

@ -8,12 +8,22 @@ BOOTDELAY=0
OVERLAY_PREFIX='rockchip'
SERIALCON=${SERIALCON:=$([ $BRANCH == "legacy" ] && echo "ttyFIQ0:1500000" || echo "ttyS2:1500000")}
GOVERNOR="ondemand"
CPUMAX="2016000"
CPUMIN="408000"
BOOTBRANCH="tag:v2020.07"
RKBIN_DIR="$SRC/cache/sources/rkbin-tools"
if [[ $BOOTCONFIG == *3399* ]]; then
CPUMIN=${CPUMIN:="408000"}
CPUMAX=${CPUMAX:="2016000"}
else # rk3308, rk3328
CPUMIN=${CPUMIN:="408000"}
CPUMAX=${CPUMAX:="1296000"}
fi
if [[ $BOARD == nanopi-r2s || $BOARD == rockpi-e || $BOARD == nanopineo3 ]]; then
BOOT_USE_BLOBS=yes
@ -25,7 +35,6 @@ if [[ $BOARD == nanopi-r2s || $BOARD == rockpi-e || $BOARD == nanopineo3 ]]; the
elif [[ $BOOTCONFIG == *3328* ]]; then
BOOT_RK3328_USE_AYUFAN_ATF=yes
CPUMAX="1390000"
elif [[ $BOARD == rockpi-4* ]]; then
@ -47,7 +56,6 @@ elif [[ $BOARD == rockpi-s ]]; then
DDR_BLOB='rk33/rk3308_ddr_589MHz_uart0_m0_v1.26.bin'
MINILOADER_BLOB='rk33/rk3308_miniloader_sd_nand_v1.13.bin'
BL31_BLOB='rk33/rk3308_bl31_v2.10.elf'
CPUMAX="1296000"
else