sunxi: remove outdated rtc package for a31/h3/r40 devices

The rtc-sunxi module only supports Allwinner A10/A20, for Allwinner
A31/h3/h5, use rtc-sun6i instead, which isn't support build as a
kernel module, just put it into default config.

Signed-off-by: AmadeusGhost <amadeus@jmu.edu.cn>
This commit is contained in:
AmadeusGhost 2021-02-09 11:20:06 +08:00
parent aa5cf017f9
commit dcc01b6832
4 changed files with 14 additions and 15 deletions

View File

@ -135,6 +135,8 @@ CONFIG_PINCTRL_SUN50I_H6_R=y
CONFIG_QUEUED_RWLOCKS=y
CONFIG_QUEUED_SPINLOCKS=y
CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_SUN6I=y
# CONFIG_SND_SUN50I_CODEC_ANALOG is not set
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
CONFIG_SPARSEMEM=y

View File

@ -12,4 +12,6 @@ CONFIG_MDIO_BUS_MUX=y
# CONFIG_PINCTRL_SUN50I_H5 is not set
# CONFIG_PINCTRL_SUN50I_H6 is not set
# CONFIG_PINCTRL_SUN50I_H6_R is not set
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_SUN6I=y
CONFIG_UNWINDER_ARM=y

View File

@ -25,7 +25,7 @@ TARGET_DEVICES += cubietech_cubietruck
define Device/friendlyarm_nanopi-m1-plus
DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL := NanoPi M1 Plus
DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-leds-gpio kmod-brcmfmac \
DEVICE_PACKAGES:= kmod-leds-gpio kmod-brcmfmac \
brcmfmac-firmware-43430-sdio wpad-basic-wolfssl
SOC := sun8i-h3
endef
@ -41,7 +41,7 @@ TARGET_DEVICES += friendlyarm_nanopi-neo
define Device/friendlyarm_nanopi-neo-air
DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL := NanoPi NEO Air
DEVICE_PACKAGES := kmod-rtc-sunxi kmod-leds-gpio kmod-brcmfmac \
DEVICE_PACKAGES := kmod-leds-gpio kmod-brcmfmac \
brcmfmac-firmware-43430-sdio wpad-basic-wolfssl
SOC := sun8i-h3
endef
@ -50,7 +50,7 @@ TARGET_DEVICES += friendlyarm_nanopi-neo-air
define Device/friendlyarm_nanopi-r1
DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL := NanoPi R1
DEVICE_PACKAGES := kmod-rtc-sunxi kmod-usb-net-rtl8152 kmod-leds-gpio \
DEVICE_PACKAGES := kmod-usb-net-rtl8152 kmod-leds-gpio \
kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic-wolfssl
SOC := sun8i-h3
endef
@ -59,7 +59,6 @@ TARGET_DEVICES += friendlyarm_nanopi-r1
define Device/friendlyarm_zeropi
DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL := ZeroPi
DEVICE_PACKAGES := kmod-rtc-sunxi
SOC := sun8i-h3
endef
TARGET_DEVICES += friendlyarm_zeropi
@ -83,7 +82,7 @@ TARGET_DEVICES += lemaker_bananapi
define Device/sinovoip_bananapi-m2-ultra
DEVICE_VENDOR := Sinovoip
DEVICE_MODEL := Banana Pi M2 Ultra
DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-sunxi kmod-brcmfmac \
DEVICE_PACKAGES:=kmod-ata-sunxi kmod-brcmfmac \
brcmfmac-firmware-43430a0-sdio wpad-basic
SUPPORTED_DEVICES:=lemaker,bananapi-m2-ultra
SOC := sun8i-r40
@ -118,7 +117,7 @@ TARGET_DEVICES += linksprite_pcduino3-nano
define Device/mele_m9
DEVICE_VENDOR := Mele
DEVICE_MODEL := M9
DEVICE_PACKAGES:=kmod-sun4i-emac kmod-rtc-sunxi kmod-rtl8192cu
DEVICE_PACKAGES:=kmod-sun4i-emac kmod-rtl8192cu
SOC := sun6i-a31
endef
TARGET_DEVICES += mele_m9
@ -159,7 +158,7 @@ TARGET_DEVICES += olimex_a20-olinuxino-micro
define Device/sinovoip_bananapi-m2-plus
DEVICE_VENDOR := Sinovoip
DEVICE_MODEL := Banana Pi M2+
DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-leds-gpio kmod-brcmfmac \
DEVICE_PACKAGES:=kmod-leds-gpio kmod-brcmfmac \
brcmfmac-firmware-43430a0-sdio wpad-basic-wolfssl
SOC := sun8i-h3
endef
@ -168,7 +167,6 @@ TARGET_DEVICES += sinovoip_bananapi-m2-plus
define Device/xunlong_orangepi-one
DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi One
DEVICE_PACKAGES:=kmod-rtc-sunxi
SOC := sun8i-h3
endef
TARGET_DEVICES += xunlong_orangepi-one
@ -176,7 +174,7 @@ TARGET_DEVICES += xunlong_orangepi-one
define Device/xunlong_orangepi-pc
DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi PC
DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-gpio-button-hotplug
DEVICE_PACKAGES:=kmod-gpio-button-hotplug
SOC := sun8i-h3
endef
TARGET_DEVICES += xunlong_orangepi-pc
@ -184,7 +182,7 @@ TARGET_DEVICES += xunlong_orangepi-pc
define Device/xunlong_orangepi-pc-plus
DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi PC Plus
DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-gpio-button-hotplug
DEVICE_PACKAGES:=kmod-gpio-button-hotplug
SOC := sun8i-h3
endef
TARGET_DEVICES += xunlong_orangepi-pc-plus
@ -192,7 +190,6 @@ TARGET_DEVICES += xunlong_orangepi-pc-plus
define Device/xunlong_orangepi-plus
DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi Plus
DEVICE_PACKAGES:=kmod-rtc-sunxi
SOC := sun8i-h3
endef
TARGET_DEVICES += xunlong_orangepi-plus
@ -200,7 +197,7 @@ TARGET_DEVICES += xunlong_orangepi-plus
define Device/xunlong_orangepi-r1
DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi R1
DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-usb-net-rtl8152
DEVICE_PACKAGES:=kmod-usb-net-rtl8152
SOC := sun8i-h2-plus
endef
TARGET_DEVICES += xunlong_orangepi-r1
@ -208,7 +205,6 @@ TARGET_DEVICES += xunlong_orangepi-r1
define Device/xunlong_orangepi-zero
DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi Zero
DEVICE_PACKAGES:=kmod-rtc-sunxi
SOC := sun8i-h2-plus
endef
TARGET_DEVICES += xunlong_orangepi-zero
@ -216,7 +212,6 @@ TARGET_DEVICES += xunlong_orangepi-zero
define Device/xunlong_orangepi-2
DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi 2
DEVICE_PACKAGES:=kmod-rtc-sunxi
SOC := sun8i-h3
endef
TARGET_DEVICES += xunlong_orangepi-2

View File

@ -6,7 +6,7 @@
define KernelPackage/rtc-sunxi
SUBMENU:=$(OTHER_MENU)
TITLE:=Sunxi SoC built-in RTC support
TITLE:=Allwinner A10/A20 built-in RTC support
DEPENDS:=@TARGET_sunxi
$(call AddDepends/rtc)
KCONFIG:= \