Merge branch 'master' into experimental/fake-hwclock

This commit is contained in:
zador-blood-stained
2015-12-17 13:21:29 +03:00
2 changed files with 7 additions and 1 deletions

View File

@@ -398,6 +398,12 @@
[[ -z $CPUMIN && ($LINUXFAMILY == udoo || $LINUXFAMILY == neo ) ]] && CPUMIN="392000" && CPUMAX="996000" && GOVERNOR="interactive"
[[ -z $GOVERNOR ]] && GOVERNOR="ondemand"
# For user override
if [[ -f "$SRC/userpatches/lib.config" ]]; then
display_alert "Using user configuration override" "$SRC/userpatches/lib.config" "info"
source $SRC/userpatches/lib.config
fi
# debug
echo -e "Config: $LINUXCONFIG\nKernel source: $LINUXKERNEL\nBranch: $KERNELBRANCH" >> $DEST/debug/install.log
echo -e "linuxsource: $LINUXSOURCE\nOffset: $OFFSET\nbootsize: $BOOTSIZE" >> $DEST/debug/install.log

View File

@@ -372,7 +372,7 @@ prepare_host() {
find $SRC/lib/patch -type d ! -name . | sed "s%lib/patch%userpatches%" | xargs mkdir -p
# TODO: needs better documentation
echo 'Place your patches and kernel.config / u-boot.config here.' > $SRC/userpatches/readme.txt
echo 'Place your patches and kernel.config / u-boot.config / lib.config here.' > $SRC/userpatches/readme.txt
echo 'They will be automatically included if placed here!' >> $SRC/userpatches/readme.txt
# legacy kernel compilation needs cross-gcc version 4.9 or lower