arm-sdk

commit 3a00e67ca27956ff95c59b34838499e4b8a4d6d8
parent d61b8d0de21683f6e3e37811e92a323543a849b3
Author: parazyd <parazyd@dyne.org>
Date:   Wed, 27 Feb 2019 18:54:20 +0100

Update droid4 script for kexecboot instead of ddroid.

Diffstat:
M
boards/droid4.sh
 | 
33
++++++---------------------------
A
extra/droid4/boot/boot/boot.cfg
 | 
6
++++++

2 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/boards/droid4.sh b/boards/droid4.sh
@@ -30,9 +30,9 @@ size=1337
 inittab=("s0:12345:respawn:/sbin/agetty -L ttyS2 115200 vt100")
 
 parted_type="dos"
-parted_boot="fat32 8192s 270335s"
+parted_boot="8192s 270335s"
 parted_root="ext4 270336s 100%"
-bootfs="vfat"
+bootfs="ext2"
 
 extra_packages+=(firmware-ti-connectivity)
 custmodules=()
@@ -42,9 +42,6 @@ custmodules=()
 gitkernel="https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"
 gitbranch="linux-4.14.y"
 
-ddroid_git="https://github.com/tmlind/ddroid.git"
-kexec_bins="$R/extra/droid4-mainline-kexec-0.3.tar.xz"
-
 
 prebuild() {
 	fn prebuild
@@ -62,6 +59,7 @@ postbuild() {
 	notice "executing $device_name postbuild"
 
 	copy-root-overlay
+	sudo sed -e "s/@release@/${release}/" -i "$strapdir/boot/boot/boot.cfg"
 }
 
 build_kernel_${arch}() {
@@ -92,8 +90,9 @@ build_kernel_${arch}() {
 		ARCH=arm \
 		CROSS_COMPILE=$compiler \
 			zImage modules omap4-droid4-xt894.dtb || zerr
-	sudo cp -v arch/arm/boot/zImage $strapdir/boot/ || zerr
-	sudo cp -v arch/arm/boot/dts/omap4-droid4-xt894.dtb "$strapdir/boot/" || zerr
+	sudo mkdir -p "$strapdir/boot/boot/"
+	sudo cp -v arch/arm/boot/zImage "$strapdir/boot/boot" || zerr
+	sudo cp -v arch/arm/boot/dts/omap4-droid4-xt894.dtb "$strapdir/boot/boot" || zerr
 
 	# install kernel modules
 	sudo -E PATH="$PATH" \
@@ -106,25 +105,5 @@ build_kernel_${arch}() {
 				modules_install || zerr
 	popd
 
-	notice "building ddroid.zip"
-	pushd $R/tmp/kernels/$device_name
-		tar xvf "${kexec_bins}"
-		git clone --depth 1 "${ddroid_git}" || zerr
-		pushd "$(basename -s .tar.xz ${kexec_bins})"
-			cp -v uart.ko arm_kexec.ko kexec.ko ../ddroid/system/etc/kexec/
-			cp -v kexec ../ddroid/system/etc/kexec/kexec.static
-			cp -v "$strapdir/boot/zImage" ../ddroid/system/etc/kexec/kernel
-			cp -v "$strapdir/boot/omap4-droid4-xt894.dtb" ../ddroid/system/etc/kexec/devtree
-		popd
-		pushd ddroid
-			sed -i system/etc/kexec/kexec \
-				-e 's/mmcblk1p23/mmcblk0p2 drm.debug=8 rootwait=10 rootdelay=10/'
-			make zip || zerr
-		popd
-		mkdir -p "$R/dist"
-		cp -vf ddroid-$(date +%Y-%m-%d).zip "$R/dist"
-		sha256sum ddroid-$(date +%Y-%m-%d).zip > "$R/dist/ddroid-$(date +%Y-%m-%d).zip.sha"
-	popd
-
 	postbuild || zerr
 }
diff --git a/extra/droid4/boot/boot/boot.cfg b/extra/droid4/boot/boot/boot.cfg
@@ -0,0 +1,6 @@
+LABEL=Devuan @release@
+PRIORITY=8
+DTB=/boot/omap4-droid4-xt894.dtb
+KERNEL=/boot/zImage
+CMDLINE=console=tty0 console=ttyS2,115200 fbcon=rotate:1 debug earlycon ro rootwait rootfstype=ext4 root=/dev/mmcblk0p2
+TIMEOUT=3