Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'openwrt:master' into master

Browse source
This commit is contained in:
Hayzam Sherif 2023-05-17 00:32:39 +05:30 committed by GitHub
commit 214ad63329
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 181 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package/libs/libbsd/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libbsd
PKG_VERSION:=0.11.7
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://libbsd.freedesktop.org/releases
@ -29,6 +29,8 @@ define Package/libbsd/description
This library provides useful functions commonly found on BSD systems, and lacking on others like GNU systems, thus making it easier to port projects with strong BSD origins, without needing to embed the same code over and over again on each project.
endef
TARGET_CFLAGS += -D_LARGEFILE64_SOURCE
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig

6
package/utils/e2fsprogs/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=e2fsprogs
PKG_VERSION:=1.47.0
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/
@ -156,6 +156,10 @@ CONFIGURE_ARGS += \
--disable-rpath \
--disable-fuse2fs
ifneq ($(CONFIG_USE_MUSL),)
CONFIGURE_VARS += ac_cv_func_lseek64=yes
endif
define Build/Prepare
$(call Build/Prepare/Default)
$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/config/

6
package/utils/f2fs-tools/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=f2fs-tools
PKG_VERSION:=1.15.0
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/
@ -111,6 +111,10 @@ endif
CONFIGURE_VARS += \
ac_cv_file__git=no
ifneq ($(CONFIG_USE_MUSL),)
CONFIGURE_VARS += ac_cv_func_lseek64=yes
endif
define Package/libf2fs/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) \

153
target/linux/ath79/dts/ar9344_mikrotik_routerboard-951ui-2hnd.dts Normal file
View file

@ -0,0 +1,153 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "ar9344_mikrotik_routerboard.dtsi"
/ {
compatible = "mikrotik,routerboard-951ui-2hnd", "qca,ar9344";
model = "Mikrotik RouterBOARD 951Ui-2HnD";
/delete-node/ leds;
leds {
compatible = "gpio-leds";
led_user: user {
label = "green:user";
gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
};
port1 {
label = "green:port1";
gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
};
port2 {
label = "green:port2";
gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
};
port3 {
label = "green:port3";
gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
};
port4 {
label = "green:port4";
gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
};
port5 {
label = "green:port5";
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
};
};
gpio-export {
compatible = "gpio-export";
gpio_poe_power {
gpio-export,name = "rb951ui2hnd:power:poe";
gpio-export,output = <1>;
gpios = <&gpio 2 GPIO_ACTIVE_HIGH>;
};
gpio_usb_power {
gpio-export,name = "rb951ui2hnd:power:usb";
gpio-export,output = <1>;
gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
};
};
};
&gpio {
nand_power {
gpio-hog;
gpios = <14 GPIO_ACTIVE_LOW>;
output-high;
};
};
&nand {
status = "okay";
nand-ecc-mode = "soft";
qca,nand-swap-dma;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "booter";
reg = <0x0000000 0x0040000>;
read-only;
};
partition@40000 {
label = "kernel";
reg = <0x0040000 0x03c0000>;
};
partition@400000 {
label = "ubi";
reg = <0x0400000 0x7c00000>;
};
};
};
&spi {
status = "okay";
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <25000000>;
partitions {
compatible = "mikrotik,routerboot-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "routerboot";
reg = <0x0 0x0>;
read-only;
};
hard_config: hard_config {
read-only;
};
bios {
size = <0x1000>;
read-only;
};
soft_config {
};
};
};
};
&eth0 {
phy-handle = <&swphy4>;
/delete-node/ gmac-config;
};
&eth1 {
compatible = "qca,ar9340-eth", "syscon";
};
&wmac {
qca,led-pin = /bits/ 8 <11>;
};
&usb {
status = "okay";
};
&usb_phy {
status = "okay";
};

9
target/linux/ath79/image/mikrotik.mk
View file

@ -48,6 +48,15 @@ define Device/mikrotik_routerboard-922uags-5hpacd
endef
TARGET_DEVICES += mikrotik_routerboard-922uags-5hpacd
define Device/mikrotik_routerboard-951ui-2hnd
$(Device/mikrotik_nand)
SOC := ar9344
DEVICE_MODEL := RouterBOARD 951Ui-2HnD
DEVICE_PACKAGES += kmod-usb-ohci kmod-usb2
SUPPORTED_DEVICES += rb-951ui-2hnd
endef
TARGET_DEVICES += mikrotik_routerboard-951ui-2hnd
define Device/mikrotik_routerboard-951ui-2nd
$(Device/mikrotik_nor)
SOC := qca9531

1
target/linux/ath79/mikrotik/base-files/etc/board.d/01_leds
View file

@ -16,6 +16,7 @@ mikrotik,routerboard-lhg-5nd)
ucidef_set_led_rssi "rssimediumhigh" "rssimediumhigh" "green:rssimediumhigh" "wlan0" "60" "100"
ucidef_set_led_rssi "rssihigh" "rssihigh" "green:rssihigh" "wlan0" "80" "100"
;;
mikrotik,routerboard-951ui-2hnd|\
mikrotik,routerboard-951ui-2nd|\
mikrotik,routerboard-952ui-5ac2nd)
ucidef_set_led_netdev "port1" "port1" "green:port1" "eth1"

1
target/linux/ath79/mikrotik/base-files/etc/board.d/02_network
View file

@ -25,6 +25,7 @@ ath79_setup_interfaces()
mikrotik,routerboard-wapr-2nd)
ucidef_set_interface_lan "eth0"
;;
mikrotik,routerboard-951ui-2hnd|\
mikrotik,routerboard-951ui-2nd|\
mikrotik,routerboard-952ui-5ac2nd)
ucidef_set_interface_wan "eth1"

3
target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
View file

@ -46,6 +46,9 @@ case "$FIRMWARE" in
mikrotik,routerboard-962uigs-5hact2hnt)
caldata_mikrotik_ath9k 0x1000 0x440 $(macaddr_add "$mac_base" 7)
;;
mikrotik,routerboard-951ui-2hnd)
caldata_mikrotik_ath9k 0x1000 0x440 $(macaddr_add "$mac_base" +11)
;;
*)
caldata_die "board $board is not supported yet"
;;

1
target/linux/ath79/mikrotik/base-files/lib/upgrade/platform.sh
View file

@ -33,6 +33,7 @@ platform_do_upgrade() {
mikrotik,routerboard-912uag-2hpnd|\
mikrotik,routerboard-921gs-5hpacd-15s|\
mikrotik,routerboard-922uags-5hpacd|\
mikrotik,routerboard-951ui-2hnd|\
mikrotik,routerboard-sxt-5nd-r2)
platform_do_upgrade_mikrotik_nand "$1"
;;