From 2011201ac6ee2f48c54e366bc8695861170d28d0 Mon Sep 17 00:00:00 2001 From: ThomasKaiser Date: Sat, 4 Jun 2016 18:49:55 +0200 Subject: [PATCH] Identical THS settings on all H3 boards, remove installation of sun8i-corekeeper.sh --- common.sh | 4 +--- config/fex/bananapim2plus.fex | 2 +- config/fex/orangepi2.fex | 4 ++-- config/fex/orangepipc.fex | 4 ++-- config/fex/orangepipcplus.fex | 4 ++-- config/fex/orangepiplus.fex | 4 ++-- config/fex/orangepiplus2e.fex | 4 ++-- .../02-0017-increase-mali-clockspeed.patch | 13 ------------- .../u-boot-99-add-missing-boards.patch | 2 +- scripts/customize-image.sh.template | 3 +++ 10 files changed, 16 insertions(+), 28 deletions(-) delete mode 100644 patch/kernel/sun8i-default/02-0017-increase-mali-clockspeed.patch diff --git a/common.sh b/common.sh index 57d45619a..503a3abf3 100644 --- a/common.sh +++ b/common.sh @@ -352,11 +352,9 @@ if [[ -n $MISC5_DIR && $BRANCH != next && $LINUXSOURCEDIR == *sun8i* ]]; then install -m 755 a10disp "$CACHEDIR/sdcard/usr/local/bin" fi -# h3disp/sun8i-corekeeper.sh for sun8i/3.4.x +# h3disp for sun8i/3.4.x if [[ $LINUXFAMILY == sun8i && $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 } diff --git a/config/fex/bananapim2plus.fex b/config/fex/bananapim2plus.fex index 5e35ae860..fe2a9bf4a 100644 --- a/config/fex/bananapim2plus.fex +++ b/config/fex/bananapim2plus.fex @@ -180,7 +180,7 @@ pll_de = 864 ; dram_tpr7[9:0] to set ddr3 or ddr3l clk. ;***************************************************************************** [dram_para] -dram_clk = 672 +dram_clk = 624 dram_type = 3 dram_zq = 0x3b3bfb dram_odt_en = 0x1 diff --git a/config/fex/orangepi2.fex b/config/fex/orangepi2.fex index 6862f5ca3..e98ee91b2 100644 --- a/config/fex/orangepi2.fex +++ b/config/fex/orangepi2.fex @@ -371,12 +371,12 @@ red_led_active_low = 0 [ths_para] ths_used = 1 ths_trip1_count = 6 -ths_trip1_0 = 70 +ths_trip1_0 = 75 ths_trip1_1 = 80 ths_trip1_2 = 85 ths_trip1_3 = 90 ths_trip1_4 = 95 -ths_trip1_5 = 100 +ths_trip1_5 = 105 ths_trip1_6 = 0 ths_trip1_7 = 0 ths_trip1_0_min = 0 diff --git a/config/fex/orangepipc.fex b/config/fex/orangepipc.fex index 89ee43d84..f2a2adb45 100644 --- a/config/fex/orangepipc.fex +++ b/config/fex/orangepipc.fex @@ -255,12 +255,12 @@ red_led_active_low = 0 [ths_para] ths_used = 1 ths_trip1_count = 6 -ths_trip1_0 = 70 +ths_trip1_0 = 75 ths_trip1_1 = 80 ths_trip1_2 = 85 ths_trip1_3 = 90 ths_trip1_4 = 95 -ths_trip1_5 = 100 +ths_trip1_5 = 105 ths_trip1_6 = 0 ths_trip1_7 = 0 ths_trip1_0_min = 0 diff --git a/config/fex/orangepipcplus.fex b/config/fex/orangepipcplus.fex index 659f515ad..dfbee36ca 100644 --- a/config/fex/orangepipcplus.fex +++ b/config/fex/orangepipcplus.fex @@ -271,12 +271,12 @@ red_led_active_low = 0 [ths_para] ths_used = 1 ths_trip1_count = 6 -ths_trip1_0 = 70 +ths_trip1_0 = 75 ths_trip1_1 = 80 ths_trip1_2 = 85 ths_trip1_3 = 90 ths_trip1_4 = 95 -ths_trip1_5 = 100 +ths_trip1_5 = 105 ths_trip1_6 = 0 ths_trip1_7 = 0 ths_trip1_0_min = 0 diff --git a/config/fex/orangepiplus.fex b/config/fex/orangepiplus.fex index 38a879646..6fa8489e3 100644 --- a/config/fex/orangepiplus.fex +++ b/config/fex/orangepiplus.fex @@ -374,12 +374,12 @@ red_led_active_low = 0 [ths_para] ths_used = 1 ths_trip1_count = 6 -ths_trip1_0 = 70 +ths_trip1_0 = 75 ths_trip1_1 = 80 ths_trip1_2 = 85 ths_trip1_3 = 90 ths_trip1_4 = 95 -ths_trip1_5 = 100 +ths_trip1_5 = 105 ths_trip1_6 = 0 ths_trip1_7 = 0 ths_trip1_0_min = 0 diff --git a/config/fex/orangepiplus2e.fex b/config/fex/orangepiplus2e.fex index 290ea5b59..692dad86c 100644 --- a/config/fex/orangepiplus2e.fex +++ b/config/fex/orangepiplus2e.fex @@ -257,12 +257,12 @@ red_led_active_low = 0 [ths_para] ths_used = 1 ths_trip1_count = 6 -ths_trip1_0 = 70 +ths_trip1_0 = 75 ths_trip1_1 = 80 ths_trip1_2 = 85 ths_trip1_3 = 90 ths_trip1_4 = 95 -ths_trip1_5 = 100 +ths_trip1_5 = 105 ths_trip1_6 = 0 ths_trip1_7 = 0 ths_trip1_0_min = 0 diff --git a/patch/kernel/sun8i-default/02-0017-increase-mali-clockspeed.patch b/patch/kernel/sun8i-default/02-0017-increase-mali-clockspeed.patch deleted file mode 100644 index fb7f6fb0a..000000000 --- a/patch/kernel/sun8i-default/02-0017-increase-mali-clockspeed.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/gpu/mali/mali/platform/mali400-pmu/mali_platform.c b/drivers/gpu/mali/mali/platform/mali400-pmu/mali_platform.c -index 54e50d5..1dc4f79 100644 ---- a/drivers/gpu/mali/mali/platform/mali400-pmu/mali_platform.c -+++ b/drivers/gpu/mali/mali/platform/mali400-pmu/mali_platform.c -@@ -37,7 +37,7 @@ static struct clk *gpu_pll = NULL; - - _mali_osk_errcode_t mali_platform_init(void) - { -- int freq = 252; /* 252 MHz */ -+ int freq = 600; /* 600 MHz */ - - gpu_pll = clk_get(NULL, PLL_GPU_CLK); - diff --git a/patch/u-boot/u-boot-default/u-boot-99-add-missing-boards.patch b/patch/u-boot/u-boot-default/u-boot-99-add-missing-boards.patch index c0cbbd980..cbe2cebc6 100644 --- a/patch/u-boot/u-boot-default/u-boot-99-add-missing-boards.patch +++ b/patch/u-boot/u-boot-default/u-boot-99-add-missing-boards.patch @@ -40,7 +40,7 @@ index 0000000..43562a2 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN8I_H3=y -+CONFIG_DRAM_CLK=672 ++CONFIG_DRAM_CLK=624 +CONFIG_DRAM_ZQ=3881979 +CONFIG_DRAM_ODT_EN=y +# CONFIG_VIDEO is not set diff --git a/scripts/customize-image.sh.template b/scripts/customize-image.sh.template index e4acd9771..0a96ee635 100644 --- a/scripts/customize-image.sh.template +++ b/scripts/customize-image.sh.template @@ -23,4 +23,7 @@ case $RELEASE in trusty) # your code here ;; + xenial) + # your code here + ;; esac