From d72923dcd5a5a9dde82b587f7205f1177a87998b Mon Sep 17 00:00:00 2001 From: Martijn Braam Date: Tue, 14 May 2019 17:08:35 +0200 Subject: [PATCH] main: linux-postmarketos-allwinner: PinePhone updates - main: postmarketos-mkinitfs: Add /run Create the /run directory in the initramfs so that cryptsetup doesn't crash on not being able to create /run/cryptsetup for lockfiles - device: pine-dontbeevil: Remove workaround for touchscreen - main: linux-postmarketos-allwinner: Implemented supplies for touchscreen This uses a slightly newer commit from the kernel repo that implements requesting a regulator in the touchscreen driver - device: pine-dontbeevil: Remove ethernet from initramfs This actually makes debugging more complicated since networkmanager wont touch the ethernet adapter afterwards and the initramfs can be debugged over uart - temp/u-boot: sync APKBUILD with upstream and update to 2019.04 - main: linux-postmarketos-allwinner: Use 20190521 git version --- device/device-pine-dontbeevil/APKBUILD | 12 ++------- device/device-pine-dontbeevil/deviceinfo | 2 +- .../load_touchscreen.sh | 10 ------- .../load_touchscreen.start | 3 --- main/linux-postmarketos-allwinner/APKBUILD | 8 +++--- .../sun50i-a64-dontbeevil.dts | 2 ++ main/postmarketos-mkinitfs/APKBUILD | 4 +-- main/postmarketos-mkinitfs/init_functions.sh | 3 +++ temp/u-boot/APKBUILD | 27 +++++++++---------- temp/u-boot/update-u-boot | 0 10 files changed, 27 insertions(+), 44 deletions(-) delete mode 100644 device/device-pine-dontbeevil/load_touchscreen.sh delete mode 100644 device/device-pine-dontbeevil/load_touchscreen.start mode change 100644 => 100755 temp/u-boot/update-u-boot diff --git a/device/device-pine-dontbeevil/APKBUILD b/device/device-pine-dontbeevil/APKBUILD index c483fab11..ae9663e51 100644 --- a/device/device-pine-dontbeevil/APKBUILD +++ b/device/device-pine-dontbeevil/APKBUILD @@ -16,8 +16,6 @@ source=" weston.ini xorg.conf start_weston.sh - load_touchscreen.sh - load_touchscreen.start " build() { @@ -29,10 +27,6 @@ package() { devicepkg_package $startdir $pkgname install -D -m644 "$srcdir"/boot.scr \ "$pkgdir"/boot/boot.scr - install -D -m755 "$srcdir"/load_touchscreen.sh \ - "$pkgdir"/usr/bin/load_touchscreen.sh - install -D -m755 "$srcdir"/load_touchscreen.start \ - "$pkgdir"/etc/local.d/load_touchscreen.start } x11() { @@ -59,10 +53,8 @@ nonfree_firmware() { mkdir "$subpkgdir" } -sha512sums="a13743f37c982d0ba4524c9e3a3b8a1bb95dceeefe3f9aac01c893128c70b5a7f3e501dd3995fcfe231c1fbb59857af79508a14181263c9ea53a5f1109097a4b deviceinfo +sha512sums="3e903f578a5112ec171e09e13e331345f0bd8fee935d6658a48cd2d369085c909106329fc103678961189486956aed97da9ff0b3be59f587f773f57d51f2d1bd deviceinfo 8ed26c0537860431a3ca279a8db37dafda2b0e678caf1dcd1c9782a5a3c49e0ac0c8ac6126c30cbb3f04c16bdae8e9a70c18e613f6bccdf257a5dededce36f4e uboot-script.cmd c4c57d1627dd451213e1ef20d89de9266cd4edcc2d33a69aa9a1f13e16d9f9742036b69dc149fd910d7213f7525c41eb79576d4457bc85cc96eba0d986382d27 weston.ini f86ef35730b89bcc8160c08db7a7fcd0970adf60c0b77af68bac397de49c0d1783e6b8db1762380c9bf874aff2d030c6f44ecb75c803d69e79ede11376409369 xorg.conf -aa11864b9960e94e13b1467e09d8eb528e3d3652bf1fb251c7a040f4d44270403072db8aa906405d4c81fa9d6043fafa8d9ccd1f97031fd96d0dcacc38da8f84 start_weston.sh -3898faf2c5fbdb3c9edf6fecc5c1bcc34b61a97de8067dca6446c72cf44bcbb8d744038e394fc0fa687b646610be2bbafcf6b06d1cd5d7f4f7a633a70b39c753 load_touchscreen.sh -40e553ec8d2f2c159acddcb8492e8a797120043c22e2fb00c941590f49adab304402189d1eaedb469ddb1d1f7dd19bf28e8332240a024c396b1f548c7c4539bd load_touchscreen.start" +aa11864b9960e94e13b1467e09d8eb528e3d3652bf1fb251c7a040f4d44270403072db8aa906405d4c81fa9d6043fafa8d9ccd1f97031fd96d0dcacc38da8f84 start_weston.sh" diff --git a/device/device-pine-dontbeevil/deviceinfo b/device/device-pine-dontbeevil/deviceinfo index 0f1ea592d..d8a7d5ca4 100644 --- a/device/device-pine-dontbeevil/deviceinfo +++ b/device/device-pine-dontbeevil/deviceinfo @@ -7,7 +7,7 @@ deviceinfo_manufacturer="PINE64" deviceinfo_codename="pine-dontbeevil" deviceinfo_date="" deviceinfo_dtb="allwinner/sun50i-a64-dontbeevil" -deviceinfo_modules_initfs="" +deviceinfo_modules_initfs="edt_ft5x06 sun6i_mipi_dsi sun4i_drm pwm_sun4i sun8i_mixer" deviceinfo_arch="aarch64" # Device related diff --git a/device/device-pine-dontbeevil/load_touchscreen.sh b/device/device-pine-dontbeevil/load_touchscreen.sh deleted file mode 100644 index 35ad1aaed..000000000 --- a/device/device-pine-dontbeevil/load_touchscreen.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# Keep reloading the touchscreen driver until the probe is successful - -while ! [ -d /dev/input ] ; -do - rmmod edt_ft5x06 - modprobe edt_ft5x06 - sleep 2 -done diff --git a/device/device-pine-dontbeevil/load_touchscreen.start b/device/device-pine-dontbeevil/load_touchscreen.start deleted file mode 100644 index c65ad1fb2..000000000 --- a/device/device-pine-dontbeevil/load_touchscreen.start +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -load_touchscreen.sh & diff --git a/main/linux-postmarketos-allwinner/APKBUILD b/main/linux-postmarketos-allwinner/APKBUILD index 9610219c2..e86f8ba4a 100644 --- a/main/linux-postmarketos-allwinner/APKBUILD +++ b/main/linux-postmarketos-allwinner/APKBUILD @@ -3,7 +3,7 @@ _config="config-${_flavor}.${CARCH}" pkgname=linux-${_flavor} -pkgver=5.1.0_git20190506 +pkgver=5.1.0_git20190521 pkgrel=0 arch="aarch64" @@ -13,7 +13,7 @@ depends="" makedepends="devicepkg-dev perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev openssl-dev file bison flex" options="!strip !check !tracedeps" install= -_commit="45eccd979a56d86e337e070b9a0aceecc43c20db" +_commit="bc1984d747095d285236f0d20f691e421f3bbfc3" source=" ${pkgname}-${_commit}.tar.gz::https://gitlab.com/pine64-org/linux/-/archive/${_commit}/linux-${_commit}.tar.gz config-${_flavor}.aarch64 @@ -85,6 +85,6 @@ package() { INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb" } -sha512sums="ec525dc86ce680aaba7edc2d2be8e3b38e3d4957d27c701e0f82b8d45f81694cdabacc3cb0dde375921afbd225b5e0cb83fde98694bd85d653ceb8c5f3f0af24 linux-postmarketos-allwinner-45eccd979a56d86e337e070b9a0aceecc43c20db.tar.gz +sha512sums="da8d27d3660864584e2910e62f76da7fae4199d79c0c53a90afb5e344045292baeb3755d50523c702e96f2f0950d0feac93aa262d836731a1037485ab570899d linux-postmarketos-allwinner-bc1984d747095d285236f0d20f691e421f3bbfc3.tar.gz 5a04df0f76344b247cab894c8a41b2683e75b08209f1a957948a91f99979080ab07a1695ee266d17a4a85146145cb677ccc63a40722b1ae43ba0a7886f28de92 config-postmarketos-allwinner.aarch64 -79496ca4fbb48d27acef4e7592a05f31d5548aeae0f4a7032325b7baf8defc358359912aedd8ce136b266766f24f42e2a15d2ad9ef4d33d8398608ac74ba71f3 sun50i-a64-dontbeevil.dts" +bbb379b359239dc40a8096c27a1d5f73371e744eeb024ffc50ec6c6de0f28624cfedd44b8eedc2288e70a33c5ff427bbe1a03a5c4d860bed8a9b7df6471c01d4 sun50i-a64-dontbeevil.dts" diff --git a/main/linux-postmarketos-allwinner/sun50i-a64-dontbeevil.dts b/main/linux-postmarketos-allwinner/sun50i-a64-dontbeevil.dts index edbfb9825..e4a1beef7 100644 --- a/main/linux-postmarketos-allwinner/sun50i-a64-dontbeevil.dts +++ b/main/linux-postmarketos-allwinner/sun50i-a64-dontbeevil.dts @@ -240,6 +240,8 @@ compatible = "focaltech,ft6236", "edt,edt-6236"; reg = <0x38>; + vdd-supply = <®_ldo_io0>; + pinctrl-names = "default"; pinctrl-0 = <&touch_intr_pin>; diff --git a/main/postmarketos-mkinitfs/APKBUILD b/main/postmarketos-mkinitfs/APKBUILD index cf21c77d5..0828f9d80 100644 --- a/main/postmarketos-mkinitfs/APKBUILD +++ b/main/postmarketos-mkinitfs/APKBUILD @@ -1,5 +1,5 @@ pkgname=postmarketos-mkinitfs -pkgver=0.7.7 +pkgver=0.7.8 pkgrel=0 pkgdesc="Tool to generate initramfs images for postmarketOS" url="https://postmarketos.org" @@ -25,5 +25,5 @@ package() { } sha512sums="2479b08e48450f7d46c83b1117d0d81edf26dad8f2107e2ae1b10689f1b063c38181be735957ec1a16392302815355ca879ab71fc28d084e075f490cb2ac42b5 init.sh.in -e4972ba261a72daba0d1f2fad425a3df082e18263a716746005f31a5cae313d66c168e09cd1bd0af3cee6a97bdb4b329ee3a8d03381a5b104fb39476bdcc7938 init_functions.sh +d458c47bb7734562f299a2f1bcf5f2bc3be8f4721d51716aadefa9addf553a5fd9582f9b2d452fbc1016bf4bcdde8a1d9fe4cd0475af030002ac660cfb86da89 init_functions.sh 2de44d5109be98aa2476640cb298b5dcb8366b8104af188768634ea3a0eeea9b7cc71e94f2f1ce09cd3b8200b7d4515719905ecf1301fcce94ded34f36e849e1 mkinitfs.sh" diff --git a/main/postmarketos-mkinitfs/init_functions.sh b/main/postmarketos-mkinitfs/init_functions.sh index 1cb5e76c1..e36691b4c 100644 --- a/main/postmarketos-mkinitfs/init_functions.sh +++ b/main/postmarketos-mkinitfs/init_functions.sh @@ -31,6 +31,9 @@ mount_proc_sys_dev() { # /dev/pts (needed for telnet) mkdir -p /dev/pts mount -t devpts devpts /dev/pts + + # /run (needed for cryptsetup) + mkdir /run } setup_mdev() { diff --git a/temp/u-boot/APKBUILD b/temp/u-boot/APKBUILD index 649d17ae8..ea4915915 100644 --- a/temp/u-boot/APKBUILD +++ b/temp/u-boot/APKBUILD @@ -1,41 +1,41 @@ # Contributor: He Yangxuan -# Contributor: William Pitcock +# Contributor: # Contributor: Timo Teras # Maintainer: Leonardo Arena pkgname=u-boot -pkgver=2019.01 +pkgver=2019.04 pkgrel=0 -_atfversion="f0bfe15b81e50c6561a3a9a8e269db0267778910" +_atfversion="2.1" pkgdesc="u-boot bootloader common files" url="http://www.denx.de/wiki/U-Boot/" arch="armhf armv7 aarch64" license="GPL-2.0-or-later OFL-1.1 BSD-2-Clause BSD-3-Clause eCos-2.0 IBM-pibs ISC LGPL-2.0-only LGPL-2.1-only X11" -options="!tracedeps" -depends="" -depends_dev="" -makedepends="$depends_dev bc dtc python2-dev swig binutils coreutils bison flex" -install="" +makedepends="$depends_dev bc dtc python2-dev swig bison flex" source="http://ftp.denx.de/pub/u-boot/u-boot-${pkgver//_/-}.tar.bz2 - arm-trusted-firmware-${_atfversion}.tar.gz::https://github.com/ARM-software/arm-trusted-firmware/archive/${_atfversion}.tar.gz + arm-trusted-firmware-${_atfversion}.tar.gz::https://github.com/ARM-software/arm-trusted-firmware/archive/v${_atfversion}.tar.gz README.txt update-u-boot " builddir="$srcdir"/u-boot-${pkgver//_/-} atfbuilddir="$srcdir"/arm-trusted-firmware-${_atfversion} +options="!tracedeps" case "$CARCH" in arm*) board_configs=" - beagleboard:am335x_boneblack + beagleboard:am335x_boneblack_vboot cubieboard:Cubieboard,Cubieboard2 cuboxi:mx6cuboxi raspberrypi:rpi_0_w,rpi,rpi_2,rpi_3_32b wandboard:wandboard + qemu:qemu_arm ";; aarch64) board_configs=" thunderx:thunderx_88xx raspberrypi:rpi_3 odroid:odroid-c2 + libretech:libretech-cc + qemu:qemu_arm64 pine64:pine64-lts ";; esac @@ -48,10 +48,9 @@ subpackages="$pkgname-all:_all $_allboards" build() { if [ "$CARCH" = "aarch64" ]; then - export LDFLAGS="" msg "Building ARM trusted firmware for allwinner" cd "$atfbuilddir" - make PLAT=sun50i_a64 DEBUG=1 bl31 + LDFLAGS="" make PLAT=sun50i_a64 DEBUG=1 bl31 export BL31="$atfbuilddir"/build/sun50i_a64/debug/bl31.bin # Sanity check $BL31 if [ ! -f "$BL31" ]; then @@ -124,7 +123,7 @@ for board_config in $board_configs; do eval "${_board}() { _split_boards $_board ${_configs//,/ }; }" done -sha512sums="d9699cd22afe9bc747d64208068c2cf8a2c3143d161ede24536f6fd6adfd6b81e28920589722639e2e48fcf34e8dbde3ead7f691f14cbcc38cd75694d14d719b u-boot-2019.01.tar.bz2 -732b806bf3a612ded9351226c8fae78d02741220034009350be1c2237341584bcb366c0db2a19b64e4548e9a720d9380d1240680459b831943d3936077eecb13 arm-trusted-firmware-f0bfe15b81e50c6561a3a9a8e269db0267778910.tar.gz +sha512sums="357fe94b5b043885472ea1b7dcbbac601d0c1f7c64f71026b9e1279b53160847c6478d6ec98a2f678e562db21e39037d6e6fbc1e6b19beaac02ca14e93c5de0e u-boot-2019.04.tar.bz2 +9b557ce5f7dc272a0cc0b955ef77fe8f00c8ed01261a2cad29bb2efba3f278e81f1061c809096c97589c7075e5d39be1abd22c8c6a9cf8aaff157f640d36d22c arm-trusted-firmware-2.1.tar.gz f8c9bb6e84d6f0620c976ac7ad5dd7ec7ff9dfdd4b1d03d2bf6653e7beccf80bdf2debfc92fb1f696dba92fb40287d3c45897e0078951451d0835cb61a5f16d1 README.txt f3bb656bbd13caf10a8ea619bc08b439e7dc27526c9cbdfa0374f4f8e277632ff4df06b34d441d6723a93d4a54aa03465d4270c44219d6a150d416b9c56edbbe update-u-boot" diff --git a/temp/u-boot/update-u-boot b/temp/u-boot/update-u-boot old mode 100644 new mode 100755