diff --git a/device/device-pine-a64lts/APKBUILD b/device/device-pine-a64lts/APKBUILD index 63bfb689d..6dd2228b7 100644 --- a/device/device-pine-a64lts/APKBUILD +++ b/device/device-pine-a64lts/APKBUILD @@ -2,7 +2,7 @@ pkgname="device-pine-a64lts" pkgdesc="PINE A64-LTS" pkgver=0.1 -pkgrel=2 +pkgrel=3 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -26,5 +26,5 @@ package() { } -sha512sums="befade7c6b8bbefe812b61afb4718acfdc4f6afb884e3538db726b98d2588286aa811548c248f1e87ab3d190df7b12e2195375ff7757463d519da1d65f3f1f66 deviceinfo +sha512sums="c7f20912c17ce4686ca06a3249d7b33a2df5c7cc3856a733365bbc2e3addc6feb3ac97d4a754c319e1a27828f40a70296ccf13ff884652af744025cea30e0a7c deviceinfo ef7d21144b8c33f80968a6a089dcc6b568abd54f66f30d21d5befc10e51217484440aa8edb1065cd871ffba7bc599f44502bb6d240ee01f59dc92706ec6eabfd uboot-script.cmd" diff --git a/device/device-pine-a64lts/deviceinfo b/device/device-pine-a64lts/deviceinfo index 3ff7fc600..cb7e4bb36 100644 --- a/device/device-pine-a64lts/deviceinfo +++ b/device/device-pine-a64lts/deviceinfo @@ -23,4 +23,4 @@ deviceinfo_dev_keyboard="" # Bootloader related deviceinfo_flash_method="none" deviceinfo_generate_legacy_uboot_initfs="true" -deviceinfo_sd_embed_firmware="u-boot/sopine_baseboard/u-boot-sunxi-with-spl.bin:8" +deviceinfo_sd_embed_firmware="u-boot/pine64-lts/u-boot-sunxi-with-spl.bin:8" diff --git a/temp/u-boot/APKBUILD b/temp/u-boot/APKBUILD index 917d5c5b2..d189c66e3 100644 --- a/temp/u-boot/APKBUILD +++ b/temp/u-boot/APKBUILD @@ -3,29 +3,28 @@ # Contributor: Timo Teras # Maintainer: Leonardo Arena pkgname=u-boot -pkgver=2018.05 -pkgrel=3 -_atfversion="c9f55c023164a6c8c49f70f7ac6c68c626839d6f" +pkgver=2019.01 +pkgrel=0 +_atfversion="f0bfe15b81e50c6561a3a9a8e269db0267778910" pkgdesc="u-boot bootloader common files" url="http://www.denx.de/wiki/U-Boot/" -arch="armhf aarch64" -license="GPL-2.0" +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" depends="" depends_dev="" -makedepends="$depends_dev bc dtc python2-dev swig binutils coreutils" +makedepends="$depends_dev bc dtc python2-dev swig binutils coreutils bison flex" install="" -source="ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver//_/-}.tar.bz2 - arm-trusted-firmware-${_atfversion}.tar.gz::https://github.com/apritzel/arm-trusted-firmware/archive/${_atfversion}.tar.gz +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 README.txt update-u-boot - sopine-baseboard.patch " - builddir="$srcdir"/u-boot-${pkgver//_/-} atfbuilddir="$srcdir"/arm-trusted-firmware-${_atfversion} case "$CARCH" in -armhf) board_configs=" +arm*) board_configs=" beagleboard:am335x_boneblack cubieboard:Cubieboard,Cubieboard2 cuboxi:mx6cuboxi @@ -35,7 +34,8 @@ armhf) board_configs=" aarch64) board_configs=" thunderx:thunderx_88xx raspberrypi:rpi_3 - pine64:sopine_baseboard + odroid:odroid-c2 + pine64:pine64-lts ";; esac @@ -50,8 +50,13 @@ build() { export LDFLAGS="" msg "Building ARM trusted firmware for allwinner" cd "$atfbuilddir" - make PLAT=sun50iw1p1 DEBUG=1 bl31 - export BL31="$atfbuilddir"/build/sun50iw1p1/debug/bl31.bin + make PLAT=sun50i_a64 DEBUG=1 bl31 + export BL31="$atfbuilddir"/build/sun50i_a64/debug/bl31.bin + # Sanity check $BL31 + if [ ! -f "$BL31" ]; then + echo 'The $BL31 variable is invalid. Please adjust.' + return 1 + fi fi cd "$builddir" @@ -118,8 +123,7 @@ for board_config in $board_configs; do eval "${_board}() { _split_boards $_board ${_configs//,/ }; }" done -sha512sums="218f71282c9d027b0faf210ce2d4d713779e0c61ea4a23f03d5dec0ca8836a3c26b46c5e258d583834f5b5a2f4663f98729ca4b0101a60f85457eb892f8370d2 u-boot-2018.05.tar.bz2 -e964f0903f29a08d3a4a3177bcbfa9df68f47d30cac7f0d2597a7101c00632efdcd2c6ecba7f8be2e66a9689388bf2fa03087c0023ef99a5e1d080af5518d53c arm-trusted-firmware-c9f55c023164a6c8c49f70f7ac6c68c626839d6f.tar.gz +sha512sums="d9699cd22afe9bc747d64208068c2cf8a2c3143d161ede24536f6fd6adfd6b81e28920589722639e2e48fcf34e8dbde3ead7f691f14cbcc38cd75694d14d719b u-boot-2019.01.tar.bz2 +732b806bf3a612ded9351226c8fae78d02741220034009350be1c2237341584bcb366c0db2a19b64e4548e9a720d9380d1240680459b831943d3936077eecb13 arm-trusted-firmware-f0bfe15b81e50c6561a3a9a8e269db0267778910.tar.gz f8c9bb6e84d6f0620c976ac7ad5dd7ec7ff9dfdd4b1d03d2bf6653e7beccf80bdf2debfc92fb1f696dba92fb40287d3c45897e0078951451d0835cb61a5f16d1 README.txt -f3bb656bbd13caf10a8ea619bc08b439e7dc27526c9cbdfa0374f4f8e277632ff4df06b34d441d6723a93d4a54aa03465d4270c44219d6a150d416b9c56edbbe update-u-boot -50b19c0452d58ff80dfd2643330bbfe2349db687af258e5cb61f3872e0cac800df160baee7d6b0133bcc8b60d743a03e513db62a1917388101cfdea634424ae4 sopine-baseboard.patch" +f3bb656bbd13caf10a8ea619bc08b439e7dc27526c9cbdfa0374f4f8e277632ff4df06b34d441d6723a93d4a54aa03465d4270c44219d6a150d416b9c56edbbe update-u-boot" diff --git a/temp/u-boot/sopine-baseboard.patch b/temp/u-boot/sopine-baseboard.patch deleted file mode 100644 index 5a2eb1e82..000000000 --- a/temp/u-boot/sopine-baseboard.patch +++ /dev/null @@ -1,207 +0,0 @@ -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 6fe93a8..d67914f 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -379,7 +379,8 @@ dtb-$(CONFIG_MACH_SUN50I) += \ - sun50i-a64-olinuxino.dtb \ - sun50i-a64-orangepi-win.dtb \ - sun50i-a64-pine64-plus.dtb \ -- sun50i-a64-pine64.dtb -+ sun50i-a64-pine64.dtb \ -+ sun50i-a64-sopine-baseboard.dtb - dtb-$(CONFIG_MACH_SUN9I) += \ - sun9i-a80-optimus.dtb \ - sun9i-a80-cubieboard4.dtb \ -diff --git a/configs/sopine_baseboard_defconfig b/configs/sopine_baseboard_defconfig -index 05436a1..c79c111 100644 ---- a/configs/sopine_baseboard_defconfig -+++ b/configs/sopine_baseboard_defconfig -@@ -10,7 +10,7 @@ CONFIG_DRAM_ODT_EN=y - CONFIG_MMC0_CD_PIN="" - CONFIG_MMC_SUNXI_SLOT_EXTRA=2 - CONFIG_SPL_SPI_SUNXI=y --CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-pine64-plus" -+CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-sopine-baseboard" - # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set - # CONFIG_CMD_FLASH is not set - # CONFIG_SPL_DOS_PARTITION is not set -diff --git a/arch/arm/dts/sun50i-a64-sopine-baseboard.dts b/arch/arm/dts/sun50i-a64-sopine-baseboard.dts -new file mode 100644 -index 0000000..42c0f10 ---- /dev/null -+++ b/arch/arm/dts/sun50i-a64-sopine-baseboard.dts -@@ -0,0 +1,102 @@ -+/* -+ * Copyright (c) 2017 Icenowy Zheng -+ * -+ * Based on sun50i-a64-pine64.dts, which is: -+ * Copyright (c) 2016 ARM Ltd. -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively, -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+/dts-v1/; -+ -+#include "sun50i-a64-sopine.dtsi" -+ -+/ { -+ model = "SoPine with baseboard"; -+ compatible = "pine64,sopine-baseboard", "pine64,sopine", -+ "allwinner,sun50i-a64"; -+ -+ aliases { -+ serial0 = &uart0; -+ }; -+ -+ chosen { -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ reg_vcc1v8: vcc1v8 { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc1v8"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ }; -+}; -+ -+&ehci0 { -+ status = "okay"; -+}; -+ -+&ehci1 { -+ status = "okay"; -+}; -+ -+&mmc2 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&mmc2_pins>; -+ vmmc-supply = <®_vcc3v3>; -+ vqmmc-supply = <®_vcc1v8>; -+ bus-width = <8>; -+ non-removable; -+ cap-mmc-hw-reset; -+ status = "okay"; -+}; -+ -+&ohci0 { -+ status = "okay"; -+}; -+ -+&ohci1 { -+ status = "okay"; -+}; -+ -+&uart0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart0_pins_a>; -+ status = "okay"; -+}; -diff --git a/arch/arm/dts/sun50i-a64-sopine.dtsi b/arch/arm/dts/sun50i-a64-sopine.dtsi -new file mode 100644 -index 0000000..475518b ---- /dev/null -+++ b/arch/arm/dts/sun50i-a64-sopine.dtsi -@@ -0,0 +1,65 @@ -+/* -+ * Copyright (c) 2017 Icenowy Zheng -+ * -+ * Based on sun50i-a64-pine64.dts, which is: -+ * Copyright (c) 2016 ARM Ltd. -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively, -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+#include "sun50i-a64.dtsi" -+ -+/ { -+ reg_vcc3v3: vcc3v3 { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc3v3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ }; -+}; -+ -+&mmc0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&mmc0_pins>; -+ vmmc-supply = <®_vcc3v3>; -+ non-removable; -+ disable-wp; -+ bus-width = <4>; -+ status = "okay"; -+}; -