GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-06-05 05:41:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add pine64 mainline configuration

Browse source
This commit is contained in:
zador-blood-stained 2016-08-13 22:54:31 +03:00
parent 186a8dcff5
commit 92d995e2b5
9 changed files with 4512 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/boards/pine64.conf
View file

@ -1,7 +1,6 @@
# A64 512MB RAM
BOARD_NAME="Pine64"
KERNEL_TARGET="default"
KERNEL_IMAGE_TYPE=Image
KERNEL_TARGET="default,dev"
LINUXFAMILY=pine64
BOOTCONFIG=pine64_defconfig
MODULES=""

3
config/boards/pine64plus.conf
View file

@ -1,7 +1,6 @@
# A64 1GB RAM
BOARD_NAME="Pine64+"
KERNEL_TARGET="default"
KERNEL_IMAGE_TYPE=Image
KERNEL_TARGET="default,dev"
LINUXFAMILY=pine64
BOOTCONFIG=pine64_plus_defconfig
MODULES="sunxi_codec sunxi_i2s sunxi_sndcodec"

0
config/bootscripts/boot-pine64.cmd → config/bootscripts/boot-pine64-default.cmd
View file

9
config/bootscripts/boot-pine64-dev.cmd Normal file
View file

@ -0,0 +1,9 @@
setenv bootargs "console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait rootfstype=ext4 panic=10 consoleblank=0 enforcing=0 loglevel=1"
ext4load mmc 0 ${fdt_addr_r} /boot/dtb/allwinner/${fdtfile} || fatload mmc 0 ${fdt_addr_r} /dtb/allwinner/${fdtfile} || ext4load mmc 0 ${fdt_addr_r} /dtb/allwinner/${fdtfile}
ext4load mmc 0 ${ramdisk_addr_r} /boot/uInitrd || fatload mmc 0 ${ramdisk_addr_r} uInitrd || ext4load mmc 0 ${ramdisk_addr_r} uInitrd || setenv ramdisk_addr_r "-"
ext4load mmc 0 ${kernel_addr_r} /boot/Image || fatload mmc 0 ${kernel_addr_r} Image || ext4load mmc 0 ${kernel_addr_r} Image
booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
# Recompile with:
# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr

4289
config/kernel/linux-pine64-dev.config Normal file
View file

File diff suppressed because it is too large Load diff

28
config/sources/pine64.conf
View file

@ -12,6 +12,7 @@ case $BRANCH in
OFFSET=20
BOOTSIZE=64
UBOOT_NEEDS_GCC='< 4.9'
UBOOT_FILES="boot0.bin u-boot-with-dtb.bin pine64-plus.dtb pine64.dtb"
;;
dev)
@ -20,30 +21,35 @@ case $BRANCH in
KERNELBRANCH='branch:a64-v5'
KERNELDIR='linux-pine64-dev'
GOVERNOR=ondemand
UBOOT_FILES="u-boot-with-spl.bin"
;;
esac
ARCH=arm64
KERNEL_IMAGE_TYPE=Image
CPUMIN=480000
CPUMAX=1200000
UBOOT_FILES="boot0.bin u-boot-with-dtb.bin pine64-plus.dtb pine64.dtb"
write_uboot_platform()
{
dd if=$1/boot0.bin of=$2 bs=1k seek=8 conv=fsync > /dev/null 2>&1
dd if=$1/u-boot-with-dtb.bin of=$2 bs=1k seek=19096 conv=fsync > /dev/null 2>&1
if [[ -n $CACHEDIR ]]; then
cp $1/pine64-plus.dtb $CACHEDIR/mount/boot
cp $1/pine64.dtb $CACHEDIR/mount/boot
else
cp $1/pine64-plus.dtb /boot
cp $1/pine64.dtb /boot
# default branch
[[ -f $1/boot0.bin ]] && dd if=$1/boot0.bin of=$2 bs=1k seek=8 conv=fsync > /dev/null 2>&1
[[ -f $1/u-boot-with-dtb.bin ]] && dd if=$1/u-boot-with-dtb.bin of=$2 bs=1k seek=19096 conv=fsync > /dev/null 2>&1
if [[ -f $1/pine64-plus.dtb ]]; then
if [[ -n $CACHEDIR ]]; then
cp $1/pine64-plus.dtb $CACHEDIR/mount/boot
cp $1/pine64.dtb $CACHEDIR/mount/boot
else
cp $1/pine64-plus.dtb /boot
cp $1/pine64.dtb /boot
fi
fi
# mainline
[[ -f $1/u-boot-with-spl.bin ]] && dd if=$1/u-boot-with-spl.bin of=$2 bs=1k seek=8 conv=fsync > /dev/null 2>&1
}
install_boot_script()
{
cp $SRC/lib/config/bootscripts/boot-pine64.cmd $CACHEDIR/sdcard/boot/boot.cmd
cp $SRC/lib/config/bootscripts/boot-pine64-$BRANCH.cmd $CACHEDIR/sdcard/boot/boot.cmd
}

4
configuration.sh
View file

@ -88,10 +88,10 @@ case $LINUXFAMILY in
;;
pine64)
# fix for u-boot needing armhf GCC 4.8
UBOOT_COMPILER="arm-linux-gnueabihf-"
[[ $BRANCH == default ]] && UBOOT_COMPILER="arm-linux-gnueabihf-"
;;
marvell)
# fix for u-boot needing arm soft float
# fix for u-boot needing arm soft float compiler
UBOOT_COMPILER="arm-linux-gnueabi-"
;;
esac

13
patch/kernel/pine64-dev/kbuild-do-not-append-NOSTDINC_FLAGS-to-avoid-rebuild-in-package-targets.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/Makefile b/Makefile
index 8d1301a..58c06be 100644
--- a/Makefile
+++ b/Makefile
@@ -767,7 +767,7 @@ KBUILD_CFLAGS += $(call cc-option, -fno-inline-functions-called-once)
endif
# arch Makefile may override CC so keep this after arch Makefile is included
-NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
+NOSTDINC_FLAGS := -nostdinc -isystem $(shell $(CC) -print-file-name=include)
CHECKFLAGS += $(NOSTDINC_FLAGS)
# warn about C99 declaration after statement

180
patch/kernel/pine64-dev/packaging-4.x-DEV-with-postinstall-scripts.patch Normal file
View file

@ -0,0 +1,180 @@
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 86e56fe..d38455e 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -27,6 +27,28 @@ create_package() {
chown -R root:root "$pdir"
chmod -R go-w "$pdir"
+ # Create preinstall and post install script to remove dtb
+ if [[ "$1" == *dtb* ]]; then
+ echo "if [ -d /boot/dtb-$version ]; then mv /boot/dtb-$version /boot/dtb-$version.old; fi" >> $pdir/DEBIAN/preinst
+ echo "if [ -d /boot/dtb.old ]; then rm -rf /boot/dtb.old; fi" >> $pdir/DEBIAN/preinst
+ echo "if [ -d /dtb ]; then mv /dtb /dtb.old; fi" >> $pdir/DEBIAN/preinst
+ echo "if [ -d /boot/dtb ]; then mv /boot/dtb /boot/dtb.old; fi" >> $pdir/DEBIAN/preinst
+ echo "exit 0" >> $pdir/DEBIAN/preinst
+ chmod 775 $pdir/DEBIAN/preinst
+ #
+ echo "if [ -d /boot/dtb-$version.old ]; then rm -rf /boot/dtb-$version.old; fi" >> $pdir/DEBIAN/postinst
+ echo "ln -sf dtb-$version /boot/dtb > /dev/null 2>&1 || mv /boot/dtb-$version /boot/dtb" >> $pdir/DEBIAN/postinst
+ echo "exit 0" >> $pdir/DEBIAN/postinst
+ chmod 775 $pdir/DEBIAN/postinst
+ fi
+
+ # Create postinstall script for headers
+ if [[ "$1" == *headers* ]]; then
+ echo "cd /usr/src/linux-headers-$version; echo \"Compiling headers - please wait ...\"; make -s scripts >/dev/null 2>&1" >> $pdir/DEBIAN/postinst
+ echo "exit 0" >> $pdir/DEBIAN/postinst
+ chmod 775 $pdir/DEBIAN/postinst
+ fi
+
# Create the package
dpkg-gencontrol $forcearch -Vkernel:debarch="${debarch}" -p$pname -P"$pdir"
dpkg --build "$pdir" ..
@@ -93,11 +115,13 @@ tmpdir="$objtree/debian/tmp"
fwdir="$objtree/debian/fwtmp"
kernel_headers_dir="$objtree/debian/hdrtmp"
libc_headers_dir="$objtree/debian/headertmp"
+dtb_dir="$objtree/debian/dtbtmp"
dbg_dir="$objtree/debian/dbgtmp"
-packagename=linux-image-$version
-fwpackagename=linux-firmware-image-$version
-kernel_headers_packagename=linux-headers-$version
-libc_headers_packagename=linux-libc-dev
+packagename=linux-image-dev"$LOCALVERSION"
+fwpackagename=linux-firmware-image-dev"$LOCALVERSION"
+kernel_headers_packagename=linux-headers-dev"$LOCALVERSION"
+dtb_packagename=linux-dtb-dev"$LOCALVERSION"
+libc_headers_packagename=linux-libc-dev-dev"$LOCALVERSION"
dbg_packagename=$packagename-dbg
debarch=
forcearch=
@@ -117,6 +141,9 @@ um)
parisc|mips|powerpc)
installed_image_path="boot/vmlinux-$version"
;;
+arm64)
+ installed_image_path="boot/Image-$version"
+ ;;
*)
installed_image_path="boot/vmlinuz-$version"
esac
@@ -124,7 +151,9 @@ esac
BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
# Setup the directory structure
-rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files
+rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" "$dtb_dir" $objtree/debian/files
+mkdir -m 755 -p "$dtb_dir/DEBIAN"
+mkdir -p "$dtb_dir/boot/dtb-$version" "$dtb_dir/usr/share/doc/$dtb_packagename"
mkdir -m 755 -p "$tmpdir/DEBIAN"
mkdir -p "$tmpdir/lib" "$tmpdir/boot"
mkdir -p "$fwdir/lib/firmware/$version/"
@@ -141,12 +170,7 @@ else
cp System.map "$tmpdir/boot/System.map-$version"
cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version"
fi
-# Not all arches include the boot path in KBUILD_IMAGE
-if [ -e $KBUILD_IMAGE ]; then
- cp $KBUILD_IMAGE "$tmpdir/$installed_image_path"
-else
- cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
-fi
+cp arch/$ARCH/boot/Image "$tmpdir/$installed_image_path"
if grep -q "^CONFIG_OF=y" $KCONFIG_CONFIG ; then
# Only some architectures with OF support have this target
@@ -183,6 +207,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
fi
fi
+if grep -q '^CONFIG_OF=y' $KCONFIG_CONFIG ; then
+ #mkdir -p "$tmpdir/boot/dtb"
+ INSTALL_DTBS_PATH="$dtb_dir/boot/dtb-$version" $MAKE KBUILD_SRC= dtbs_install
+fi
+
if [ "$ARCH" != "um" ]; then
$MAKE headers_check KBUILD_SRC=
$MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
@@ -207,9 +236,11 @@ for script in postinst postrm preinst prerm ; do
set -e
# Pass maintainer script parameters to hook scripts
+
export DEB_MAINT_PARAMS="\$*"
# Tell initramfs builder whether it's wanted
+
export INITRD=$want_initrd
test -d $debhookdir/$script.d && run-parts --arg="$version" --arg="/$installed_image_path" $debhookdir/$script.d
@@ -218,6 +249,17 @@ EOF
chmod 755 "$tmpdir/DEBIAN/$script"
done
+##
+## Create sym link to kernel image
+##
+sed -e "s/set -e//g" -i $tmpdir/DEBIAN/postinst
+sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
+cat >> $tmpdir/DEBIAN/postinst <<EOT
+ln -sf $(basename $installed_image_path) /boot/Image > /dev/null 2>&1 || mv /$installed_image_path /boot/Image
+touch /boot/.next
+exit 0
+EOT
+
# Try to determine maintainer and email values
if [ -n "$DEBEMAIL" ]; then
email=$DEBEMAIL
@@ -331,16 +373,24 @@ fi
(cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles"
destdir=$kernel_headers_dir/usr/src/linux-headers-$version
mkdir -p "$destdir"
+######################## headers patch
+ZACNI=$(pwd)
+cd $destdir
+patch -p1 < /tmp/headers-debian-byteshift.patch
+cd $ZACNI
+######################## headers patch
(cd $srctree; tar -c -f - -T -) < "$objtree/debian/hdrsrcfiles" | (cd $destdir; tar -xf -)
(cd $objtree; tar -c -f - -T -) < "$objtree/debian/hdrobjfiles" | (cd $destdir; tar -xf -)
(cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be
ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
+(cd "$destdir"; make M=scripts clean)
+
cat <<EOF >> debian/control
Package: $kernel_headers_packagename
-Provides: linux-headers, linux-headers-2.6
+Provides: linux-headers
Architecture: any
Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch}
@@ -366,6 +416,16 @@ fi
cat <<EOF >> debian/control
+Package: $dtb_packagename
+Architecture: any
+Description: Linux DTB, version $version
+ This package contains device blobs from the Linux kernel, version $version.
+EOF
+
+create_package "$dtb_packagename" "$dtb_dir"
+
+cat <<EOF >> debian/control
+
Package: $libc_headers_packagename
Section: devel
Provides: linux-kernel-headers
@@ -377,7 +437,7 @@ EOF
if [ "$ARCH" != "um" ]; then
create_package "$kernel_headers_packagename" "$kernel_headers_dir"
- create_package "$libc_headers_packagename" "$libc_headers_dir"
+# create_package "$libc_headers_packagename" "$libc_headers_dir"
fi
create_package "$packagename" "$tmpdir"