fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sunxi: sync with upstream source

Browse Source
This commit is contained in:
CN_SZTL 2020-09-06 12:40:53 +08:00
parent 271aafdfae
commit a28742101a
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
10 changed files with 26 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/linux/sunxi/Makefile
View File

@ -12,7 +12,6 @@ BOARD:=sunxi
BOARDNAME:=Allwinner A1x/A20/A3x/H3/H5/R40
FEATURES:=fpu usb ext4 display rtc squashfs
SUBTARGETS:=cortexa8 cortexa7 cortexa53
MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu>
KERNEL_PATCHVER:=5.4
KERNELNAME:=zImage dtbs

23
target/linux/sunxi/base-files/etc/board.d/02_network
View File

@ -18,29 +18,8 @@ olimex,a20-olinuxino-micro)
xunlong,orangepi-r1)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
;;
friendlyelec,nanopi-m1-plus|\
friendlyelec,nanopi-k1-plus|\
friendlyelec,nanopi-duo|\
friendlyelec,nanopi-neo-plus2|\
friendlyelec,nanopi-neo-s)
ucidef_set_interfaces_lan_wan "wlan0" "eth0"
;;
friendlyelec,nanopi-neo|\
friendlyelec,nanopi-neo2|\
friendlyelec,nanopi-neo-core2|\
friendlyelec,nanopi-neo2-black|\
friendlyelec,nanopi-m1|\
friendlyelec,zeropi)
ucidef_set_interface_wan "eth0"
;;
friendlyelec,nanopi-neo-air)
ucidef_set_interface_lan "wlan0"
;;
friendlyelec,nanopi-neo-core)
ucidef_set_interface_wan "eth0"
;;
*)
ucidef_set_interface_lan 'eth0'
ucidef_set_interface_lan "eth0"
;;
esac

2
target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh Executable file → Normal file
View File

@ -3,7 +3,7 @@ do_b53_hack() {
# hack: enable switch on Lamobo R1 and reset counters
case $(board_name) in
"lamobo,lamobo-r1")
lamobo,lamobo-r1)
ip link set eth0 up
sleep 1
swconfig dev switch0 set reset 1

2
target/linux/sunxi/base-files/lib/preinit/79_move_config
View File

@ -5,7 +5,7 @@ move_config() {
. /lib/upgrade/common.sh
if export_bootdevice && export_partdevice partdev -1; then
if export_bootdevice && export_partdevice partdev 1; then
if mount -t vfat -o rw,noatime "/dev/$partdev" /mnt; then
if [ -f /mnt/sysupgrade.tgz ]; then
mv -f /mnt/sysupgrade.tgz /

7
target/linux/sunxi/base-files/lib/upgrade/platform.sh
View File

@ -1,7 +1,7 @@
platform_check_image() {
local diskdev partdev diff
export_bootdevice && export_partdevice diskdev -2 || {
export_bootdevice && export_partdevice diskdev 0 || {
echo "Unable to determine upgrade device"
return 1
}
@ -28,7 +28,7 @@ platform_check_image() {
platform_copy_config() {
local partdev
if export_partdevice partdev -1; then
if export_partdevice partdev 1; then
mount -t vfat -o rw,noatime "/dev/$partdev" /mnt
cp -af "$CONF_TAR" /mnt/
umount /mnt
@ -38,7 +38,7 @@ platform_copy_config() {
platform_do_upgrade() {
local diskdev partdev diff
export_bootdevice && export_partdevice diskdev -2 || {
export_bootdevice && export_partdevice diskdev 0 || {
echo "Unable to determine upgrade device"
return 1
}
@ -74,7 +74,6 @@ platform_do_upgrade() {
get_image "$@" | dd of="$diskdev" bs=1024 skip=8 seek=8 count=1016 conv=fsync
#iterate over each partition from the image and write it to the boot disk
while read part start size; do
part="$(($part - 2))"
if export_partdevice partdev $part; then
echo "Writing image to /dev/$partdev..."
get_image "$@" | dd of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync

12
target/linux/sunxi/image/Makefile
View File

@ -42,16 +42,6 @@ define Device/Default
SUNXI_DTS = $$(SUNXI_DTS_DIR)$$(SOC)-$(lastword $(subst _, ,$(1)))
endef
ifeq ($(SUBTARGET),cortexa7)
include cortex-a7.mk
endif
ifeq ($(SUBTARGET),cortexa8)
include cortex-a8.mk
endif
ifeq ($(SUBTARGET),cortexa53)
include cortex-a53.mk
endif
include $(SUBTARGET).mk
$(eval $(call BuildImage))

0
target/linux/sunxi/image/cortex-a53.mk → target/linux/sunxi/image/cortexa53.mk
View File

32
target/linux/sunxi/image/cortex-a7.mk → target/linux/sunxi/image/cortexa7.mk
View File

@ -9,7 +9,7 @@
define Device/cubietech_cubieboard2
DEVICE_VENDOR := Cubietech
DEVICE_MODEL := Cubieboard2
DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi
DEVICE_PACKAGES:=kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi
SOC := sun7i-a20
endef
TARGET_DEVICES += cubietech_cubieboard2
@ -17,7 +17,7 @@ TARGET_DEVICES += cubietech_cubieboard2
define Device/cubietech_cubietruck
DEVICE_VENDOR := Cubietech
DEVICE_MODEL := Cubietruck
DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi kmod-brcmfmac
DEVICE_PACKAGES:=kmod-ata-sunxi kmod-rtc-sunxi kmod-brcmfmac
SOC := sun7i-a20
endef
TARGET_DEVICES += cubietech_cubietruck
@ -26,7 +26,7 @@ define Device/friendlyarm_nanopi-m1-plus
DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL := NanoPi M1 Plus
DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-heartbeat \
kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic
kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic-wolfssl
SOC := sun8i-h3
endef
TARGET_DEVICES += friendlyarm_nanopi-m1-plus
@ -42,7 +42,7 @@ define Device/friendlyarm_nanopi-neo-air
DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL := NanoPi NEO Air
DEVICE_PACKAGES := kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-heartbeat \
kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic
kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic-wolfssl
SOC := sun8i-h3
endef
TARGET_DEVICES += friendlyarm_nanopi-neo-air
@ -50,7 +50,7 @@ TARGET_DEVICES += friendlyarm_nanopi-neo-air
define Device/lamobo_lamobo-r1
DEVICE_VENDOR := Lamobo
DEVICE_MODEL := Lamobo R1
DEVICE_PACKAGES:=kmod-ata-sunxi kmod-rtl8192cu swconfig wpad-basic
DEVICE_PACKAGES:=kmod-ata-sunxi kmod-rtl8192cu swconfig wpad-basic-wolfssl
SOC := sun7i-a20
endef
TARGET_DEVICES += lamobo_lamobo-r1
@ -58,7 +58,7 @@ TARGET_DEVICES += lamobo_lamobo-r1
define Device/lemaker_bananapi
DEVICE_VENDOR := LeMaker
DEVICE_MODEL := Banana Pi
DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi
DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-sunxi
SOC := sun7i-a20
endef
TARGET_DEVICES += lemaker_bananapi
@ -66,7 +66,7 @@ TARGET_DEVICES += lemaker_bananapi
define Device/lemaker_bananapi-m2-ultra
DEVICE_VENDOR := LeMaker
DEVICE_MODEL := Banana Pi M2 Ultra
DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi
DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-sunxi
SOC := sun8i-r40
endef
TARGET_DEVICES += lemaker_bananapi-m2-ultra
@ -74,7 +74,7 @@ TARGET_DEVICES += lemaker_bananapi-m2-ultra
define Device/lemaker_bananapro
DEVICE_VENDOR := LeMaker
DEVICE_MODEL := Banana Pro
DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi kmod-brcmfmac
DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-sunxi kmod-brcmfmac
SOC := sun7i-a20
endef
TARGET_DEVICES += lemaker_bananapro
@ -82,8 +82,8 @@ TARGET_DEVICES += lemaker_bananapro
define Device/linksprite_pcduino3
DEVICE_VENDOR := LinkSprite
DEVICE_MODEL := pcDuino3
DEVICE_PACKAGES:=kmod-sun4i-emac kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi \
kmod-rtl8xxxu rtl8188eu-firmware
DEVICE_PACKAGES:=kmod-sun4i-emac kmod-rtc-sunxi kmod-ata-sunxi kmod-rtl8xxxu \
rtl8188eu-firmware
SOC := sun7i-a20
endef
TARGET_DEVICES += linksprite_pcduino3
@ -99,7 +99,7 @@ TARGET_DEVICES += mele_m9
define Device/olimex_a20-olinuxino-lime
DEVICE_VENDOR := Olimex
DEVICE_MODEL := A20-OLinuXino-LIME
DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi
DEVICE_PACKAGES:=kmod-ata-sunxi kmod-rtc-sunxi
SOC := sun7i
endef
TARGET_DEVICES += olimex_a20-olinuxino-lime
@ -107,7 +107,7 @@ TARGET_DEVICES += olimex_a20-olinuxino-lime
define Device/olimex_a20-olinuxino-lime2
DEVICE_VENDOR := Olimex
DEVICE_MODEL := A20-OLinuXino-LIME2
DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi kmod-usb-hid
DEVICE_PACKAGES:=kmod-ata-sunxi kmod-rtc-sunxi kmod-usb-hid
SOC := sun7i
endef
TARGET_DEVICES += olimex_a20-olinuxino-lime2
@ -116,7 +116,7 @@ define Device/olimex_a20-olinuxino-lime2-emmc
DEVICE_VENDOR := Olimex
DEVICE_MODEL := A20-OLinuXino-LIME2
DEVICE_VARIANT := eMMC
DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi kmod-usb-hid
DEVICE_PACKAGES:=kmod-ata-sunxi kmod-rtc-sunxi kmod-usb-hid
SOC := sun7i
endef
TARGET_DEVICES += olimex_a20-olinuxino-lime2-emmc
@ -124,7 +124,7 @@ TARGET_DEVICES += olimex_a20-olinuxino-lime2-emmc
define Device/olimex_a20-olinuxino-micro
DEVICE_VENDOR := Olimex
DEVICE_MODEL := A20-OLinuXino-MICRO
DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi
DEVICE_PACKAGES:=kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi
SOC := sun7i
endef
TARGET_DEVICES += olimex_a20-olinuxino-micro
@ -133,7 +133,7 @@ define Device/sinovoip_bananapi-m2-plus
DEVICE_VENDOR := Sinovoip
DEVICE_MODEL := Banana Pi M2+
DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-heartbeat \
kmod-brcmfmac brcmfmac-firmware-43430a0-sdio wpad-basic
kmod-brcmfmac brcmfmac-firmware-43430a0-sdio wpad-basic-wolfssl
SOC := sun8i-h3
endef
TARGET_DEVICES += sinovoip_bananapi-m2-plus
@ -173,7 +173,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 kmod-usb-net-rtl8152
DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-usb-net-rtl8152
SOC := sun8i-h2-plus
endef
TARGET_DEVICES += xunlong_orangepi-r1

4
target/linux/sunxi/image/cortex-a8.mk → target/linux/sunxi/image/cortexa8.mk
View File

@ -9,7 +9,7 @@
define Device/cubietech_a10-cubieboard
DEVICE_VENDOR := Cubietech
DEVICE_MODEL := Cubieboard
DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi
DEVICE_PACKAGES:=kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi
SOC := sun4i
endef
TARGET_DEVICES += cubietech_a10-cubieboard
@ -34,7 +34,7 @@ TARGET_DEVICES += marsboard_a10-marsboard
define Device/olimex_a10-olinuxino-lime
DEVICE_VENDOR := Olimex
DEVICE_MODEL := A10-OLinuXino-LIME
DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi
DEVICE_PACKAGES:=kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi
SOC := sun4i
endef
TARGET_DEVICES += olimex_a10-olinuxino-lime

3
target/linux/sunxi/profiles/00-default.mk
View File

@ -8,7 +8,6 @@
define Profile/Default
NAME:=Default Profile (all drivers)
PACKAGES:= \
kmod-ata-core \
kmod-ata-sunxi \
kmod-brcmfmac \
kmod-rtc-sunxi \
@ -17,7 +16,7 @@ define Profile/Default
kmod-sun4i-emac \
rtl8188eu-firmware \
swconfig \
wpad-basic
wpad-basic-wolfssl
PRIORITY := 1
endef