From 7e779f435ce02d12097d1adbf60b4a74df9fca14 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Tue, 9 Feb 2021 12:10:08 +0800 Subject: [PATCH] sunxi: Nanopi R1S H5: add missing device package That is required by the Reset button. Signed-off-by: AmadeusGhost --- package/boot/uboot-sunxi/Makefile | 16 ++++++++-------- target/linux/sunxi/image/cortex-a53.mk | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile index f02f6b4c94..a3a8b95317 100644 --- a/package/boot/uboot-sunxi/Makefile +++ b/package/boot/uboot-sunxi/Makefile @@ -156,14 +156,6 @@ define U-Boot/nanopi_r1 BUILD_DEVICES:=friendlyarm_nanopi-r1 endef -define U-Boot/nanopi_r1s_h5 - BUILD_SUBTARGET:=cortexa53 - NAME:=U-Boot for NanoPi R1S (H5) - BUILD_DEVICES:=friendlyarm_nanopi-r1s-h5 - DEPENDS:=+PACKAGE_u-boot-nanopi_r1s_h5:arm-trusted-firmware-sunxi - UENV:=a64 -endef - define U-Boot/orangepi_r1 BUILD_SUBTARGET:=cortexa7 NAME:=Orange Pi R1 (H2+) @@ -228,6 +220,14 @@ define U-Boot/nanopi_neo2 UENV:=a64 endef +define U-Boot/nanopi_r1s_h5 + BUILD_SUBTARGET:=cortexa53 + NAME:=NanoPi R1S (H5) + BUILD_DEVICES:=friendlyarm_nanopi-r1s-h5 + DEPENDS:=+PACKAGE_u-boot-nanopi_r1s_h5:arm-trusted-firmware-sunxi + UENV:=a64 +endef + define U-Boot/pine64_plus BUILD_SUBTARGET:=cortexa53 NAME:=Pine64 Plus A64 diff --git a/target/linux/sunxi/image/cortex-a53.mk b/target/linux/sunxi/image/cortex-a53.mk index 2b2933aa63..dae515065e 100644 --- a/target/linux/sunxi/image/cortex-a53.mk +++ b/target/linux/sunxi/image/cortex-a53.mk @@ -31,8 +31,8 @@ TARGET_DEVICES += friendlyarm_nanopi-neo2 define Device/friendlyarm_nanopi-r1s-h5 DEVICE_VENDOR := FriendlyARM DEVICE_MODEL:=Nanopi R1S H5 - DEVICE_PACKAGES:= kmod-eeprom-at24 kmod-leds-gpio kmod-rtl8189es \ - kmod-usb2 kmod-usb-net kmod-usb-net-rtl8152 wpad-basic + DEVICE_PACKAGES:= kmod-eeprom-at24 kmod-gpio-button-hotplug kmod-leds-gpio \ + kmod-rtl8189es kmod-usb2 kmod-usb-net kmod-usb-net-rtl8152 wpad-basic SUPPORTED_DEVICES:=nanopi-r1s-h5 SUNXI_DTS_DIR := allwinner/ SOC := sun50i-h5