Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rebasing #1

Merged
merged 2 commits into from
Apr 3, 2016
+186 −2,699
Merged

rebasing #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
358b498
Bumpt dev branch to 4.6.0-rc1, switch sun8i mainline to wens/h3-emac,…
Apr 2, 2016
51ad937
Merge pull request #254 from ThomasKaiser/master
igorpecovnik Apr 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
187 changes: 119 additions & 68 deletions config/linux-sunxi-dev.config
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 15 additions & 11 deletions configuration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ case $BOARD in
CPUMAX="1200000"
GOVERNOR="interactive"
CLI_TARGET="%,%"
DESKTOP_TARGET="jessie,default"
DESKTOP_TARGET="jessie,default"
;;

cubox-i)#enabled
Expand Down Expand Up @@ -397,25 +397,28 @@ case $LINUXFAMILY in
[[ -z $LINUXCONFIG && $BRANCH == "default" ]] && LINUXCONFIG="linux-"$LINUXFAMILY-"$BRANCH"
[[ -z $LINUXCONFIG && $BRANCH != "default" ]] && LINUXCONFIG="linux-sunxi-"$BRANCH
# Kernel
KERNEL_DEFAULT='https://github.com/linux-sunxi/linux-sunxi'
KERNEL_DEFAULT_BRANCH="sunxi-3.4"
KERNEL_DEFAULT_SOURCE="linux-sunxi"
# sun8i legacy
# sun8i switches
if [[ $LINUXFAMILY == sun8i ]]; then
# KERNEL_DEFAULT="https://github.com/ssvb/linux-sunxi"
# KERNEL_DEFAULT_BRANCH="20151207-embedded-lima-memtester-h3"
KERNEL_DEFAULT="https://github.com/O-Computers/linux-sunxi"
KERNEL_DEFAULT_BRANCH="h3-wip"
KERNEL_DEFAULT_SOURCE="linux-sun8i"
KERNEL_DEV=https://github.com/wens/linux
KERNEL_DEV_BRANCH=h3-emac
KERNEL_DEV_SOURCE="linux-sun8i-mainline"
else
KERNEL_DEFAULT='https://github.com/linux-sunxi/linux-sunxi'
KERNEL_DEFAULT_BRANCH="sunxi-3.4"
KERNEL_DEFAULT_SOURCE="linux-sunxi"
KERNEL_DEV='git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git'
[ "$USE_MAINLINE_GOOGLE_MIRROR" = "yes" ] && KERNEL_DEV='https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable'
KERNEL_DEV_BRANCH=""
KERNEL_DEV_SOURCE="linux-vanilla"
fi
KERNEL_NEXT='git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git'
[ "$USE_MAINLINE_GOOGLE_MIRROR" = "yes" ] && KERNEL_NEXT='https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable'
KERNEL_NEXT_BRANCH="v"`wget -qO- https://www.kernel.org/finger_banner | grep "The latest st" | awk '{print $NF}' | head -1`
KERNEL_NEXT_SOURCE="linux-vanilla"
KERNEL_DEV='git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git'
[ "$USE_MAINLINE_GOOGLE_MIRROR" = "yes" ] && KERNEL_DEV='https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable'
KERNEL_DEV_BRANCH=""
KERNEL_DEV_SOURCE="linux-vanilla"

# U-boot
UBOOT_DEFAULT="git://git.denx.de/u-boot.git"
UBOOT_DEFAULT_BRANCH="v"$(git ls-remote git://git.denx.de/u-boot.git | grep -v rc | grep -v "\^" | tail -1 | cut -d "v" -f 2)
Expand Down Expand Up @@ -705,3 +708,4 @@ echo -e "Config: $LINUXCONFIG\nKernel source: $LINUXKERNEL\nBranch: $KERNELBRANC
echo -e "linuxsource: $LINUXSOURCE\nOffset: $OFFSET\nbootsize: $BOOTSIZE" >> $DEST/debug/install.log
echo -e "bootloader: $BOOTLOADER\nbootsource: $BOOTSOURCE\nbootbranch: $BOOTBRANCH" >> $DEST/debug/install.log
echo -e "CPU $CPUMIN / $CPUMAX with $GOVERNOR" >> $DEST/debug/install.log

Loading