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

target/sunxi: fix

Browse Source
This commit is contained in:
CN_SZTL 2020-02-08 21:14:22 +08:00
parent 964b84a51c
commit 4070332704
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
5 changed files with 57 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/boot/uboot-sunxi/Makefile
View File

@ -153,19 +153,19 @@ endef
define U-Boot/nanopi_duo2
BUILD_SUBTARGET:=cortexa7
NAME:=U-Boot for NanoPi Duo2 (H3)
BUILD_DEVICES:=sun8i-h3-nanopi-duo2
BUILD_DEVICES:=friendyarm-h3-nanopi-duo2
endef
define U-Boot/nanopi_r1
BUILD_SUBTARGET:=cortexa7
NAME:=U-Boot for NanoPi R1 (H3)
BUILD_DEVICES:=sun8i-h3-nanopi-r1
BUILD_DEVICES:=friendyarm-h3-nanopi-r1
endef
define U-Boot/nanopi_r1s
BUILD_SUBTARGET:=cortexa53
NAME:=NanoPi R1S (H5)
BUILD_DEVICES:=sun50i-h5-nanopi-r1s
BUILD_DEVICES:=friendlyarm-h5-nanopi-r1s
DEPENDS:=+PACKAGE_u-boot-nanopi_r1s:arm-trusted-firmware-sunxi
UENV:=a64
endef

2
target/linux/sunxi/base-files/etc/board.d/01_leds
View File

@ -14,7 +14,7 @@ case "$(board_name)" in
*)
;;
esac
board_config_flush
exit 0

22
target/linux/sunxi/base-files/root/setup.sh
View File

@ -15,7 +15,7 @@ setup_ssid()
wlan_path=/sys/devices/`uci get wireless.${r}.path`
wlan_path=`find ${wlan_path} -name wlan* | tail -n 1`
local mac=`cat ${wlan_path}/address`
local dev_path=/sys/devices/`uci get wireless.${r}.path`
if [ -e "${dev_path}/../idVendor" -a -e "${dev_path}/../idProduct" ]; then
@ -79,8 +79,28 @@ if [ -f /sys/class/sunxi_info/sys_info ]; then
fi
fi
# update /etc/config/network
WAN_IF=`uci get network.wan.ifname`
if [ "x${WAN_IF}" = "xeth0" ]; then
uci set network.wan.dns=8.8.8.8
uci commit
fi
WIFI_NUM=`find /sys/class/net/ -name wlan* | wc -l`
if [ ${WIFI_NUM} -gt 0 ]; then
# make sure lan interface exist
if [ -z "`uci get network.lan`" ]; then
uci batch <<EOF
set network.lan='interface'
set network.lan.type='bridge'
set network.lan.proto='static'
set network.lan.ipaddr='192.168.2.1'
set network.lan.netmask='255.255.255.0'
set network.lan.ip6assign='60'
EOF
fi
# update /etc/config/wireless
for i in `seq 0 ${WIFI_NUM}`; do
setup_ssid radio${i}

21
target/linux/sunxi/image/cortex-a53.mk
View File

@ -28,26 +28,27 @@ define Device/friendlyarm_nanopi-neo2
endef
TARGET_DEVICES += friendlyarm_nanopi-neo2
TARGET_DEVICES += sun50i-h5-nanopi-neo2
define Device/sun50i-h5-nanopi-r1s
DEVICE_TITLE:=Nanopi R1S (H5)
define Device/friendlyarm_nanopi-r1s
DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL:=Nanopi R1S (H5)
DEVICE_PACKAGES:=kmod-rtc-sunxi \
kmod-leds-gpio kmod-ledtrig-heartbeat \
kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic \
kmod-usb-net kmod-usb-net-rtl8152
SUPPORTED_DEVICES:=nanopi-r1s
SUNXI_DTS:=allwinner/sun50i-h5-nanopi-r1s
SUNXI_DTS_DIR := allwinner/
SOC := sun50i-h5
KERNEL_NAME := Image
KERNEL := kernel-bin
endef
TARGET_DEVICES += sun50i-h5-nanopi-r1s
TARGET_DEVICES += friendlyarm_h5-nanopi-r1s
define Device/sun50i-a64-pine64-plus
DEVICE_TITLE:=Pine64 Plus A64
SUPPORTED_DEVICES:=pine64,pine64-plus
SUNXI_DTS:=allwinner/sun50i-a64-pine64-plus
define Device/pine64_pine64-plus
DEVICE_VENDOR := Pine64
DEVICE_MODEL := Pine64+
SUNXI_DTS_DIR := allwinner/
SOC := sun50i-a64
KERNEL_NAME := Image
KERNEL := kernel-bin
endef

53
target/linux/sunxi/image/cortex-a7.mk
View File

@ -47,6 +47,23 @@ define Device/friendlyarm_nanopi-neo-air
endef
TARGET_DEVICES += friendlyarm_nanopi-neo-air
define Device/friendlyarm_nanopi-duo2
DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL:=FriendlyARM NanoPi Duo2
DEVICE_PACKAGES:=ar3k-firmware ath6k-firmware ath9k-htc-firmware brcmfmac-firmware-43430-sdio brcmfmac-firmware-usb carl9170-firmware collectd collectd-mod-cpu collectd-mod-interface collectd-mod-iwinfo collectd-mod-load collectd-mod-memory collectd-mod-network collectd-mod-rrdtool collectd-mod-thermal collectd-mod-uptime collectd-mod-wireless edgeport-firmware hostapd-common iperf iw iwinfo kmod-brcmfmac kmod-brcmutil kmod-cfg80211 kmod-mmc kmod-nls-base kmod-usb-core libertas-spi-firmware libertas-usb-firmware libiwinfo libiwinfo-lua libltdl \
mt7601u-firmware mwl8k-firmware p54-usb-firmware prism54-firmware r8169-firmware rpcd rpcd-mod-rrdns rrdtool1 rs9113-firmware rt2800-usb-firmware rt73-usb-firmware rtl8188eu-firmware rtl8192ce-firmware rtl8192cu-firmware rtl8192de-firmware rtl8192se-firmware rtl8192su-firmware rtl8821ae-firmware swconfigti-3410-firmware ti-5052-firmware triggerhappy uclibcxx usb-modeswitch usbutils wireless-regdb wl12xx-firmware wl18xx-firmware wpad-mini zlib \
travelmate luci-app-travelmate
SOC := sun8i-h3
endef
TARGET_DEVICES += friendlyarm_nanopi-duo2
define Device/friendlyarm_nanopi-r1
DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL:=FriendlyARM NanoPi R1
SOC := sun8i-h3
endef
TARGET_DEVICES += friendlyarm_nanopi-r1
define Device/lamobo_lamobo-r1
DEVICE_VENDOR := Lamobo
DEVICE_MODEL := Lamobo R1
@ -138,32 +155,9 @@ define Device/sinovoip_bananapi-m2-plus
endef
TARGET_DEVICES += sinovoip_bananapi-m2-plus
TARGET_DEVICES += sun8i-h3-nanopi-neo
define Device/sun8i-h3-nanopi-duo2
DEVICE_TITLE:=FriendlyARM NanoPi Duo2
SUPPORTED_DEVICES:=friendlyarm,nanopi-duo2
DEVICE_PACKAGES:=ar3k-firmware ath6k-firmware ath9k-htc-firmware brcmfmac-firmware-43430-sdio brcmfmac-firmware-usb carl9170-firmware collectd collectd-mod-cpu collectd-mod-interface collectd-mod-iwinfo collectd-mod-load collectd-mod-memory collectd-mod-network collectd-mod-rrdtool collectd-mod-thermal collectd-mod-uptime collectd-mod-wireless edgeport-firmware hostapd-common iperf iw iwinfo kmod-brcmfmac kmod-brcmutil kmod-cfg80211 kmod-mmc kmod-nls-base kmod-usb-core libertas-spi-firmware libertas-usb-firmware libiwinfo libiwinfo-lua libltdl liblua liblucihttp liblucihttp-lua librrd1 libubus-lua libusb-1.0 lua luci luci-app-firewall luci-app-statistics luci-base \
luci-lib-ip luci-lib-jsonc luci-lib-nixio luci-mod-admin-full luci-proto-ipv6 luci-proto-ppp luci-theme-bootstrap mt7601u-firmware mwl8k-firmware p54-usb-firmware prism54-firmware r8169-firmware rpcd rpcd-mod-rrdns rrdtool1 rs9113-firmware rt2800-usb-firmware rt73-usb-firmware rtl8188eu-firmware rtl8192ce-firmware rtl8192cu-firmware rtl8192de-firmware rtl8192se-firmware rtl8192su-firmware rtl8821ae-firmware swconfigti-3410-firmware ti-5052-firmware triggerhappy uclibcxx uhttpd usb-modeswitch usbutils wireless-regdb wl12xx-firmware wl18xx-firmware wpad-mini zlib \
travelmate luci-app-travelmate
SUNXI_DTS:=sun8i-h3-nanopi-duo2
endef
TARGET_DEVICES += sun8i-h3-nanopi-duo2
define Device/sun8i-h3-nanopi-r1
DEVICE_TITLE:=FriendlyARM NanoPi R1
SUPPORTED_DEVICES:=friendlyarm,nanopi-r1
SUNXI_DTS:=sun8i-h3-nanopi-r1
endef
TARGET_DEVICES += sun8i-h3-nanopi-r1
define Device/sun8i-h3-orangepi-one
DEVICE_TITLE:=Xunlong Orange Pi One
define Device/xunlong_orangepi-one
DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi One
DEVICE_PACKAGES:=kmod-rtc-sunxi
SOC := sun8i-h3
endef
@ -215,9 +209,4 @@ define Device/xunlong_orangepi-2
DEVICE_PACKAGES:=kmod-rtc-sunxi
SOC := sun8i-h3
endef
TARGET_DEVICES += sun7i-a20-pcduino3
endif
TARGET_DEVICES += xunlong_orangepi-2