enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into clearfog-legacy-4.14

Browse Source
This commit is contained in:
Jannis 2020-01-07 21:53:51 +01:00
commit d03fb57af9
24 changed files with 161 additions and 12070 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -18,7 +18,7 @@ Supported build environment is **Ubuntu Bionic 18.04 x64** ([minimal iso image](
**Execution**
apt-get -y install git
apt -y install git
git clone https://github.com/armbian/build
cd build
./compile.sh

2
VERSION
View File

@ -1 +1 @@
19.11.6
19.11.7

10
compile.sh
View File

@ -87,8 +87,8 @@ rm $TMPFILE
# Check for Vagrant
if [[ "$1" == vagrant && -z "$(which vagrant)" ]]; then
display_alert "Vagrant not installed." "Installing"
sudo apt-get update
sudo apt-get install -y vagrant virtualbox
sudo apt update
sudo apt install -y vagrant virtualbox
fi
if [[ "$1" == dockerpurge && -f /etc/debian_version ]]; then
@ -116,12 +116,12 @@ if [[ "$1" == docker && -f /etc/debian_version && -z "$(which docker)" ]]; then
do
[[ ! $(which $i) ]] && install_packages+=$i" "
done
[[ -z $install_packages ]] && apt-get update;apt-get install -y -qq --no-install-recommends $install_packages
[[ -z $install_packages ]] && apt update;apt install -y -qq --no-install-recommends $install_packages
curl -fsSL "https://download.docker.com/linux/$(lsb_release -is | awk '{print tolower($0)}')/gpg" | apt-key add -qq - > /dev/null 2>&1
export DEBIAN_FRONTEND=noninteractive
apt-get update
apt-get install -y -qq --no-install-recommends docker-ce
apt update
apt install -y -qq --no-install-recommends docker-ce
display_alert "Add yourself to docker group to avoid root privileges" "" "wrn"
"$SRC/compile.sh" "$@"
exit $?

15
config/targets.conf
View File

@ -78,6 +78,7 @@ cubietruck current buster desktop stable yes
cubietruck current buster cli stable yes
cubietruck current bionic cli stable yes
cubietruck current stretch cli stable yes
cubietruck current bullseye cli stable yes
# Cubox-i
cubox-i current buster cli stable yes
@ -333,6 +334,7 @@ odroidn2 current bionic minimal stable yes
odroidxu4 legacy buster cli stable yes
odroidxu4 legacy buster desktop stable yes
odroidxu4 legacy bionic desktop stable yes
odroidxu4 legacy stretch cli stable yes
odroidxu4 current bionic desktop stable yes
odroidxu4 current buster minimal stable yes
@ -470,12 +472,14 @@ orangepizeroplus current bionic cli stable yes
orangepizeroplus2-h3 current buster cli stable yes
orangepizeroplus2-h3 current stretch cli stable yes
orangepizeroplus2-h3 current bionic minimal stable yes
orangepizeroplus2-h3 current bullseye cli stable yes
# orangepizeroplus2-h5
orangepizeroplus2-h5 current buster cli stable yes
orangepizeroplus2-h5 current stretch cli stable yes
orangepizeroplus2-h5 current bionic minimal stable yes
orangepizeroplus2-h5 current bullseye cli stable yes
# LinkSprite pcDuino3
@ -534,6 +538,8 @@ rock64 current bionic desktop stable yes
rockpi-4b legacy buster cli stable yes
rockpi-4b current buster cli stable yes
rockpi-4b current bionic minimal stable yes
rockpi-4b legacy bionic minimal stable yes
rockpi-4b legacy bionic desktop stable yes
rockpi-4b current buster desktop stable yes
@ -541,6 +547,8 @@ rockpi-4b current buster desktop stable yes
rockpi-4a legacy buster cli stable yes
rockpi-4a current buster cli stable yes
rockpi-4a current bionic minimal stable yes
rockpi-4a legacy bionic minimal stable yes
rockpi-4a legacy bionic desktop stable yes
rockpi-4a current buster desktop stable yes
@ -556,6 +564,7 @@ rockpro64 legacy buster cli stable yes
rockpro64 legacy bionic desktop stable yes
rockpro64 current buster desktop stable yes
rockpro64 current bionic cli stable yes
rockpro64 current bullseye cli stable yes
# Teres A64
@ -564,9 +573,9 @@ teres-a64 current buster desktop stable yes
# Tinkerboard
#tinkerboard legacy buster cli stable yes
#tinkerboard legacy bionic desktop stable yes
#tinkerboard legacy bionic cli stable yes
tinkerboard legacy buster cli stable yes
tinkerboard legacy bionic desktop stable yes
tinkerboard legacy bionic cli stable yes
tinkerboard current bionic desktop stable yes
tinkerboard current buster minimal stable yes
tinkerboard current bullseye cli stable yes

2
lib/build-all-ng.sh
View File

@ -209,7 +209,7 @@ function build_all()
# unset also board related variables
unset BOARDFAMILY DESKTOP_AUTOLOGIN DEFAULT_CONSOLE FULL_DESKTOP MODULES_CURRENT MODULES_LEGACY MODULES_DEV \
BOOTCONFIG MODULES_BLACKLIST_LEGACY MODULES_BLACKLIST_CURRENT MODULES_BLACKLIST_DEV DEFAULT_OVERLAYS SERIALCON \
BUILD_MINIMAL RELEASE
BUILD_MINIMAL RELEASE ATFBRANCH
read -r BOARD BRANCH RELEASE BUILD_TARGET BUILD_STABILITY BUILD_IMAGE <<< "${line}"

14
lib/chroot-buildpackages.sh
View File

@ -156,7 +156,7 @@ chroot_build_packages()
local t=$target_dir/root/.update-timestamp
if [[ ! -f $t || $(( ($(date +%s) - $(<$t)) / 86400 )) -gt 7 ]]; then
display_alert "Upgrading packages" "$release/$arch" "info"
systemd-nspawn -a -q -D $target_dir /bin/bash -c "apt-get -q update; apt-get -q -y upgrade; apt-get clean"
systemd-nspawn -a -q -D $target_dir /bin/bash -c "apt -q update; apt -q -y upgrade; apt clean"
date +%s > $t
fi
@ -219,8 +219,8 @@ chroot_build_packages()
for packet in $package_builddeps; do grep -q -x -e "\$packet" <<< "\$installed" || deps+=("\$packet"); done
if [[ \${#deps[@]} -gt 0 ]]; then
display_alert "Installing build dependencies"
apt-get -y -q update
apt-get -y -q --no-install-recommends --show-progress -o DPKG::Progress-Fancy=1 install "\${deps[@]}"
apt -y -q update
apt -y -q --no-install-recommends --show-progress -o DPKG::Progress-Fancy=1 install "\${deps[@]}"
fi
fi
display_alert "Copying sources"
@ -333,17 +333,17 @@ chroot_installpackages()
cat <<-EOF > "${SDCARD}"/tmp/install.sh
#!/bin/bash
[[ "$remote_only" != yes ]] && apt-key add /tmp/buildpkg.key
apt-get $apt_extra -q update
apt $apt_extra -q update
# uncomment to debug
# /bin/bash
# TODO: check if package exists in case new config was added
#if [[ -n "$remote_only" == yes ]]; then
# for p in $install_list; do
# if grep -qE "apt.armbian.com|localhost" <(apt-cache madison \$p); then
# if apt-get -s -qq install \$p; then
# if apt -s -qq install \$p; then
#fi
apt-get -q $apt_extra --show-progress -o DPKG::Progress-Fancy=1 install -y $install_list
apt-get clean
apt -q $apt_extra --show-progress -o DPKG::Progress-Fancy=1 install -y $install_list
apt clean
[[ "$remote_only" != yes ]] && apt-key del "925644A6"
rm /etc/apt/sources.list.d/armbian-temp.list 2>/dev/null
rm /etc/apt/preferences.d/90-armbian-temp.pref 2>/dev/null

6
lib/configuration.sh
View File

@ -20,7 +20,7 @@ TZDATA=$(cat /etc/timezone) # Timezone for target is taken from host or defined
USEALLCORES=yes # Use all CPU cores for compiling
EXIT_PATCHING_ERROR="" # exit patching if failed
[[ -z $HOST ]] && HOST="$(echo "$BOARD" | cut -f1 -d-)" # set hostname to the board
ROOTFSCACHE_VERSION=15
ROOTFSCACHE_VERSION=16
CHROOT_CACHE_VERSION=7
BUILD_REPOSITORY_URL=$(git remote get-url $(git remote 2>/dev/null) 2>/dev/null)
BUILD_REPOSITORY_COMMIT=$(git describe --match=d_e_a_d_b_e_e_f --always --dirty 2>/dev/null)
@ -252,10 +252,12 @@ esac
DEBIAN_MIRROR='httpredir.debian.org/debian'
DEBIAN_SECURTY='http://security.debian.org/'
UBUNTU_MIRROR='ports.ubuntu.com/'
if [[ $DOWNLOAD_MIRROR == china ]] ; then
DEBIAN_MIRROR='mirrors.tuna.tsinghua.edu.cn/debian'
DEBIAN_SECURTY='mirrors.tuna.tsinghua.edu.cn/debian-security'
UBUNTU_MIRROR='mirrors.tuna.tsinghua.edu.cn/ubuntu-ports/'
fi
@ -312,7 +314,7 @@ Build directory permissions:
$(getfacl -p "${SRC}")
Temp directory permissions:
$(getfacl -p "${SRC}"/.tmp)
$(getfacl -p "${SRC}"/.tmp 2> /dev/null)
## BUILD CONFIGURATION

32
lib/debootstrap.sh
View File

@ -75,8 +75,6 @@ debootstrap_ng()
source $SRC/lib/fel-load.sh
else
prepare_partitions
# update initramfs to reflect any configuration changes since kernel installation
update_initramfs
create_image
fi
@ -126,7 +124,7 @@ create_rootfs_cache()
# stage: debootstrap base system
if [[ $NO_APT_CACHER != yes ]]; then
# apt-cacher-ng apt-get proxy parameter
# apt-cacher-ng apt proxy parameter
local apt_extra="-o Acquire::http::Proxy=\"http://${APT_PROXY_ADDR:-localhost:3142}\""
local apt_mirror="http://${APT_PROXY_ADDR:-localhost:3142}/$APT_MIRROR"
else
@ -196,7 +194,7 @@ create_rootfs_cache()
# stage: update packages list
display_alert "Updating package list" "$RELEASE" "info"
eval 'LC_ALL=C LANG=C chroot $SDCARD /bin/bash -c "apt-get -q -y $apt_extra update"' \
eval 'LC_ALL=C LANG=C chroot $SDCARD /bin/bash -c "apt -q -y $apt_extra update"' \
${PROGRESS_LOG_TO_FILE:+' | tee -a $DEST/debug/debootstrap.log'} \
${OUTPUT_DIALOG:+' | dialog --backtitle "$backtitle" --progressbox "Updating package lists..." $TTY_Y $TTY_X'} \
${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'}
@ -205,7 +203,7 @@ create_rootfs_cache()
# stage: upgrade base packages from xxx-updates and xxx-backports repository branches
display_alert "Upgrading base packages" "Armbian" "info"
eval 'LC_ALL=C LANG=C chroot $SDCARD /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get -y -q \
eval 'LC_ALL=C LANG=C chroot $SDCARD /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt -y -q \
$apt_extra $apt_extra_progress upgrade"' \
${PROGRESS_LOG_TO_FILE:+' | tee -a $DEST/debug/debootstrap.log'} \
${OUTPUT_DIALOG:+' | dialog --backtitle "$backtitle" --progressbox "Upgrading base packages..." $TTY_Y $TTY_X'} \
@ -224,7 +222,7 @@ create_rootfs_cache()
[[ ${PIPESTATUS[0]} -ne 0 ]] && exit_with_error "Installation of Armbian packages failed"
# stage: remove downloaded packages
chroot $SDCARD /bin/bash -c "apt-get clean"
chroot $SDCARD /bin/bash -c "apt clean"
# DEBUG: print free space
echo -e "\nFree space:"
@ -525,18 +523,23 @@ prepare_partitions()
# for cryptroot-unlock to work:
# https://serverfault.com/questions/907254/cryproot-unlock-with-dropbear-timeout-while-waiting-for-askpass
#
update_initramfs() {
# since Debian buster, it has to be called within create_image() on the $MOUNT
# path instead of $SDCARD (which can be a tmpfs and breaks cryptsetup-initramfs).
# see: https://github.com/armbian/build/issues/1584
#
update_initramfs()
{
local chroot_target=$1
update_initramfs_cmd="update-initramfs -uv -k ${VER}-${LINUXFAMILY}"
display_alert "Updating initramfs..." "$update_initramfs_cmd" ""
cp /usr/bin/$QEMU_BINARY $SDCARD/usr/bin/
mount_chroot "$SDCARD/"
cp /usr/bin/$QEMU_BINARY $chroot_target/usr/bin/
mount_chroot "$chroot_target/"
chroot $SDCARD /bin/bash -c "$update_initramfs_cmd" >> $DEST/debug/install.log 2>&1
chroot $chroot_target /bin/bash -c "$update_initramfs_cmd" >> $DEST/debug/install.log 2>&1
display_alert "Updated initramfs." "for details see: $DEST/debug/install.log" "ext"
umount_chroot "$SDCARD/"
rm $SDCARD/usr/bin/$QEMU_BINARY
umount_chroot "$chroot_target/"
rm $chroot_target/usr/bin/$QEMU_BINARY
} #############################################################################
@ -572,6 +575,9 @@ create_image()
rsync -aHWXh --info=progress2,stats1 $SDCARD/boot $MOUNT
fi
# stage: create final initramfs
update_initramfs $MOUNT
# DEBUG: print free space
display_alert "Free space:" "SD card" "info"
eval 'df -h' ${PROGRESS_LOG_TO_FILE:+' | tee -a $DEST/debug/debootstrap.log'}

10
lib/desktop.sh
View File

@ -120,18 +120,18 @@ desktop_postinstall ()
{
# disable display manager for first run
chroot "${SDCARD}" /bin/bash -c "systemctl --no-reload disable lightdm.service >/dev/null 2>&1"
chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt update" >> "${DEST}"/debug/install.log
if [[ ${FULL_DESKTOP} == yes ]]; then
chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get update" >> "${DEST}"/debug/install.log
chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get update; apt-get -yqq --no-install-recommends install $PACKAGE_LIST_DESKTOP_FULL" >> "${DEST}"/debug/install.log
chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt -yqq --no-install-recommends install $PACKAGE_LIST_DESKTOP_FULL" >> "${DEST}"/debug/install.log
fi
if [[ -n ${PACKAGE_LIST_DESKTOP_BOARD} ]]; then
chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get update; apt-get -yqq --no-install-recommends install $PACKAGE_LIST_DESKTOP_BOARD" >> "${DEST}"/debug/install.log
chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt -yqq --no-install-recommends install $PACKAGE_LIST_DESKTOP_BOARD" >> "${DEST}"/debug/install.log
fi
if [[ -n ${PACKAGE_LIST_DESKTOP_FAMILY} ]]; then
chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get update; apt-get -yqq --no-install-recommends install $PACKAGE_LIST_DESKTOP_FAMILY" >> "${DEST}"/debug/install.log
fi
chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt -yqq --no-install-recommends install $PACKAGE_LIST_DESKTOP_FAMILY" >> "${DEST}"/debug/install.log
fi
# Compile Turbo Frame buffer for sunxi
if [[ $LINUXFAMILY == sun* && $BRANCH == default ]]; then

3
lib/distributions.sh
View File

@ -59,8 +59,7 @@ install_common()
# /usr/share/initramfs-tools/hooks/dropbear will automatically add 'id_ecdsa.pub' to authorized_keys file
# during mkinitramfs of update-initramfs
#cat $SDCARD/etc/dropbear-initramfs/id_ecdsa.pub > $SDCARD/etc/dropbear-initramfs/authorized_keys
CRYPTROOT_SSH_UNLOCK_KEY_NAME=\
"Armbian_${REVISION}_${BOARD^}_${DISTRIBUTION}_${RELEASE}_${BRANCH}_${VER/-$LINUXFAMILY/}".key
CRYPTROOT_SSH_UNLOCK_KEY_NAME="Armbian_${REVISION}_${BOARD^}_${RELEASE}_${BRANCH}_${VER/-$LINUXFAMILY/}".key
# copy dropbear ssh key to image output dir for convenience
cp "${SDCARD}"/etc/dropbear-initramfs/id_ecdsa "${DEST}/images/${CRYPTROOT_SSH_UNLOCK_KEY_NAME}"
display_alert "SSH private key for dropbear (initramfs) has been copied to:" \

4
lib/general.sh
View File

@ -144,8 +144,8 @@ create_sources_list()
deb http://${DEBIAN_MIRROR} ${release}-backports main contrib non-free
#deb-src http://${DEBIAN_MIRROR} ${release}-backports main contrib non-free
deb http://security.debian.org/ ${release}/updates main contrib non-free
#deb-src http://security.debian.org/ ${release}/updates main contrib non-free
deb http://${DEBIAN_SECURTY} ${release}/updates main contrib non-free
#deb-src http://${DEBIAN_SECURTY} ${release}/updates main contrib non-free
EOF
;;

2
lib/image-helpers.sh
View File

@ -126,7 +126,7 @@ install_deb_chroot()
cp "${package}" "${SDCARD}/root/${name}"
display_alert "Installing" "$name"
[[ $NO_APT_CACHER != yes ]] && local apt_extra="-o Acquire::http::Proxy=\"http://${APT_PROXY_ADDR:-localhost:3142}\" -o Acquire::http::Proxy::localhost=\"DIRECT\""
LC_ALL=C LANG=C chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get -yqq \
LC_ALL=C LANG=C chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt -yqq \
$apt_extra --no-install-recommends install ./root/$name" >> "${DEST}"/debug/install.log 2>&1
rm -f "${SDCARD}/root/${name}"

8
patch/kernel/meson64-current/board-odroidc2-enable-SPI.patch
View File

@ -12,12 +12,12 @@ index 0916dcb..cbc03df 100644
+ #address-cells = <0x1>;
+ #size-cells = <0x0>;
+ ranges;
+ status = "ok";
+ status = "disabled";
+ sck-gpios = <&gpio GPIOX_2 0>;
+ miso-gpios = <&gpio GPIOX_4 0>;
+ mosi-gpios = <&gpio GPIOX_7 0>;
+ cs-gpios = <&gpio GPIOX_1 0
+ &gpio GPIOY_14 0>;
+ cs-gpios = <&gpio GPIOX_3 0
+ &gpio GPIOX_1 0>;
+ num-chipselects = <2>;
+
+ /* clients */
@ -34,4 +34,4 @@ index 0916dcb..cbc03df 100644
+ };
sound {
compatible = "simple-audio-card";
compatible = "simple-audio-card";

19
patch/kernel/meson64-current/fix-uartC-pinctrl-in-LE-branch.patch Normal file
View File

@ -0,0 +1,19 @@
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
index 111c198..b0d0ff9 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
@@ -463,10 +463,10 @@ static struct meson_pmx_group meson_gxbb_periphs_groups[] = {
GROUP(tsin_a_clk, 3, 0),
GROUP(tsin_a_d0, 3, 4),
GROUP(tsin_a_dp, 3, 5),
- GROUP(uart_cts_c, 1, 19),
- GROUP(uart_rts_c, 1, 18),
- GROUP(uart_tx_c, 1, 17),
- GROUP(uart_rx_c, 1, 16),
+ GROUP(uart_cts_c, 1, 17),
+ GROUP(uart_rts_c, 1, 16),
+ GROUP(uart_tx_c, 1, 19),
+ GROUP(uart_rx_c, 1, 18),
GROUP(pwm_a_y, 1, 21),
GROUP(pwm_f_y, 1, 20),
GROUP(i2s_out_ch23_y, 1, 5),

6079
patch/kernel/odroidxu4-current/patch-5.4.3-4.patch
View File

File diff suppressed because it is too large Load Diff

2510
patch/kernel/odroidxu4-current/patch-5.4.4-5.patch
View File

File diff suppressed because it is too large Load Diff

3420
patch/kernel/odroidxu4-current/patch-5.4.5-6.patch
View File

File diff suppressed because it is too large Load Diff

25
patch/kernel/rockchip64-current/board-firefly-rk3399-fix-gpu-power.patch Normal file
View File

@ -0,0 +1,25 @@
From 2345073b11f6bfa5faa2e514b9d4ca03157e5149 Mon Sep 17 00:00:00 2001
From: Michal Lazo <michal.lazo@memsource.com>
Date: Mon, 6 Jan 2020 14:52:00 -0800
Subject: [PATCH 1/1] mali power fix
---
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
index c706db0ee..0fd8ef955 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
@@ -803,3 +803,8 @@
&vopl_mmu {
status = "okay";
};
+
+&gpu {
+ mali-supply = <&vdd_gpu>;
+ status = "okay";
+};
--
2.17.1

23
patch/kernel/rockchip64-current/general-temporary-ethernet-fixup.patch Normal file
View File

@ -0,0 +1,23 @@
This is a temporary fix for ethernet with kernels 5.4.7+
It reverts the following change: https://patchwork.ozlabs.org/patch/1213121/
which disabled mdio init for most of the boards except NanoPi M4(V2)
or NanoPC T4 which have proper device tree definition for mdio/phy.
The proper fix will be to add phy device tree node for boards that miss
it.
---
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 170c3a052b14..1f230bd854c4 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -320,7 +320,7 @@ out:
static int stmmac_dt_phy(struct plat_stmmacenet_data *plat,
struct device_node *np, struct device *dev)
{
- bool mdio = false;
+ bool mdio = true;
static const struct of_device_id need_mdio_ids[] = {
{ .compatible = "snps,dwc-qos-ethernet-4.10" },
{},

25
patch/kernel/rockchip64-dev/board-firefly-rk3399-fix-gpu-power.patch Normal file
View File

@ -0,0 +1,25 @@
From 2345073b11f6bfa5faa2e514b9d4ca03157e5149 Mon Sep 17 00:00:00 2001
From: Michal Lazo <michal.lazo@memsource.com>
Date: Mon, 6 Jan 2020 14:52:00 -0800
Subject: [PATCH 1/1] mali power fix
---
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
index c706db0ee..0fd8ef955 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
@@ -803,3 +803,8 @@
&vopl_mmu {
status = "okay";
};
+
+&gpu {
+ mali-supply = <&vdd_gpu>;
+ status = "okay";
+};
--
2.17.1

2
patch/kernel/sunxi-current/0130-drm-bridge-Add-Analogix-anx6345-support.patch
View File

@ -604,7 +604,7 @@ index 000000000000..81676407aa6d
+ if (!anx6345->edid) {
+ err = anx6345_probe_edid_from_of(anx6345);
+ if (err) {
+ DRM_ERROR("Failed to probe EDID from device tree\n");
+ DRM_ERROR("Failed to probe EDID from device tree: %d\n", err);
+ goto unlock;
+ }
+ }

2
patch/kernel/sunxi-dev/0130-drm-bridge-Add-Analogix-anx6345-support.patch-disabled
View File

@ -604,7 +604,7 @@ index 000000000000..81676407aa6d
+ if (!anx6345->edid) {
+ err = anx6345_probe_edid_from_of(anx6345);
+ if (err) {
+ DRM_ERROR("Failed to probe EDID from device tree\n");
+ DRM_ERROR("Failed to probe EDID from device tree: &d\n", err);
+ goto unlock;
+ }
+ }

2
patch/kernel/sunxi-legacy/0130-drm-bridge-Add-Analogix-anx6345-support.patch
View File

@ -603,7 +603,7 @@ index 000000000000..81676407aa6d
+ if (!anx6345->edid) {
+ err = anx6345_probe_edid_from_of(anx6345);
+ if (err) {
+ DRM_ERROR("Failed to probe EDID from device tree\n");
+ DRM_ERROR("Failed to probe EDID from device tree: %d\n", err);
+ goto unlock;
+ }
+ }

14
patch/u-boot/u-boot-sunxi/fix-usb1-vbus-opiwin.patch.disabled → patch/u-boot/u-boot-sunxi/fix-usb1-vbus-opiwin.patch
View File

@ -38,8 +38,8 @@ index cf76c35..a7d36a5 100644
};
&ehci1 {
@@ -83,6 +96,13 @@
status = "okay";
@@ -180,6 +222,13 @@
status = "okay";
};
+&pio {
@ -49,14 +49,6 @@ index cf76c35..a7d36a5 100644
+ };
+};
+
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
@@ -198,6 +198,7 @@
};
&usbphy {
+ usb1_vbus-supply = <&reg_usb1_vbus>;
&r_rsb {
status = "okay";
};