Merge branch 'openwrt:master' into master
This commit is contained in:
GitHub
commit
a8a04fa1df
988 changed files with 88094 additions and 10663 deletions
63
.github/workflows/formal.yml
vendored
63
.github/workflows/formal.yml
vendored
|
|
@ -9,65 +9,4 @@ permissions:
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
name: Test Formalities
|
name: Test Formalities
|
||||||
runs-on: ubuntu-latest
|
uses: openwrt/actions-shared-workflows/.github/workflows/formal.yml@main
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
ref: ${{ github.event.pull_request.head.sha }}
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Determine branch name
|
|
||||||
run: |
|
|
||||||
BRANCH="${GITHUB_BASE_REF#refs/heads/}"
|
|
||||||
echo "Building for $BRANCH"
|
|
||||||
echo "BRANCH=$BRANCH" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Test formalities
|
|
||||||
run: |
|
|
||||||
source .github/workflows/scripts/ci_helpers.sh
|
|
||||||
|
|
||||||
RET=0
|
|
||||||
for commit in $(git rev-list HEAD ^origin/$BRANCH); do
|
|
||||||
info "=== Checking commit '$commit'"
|
|
||||||
if git show --format='%P' -s $commit | grep -qF ' '; then
|
|
||||||
err "Pull request should not include merge commits"
|
|
||||||
RET=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
author="$(git show -s --format=%aN $commit)"
|
|
||||||
if echo $author | grep -q '\S\+\s\+\S\+'; then
|
|
||||||
success "Author name ($author) seems ok"
|
|
||||||
else
|
|
||||||
err "Author name ($author) need to be your real name 'firstname lastname'"
|
|
||||||
RET=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
subject="$(git show -s --format=%s $commit)"
|
|
||||||
if echo "$subject" | grep -q -e '^[0-9A-Za-z,+/_\.-]\+: ' -e '^Revert '; then
|
|
||||||
success "Commit subject line seems ok ($subject)"
|
|
||||||
else
|
|
||||||
err "Commit subject line MUST start with '<area>: ' ($subject)"
|
|
||||||
RET=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
body="$(git show -s --format=%b $commit)"
|
|
||||||
sob="$(git show -s --format='Signed-off-by: %aN <%aE>' $commit)"
|
|
||||||
if echo "$body" | grep -qF "$sob"; then
|
|
||||||
success "Signed-off-by match author"
|
|
||||||
else
|
|
||||||
err "Signed-off-by is missing or doesn't match author (should be '$sob')"
|
|
||||||
RET=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if echo "$body" | grep -v "Signed-off-by:"; then
|
|
||||||
success "A commit message exists"
|
|
||||||
else
|
|
||||||
err "Missing commit message. Please describe your changes"
|
|
||||||
RET=1
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
exit $RET
|
|
||||||
|
|
|
||||||
|
|
@ -293,6 +293,8 @@ menu "Global build settings"
|
||||||
bool "Regular"
|
bool "Regular"
|
||||||
config PKG_CC_STACKPROTECTOR_STRONG
|
config PKG_CC_STACKPROTECTOR_STRONG
|
||||||
bool "Strong"
|
bool "Strong"
|
||||||
|
config PKG_CC_STACKPROTECTOR_ALL
|
||||||
|
bool "All"
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
choice
|
choice
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,11 @@ ifdef CONFIG_PKG_CC_STACKPROTECTOR_STRONG
|
||||||
TARGET_CFLAGS += -fstack-protector-strong
|
TARGET_CFLAGS += -fstack-protector-strong
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
ifdef CONFIG_PKG_CC_STACKPROTECTOR_ALL
|
||||||
|
ifeq ($(strip $(PKG_SSP)),1)
|
||||||
|
TARGET_CFLAGS += -fstack-protector-all
|
||||||
|
endif
|
||||||
|
endif
|
||||||
ifdef CONFIG_PKG_FORTIFY_SOURCE_1
|
ifdef CONFIG_PKG_FORTIFY_SOURCE_1
|
||||||
ifeq ($(strip $(PKG_FORTIFY_SOURCE)),1)
|
ifeq ($(strip $(PKG_FORTIFY_SOURCE)),1)
|
||||||
TARGET_CFLAGS += -D_FORTIFY_SOURCE=1
|
TARGET_CFLAGS += -D_FORTIFY_SOURCE=1
|
||||||
|
|
|
||||||
|
|
@ -151,17 +151,13 @@ endif
|
||||||
|
|
||||||
# Disable noisy checks by default as in upstream
|
# Disable noisy checks by default as in upstream
|
||||||
DTC_WARN_FLAGS := \
|
DTC_WARN_FLAGS := \
|
||||||
|
-Wno-interrupt_provider \
|
||||||
|
-Wno-unique_unit_address \
|
||||||
-Wno-unit_address_vs_reg \
|
-Wno-unit_address_vs_reg \
|
||||||
-Wno-simple_bus_reg \
|
|
||||||
-Wno-unit_address_format \
|
|
||||||
-Wno-pci_bridge \
|
|
||||||
-Wno-pci_device_bus_num \
|
|
||||||
-Wno-pci_device_reg \
|
|
||||||
-Wno-avoid_unnecessary_addr_size \
|
-Wno-avoid_unnecessary_addr_size \
|
||||||
-Wno-alias_paths \
|
-Wno-alias_paths \
|
||||||
-Wno-graph_child_address \
|
-Wno-graph_child_address \
|
||||||
-Wno-graph_port \
|
-Wno-simple_bus_reg
|
||||||
-Wno-unique_unit_address
|
|
||||||
|
|
||||||
DTC_FLAGS += $(DTC_WARN_FLAGS)
|
DTC_FLAGS += $(DTC_WARN_FLAGS)
|
||||||
DTCO_FLAGS += $(DTC_WARN_FLAGS)
|
DTCO_FLAGS += $(DTC_WARN_FLAGS)
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
LINUX_VERSION-5.15 = .145
|
LINUX_VERSION-5.15 = .147
|
||||||
LINUX_KERNEL_HASH-5.15.145 = b2a49d87605f3a9491581150315e22337c1afb599efc1e2737481be3a2d6d620
|
LINUX_KERNEL_HASH-5.15.147 = 56c1e65625d201db431efda7a3816e7b424071e7cb0245b2ba594d15b1fdfcd4
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
LINUX_VERSION-6.1 = .69
|
LINUX_VERSION-6.1 = .74
|
||||||
LINUX_KERNEL_HASH-6.1.69 = 7e3d2694d18ce502068cc88a430da809abbd17d0773268524ebece442612b541
|
LINUX_KERNEL_HASH-6.1.74 = b7fbd1d79faed2ce3570ef79dc1223e4e19c868b86326b14a435db56ebbb2022
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@ ifdef CONFIG_COLLECT_KERNEL_DEBUG
|
||||||
mkdir -p $(KERNEL_BUILD_DIR)/debug/modules
|
mkdir -p $(KERNEL_BUILD_DIR)/debug/modules
|
||||||
$(CP) $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/debug/
|
$(CP) $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/debug/
|
||||||
-$(CP) \
|
-$(CP) \
|
||||||
$(STAGING_DIR_ROOT)/lib/modules/$(LINUX_VERSION)/* \
|
$(STAGING_DIR_ROOT)/lib/modules/$(LINUX_VERSION)/*.ko \
|
||||||
$(KERNEL_BUILD_DIR)/debug/modules/
|
$(KERNEL_BUILD_DIR)/debug/modules/
|
||||||
$(FIND) $(KERNEL_BUILD_DIR)/debug -type f | $(XARGS) $(KERNEL_CROSS)strip --only-keep-debug
|
$(FIND) $(KERNEL_BUILD_DIR)/debug -type f | $(XARGS) $(KERNEL_CROSS)strip --only-keep-debug
|
||||||
$(TAR) c -C $(KERNEL_BUILD_DIR) debug \
|
$(TAR) c -C $(KERNEL_BUILD_DIR) debug \
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ define Package/Default
|
||||||
KCONFIG:=
|
KCONFIG:=
|
||||||
BUILDONLY:=
|
BUILDONLY:=
|
||||||
HIDDEN:=
|
HIDDEN:=
|
||||||
URL:=
|
URL:=$(PKG_URL)
|
||||||
VARIANT:=
|
VARIANT:=
|
||||||
DEFAULT_VARIANT:=
|
DEFAULT_VARIANT:=
|
||||||
USERID:=
|
USERID:=
|
||||||
|
|
|
||||||
|
|
@ -37,14 +37,14 @@ $(if $(USERID),Require-User: $(USERID)
|
||||||
$(if $(LICENSE),License: $(LICENSE)
|
$(if $(LICENSE),License: $(LICENSE)
|
||||||
)$(if $(LICENSE_FILES),LicenseFiles: $(LICENSE_FILES)
|
)$(if $(LICENSE_FILES),LicenseFiles: $(LICENSE_FILES)
|
||||||
)$(if $(PKG_CPE_ID),CPE-ID: $(PKG_CPE_ID)
|
)$(if $(PKG_CPE_ID),CPE-ID: $(PKG_CPE_ID)
|
||||||
|
)$(if $(URL),URL: $(URL)
|
||||||
)$(if $(ABI_VERSION),ABI-Version: $(ABI_VERSION)
|
)$(if $(ABI_VERSION),ABI-Version: $(ABI_VERSION)
|
||||||
)Type: $(if $(Package/$(1)/targets),$(Package/$(1)/targets),$(if $(PKG_TARGETS),$(PKG_TARGETS),ipkg))
|
)Type: $(if $(Package/$(1)/targets),$(Package/$(1)/targets),$(if $(PKG_TARGETS),$(PKG_TARGETS),ipkg))
|
||||||
$(if $(KCONFIG),Kernel-Config: $(KCONFIG)
|
$(if $(KCONFIG),Kernel-Config: $(KCONFIG)
|
||||||
)$(if $(BUILDONLY),Build-Only: $(BUILDONLY)
|
)$(if $(BUILDONLY),Build-Only: $(BUILDONLY)
|
||||||
)$(if $(HIDDEN),Hidden: $(HIDDEN)
|
)$(if $(HIDDEN),Hidden: $(HIDDEN)
|
||||||
)Description: $(if $(Package/$(1)/description),$(Package/$(1)/description),$(TITLE))
|
)Description: $(if $(Package/$(1)/description),$(Package/$(1)/description),$(TITLE))
|
||||||
$(if $(URL),$(URL)
|
$(MAINTAINER)
|
||||||
)$(MAINTAINER)
|
|
||||||
@@
|
@@
|
||||||
$(if $(Package/$(1)/config),Config:
|
$(if $(Package/$(1)/config),Config:
|
||||||
$(Package/$(1)/config)
|
$(Package/$(1)/config)
|
||||||
|
|
|
||||||
|
|
@ -185,6 +185,7 @@ $$(call addfield,Depends,$$(Package/$(1)/DEPENDS)
|
||||||
)$$(call addfield,Section,$(SECTION)
|
)$$(call addfield,Section,$(SECTION)
|
||||||
)$$(call addfield,Require-User,$(USERID)
|
)$$(call addfield,Require-User,$(USERID)
|
||||||
)$$(call addfield,SourceDateEpoch,$(PKG_SOURCE_DATE_EPOCH)
|
)$$(call addfield,SourceDateEpoch,$(PKG_SOURCE_DATE_EPOCH)
|
||||||
|
)$$(call addfield,URL,$(URL)
|
||||||
)$$(if $$(ABIV_$(1)),ABIVersion: $$(ABIV_$(1))
|
)$$(if $$(ABIV_$(1)),ABIVersion: $$(ABIV_$(1))
|
||||||
)$(if $(PKG_CPE_ID),CPE-ID: $(PKG_CPE_ID)
|
)$(if $(PKG_CPE_ID),CPE-ID: $(PKG_CPE_ID)
|
||||||
)$(if $(filter hold,$(PKG_FLAGS)),Status: unknown hold not-installed
|
)$(if $(filter hold,$(PKG_FLAGS)),Status: unknown hold not-installed
|
||||||
|
|
|
||||||
|
|
@ -212,7 +212,7 @@ prereq:: prepare-tmpinfo .config
|
||||||
check: .config FORCE
|
check: .config FORCE
|
||||||
@+$(NO_TRACE_MAKE) -r -s $@ QUIET= V=s
|
@+$(NO_TRACE_MAKE) -r -s $@ QUIET= V=s
|
||||||
|
|
||||||
val.%: FORCE
|
val.% var.%: FORCE
|
||||||
@+$(NO_TRACE_MAKE) -r -s $@ QUIET= V=s
|
@+$(NO_TRACE_MAKE) -r -s $@ QUIET= V=s
|
||||||
|
|
||||||
WARN_PARALLEL_ERROR = $(if $(BUILD_LOG),,$(and $(filter -j,$(MAKEFLAGS)),$(findstring s,$(OPENWRT_VERBOSE))))
|
WARN_PARALLEL_ERROR = $(if $(BUILD_LOG),,$(and $(filter -j,$(MAKEFLAGS)),$(findstring s,$(OPENWRT_VERBOSE))))
|
||||||
|
|
|
||||||
|
|
@ -30,12 +30,18 @@ ifeq ($(IS_TTY),1)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
define ERROR_MESSAGE
|
define ERROR_MESSAGE
|
||||||
printf "$(_R)%s$(_N)\n" "$(1)" >&8
|
{ \
|
||||||
|
printf "$(_R)%s$(_N)\n" "$(1)" >&9 || \
|
||||||
|
printf "$(_R)%s$(_N)\n" "$(1)"; \
|
||||||
|
} >&2 2>/dev/null
|
||||||
endef
|
endef
|
||||||
|
|
||||||
ifeq ($(findstring s,$(OPENWRT_VERBOSE)),)
|
ifeq ($(findstring s,$(OPENWRT_VERBOSE)),)
|
||||||
define MESSAGE
|
define MESSAGE
|
||||||
printf "$(_Y)%s$(_N)\n" "$(1)" >&8
|
{ \
|
||||||
|
printf "$(_Y)%s$(_N)\n" "$(1)" >&8 || \
|
||||||
|
printf "$(_Y)%s$(_N)\n" "$(1)"; \
|
||||||
|
} 2>/dev/null
|
||||||
endef
|
endef
|
||||||
|
|
||||||
ifeq ($(QUIET),1)
|
ifeq ($(QUIET),1)
|
||||||
|
|
@ -44,9 +50,12 @@ ifeq ($(findstring s,$(OPENWRT_VERBOSE)),)
|
||||||
else
|
else
|
||||||
_DIR:=
|
_DIR:=
|
||||||
endif
|
endif
|
||||||
_NULL:=$(if $(MAKECMDGOALS),$(shell \
|
_MESSAGE:=$(if $(MAKECMDGOALS),$(shell \
|
||||||
$(call MESSAGE, make[$(MAKELEVEL)]$(if $(_DIR), -C $(_DIR)) $(MAKECMDGOALS)); \
|
$(call MESSAGE, make[$(MAKELEVEL)]$(if $(_DIR), -C $(_DIR)) $(MAKECMDGOALS)); \
|
||||||
))
|
))
|
||||||
|
ifneq ($(strip $(_MESSAGE)),)
|
||||||
|
$(info $(_MESSAGE))
|
||||||
|
endif
|
||||||
SUBMAKE=$(MAKE)
|
SUBMAKE=$(MAKE)
|
||||||
else
|
else
|
||||||
SILENT:=>/dev/null $(if $(findstring w,$(OPENWRT_VERBOSE)),,2>&1)
|
SILENT:=>/dev/null $(if $(findstring w,$(OPENWRT_VERBOSE)),,2>&1)
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ prepend() {
|
||||||
local value="$2"
|
local value="$2"
|
||||||
local sep="${3:- }"
|
local sep="${3:- }"
|
||||||
|
|
||||||
eval "export ${NO_EXPORT:+-n} -- \"$var=\${$value:+\${$value}\$sep}\$var\""
|
eval "export ${NO_EXPORT:+-n} -- \"$var=\$value\${$var:+\${sep}\${$var}}\""
|
||||||
}
|
}
|
||||||
|
|
||||||
list_contains() {
|
list_contains() {
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,27 @@ missing_lines() {
|
||||||
IFS="$oIFS"
|
IFS="$oIFS"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Rootfs mount options can be passed by declaring in the kernel
|
||||||
|
# cmdline as much options as needed prefixed with "rootfs_mount_options."
|
||||||
|
#
|
||||||
|
# Example:
|
||||||
|
# rootfs_mount_options.compress_algorithm=zstd rootfs_mount_options.noinline_data
|
||||||
|
#
|
||||||
|
compose_rootfs_mount_options() {
|
||||||
|
local mount_options
|
||||||
|
local cmdlinevar
|
||||||
|
|
||||||
|
for cmdlinevar in $(cat /proc/cmdline); do
|
||||||
|
if [ "$cmdlinevar" != "${cmdlinevar#rootfs_mount_options\.}" ]; then
|
||||||
|
append mount_options "${cmdlinevar#rootfs_mount_options\.}"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
echo $mount_options
|
||||||
|
}
|
||||||
|
|
||||||
do_mount_root() {
|
do_mount_root() {
|
||||||
mount_root
|
mount_root start "$(compose_rootfs_mount_options)"
|
||||||
boot_run_hook preinit_mount_root
|
boot_run_hook preinit_mount_root
|
||||||
[ -f /sysupgrade.tgz -o -f /tmp/sysupgrade.tar ] && {
|
[ -f /sysupgrade.tgz -o -f /tmp/sysupgrade.tar ] && {
|
||||||
echo "- config restore -"
|
echo "- config restore -"
|
||||||
|
|
|
||||||
|
|
@ -7,10 +7,10 @@
|
||||||
|
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_VERSION:=2.9
|
PKG_VERSION:=2.10
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_HASH:=76a66a1de0c01aeb83dfc7b72b51173fe62c6e51d6fca17cc562393117bed08b
|
PKG_HASH:=88215a62291b9ba87da8e50b077741103cdc08fb6c9e1ebd34dfaace746d3201
|
||||||
|
|
||||||
PKG_MAINTAINER:=Tobias Maedel <openwrt@tbspace.de>
|
PKG_MAINTAINER:=Tobias Maedel <openwrt@tbspace.de>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_VERSION:=2023.04
|
PKG_VERSION:=2024.01
|
||||||
PKG_HASH:=e31cac91545ff41b71cec5d8c22afd695645cd6e2a442ccdacacd60534069341
|
PKG_HASH:=b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3
|
||||||
PKG_RELEASE:=$(AUTORELEASE)
|
PKG_RELEASE:=$(AUTORELEASE)
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/u-boot.mk
|
include $(INCLUDE_DIR)/u-boot.mk
|
||||||
|
|
|
||||||
|
|
@ -1,199 +0,0 @@
|
||||||
From 854dc4b790ce1291326d52b8405ebe771bff2edd Mon Sep 17 00:00:00 2001
|
|
||||||
From: Linus Walleij <linus.walleij@linaro.org>
|
|
||||||
Date: Wed, 8 Mar 2023 22:42:31 +0100
|
|
||||||
Subject: [PATCH 1/5] nand: brcmnand: add iproc support
|
|
||||||
|
|
||||||
Add support for the iproc Broadcom NAND controller,
|
|
||||||
used in Northstar SoCs for example. Based on the Linux
|
|
||||||
driver.
|
|
||||||
|
|
||||||
Cc: Philippe Reynes <philippe.reynes@softathome.com>
|
|
||||||
Cc: Dario Binacchi <dario.binacchi@amarulasolutions.com>
|
|
||||||
Reviewed-by: Michael Trimarchi <michael@amarulasolutions.com>
|
|
||||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|
||||||
Acked-by: William Zhang <william.zhang@broadcom.com>
|
|
||||||
Link: https://lore.kernel.org/all/20230308214231.378013-1-linus.walleij@linaro.org/
|
|
||||||
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
|
|
||||||
---
|
|
||||||
drivers/mtd/nand/raw/Kconfig | 7 +
|
|
||||||
drivers/mtd/nand/raw/brcmnand/Makefile | 1 +
|
|
||||||
drivers/mtd/nand/raw/brcmnand/iproc_nand.c | 148 +++++++++++++++++++++
|
|
||||||
3 files changed, 156 insertions(+)
|
|
||||||
create mode 100644 drivers/mtd/nand/raw/brcmnand/iproc_nand.c
|
|
||||||
|
|
||||||
--- a/drivers/mtd/nand/raw/Kconfig
|
|
||||||
+++ b/drivers/mtd/nand/raw/Kconfig
|
|
||||||
@@ -156,6 +156,13 @@ config NAND_BRCMNAND_63158
|
|
||||||
help
|
|
||||||
Enable support for broadcom nand driver on bcm63158.
|
|
||||||
|
|
||||||
+config NAND_BRCMNAND_IPROC
|
|
||||||
+ bool "Support Broadcom NAND controller on the iproc family"
|
|
||||||
+ depends on NAND_BRCMNAND
|
|
||||||
+ help
|
|
||||||
+ Enable support for broadcom nand driver on the Broadcom
|
|
||||||
+ iproc family such as Northstar (BCM5301x, BCM4708...)
|
|
||||||
+
|
|
||||||
config NAND_DAVINCI
|
|
||||||
bool "Support TI Davinci NAND controller"
|
|
||||||
select SYS_NAND_SELF_INIT if TARGET_DA850EVM
|
|
||||||
--- a/drivers/mtd/nand/raw/brcmnand/Makefile
|
|
||||||
+++ b/drivers/mtd/nand/raw/brcmnand/Makefile
|
|
||||||
@@ -6,5 +6,6 @@ obj-$(CONFIG_NAND_BRCMNAND_6753) += bcm6
|
|
||||||
obj-$(CONFIG_NAND_BRCMNAND_68360) += bcm68360_nand.o
|
|
||||||
obj-$(CONFIG_NAND_BRCMNAND_6838) += bcm6838_nand.o
|
|
||||||
obj-$(CONFIG_NAND_BRCMNAND_6858) += bcm6858_nand.o
|
|
||||||
+obj-$(CONFIG_NAND_BRCMNAND_IPROC) += iproc_nand.o
|
|
||||||
obj-$(CONFIG_NAND_BRCMNAND) += brcmnand.o
|
|
||||||
obj-$(CONFIG_NAND_BRCMNAND) += brcmnand_compat.o
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/drivers/mtd/nand/raw/brcmnand/iproc_nand.c
|
|
||||||
@@ -0,0 +1,148 @@
|
|
||||||
+// SPDX-License-Identifier: GPL-2.0
|
|
||||||
+/*
|
|
||||||
+ * Code borrowed from the Linux driver
|
|
||||||
+ * Copyright (C) 2015 Broadcom Corporation
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#include <common.h>
|
|
||||||
+#include <asm/io.h>
|
|
||||||
+#include <memalign.h>
|
|
||||||
+#include <nand.h>
|
|
||||||
+#include <linux/bitops.h>
|
|
||||||
+#include <linux/err.h>
|
|
||||||
+#include <linux/errno.h>
|
|
||||||
+#include <linux/io.h>
|
|
||||||
+#include <linux/ioport.h>
|
|
||||||
+#include <dm.h>
|
|
||||||
+
|
|
||||||
+#include "brcmnand.h"
|
|
||||||
+
|
|
||||||
+struct iproc_nand_soc {
|
|
||||||
+ struct brcmnand_soc soc;
|
|
||||||
+ void __iomem *idm_base;
|
|
||||||
+ void __iomem *ext_base;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+#define IPROC_NAND_CTLR_READY_OFFSET 0x10
|
|
||||||
+#define IPROC_NAND_CTLR_READY BIT(0)
|
|
||||||
+
|
|
||||||
+#define IPROC_NAND_IO_CTRL_OFFSET 0x00
|
|
||||||
+#define IPROC_NAND_APB_LE_MODE BIT(24)
|
|
||||||
+#define IPROC_NAND_INT_CTRL_READ_ENABLE BIT(6)
|
|
||||||
+
|
|
||||||
+static bool iproc_nand_intc_ack(struct brcmnand_soc *soc)
|
|
||||||
+{
|
|
||||||
+ struct iproc_nand_soc *priv =
|
|
||||||
+ container_of(soc, struct iproc_nand_soc, soc);
|
|
||||||
+ void __iomem *mmio = priv->ext_base + IPROC_NAND_CTLR_READY_OFFSET;
|
|
||||||
+ u32 val = brcmnand_readl(mmio);
|
|
||||||
+
|
|
||||||
+ if (val & IPROC_NAND_CTLR_READY) {
|
|
||||||
+ brcmnand_writel(IPROC_NAND_CTLR_READY, mmio);
|
|
||||||
+ return true;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return false;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void iproc_nand_intc_set(struct brcmnand_soc *soc, bool en)
|
|
||||||
+{
|
|
||||||
+ struct iproc_nand_soc *priv =
|
|
||||||
+ container_of(soc, struct iproc_nand_soc, soc);
|
|
||||||
+ void __iomem *mmio = priv->idm_base + IPROC_NAND_IO_CTRL_OFFSET;
|
|
||||||
+ u32 val = brcmnand_readl(mmio);
|
|
||||||
+
|
|
||||||
+ if (en)
|
|
||||||
+ val |= IPROC_NAND_INT_CTRL_READ_ENABLE;
|
|
||||||
+ else
|
|
||||||
+ val &= ~IPROC_NAND_INT_CTRL_READ_ENABLE;
|
|
||||||
+
|
|
||||||
+ brcmnand_writel(val, mmio);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void iproc_nand_apb_access(struct brcmnand_soc *soc, bool prepare,
|
|
||||||
+ bool is_param)
|
|
||||||
+{
|
|
||||||
+ struct iproc_nand_soc *priv =
|
|
||||||
+ container_of(soc, struct iproc_nand_soc, soc);
|
|
||||||
+ void __iomem *mmio = priv->idm_base + IPROC_NAND_IO_CTRL_OFFSET;
|
|
||||||
+ u32 val;
|
|
||||||
+
|
|
||||||
+ val = brcmnand_readl(mmio);
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * In the case of BE or when dealing with NAND data, always configure
|
|
||||||
+ * the APB bus to LE mode before accessing the FIFO and back to BE mode
|
|
||||||
+ * after the access is done
|
|
||||||
+ */
|
|
||||||
+ if (IS_ENABLED(CONFIG_SYS_BIG_ENDIAN) || !is_param) {
|
|
||||||
+ if (prepare)
|
|
||||||
+ val |= IPROC_NAND_APB_LE_MODE;
|
|
||||||
+ else
|
|
||||||
+ val &= ~IPROC_NAND_APB_LE_MODE;
|
|
||||||
+ } else { /* when in LE accessing the parameter page, keep APB in BE */
|
|
||||||
+ val &= ~IPROC_NAND_APB_LE_MODE;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ brcmnand_writel(val, mmio);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int iproc_nand_probe(struct udevice *dev)
|
|
||||||
+{
|
|
||||||
+ struct udevice *pdev = dev;
|
|
||||||
+ struct iproc_nand_soc *priv = dev_get_priv(dev);
|
|
||||||
+ struct brcmnand_soc *soc;
|
|
||||||
+ struct resource res;
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
+ soc = &priv->soc;
|
|
||||||
+
|
|
||||||
+ ret = dev_read_resource_byname(pdev, "iproc-idm", &res);
|
|
||||||
+ if (ret)
|
|
||||||
+ return ret;
|
|
||||||
+
|
|
||||||
+ priv->idm_base = devm_ioremap(dev, res.start, resource_size(&res));
|
|
||||||
+ if (IS_ERR(priv->idm_base))
|
|
||||||
+ return PTR_ERR(priv->idm_base);
|
|
||||||
+
|
|
||||||
+ ret = dev_read_resource_byname(pdev, "iproc-ext", &res);
|
|
||||||
+ if (ret)
|
|
||||||
+ return ret;
|
|
||||||
+
|
|
||||||
+ priv->ext_base = devm_ioremap(dev, res.start, resource_size(&res));
|
|
||||||
+ if (IS_ERR(priv->ext_base))
|
|
||||||
+ return PTR_ERR(priv->ext_base);
|
|
||||||
+
|
|
||||||
+ soc->ctlrdy_ack = iproc_nand_intc_ack;
|
|
||||||
+ soc->ctlrdy_set_enabled = iproc_nand_intc_set;
|
|
||||||
+ soc->prepare_data_bus = iproc_nand_apb_access;
|
|
||||||
+
|
|
||||||
+ return brcmnand_probe(pdev, soc);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static const struct udevice_id iproc_nand_dt_ids[] = {
|
|
||||||
+ {
|
|
||||||
+ .compatible = "brcm,nand-iproc",
|
|
||||||
+ },
|
|
||||||
+ { /* sentinel */ }
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+U_BOOT_DRIVER(iproc_nand) = {
|
|
||||||
+ .name = "iproc-nand",
|
|
||||||
+ .id = UCLASS_MTD,
|
|
||||||
+ .of_match = iproc_nand_dt_ids,
|
|
||||||
+ .probe = iproc_nand_probe,
|
|
||||||
+ .priv_auto = sizeof(struct iproc_nand_soc),
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+void board_nand_init(void)
|
|
||||||
+{
|
|
||||||
+ struct udevice *dev;
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
+ ret = uclass_get_device_by_driver(UCLASS_MTD,
|
|
||||||
+ DM_DRIVER_GET(iproc_nand), &dev);
|
|
||||||
+ if (ret && ret != -ENODEV)
|
|
||||||
+ pr_err("Failed to initialize %s. (error %d)\n", dev->name,
|
|
||||||
+ ret);
|
|
||||||
+}
|
|
||||||
|
|
@ -1,80 +0,0 @@
|
||||||
From d75483f8892f3a0dfb8f5aa4147e72c02c8b034c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Linus Walleij <linus.walleij@linaro.org>
|
|
||||||
Date: Fri, 7 Apr 2023 15:40:05 +0200
|
|
||||||
Subject: [PATCH 2/5] mtd: rawnand: nand_base: Handle algorithm selection
|
|
||||||
|
|
||||||
For BRCMNAND with 1-bit BCH ECC (BCH-1) such as used on the
|
|
||||||
D-Link DIR-885L and DIR-890L routers, we need to explicitly
|
|
||||||
select the ECC like this in the device tree:
|
|
||||||
|
|
||||||
nand-ecc-algo = "bch";
|
|
||||||
nand-ecc-strength = <1>;
|
|
||||||
nand-ecc-step-size = <512>;
|
|
||||||
|
|
||||||
This is handled by the Linux kernel but U-Boot core does
|
|
||||||
not respect this. Fix it up by parsing the algorithm and
|
|
||||||
preserve the behaviour using this property to select
|
|
||||||
software BCH as far as possible.
|
|
||||||
|
|
||||||
Reviewed-by: Michael Trimarchi <michael@amarulasolutions.com>
|
|
||||||
Acked-by: William Zhang <william.zhang@broadcom.com>
|
|
||||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|
||||||
Tested-by: Tom Rini <trini@konsulko.com> [am335x_evm]
|
|
||||||
Link: https://lore.kernel.org/all/20230407134008.1939717-3-linus.walleij@linaro.org/
|
|
||||||
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
|
|
||||||
---
|
|
||||||
drivers/mtd/nand/raw/nand_base.c | 29 +++++++++++++++++++++++++----
|
|
||||||
1 file changed, 25 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/mtd/nand/raw/nand_base.c
|
|
||||||
+++ b/drivers/mtd/nand/raw/nand_base.c
|
|
||||||
@@ -4487,6 +4487,7 @@ EXPORT_SYMBOL(nand_detect);
|
|
||||||
static int nand_dt_init(struct mtd_info *mtd, struct nand_chip *chip, ofnode node)
|
|
||||||
{
|
|
||||||
int ret, ecc_mode = -1, ecc_strength, ecc_step;
|
|
||||||
+ int ecc_algo = NAND_ECC_UNKNOWN;
|
|
||||||
const char *str;
|
|
||||||
|
|
||||||
ret = ofnode_read_s32_default(node, "nand-bus-width", -1);
|
|
||||||
@@ -4512,10 +4513,22 @@ static int nand_dt_init(struct mtd_info
|
|
||||||
ecc_mode = NAND_ECC_SOFT_BCH;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (ecc_mode == NAND_ECC_SOFT) {
|
|
||||||
- str = ofnode_read_string(node, "nand-ecc-algo");
|
|
||||||
- if (str && !strcmp(str, "bch"))
|
|
||||||
- ecc_mode = NAND_ECC_SOFT_BCH;
|
|
||||||
+ str = ofnode_read_string(node, "nand-ecc-algo");
|
|
||||||
+ if (str) {
|
|
||||||
+ /*
|
|
||||||
+ * If we are in NAND_ECC_SOFT mode, just alter the
|
|
||||||
+ * soft mode to BCH here. No change of algorithm.
|
|
||||||
+ */
|
|
||||||
+ if (ecc_mode == NAND_ECC_SOFT) {
|
|
||||||
+ if (!strcmp(str, "bch"))
|
|
||||||
+ ecc_mode = NAND_ECC_SOFT_BCH;
|
|
||||||
+ } else {
|
|
||||||
+ if (!strcmp(str, "bch")) {
|
|
||||||
+ ecc_algo = NAND_ECC_BCH;
|
|
||||||
+ } else if (!strcmp(str, "hamming")) {
|
|
||||||
+ ecc_algo = NAND_ECC_HAMMING;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
ecc_strength = ofnode_read_s32_default(node,
|
|
||||||
@@ -4529,6 +4542,14 @@ static int nand_dt_init(struct mtd_info
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ /*
|
|
||||||
+ * Chip drivers may have assigned default algorithms here,
|
|
||||||
+ * onlt override it if we have found something explicitly
|
|
||||||
+ * specified in the device tree.
|
|
||||||
+ */
|
|
||||||
+ if (ecc_algo != NAND_ECC_UNKNOWN)
|
|
||||||
+ chip->ecc.algo = ecc_algo;
|
|
||||||
+
|
|
||||||
if (ecc_mode >= 0)
|
|
||||||
chip->ecc.mode = ecc_mode;
|
|
||||||
|
|
||||||
|
|
@ -1,659 +0,0 @@
|
||||||
From 3d6098a662b7ff5b80c4b75c54fcd1b2baf9f150 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Linus Walleij <linus.walleij@linaro.org>
|
|
||||||
Date: Mon, 24 Apr 2023 09:38:28 +0200
|
|
||||||
Subject: [PATCH 3/5] arm: dts: Import device tree for Broadcom Northstar
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
This brings in the main SoC device tree used by the
|
|
||||||
Broadcom Northstar chipset, i.e. BCM4709x and BCM5301x.
|
|
||||||
This is taken from the v6.3 Linux kernel.
|
|
||||||
|
|
||||||
Cc: Rafał Miłecki <rafal@milecki.pl>
|
|
||||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|
||||||
---
|
|
||||||
arch/arm/dts/bcm5301x.dtsi | 581 ++++++++++++++++++++++++++++
|
|
||||||
include/dt-bindings/clock/bcm-nsp.h | 51 +++
|
|
||||||
2 files changed, 632 insertions(+)
|
|
||||||
create mode 100644 arch/arm/dts/bcm5301x.dtsi
|
|
||||||
create mode 100644 include/dt-bindings/clock/bcm-nsp.h
|
|
||||||
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/arch/arm/dts/bcm5301x.dtsi
|
|
||||||
@@ -0,0 +1,581 @@
|
|
||||||
+/*
|
|
||||||
+ * Broadcom BCM470X / BCM5301X ARM platform code.
|
|
||||||
+ * Generic DTS part for all BCM53010, BCM53011, BCM53012, BCM53014, BCM53015,
|
|
||||||
+ * BCM53016, BCM53017, BCM53018, BCM4707, BCM4708 and BCM4709 SoCs
|
|
||||||
+ *
|
|
||||||
+ * Copyright 2013-2014 Hauke Mehrtens <hauke@hauke-m.de>
|
|
||||||
+ *
|
|
||||||
+ * Licensed under the GNU/GPL. See COPYING for details.
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#include <dt-bindings/clock/bcm-nsp.h>
|
|
||||||
+#include <dt-bindings/gpio/gpio.h>
|
|
||||||
+#include <dt-bindings/input/input.h>
|
|
||||||
+#include <dt-bindings/interrupt-controller/irq.h>
|
|
||||||
+#include <dt-bindings/interrupt-controller/arm-gic.h>
|
|
||||||
+
|
|
||||||
+/ {
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <1>;
|
|
||||||
+ interrupt-parent = <&gic>;
|
|
||||||
+
|
|
||||||
+ chipcommon-a-bus@18000000 {
|
|
||||||
+ compatible = "simple-bus";
|
|
||||||
+ ranges = <0x00000000 0x18000000 0x00001000>;
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <1>;
|
|
||||||
+
|
|
||||||
+ uart0: serial@300 {
|
|
||||||
+ compatible = "ns16550";
|
|
||||||
+ reg = <0x0300 0x100>;
|
|
||||||
+ interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
+ clocks = <&iprocslow>;
|
|
||||||
+ status = "disabled";
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ uart1: serial@400 {
|
|
||||||
+ compatible = "ns16550";
|
|
||||||
+ reg = <0x0400 0x100>;
|
|
||||||
+ interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
+ clocks = <&iprocslow>;
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&pinmux_uart1>;
|
|
||||||
+ status = "disabled";
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ mpcore-bus@19000000 {
|
|
||||||
+ compatible = "simple-bus";
|
|
||||||
+ ranges = <0x00000000 0x19000000 0x00023000>;
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <1>;
|
|
||||||
+
|
|
||||||
+ a9pll: arm_clk@0 {
|
|
||||||
+ #clock-cells = <0>;
|
|
||||||
+ compatible = "brcm,nsp-armpll";
|
|
||||||
+ clocks = <&osc>;
|
|
||||||
+ reg = <0x00000 0x1000>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ scu@20000 {
|
|
||||||
+ compatible = "arm,cortex-a9-scu";
|
|
||||||
+ reg = <0x20000 0x100>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ timer@20200 {
|
|
||||||
+ compatible = "arm,cortex-a9-global-timer";
|
|
||||||
+ reg = <0x20200 0x100>;
|
|
||||||
+ interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;
|
|
||||||
+ clocks = <&periph_clk>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ timer@20600 {
|
|
||||||
+ compatible = "arm,cortex-a9-twd-timer";
|
|
||||||
+ reg = <0x20600 0x20>;
|
|
||||||
+ interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
|
|
||||||
+ IRQ_TYPE_EDGE_RISING)>;
|
|
||||||
+ clocks = <&periph_clk>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ watchdog@20620 {
|
|
||||||
+ compatible = "arm,cortex-a9-twd-wdt";
|
|
||||||
+ reg = <0x20620 0x20>;
|
|
||||||
+ interrupts = <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) |
|
|
||||||
+ IRQ_TYPE_EDGE_RISING)>;
|
|
||||||
+ clocks = <&periph_clk>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ gic: interrupt-controller@21000 {
|
|
||||||
+ compatible = "arm,cortex-a9-gic";
|
|
||||||
+ #interrupt-cells = <3>;
|
|
||||||
+ #address-cells = <0>;
|
|
||||||
+ interrupt-controller;
|
|
||||||
+ reg = <0x21000 0x1000>,
|
|
||||||
+ <0x20100 0x100>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ L2: cache-controller@22000 {
|
|
||||||
+ compatible = "arm,pl310-cache";
|
|
||||||
+ reg = <0x22000 0x1000>;
|
|
||||||
+ cache-unified;
|
|
||||||
+ arm,shared-override;
|
|
||||||
+ prefetch-data = <1>;
|
|
||||||
+ prefetch-instr = <1>;
|
|
||||||
+ cache-level = <2>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ pmu {
|
|
||||||
+ compatible = "arm,cortex-a9-pmu";
|
|
||||||
+ interrupts =
|
|
||||||
+ <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ clocks {
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <1>;
|
|
||||||
+ ranges;
|
|
||||||
+
|
|
||||||
+ osc: oscillator {
|
|
||||||
+ #clock-cells = <0>;
|
|
||||||
+ compatible = "fixed-clock";
|
|
||||||
+ clock-frequency = <25000000>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ iprocmed: iprocmed {
|
|
||||||
+ #clock-cells = <0>;
|
|
||||||
+ compatible = "fixed-factor-clock";
|
|
||||||
+ clocks = <&genpll BCM_NSP_GENPLL_IPROCFAST_CLK>;
|
|
||||||
+ clock-div = <2>;
|
|
||||||
+ clock-mult = <1>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ iprocslow: iprocslow {
|
|
||||||
+ #clock-cells = <0>;
|
|
||||||
+ compatible = "fixed-factor-clock";
|
|
||||||
+ clocks = <&genpll BCM_NSP_GENPLL_IPROCFAST_CLK>;
|
|
||||||
+ clock-div = <4>;
|
|
||||||
+ clock-mult = <1>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ periph_clk: periph_clk {
|
|
||||||
+ #clock-cells = <0>;
|
|
||||||
+ compatible = "fixed-factor-clock";
|
|
||||||
+ clocks = <&a9pll>;
|
|
||||||
+ clock-div = <2>;
|
|
||||||
+ clock-mult = <1>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ axi@18000000 {
|
|
||||||
+ compatible = "brcm,bus-axi";
|
|
||||||
+ reg = <0x18000000 0x1000>;
|
|
||||||
+ ranges = <0x00000000 0x18000000 0x00100000>;
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <1>;
|
|
||||||
+
|
|
||||||
+ #interrupt-cells = <1>;
|
|
||||||
+ interrupt-map-mask = <0x000fffff 0xffff>;
|
|
||||||
+ interrupt-map =
|
|
||||||
+ /* ChipCommon */
|
|
||||||
+ <0x00000000 0 &gic GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+
|
|
||||||
+ /* Switch Register Access Block */
|
|
||||||
+ <0x00007000 0 &gic GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00007000 1 &gic GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00007000 2 &gic GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00007000 3 &gic GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00007000 4 &gic GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00007000 5 &gic GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00007000 6 &gic GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00007000 7 &gic GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00007000 8 &gic GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00007000 9 &gic GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00007000 10 &gic GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00007000 11 &gic GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00007000 12 &gic GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+
|
|
||||||
+ /* PCIe Controller 0 */
|
|
||||||
+ <0x00012000 0 &gic GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00012000 1 &gic GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00012000 2 &gic GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00012000 3 &gic GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00012000 4 &gic GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00012000 5 &gic GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+
|
|
||||||
+ /* PCIe Controller 1 */
|
|
||||||
+ <0x00013000 0 &gic GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00013000 1 &gic GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00013000 2 &gic GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00013000 3 &gic GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00013000 4 &gic GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00013000 5 &gic GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+
|
|
||||||
+ /* PCIe Controller 2 */
|
|
||||||
+ <0x00014000 0 &gic GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00014000 1 &gic GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00014000 2 &gic GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00014000 3 &gic GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00014000 4 &gic GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00014000 5 &gic GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+
|
|
||||||
+ /* USB 2.0 Controller */
|
|
||||||
+ <0x00021000 0 &gic GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+
|
|
||||||
+ /* USB 3.0 Controller */
|
|
||||||
+ <0x00023000 0 &gic GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+
|
|
||||||
+ /* Ethernet Controller 0 */
|
|
||||||
+ <0x00024000 0 &gic GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+
|
|
||||||
+ /* Ethernet Controller 1 */
|
|
||||||
+ <0x00025000 0 &gic GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+
|
|
||||||
+ /* Ethernet Controller 2 */
|
|
||||||
+ <0x00026000 0 &gic GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+
|
|
||||||
+ /* Ethernet Controller 3 */
|
|
||||||
+ <0x00027000 0 &gic GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+
|
|
||||||
+ /* NAND Controller */
|
|
||||||
+ <0x00028000 0 &gic GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00028000 1 &gic GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00028000 2 &gic GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00028000 3 &gic GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00028000 4 &gic GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00028000 5 &gic GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00028000 6 &gic GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <0x00028000 7 &gic GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
+
|
|
||||||
+ chipcommon: chipcommon@0 {
|
|
||||||
+ reg = <0x00000000 0x1000>;
|
|
||||||
+
|
|
||||||
+ gpio-controller;
|
|
||||||
+ #gpio-cells = <2>;
|
|
||||||
+ interrupt-controller;
|
|
||||||
+ #interrupt-cells = <2>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ pcie0: pcie@12000 {
|
|
||||||
+ reg = <0x00012000 0x1000>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ pcie1: pcie@13000 {
|
|
||||||
+ reg = <0x00013000 0x1000>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ pcie2: pcie@14000 {
|
|
||||||
+ reg = <0x00014000 0x1000>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ usb2: usb2@21000 {
|
|
||||||
+ reg = <0x00021000 0x1000>;
|
|
||||||
+
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <1>;
|
|
||||||
+ ranges;
|
|
||||||
+
|
|
||||||
+ interrupt-parent = <&gic>;
|
|
||||||
+
|
|
||||||
+ ehci: usb@21000 {
|
|
||||||
+ #usb-cells = <0>;
|
|
||||||
+
|
|
||||||
+ compatible = "generic-ehci";
|
|
||||||
+ reg = <0x00021000 0x1000>;
|
|
||||||
+ interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
+ phys = <&usb2_phy>;
|
|
||||||
+
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <0>;
|
|
||||||
+
|
|
||||||
+ ehci_port1: port@1 {
|
|
||||||
+ reg = <1>;
|
|
||||||
+ #trigger-source-cells = <0>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ ehci_port2: port@2 {
|
|
||||||
+ reg = <2>;
|
|
||||||
+ #trigger-source-cells = <0>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ ohci: usb@22000 {
|
|
||||||
+ #usb-cells = <0>;
|
|
||||||
+
|
|
||||||
+ compatible = "generic-ohci";
|
|
||||||
+ reg = <0x00022000 0x1000>;
|
|
||||||
+ interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
+
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <0>;
|
|
||||||
+
|
|
||||||
+ ohci_port1: port@1 {
|
|
||||||
+ reg = <1>;
|
|
||||||
+ #trigger-source-cells = <0>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ ohci_port2: port@2 {
|
|
||||||
+ reg = <2>;
|
|
||||||
+ #trigger-source-cells = <0>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ usb3: usb3@23000 {
|
|
||||||
+ reg = <0x00023000 0x1000>;
|
|
||||||
+
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <1>;
|
|
||||||
+ ranges;
|
|
||||||
+
|
|
||||||
+ interrupt-parent = <&gic>;
|
|
||||||
+
|
|
||||||
+ xhci: usb@23000 {
|
|
||||||
+ #usb-cells = <0>;
|
|
||||||
+
|
|
||||||
+ compatible = "generic-xhci";
|
|
||||||
+ reg = <0x00023000 0x1000>;
|
|
||||||
+ interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
+ phys = <&usb3_phy>;
|
|
||||||
+ phy-names = "usb";
|
|
||||||
+
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <0>;
|
|
||||||
+
|
|
||||||
+ xhci_port1: port@1 {
|
|
||||||
+ reg = <1>;
|
|
||||||
+ #trigger-source-cells = <0>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ gmac0: ethernet@24000 {
|
|
||||||
+ reg = <0x24000 0x800>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ gmac1: ethernet@25000 {
|
|
||||||
+ reg = <0x25000 0x800>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ gmac2: ethernet@26000 {
|
|
||||||
+ reg = <0x26000 0x800>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ gmac3: ethernet@27000 {
|
|
||||||
+ reg = <0x27000 0x800>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ pwm: pwm@18002000 {
|
|
||||||
+ compatible = "brcm,iproc-pwm";
|
|
||||||
+ reg = <0x18002000 0x28>;
|
|
||||||
+ clocks = <&osc>;
|
|
||||||
+ #pwm-cells = <3>;
|
|
||||||
+ status = "disabled";
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ mdio: mdio@18003000 {
|
|
||||||
+ compatible = "brcm,iproc-mdio";
|
|
||||||
+ reg = <0x18003000 0x8>;
|
|
||||||
+ #size-cells = <0>;
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ mdio-mux@18003000 {
|
|
||||||
+ compatible = "mdio-mux-mmioreg", "mdio-mux";
|
|
||||||
+ mdio-parent-bus = <&mdio>;
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <0>;
|
|
||||||
+ reg = <0x18003000 0x4>;
|
|
||||||
+ mux-mask = <0x200>;
|
|
||||||
+
|
|
||||||
+ mdio@0 {
|
|
||||||
+ reg = <0x0>;
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <0>;
|
|
||||||
+
|
|
||||||
+ usb3_phy: usb3-phy@10 {
|
|
||||||
+ compatible = "brcm,ns-ax-usb3-phy";
|
|
||||||
+ reg = <0x10>;
|
|
||||||
+ usb3-dmp-syscon = <&usb3_dmp>;
|
|
||||||
+ #phy-cells = <0>;
|
|
||||||
+ status = "disabled";
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ usb3_dmp: syscon@18105000 {
|
|
||||||
+ reg = <0x18105000 0x1000>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ uart2: serial@18008000 {
|
|
||||||
+ compatible = "ns16550a";
|
|
||||||
+ reg = <0x18008000 0x20>;
|
|
||||||
+ clocks = <&iprocslow>;
|
|
||||||
+ interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
+ reg-shift = <2>;
|
|
||||||
+ status = "disabled";
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ i2c0: i2c@18009000 {
|
|
||||||
+ compatible = "brcm,iproc-i2c";
|
|
||||||
+ reg = <0x18009000 0x50>;
|
|
||||||
+ interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <0>;
|
|
||||||
+ clock-frequency = <100000>;
|
|
||||||
+ status = "disabled";
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ dmu-bus@1800c000 {
|
|
||||||
+ compatible = "simple-bus";
|
|
||||||
+ ranges = <0 0x1800c000 0x1000>;
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <1>;
|
|
||||||
+
|
|
||||||
+ cru-bus@100 {
|
|
||||||
+ compatible = "brcm,ns-cru", "simple-mfd";
|
|
||||||
+ reg = <0x100 0x1a4>;
|
|
||||||
+ ranges;
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <1>;
|
|
||||||
+
|
|
||||||
+ lcpll0: clock-controller@100 {
|
|
||||||
+ #clock-cells = <1>;
|
|
||||||
+ compatible = "brcm,nsp-lcpll0";
|
|
||||||
+ reg = <0x100 0x14>;
|
|
||||||
+ clocks = <&osc>;
|
|
||||||
+ clock-output-names = "lcpll0", "pcie_phy",
|
|
||||||
+ "sdio", "ddr_phy";
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ genpll: clock-controller@140 {
|
|
||||||
+ #clock-cells = <1>;
|
|
||||||
+ compatible = "brcm,nsp-genpll";
|
|
||||||
+ reg = <0x140 0x24>;
|
|
||||||
+ clocks = <&osc>;
|
|
||||||
+ clock-output-names = "genpll", "phy",
|
|
||||||
+ "ethernetclk",
|
|
||||||
+ "usbclk", "iprocfast",
|
|
||||||
+ "sata1", "sata2";
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ usb2_phy: phy@164 {
|
|
||||||
+ compatible = "brcm,ns-usb2-phy";
|
|
||||||
+ reg = <0x164 0x4>;
|
|
||||||
+ brcm,syscon-clkset = <&cru_clkset>;
|
|
||||||
+ clocks = <&genpll BCM_NSP_GENPLL_USB_PHY_REF_CLK>;
|
|
||||||
+ clock-names = "phy-ref-clk";
|
|
||||||
+ #phy-cells = <0>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ cru_clkset: syscon@180 {
|
|
||||||
+ compatible = "brcm,cru-clkset", "syscon";
|
|
||||||
+ reg = <0x180 0x4>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ pinctrl: pinctrl@1c0 {
|
|
||||||
+ compatible = "brcm,bcm4708-pinmux";
|
|
||||||
+ reg = <0x1c0 0x24>;
|
|
||||||
+ reg-names = "cru_gpio_control";
|
|
||||||
+
|
|
||||||
+ spi-pins {
|
|
||||||
+ groups = "spi_grp";
|
|
||||||
+ function = "spi";
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ pinmux_i2c: i2c-pins {
|
|
||||||
+ groups = "i2c_grp";
|
|
||||||
+ function = "i2c";
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ pinmux_pwm: pwm-pins {
|
|
||||||
+ groups = "pwm0_grp", "pwm1_grp",
|
|
||||||
+ "pwm2_grp", "pwm3_grp";
|
|
||||||
+ function = "pwm";
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ pinmux_uart1: uart1-pins {
|
|
||||||
+ groups = "uart1_grp";
|
|
||||||
+ function = "uart1";
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ thermal: thermal@2c0 {
|
|
||||||
+ compatible = "brcm,ns-thermal";
|
|
||||||
+ reg = <0x2c0 0x10>;
|
|
||||||
+ #thermal-sensor-cells = <0>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ srab: ethernet-switch@18007000 {
|
|
||||||
+ compatible = "brcm,bcm53011-srab", "brcm,bcm5301x-srab";
|
|
||||||
+ reg = <0x18007000 0x1000>;
|
|
||||||
+
|
|
||||||
+ status = "disabled";
|
|
||||||
+
|
|
||||||
+ /* ports are defined in board DTS */
|
|
||||||
+ ports {
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <0>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ rng: rng@18004000 {
|
|
||||||
+ compatible = "brcm,bcm5301x-rng";
|
|
||||||
+ reg = <0x18004000 0x14>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ nand_controller: nand-controller@18028000 {
|
|
||||||
+ compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand";
|
|
||||||
+ reg = <0x18028000 0x600>, <0x1811a408 0x600>, <0x18028f00 0x20>;
|
|
||||||
+ reg-names = "nand", "iproc-idm", "iproc-ext";
|
|
||||||
+ interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
+
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <0>;
|
|
||||||
+
|
|
||||||
+ brcm,nand-has-wp;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ spi@18029200 {
|
|
||||||
+ compatible = "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi";
|
|
||||||
+ reg = <0x18029200 0x184>,
|
|
||||||
+ <0x18029000 0x124>,
|
|
||||||
+ <0x1811b408 0x004>,
|
|
||||||
+ <0x180293a0 0x01c>;
|
|
||||||
+ reg-names = "mspi", "bspi", "intr_regs", "intr_status_reg";
|
|
||||||
+ interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
+ interrupt-names = "mspi_done",
|
|
||||||
+ "mspi_halted",
|
|
||||||
+ "spi_lr_fullness_reached",
|
|
||||||
+ "spi_lr_session_aborted",
|
|
||||||
+ "spi_lr_impatient",
|
|
||||||
+ "spi_lr_session_done",
|
|
||||||
+ "spi_lr_overread";
|
|
||||||
+ clocks = <&iprocmed>;
|
|
||||||
+ clock-names = "iprocmed";
|
|
||||||
+ num-cs = <2>;
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <0>;
|
|
||||||
+
|
|
||||||
+ spi_nor: flash@0 {
|
|
||||||
+ compatible = "jedec,spi-nor";
|
|
||||||
+ reg = <0>;
|
|
||||||
+ spi-max-frequency = <20000000>;
|
|
||||||
+ status = "disabled";
|
|
||||||
+
|
|
||||||
+ partitions {
|
|
||||||
+ compatible = "brcm,bcm947xx-cfe-partitions";
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ thermal-zones {
|
|
||||||
+ cpu_thermal: cpu-thermal {
|
|
||||||
+ polling-delay-passive = <0>;
|
|
||||||
+ polling-delay = <1000>;
|
|
||||||
+ coefficients = <(-556) 418000>;
|
|
||||||
+ thermal-sensors = <&thermal>;
|
|
||||||
+
|
|
||||||
+ trips {
|
|
||||||
+ cpu-crit {
|
|
||||||
+ temperature = <125000>;
|
|
||||||
+ hysteresis = <0>;
|
|
||||||
+ type = "critical";
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ cooling-maps {
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/include/dt-bindings/clock/bcm-nsp.h
|
|
||||||
@@ -0,0 +1,51 @@
|
|
||||||
+/*
|
|
||||||
+ * BSD LICENSE
|
|
||||||
+ *
|
|
||||||
+ * Copyright(c) 2015 Broadcom Corporation. All rights reserved.
|
|
||||||
+ *
|
|
||||||
+ * Redistribution and use in source and binary forms, with or without
|
|
||||||
+ * modification, are permitted provided that the following conditions
|
|
||||||
+ * are met:
|
|
||||||
+ *
|
|
||||||
+ * * Redistributions of source code must retain the above copyright
|
|
||||||
+ * notice, this list of conditions and the following disclaimer.
|
|
||||||
+ * * Redistributions in binary form must reproduce the above copyright
|
|
||||||
+ * notice, this list of conditions and the following disclaimer in
|
|
||||||
+ * the documentation and/or other materials provided with the
|
|
||||||
+ * distribution.
|
|
||||||
+ * * Neither the name of Broadcom Corporation nor the names of its
|
|
||||||
+ * contributors may be used to endorse or promote products derived
|
|
||||||
+ * from this software without specific prior written permission.
|
|
||||||
+ *
|
|
||||||
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
||||||
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
||||||
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
||||||
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
||||||
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
||||||
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#ifndef _CLOCK_BCM_NSP_H
|
|
||||||
+#define _CLOCK_BCM_NSP_H
|
|
||||||
+
|
|
||||||
+/* GENPLL clock channel ID */
|
|
||||||
+#define BCM_NSP_GENPLL 0
|
|
||||||
+#define BCM_NSP_GENPLL_PHY_CLK 1
|
|
||||||
+#define BCM_NSP_GENPLL_ENET_SW_CLK 2
|
|
||||||
+#define BCM_NSP_GENPLL_USB_PHY_REF_CLK 3
|
|
||||||
+#define BCM_NSP_GENPLL_IPROCFAST_CLK 4
|
|
||||||
+#define BCM_NSP_GENPLL_SATA1_CLK 5
|
|
||||||
+#define BCM_NSP_GENPLL_SATA2_CLK 6
|
|
||||||
+
|
|
||||||
+/* LCPLL0 clock channel ID */
|
|
||||||
+#define BCM_NSP_LCPLL0 0
|
|
||||||
+#define BCM_NSP_LCPLL0_PCIE_PHY_REF_CLK 1
|
|
||||||
+#define BCM_NSP_LCPLL0_SDIO_CLK 2
|
|
||||||
+#define BCM_NSP_LCPLL0_DDR_PHY_CLK 3
|
|
||||||
+
|
|
||||||
+#endif /* _CLOCK_BCM_NSP_H */
|
|
||||||
|
|
@ -1,66 +0,0 @@
|
||||||
From b81ea0a64b01ae42e8b41d2a8b9a3fabffe97489 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Linus Walleij <linus.walleij@linaro.org>
|
|
||||||
Date: Mon, 24 Apr 2023 09:38:29 +0200
|
|
||||||
Subject: [PATCH 4/5] arm: Add support for the Broadcom Northstar SoCs
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
The original Northstar is an ARM SoC series that comprise
|
|
||||||
BCM4709x and BCM5301x and uses a dual-core Cortex A9, the
|
|
||||||
global timer and a few other things.
|
|
||||||
|
|
||||||
This series should not be confused with North Star Plus
|
|
||||||
(NSP) which is partly supported by U-Boot already.
|
|
||||||
|
|
||||||
The SoC is well supported by the Linux kernel and OpenWrt
|
|
||||||
as it is used in many routers.
|
|
||||||
|
|
||||||
Since we currently don't need any chip-specific quirks
|
|
||||||
and can get the system up from just the device tree, a
|
|
||||||
mach-* directory doesn't even need to be added, just
|
|
||||||
some small Kconfig fragments.
|
|
||||||
|
|
||||||
Cc: Rafał Miłecki <rafal@milecki.pl>
|
|
||||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|
||||||
---
|
|
||||||
arch/arm/Kconfig | 21 ++++++++++++++++++++-
|
|
||||||
1 file changed, 20 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/arch/arm/Kconfig
|
|
||||||
+++ b/arch/arm/Kconfig
|
|
||||||
@@ -357,7 +357,7 @@ config SYS_ARM_ARCH
|
|
||||||
|
|
||||||
choice
|
|
||||||
prompt "Select the ARM data write cache policy"
|
|
||||||
- default SYS_ARM_CACHE_WRITETHROUGH if TARGET_BCMCYGNUS || RZA1
|
|
||||||
+ default SYS_ARM_CACHE_WRITETHROUGH if TARGET_BCMCYGNUS || TARGET_BCMNS || RZA1
|
|
||||||
default SYS_ARM_CACHE_WRITEBACK
|
|
||||||
|
|
||||||
config SYS_ARM_CACHE_WRITEBACK
|
|
||||||
@@ -670,6 +670,25 @@ config TARGET_BCMCYGNUS
|
|
||||||
imply HASH_VERIFY
|
|
||||||
imply NETDEVICES
|
|
||||||
|
|
||||||
+config TARGET_BCMNS
|
|
||||||
+ bool "Support Broadcom Northstar"
|
|
||||||
+ select CPU_V7A
|
|
||||||
+ select DM
|
|
||||||
+ select DM_GPIO
|
|
||||||
+ select DM_SERIAL
|
|
||||||
+ select OF_CONTROL
|
|
||||||
+ select TIMER
|
|
||||||
+ select SYS_NS16550
|
|
||||||
+ select ARM_GLOBAL_TIMER
|
|
||||||
+ imply SYS_THUMB_BUILD
|
|
||||||
+ imply MTD_RAW_NAND
|
|
||||||
+ imply NAND_BRCMNAND
|
|
||||||
+ imply NAND_BRCMNAND_IPROC
|
|
||||||
+ help
|
|
||||||
+ Support for Broadcom Northstar SoCs. NS is a dual-core 32-bit
|
|
||||||
+ ARMv7 Cortex-A9 SoC family including BCM4708, BCM47094,
|
|
||||||
+ BCM5301x etc.
|
|
||||||
+
|
|
||||||
config TARGET_BCMNS2
|
|
||||||
bool "Support Broadcom Northstar2"
|
|
||||||
select ARM64
|
|
||||||
|
|
@ -1,372 +0,0 @@
|
||||||
From 652a6fa45b6c9d52dd9685fc12ad662e54a9092e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Linus Walleij <linus.walleij@linaro.org>
|
|
||||||
Date: Mon, 24 Apr 2023 09:38:30 +0200
|
|
||||||
Subject: [PATCH 5/5] board: Add new Broadcom Northstar board
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
This adds a simple Northstar "BRCMNS" board to be used with
|
|
||||||
the BCM4708x and BCM5301x chips.
|
|
||||||
|
|
||||||
The main intention is to use this with the D-Link DIR-890L
|
|
||||||
and DIR-885L routers for loading the kernel into RAM from
|
|
||||||
NAND memory using the BCH-1 ECC and using the separately
|
|
||||||
submitted SEAMA load command, so we are currently not adding
|
|
||||||
support for things such as networking.
|
|
||||||
|
|
||||||
The DTS file is a multiplatform NorthStar board, designed to
|
|
||||||
be usable with several NorthStar designs by avoiding any
|
|
||||||
particulars not related to the operation of U-Boot.
|
|
||||||
|
|
||||||
If other board need other ECC for example, they need to
|
|
||||||
create a separate DTS file and augment the code, but I don't
|
|
||||||
know if any other users will turn up.
|
|
||||||
|
|
||||||
Cc: Rafał Miłecki <rafal@milecki.pl>
|
|
||||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|
||||||
---
|
|
||||||
arch/arm/Kconfig | 1 +
|
|
||||||
arch/arm/dts/Makefile | 2 ++
|
|
||||||
arch/arm/dts/ns-board.dts | 57 ++++++++++++++++++++++++++++++
|
|
||||||
board/broadcom/bcmns/Kconfig | 12 +++++++
|
|
||||||
board/broadcom/bcmns/MAINTAINERS | 6 ++++
|
|
||||||
board/broadcom/bcmns/Makefile | 2 ++
|
|
||||||
board/broadcom/bcmns/ns.c | 60 ++++++++++++++++++++++++++++++++
|
|
||||||
configs/bcmns_defconfig | 41 ++++++++++++++++++++++
|
|
||||||
doc/board/broadcom/index.rst | 1 +
|
|
||||||
doc/board/broadcom/northstar.rst | 44 +++++++++++++++++++++++
|
|
||||||
include/configs/bcmns.h | 49 ++++++++++++++++++++++++++
|
|
||||||
11 files changed, 275 insertions(+)
|
|
||||||
create mode 100644 arch/arm/dts/ns-board.dts
|
|
||||||
create mode 100644 board/broadcom/bcmns/Kconfig
|
|
||||||
create mode 100644 board/broadcom/bcmns/MAINTAINERS
|
|
||||||
create mode 100644 board/broadcom/bcmns/Makefile
|
|
||||||
create mode 100644 board/broadcom/bcmns/ns.c
|
|
||||||
create mode 100644 configs/bcmns_defconfig
|
|
||||||
create mode 100644 doc/board/broadcom/northstar.rst
|
|
||||||
create mode 100644 include/configs/bcmns.h
|
|
||||||
|
|
||||||
--- a/arch/arm/Kconfig
|
|
||||||
+++ b/arch/arm/Kconfig
|
|
||||||
@@ -2286,6 +2286,7 @@ source "board/Marvell/octeontx2/Kconfig"
|
|
||||||
source "board/armltd/vexpress/Kconfig"
|
|
||||||
source "board/armltd/vexpress64/Kconfig"
|
|
||||||
source "board/cortina/presidio-asic/Kconfig"
|
|
||||||
+source "board/broadcom/bcmns/Kconfig"
|
|
||||||
source "board/broadcom/bcmns3/Kconfig"
|
|
||||||
source "board/cavium/thunderx/Kconfig"
|
|
||||||
source "board/eets/pdu001/Kconfig"
|
|
||||||
--- a/arch/arm/dts/Makefile
|
|
||||||
+++ b/arch/arm/dts/Makefile
|
|
||||||
@@ -1185,6 +1185,8 @@ dtb-$(CONFIG_ARCH_BCM283X) += \
|
|
||||||
bcm2837-rpi-cm3-io3.dtb \
|
|
||||||
bcm2711-rpi-4-b.dtb
|
|
||||||
|
|
||||||
+dtb-$(CONFIG_TARGET_BCMNS) += ns-board.dtb
|
|
||||||
+
|
|
||||||
dtb-$(CONFIG_TARGET_BCMNS3) += ns3-board.dtb
|
|
||||||
|
|
||||||
dtb-$(CONFIG_ARCH_BCMSTB) += bcm7xxx.dtb
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/arch/arm/dts/ns-board.dts
|
|
||||||
@@ -0,0 +1,57 @@
|
|
||||||
+// SPDX-License-Identifier: GPL-2.0+
|
|
||||||
+
|
|
||||||
+/dts-v1/;
|
|
||||||
+
|
|
||||||
+#include "bcm5301x.dtsi"
|
|
||||||
+
|
|
||||||
+/ {
|
|
||||||
+ /*
|
|
||||||
+ * The Northstar does not have a proper fallback compatible, but
|
|
||||||
+ * these basic chips will suffice.
|
|
||||||
+ */
|
|
||||||
+ model = "Northstar model";
|
|
||||||
+ compatible = "brcm,bcm47094", "brcm,bcm4708";
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <1>;
|
|
||||||
+ interrupt-parent = <&gic>;
|
|
||||||
+
|
|
||||||
+ memory {
|
|
||||||
+ device_type = "memory";
|
|
||||||
+ reg = <0x00000000 0x08000000>,
|
|
||||||
+ <0x88000000 0x08000000>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ aliases {
|
|
||||||
+ serial0 = &uart0;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ chosen {
|
|
||||||
+ stdout-path = "serial0:115200n8";
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ nand-controller@18028000 {
|
|
||||||
+ nandcs: nand@0 {
|
|
||||||
+ compatible = "brcm,nandcs";
|
|
||||||
+ reg = <0>;
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <1>;
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Same as using the bcm5301x-nand-cs0-bch1.dtsi
|
|
||||||
+ * include from the Linux kernel.
|
|
||||||
+ */
|
|
||||||
+ nand-ecc-algo = "bch";
|
|
||||||
+ nand-ecc-strength = <1>;
|
|
||||||
+ nand-ecc-step-size = <512>;
|
|
||||||
+
|
|
||||||
+ partitions {
|
|
||||||
+ compatible = "brcm,bcm947xx-cfe-partitions";
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&uart0 {
|
|
||||||
+ clock-frequency = <125000000>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/board/broadcom/bcmns/Kconfig
|
|
||||||
@@ -0,0 +1,12 @@
|
|
||||||
+if TARGET_BCMNS
|
|
||||||
+
|
|
||||||
+config SYS_BOARD
|
|
||||||
+ default "bcmns"
|
|
||||||
+
|
|
||||||
+config SYS_VENDOR
|
|
||||||
+ default "broadcom"
|
|
||||||
+
|
|
||||||
+config SYS_CONFIG_NAME
|
|
||||||
+ default "bcmns"
|
|
||||||
+
|
|
||||||
+endif
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/board/broadcom/bcmns/MAINTAINERS
|
|
||||||
@@ -0,0 +1,6 @@
|
|
||||||
+BCMNS BOARD
|
|
||||||
+M: Linus Walleij <linus.walleij@linaro.org>
|
|
||||||
+S: Maintained
|
|
||||||
+F: board/broadcom/bcmnsp/
|
|
||||||
+F: configs/bcmnsp_defconfig
|
|
||||||
+F: include/configs/bcmnsp.h
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/board/broadcom/bcmns/Makefile
|
|
||||||
@@ -0,0 +1,2 @@
|
|
||||||
+# SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
+obj-y := ns.o
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/board/broadcom/bcmns/ns.c
|
|
||||||
@@ -0,0 +1,60 @@
|
|
||||||
+// SPDX-License-Identifier: GPL-2.0+
|
|
||||||
+/*
|
|
||||||
+ * Broadcom Northstar generic board set-up code
|
|
||||||
+ * Copyright (C) 2023 Linus Walleij <linus.walleij@linaro.org>
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#include <common.h>
|
|
||||||
+#include <dm.h>
|
|
||||||
+#include <init.h>
|
|
||||||
+#include <log.h>
|
|
||||||
+#include <ram.h>
|
|
||||||
+#include <serial.h>
|
|
||||||
+#include <asm/global_data.h>
|
|
||||||
+#include <asm/io.h>
|
|
||||||
+#include <asm/armv7m.h>
|
|
||||||
+
|
|
||||||
+DECLARE_GLOBAL_DATA_PTR;
|
|
||||||
+
|
|
||||||
+int dram_init(void)
|
|
||||||
+{
|
|
||||||
+ return fdtdec_setup_mem_size_base();
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+int dram_init_banksize(void)
|
|
||||||
+{
|
|
||||||
+ return fdtdec_setup_memory_banksize();
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+int board_late_init(void)
|
|
||||||
+{
|
|
||||||
+ /* LEDs etc can be initialized here */
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+int board_init(void)
|
|
||||||
+{
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void reset_cpu(void)
|
|
||||||
+{
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+int print_cpuinfo(void)
|
|
||||||
+{
|
|
||||||
+ printf("BCMNS Northstar SoC\n");
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+int misc_init_r(void)
|
|
||||||
+{
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+int ft_board_setup(void *fdt, struct bd_info *bd)
|
|
||||||
+{
|
|
||||||
+ printf("Northstar board setup: DTB at 0x%08lx\n", (ulong)fdt);
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/configs/bcmns_defconfig
|
|
||||||
@@ -0,0 +1,41 @@
|
|
||||||
+CONFIG_ARM=y
|
|
||||||
+CONFIG_TARGET_BCMNS=y
|
|
||||||
+CONFIG_TEXT_BASE=0x00008000
|
|
||||||
+CONFIG_SYS_MALLOC_LEN=0x2000000
|
|
||||||
+CONFIG_SYS_MALLOC_F_LEN=0x8000
|
|
||||||
+CONFIG_NR_DRAM_BANKS=2
|
|
||||||
+CONFIG_DEFAULT_DEVICE_TREE="ns-board"
|
|
||||||
+CONFIG_IDENT_STRING="Broadcom Northstar"
|
|
||||||
+CONFIG_SYS_LOAD_ADDR=0x00008000
|
|
||||||
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
|
|
||||||
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x00100000
|
|
||||||
+# CONFIG_BOOTSTD is not set
|
|
||||||
+CONFIG_AUTOBOOT_KEYED=y
|
|
||||||
+CONFIG_AUTOBOOT_PROMPT="Boot Northstar system in %d seconds\n"
|
|
||||||
+CONFIG_BOOTDELAY=1
|
|
||||||
+CONFIG_USE_BOOTCOMMAND=y
|
|
||||||
+CONFIG_BOOTCOMMAND="run bootcmd_dlink_dir8xxl"
|
|
||||||
+CONFIG_SYS_PROMPT="northstar> "
|
|
||||||
+CONFIG_ENV_VARS_UBOOT_CONFIG=y
|
|
||||||
+CONFIG_OF_BOARD_SETUP=y
|
|
||||||
+CONFIG_OF_STDOUT_VIA_ALIAS=y
|
|
||||||
+CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
||||||
+CONFIG_HUSH_PARSER=y
|
|
||||||
+CONFIG_SYS_MAXARGS=64
|
|
||||||
+CONFIG_CMD_SEAMA=y
|
|
||||||
+CONFIG_CMD_BOOTZ=y
|
|
||||||
+CONFIG_CMD_CACHE=y
|
|
||||||
+CONFIG_OF_EMBED=y
|
|
||||||
+CONFIG_USE_HOSTNAME=y
|
|
||||||
+CONFIG_HOSTNAME="NS"
|
|
||||||
+CONFIG_CLK=y
|
|
||||||
+CONFIG_MTD=y
|
|
||||||
+CONFIG_DM_MTD=y
|
|
||||||
+CONFIG_MTD_RAW_NAND=y
|
|
||||||
+CONFIG_NAND_BRCMNAND=y
|
|
||||||
+CONFIG_SYS_NAND_ONFI_DETECTION=y
|
|
||||||
+CONFIG_CMD_NAND=y
|
|
||||||
+CONFIG_DM_SERIAL=y
|
|
||||||
+CONFIG_SYS_NS16550=y
|
|
||||||
+# CONFIG_NET is not set
|
|
||||||
+# CONFIG_EFI_LOADER is not set
|
|
||||||
--- a/doc/board/broadcom/index.rst
|
|
||||||
+++ b/doc/board/broadcom/index.rst
|
|
||||||
@@ -9,3 +9,4 @@ Broadcom
|
|
||||||
|
|
||||||
bcm7xxx
|
|
||||||
raspberrypi
|
|
||||||
+ northstar
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/doc/board/broadcom/northstar.rst
|
|
||||||
@@ -0,0 +1,44 @@
|
|
||||||
+.. SPDX-License-Identifier: GPL-2.0+
|
|
||||||
+.. Copyright (C) 2023 Linus Walleij <linus.walleij@linaro.org>
|
|
||||||
+
|
|
||||||
+Broadcom Northstar Boards
|
|
||||||
+=========================
|
|
||||||
+
|
|
||||||
+This document describes how to use U-Boot on the Broadcom Northstar
|
|
||||||
+boards, comprised of the Cortex A9 ARM-based BCM470x and BCM5301x SoCs. These
|
|
||||||
+were introduced in 2012-2013 and some of them are also called StrataGX.
|
|
||||||
+
|
|
||||||
+Northstar is part of the iProc SoC family.
|
|
||||||
+
|
|
||||||
+A good overview of these boards can be found in Jon Mason's presentation
|
|
||||||
+"Enabling New Hardware in U-Boot" where the difference between Northstar
|
|
||||||
+and Northstar Plus and Northstar 2 (Aarch64) is addressed.
|
|
||||||
+
|
|
||||||
+The ROM in the Northstar SoC will typically look into NOR flash memory
|
|
||||||
+for a boot loader, and the way this works is undocumented. It should be
|
|
||||||
+possible to execute U-Boot as the first binary from the NOR flash but
|
|
||||||
+this usage path is unexplored. Please add information if you know more.
|
|
||||||
+
|
|
||||||
+D-Link Boards
|
|
||||||
+-------------
|
|
||||||
+
|
|
||||||
+When we use U-Boot with D-Link routers, the NOR flash has a boot loader
|
|
||||||
+and web server that can re-flash the bigger NAND flash memory for object
|
|
||||||
+code in the SEAMA format, so on these platforms U-Boot is converted into
|
|
||||||
+a SEAMA binary and installed in the SoC using the flash tool resident in
|
|
||||||
+the NOR flash. Details can be found in the OpenWrt project codebase.
|
|
||||||
+
|
|
||||||
+Configure
|
|
||||||
+---------
|
|
||||||
+
|
|
||||||
+.. code-block:: console
|
|
||||||
+
|
|
||||||
+ $ make CROSS_COMPILE=${CROSS_COMPILE} bcmns_defconfig
|
|
||||||
+
|
|
||||||
+Build
|
|
||||||
+-----
|
|
||||||
+
|
|
||||||
+.. code-block:: console
|
|
||||||
+
|
|
||||||
+ $ make CROSS_COMPILE=${CROSS_COMPILE}
|
|
||||||
+ $ ${CROSS_COMPILE}strip u-boot
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/include/configs/bcmns.h
|
|
||||||
@@ -0,0 +1,49 @@
|
|
||||||
+/* SPDX-License-Identifier: GPL-2.0+ */
|
|
||||||
+
|
|
||||||
+#ifndef __BCM_NS_H
|
|
||||||
+#define __BCM_NS_H
|
|
||||||
+
|
|
||||||
+#include <linux/sizes.h>
|
|
||||||
+
|
|
||||||
+/* Physical Memory Map */
|
|
||||||
+#define V2M_BASE 0x00000000
|
|
||||||
+#define PHYS_SDRAM_1 V2M_BASE
|
|
||||||
+
|
|
||||||
+#define CFG_SYS_SDRAM_BASE PHYS_SDRAM_1
|
|
||||||
+
|
|
||||||
+/* Called "periph_clk" in Linux, used by the global timer */
|
|
||||||
+#define CFG_SYS_HZ_CLOCK 500000000
|
|
||||||
+
|
|
||||||
+/* Called "iprocslow" in Linux */
|
|
||||||
+#define CFG_SYS_NS16550_CLK 125000000
|
|
||||||
+
|
|
||||||
+/* console configuration */
|
|
||||||
+#define CONSOLE_ARGS "console_args=console=ttyS0,115200n8\0"
|
|
||||||
+#define MAX_CPUS "max_cpus=maxcpus=2\0"
|
|
||||||
+#define EXTRA_ARGS "extra_args=earlycon=uart8250,mmio32,0x18000300\0"
|
|
||||||
+
|
|
||||||
+#define BASE_ARGS "${console_args} ${extra_args} ${pcie_args}" \
|
|
||||||
+ " ${max_cpus} ${log_level} ${reserved_mem}"
|
|
||||||
+#define SETBOOTARGS "setbootargs=setenv bootargs " BASE_ARGS "\0"
|
|
||||||
+
|
|
||||||
+#define KERNEL_LOADADDR_CFG \
|
|
||||||
+ "loadaddr=0x01000000\0" \
|
|
||||||
+ "dtb_loadaddr=0x02000000\0"
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Hardcoded for the only boards we support, if you add more
|
|
||||||
+ * boards, add a more clever bootcmd!
|
|
||||||
+ */
|
|
||||||
+#define NS_BOOTCMD "bootcmd_dlink_dir8xxl=seama 0x00fe0000; go 0x01000000"
|
|
||||||
+
|
|
||||||
+#define ARCH_ENV_SETTINGS \
|
|
||||||
+ CONSOLE_ARGS \
|
|
||||||
+ MAX_CPUS \
|
|
||||||
+ EXTRA_ARGS \
|
|
||||||
+ KERNEL_LOADADDR_CFG \
|
|
||||||
+ NS_BOOTCMD
|
|
||||||
+
|
|
||||||
+#define CFG_EXTRA_ENV_SETTINGS \
|
|
||||||
+ ARCH_ENV_SETTINGS
|
|
||||||
+
|
|
||||||
+#endif /* __BCM_NS_H */
|
|
||||||
|
|
@ -69,6 +69,7 @@ qihoo,360t7|\
|
||||||
tplink,tl-xdr4288|\
|
tplink,tl-xdr4288|\
|
||||||
tplink,tl-xdr6086|\
|
tplink,tl-xdr6086|\
|
||||||
tplink,tl-xdr6088|\
|
tplink,tl-xdr6088|\
|
||||||
|
xiaomi,mi-router-ax3000t-ubootmod|\
|
||||||
xiaomi,mi-router-wr30u-ubootmod|\
|
xiaomi,mi-router-wr30u-ubootmod|\
|
||||||
xiaomi,redmi-router-ax6000-ubootmod)
|
xiaomi,redmi-router-ax6000-ubootmod)
|
||||||
. /lib/upgrade/nand.sh
|
. /lib/upgrade/nand.sh
|
||||||
|
|
@ -86,6 +87,11 @@ glinet,gl-mt6000)
|
||||||
glinet,gl-mt3000)
|
glinet,gl-mt3000)
|
||||||
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x80000" "0x20000"
|
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x80000" "0x20000"
|
||||||
;;
|
;;
|
||||||
|
jdcloud,re-cp-03)
|
||||||
|
local envdev=$(find_mmc_part "ubootenv" "mmcblk0")
|
||||||
|
ubootenv_add_uci_config "$envdev" "0x0" "0x40000" "0x40000" "1"
|
||||||
|
ubootenv_add_uci_config "$envdev" "0x40000" "0x40000" "0x40000" "1"
|
||||||
|
;;
|
||||||
mercusys,mr90x-v1|\
|
mercusys,mr90x-v1|\
|
||||||
routerich,ax3000)
|
routerich,ax3000)
|
||||||
local envdev=/dev/mtd$(find_mtd_index "u-boot-env")
|
local envdev=/dev/mtd$(find_mtd_index "u-boot-env")
|
||||||
|
|
@ -94,7 +100,7 @@ routerich,ax3000)
|
||||||
ubnt,unifi-6-plus)
|
ubnt,unifi-6-plus)
|
||||||
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x80000" "0x10000"
|
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x80000" "0x10000"
|
||||||
;;
|
;;
|
||||||
xiaomi,mi-router-wr30u-112m-nmbm|\
|
xiaomi,mi-router-ax3000t|\
|
||||||
xiaomi,mi-router-wr30u-stock|\
|
xiaomi,mi-router-wr30u-stock|\
|
||||||
xiaomi,redmi-router-ax6000-stock)
|
xiaomi,redmi-router-ax6000-stock)
|
||||||
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x10000" "0x20000"
|
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x10000" "0x20000"
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,10 @@ touch /etc/config/ubootenv
|
||||||
board=$(board_name)
|
board=$(board_name)
|
||||||
|
|
||||||
case "$board" in
|
case "$board" in
|
||||||
|
dlink,eagle-pro-ai-m32-a1|\
|
||||||
|
dlink,eagle-pro-ai-r32-a1)
|
||||||
|
ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x2000" "0x2000"
|
||||||
|
;;
|
||||||
linksys,e8450-ubi)
|
linksys,e8450-ubi)
|
||||||
ubootenv_add_uci_config "/dev/ubi0_0" "0x0" "0x1f000" "0x1f000" "1"
|
ubootenv_add_uci_config "/dev/ubi0_0" "0x0" "0x1f000" "0x1f000" "1"
|
||||||
ubootenv_add_uci_config "/dev/ubi0_1" "0x0" "0x1f000" "0x1f000" "1"
|
ubootenv_add_uci_config "/dev/ubi0_1" "0x0" "0x1f000" "0x1f000" "1"
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,12 @@ edimax,cax1800)
|
||||||
[ -n "$idx" ] && \
|
[ -n "$idx" ] && \
|
||||||
ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x10000" "0x20000"
|
ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x10000" "0x20000"
|
||||||
;;
|
;;
|
||||||
|
linksys,mx4200v1|\
|
||||||
|
linksys,mx4200v2)
|
||||||
|
idx="$(find_mtd_index u_env)"
|
||||||
|
[ -n "$idx" ] && \
|
||||||
|
ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x40000" "0x20000" "2"
|
||||||
|
;;
|
||||||
redmi,ax6|\
|
redmi,ax6|\
|
||||||
xiaomi,ax3600|\
|
xiaomi,ax3600|\
|
||||||
xiaomi,ax9000)
|
xiaomi,ax9000)
|
||||||
|
|
|
||||||
|
|
@ -322,6 +322,18 @@ define U-Boot/mt7981_qihoo_360t7
|
||||||
DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3
|
DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
define U-Boot/mt7981_xiaomi_mi-router-ax3000t
|
||||||
|
NAME:=Xiaomi Router AX3000T
|
||||||
|
BUILD_SUBTARGET:=filogic
|
||||||
|
BUILD_DEVICES:=xiaomi_mi-router-ax3000t-ubootmod
|
||||||
|
UBOOT_CONFIG:=mt7981_xiaomi_mi-router-ax3000t
|
||||||
|
UBOOT_IMAGE:=u-boot.fip
|
||||||
|
BL2_BOOTDEV:=spim-nand
|
||||||
|
BL2_SOC:=mt7981
|
||||||
|
BL2_DDRTYPE:=ddr3
|
||||||
|
DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3
|
||||||
|
endef
|
||||||
|
|
||||||
define U-Boot/mt7981_xiaomi_mi-router-wr30u
|
define U-Boot/mt7981_xiaomi_mi-router-wr30u
|
||||||
NAME:=Xiaomi Router WR30U
|
NAME:=Xiaomi Router WR30U
|
||||||
BUILD_SUBTARGET:=filogic
|
BUILD_SUBTARGET:=filogic
|
||||||
|
|
@ -407,6 +419,18 @@ define U-Boot/mt7986_glinet_gl-mt6000
|
||||||
DEPENDS:=+trusted-firmware-a-mt7986-emmc-ddr4
|
DEPENDS:=+trusted-firmware-a-mt7986-emmc-ddr4
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
define U-Boot/mt7986_jdcloud_re-cp-03
|
||||||
|
NAME:=JDCloud RE-CP-03
|
||||||
|
BUILD_SUBTARGET:=filogic
|
||||||
|
BUILD_DEVICES:=jdcloud_re-cp-03
|
||||||
|
UBOOT_CONFIG:=mt7986a_jdcloud_re-cp-03
|
||||||
|
UBOOT_IMAGE:=u-boot.fip
|
||||||
|
BL2_BOOTDEV:=emmc
|
||||||
|
BL2_SOC:=mt7986
|
||||||
|
BL2_DDRTYPE:=ddr4
|
||||||
|
DEPENDS:=+trusted-firmware-a-mt7986-emmc-ddr4
|
||||||
|
endef
|
||||||
|
|
||||||
define U-Boot/mt7986_tplink_tl-xdr4288
|
define U-Boot/mt7986_tplink_tl-xdr4288
|
||||||
NAME:=TP-LINK TL-XDR4288
|
NAME:=TP-LINK TL-XDR4288
|
||||||
BUILD_SUBTARGET:=filogic
|
BUILD_SUBTARGET:=filogic
|
||||||
|
|
@ -556,12 +580,14 @@ UBOOT_TARGETS := \
|
||||||
mt7981_rfb-sd \
|
mt7981_rfb-sd \
|
||||||
mt7981_rfb-snfi \
|
mt7981_rfb-snfi \
|
||||||
mt7981_qihoo_360t7 \
|
mt7981_qihoo_360t7 \
|
||||||
|
mt7981_xiaomi_mi-router-ax3000t \
|
||||||
mt7981_xiaomi_mi-router-wr30u \
|
mt7981_xiaomi_mi-router-wr30u \
|
||||||
mt7986_bananapi_bpi-r3-emmc \
|
mt7986_bananapi_bpi-r3-emmc \
|
||||||
mt7986_bananapi_bpi-r3-sdmmc \
|
mt7986_bananapi_bpi-r3-sdmmc \
|
||||||
mt7986_bananapi_bpi-r3-snand \
|
mt7986_bananapi_bpi-r3-snand \
|
||||||
mt7986_bananapi_bpi-r3-nor \
|
mt7986_bananapi_bpi-r3-nor \
|
||||||
mt7986_glinet_gl-mt6000 \
|
mt7986_glinet_gl-mt6000 \
|
||||||
|
mt7986_jdcloud_re-cp-03 \
|
||||||
mt7986_tplink_tl-xdr4288 \
|
mt7986_tplink_tl-xdr4288 \
|
||||||
mt7986_tplink_tl-xdr6086 \
|
mt7986_tplink_tl-xdr6086 \
|
||||||
mt7986_tplink_tl-xdr6088 \
|
mt7986_tplink_tl-xdr6088 \
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,324 @@
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/configs/mt7986a_jdcloud_re-cp-03_defconfig
|
||||||
|
@@ -0,0 +1,112 @@
|
||||||
|
+CONFIG_ARM=y
|
||||||
|
+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
|
||||||
|
+CONFIG_POSITION_INDEPENDENT=y
|
||||||
|
+CONFIG_ARCH_MEDIATEK=y
|
||||||
|
+CONFIG_TEXT_BASE=0x41e00000
|
||||||
|
+CONFIG_SYS_MALLOC_F_LEN=0x4000
|
||||||
|
+CONFIG_NR_DRAM_BANKS=1
|
||||||
|
+CONFIG_ENV_SIZE=0x40000
|
||||||
|
+CONFIG_ENV_OFFSET=0x400000
|
||||||
|
+CONFIG_DEFAULT_DEVICE_TREE="mt7986a-jdcloud_re-cp-03"
|
||||||
|
+CONFIG_SYS_PROMPT="MT7986> "
|
||||||
|
+CONFIG_OF_LIBFDT_OVERLAY=y
|
||||||
|
+CONFIG_TARGET_MT7986=y
|
||||||
|
+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
|
||||||
|
+CONFIG_DEBUG_UART_BASE=0x11002000
|
||||||
|
+CONFIG_DEBUG_UART_CLOCK=40000000
|
||||||
|
+CONFIG_ENV_OFFSET_REDUND=0x440000
|
||||||
|
+CONFIG_SYS_LOAD_ADDR=0x46000000
|
||||||
|
+CONFIG_DEBUG_UART=y
|
||||||
|
+CONFIG_FIT=y
|
||||||
|
+CONFIG_BOOTDELAY=30
|
||||||
|
+CONFIG_AUTOBOOT_KEYED=y
|
||||||
|
+CONFIG_AUTOBOOT_MENU_SHOW=y
|
||||||
|
+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7986a-jdcloud_re-cp-03.dtb"
|
||||||
|
+CONFIG_LOGLEVEL=7
|
||||||
|
+CONFIG_PRE_CONSOLE_BUFFER=y
|
||||||
|
+CONFIG_LOG=y
|
||||||
|
+CONFIG_BOARD_LATE_INIT=y
|
||||||
|
+CONFIG_HUSH_PARSER=y
|
||||||
|
+CONFIG_CMD_CPU=y
|
||||||
|
+CONFIG_CMD_LICENSE=y
|
||||||
|
+CONFIG_CMD_BOOTMENU=y
|
||||||
|
+CONFIG_CMD_ASKENV=y
|
||||||
|
+CONFIG_CMD_ERASEENV=y
|
||||||
|
+CONFIG_CMD_ENV_FLAGS=y
|
||||||
|
+CONFIG_CMD_STRINGS=y
|
||||||
|
+CONFIG_CMD_DM=y
|
||||||
|
+CONFIG_CMD_GPIO=y
|
||||||
|
+CONFIG_CMD_PWM=y
|
||||||
|
+CONFIG_CMD_GPT=y
|
||||||
|
+CONFIG_CMD_MMC=y
|
||||||
|
+CONFIG_CMD_PART=y
|
||||||
|
+CONFIG_CMD_DHCP=y
|
||||||
|
+CONFIG_CMD_TFTPSRV=y
|
||||||
|
+CONFIG_CMD_RARP=y
|
||||||
|
+CONFIG_CMD_PING=y
|
||||||
|
+CONFIG_CMD_CDP=y
|
||||||
|
+CONFIG_CMD_SNTP=y
|
||||||
|
+CONFIG_CMD_DNS=y
|
||||||
|
+CONFIG_CMD_LINK_LOCAL=y
|
||||||
|
+CONFIG_CMD_PXE=y
|
||||||
|
+CONFIG_CMD_CACHE=y
|
||||||
|
+CONFIG_CMD_PSTORE=y
|
||||||
|
+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
|
||||||
|
+CONFIG_CMD_UUID=y
|
||||||
|
+CONFIG_CMD_HASH=y
|
||||||
|
+CONFIG_CMD_SMC=y
|
||||||
|
+CONFIG_CMD_EXT4=y
|
||||||
|
+CONFIG_CMD_FAT=y
|
||||||
|
+CONFIG_CMD_FS_GENERIC=y
|
||||||
|
+CONFIG_CMD_FS_UUID=y
|
||||||
|
+CONFIG_OF_EMBED=y
|
||||||
|
+CONFIG_ENV_OVERWRITE=y
|
||||||
|
+CONFIG_ENV_IS_IN_MMC=y
|
||||||
|
+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
|
||||||
|
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||||
|
+CONFIG_USE_DEFAULT_ENV_FILE=y
|
||||||
|
+CONFIG_DEFAULT_ENV_FILE="jdcloud_re-cp-03_env"
|
||||||
|
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
||||||
|
+CONFIG_VERSION_VARIABLE=y
|
||||||
|
+CONFIG_NET_RANDOM_ETHADDR=y
|
||||||
|
+CONFIG_NETCONSOLE=y
|
||||||
|
+CONFIG_USE_IPADDR=y
|
||||||
|
+CONFIG_IPADDR="192.168.1.1"
|
||||||
|
+CONFIG_USE_SERVERIP=y
|
||||||
|
+CONFIG_SERVERIP="192.168.1.254"
|
||||||
|
+CONFIG_REGMAP=y
|
||||||
|
+CONFIG_SYSCON=y
|
||||||
|
+CONFIG_BUTTON=y
|
||||||
|
+CONFIG_BUTTON_GPIO=y
|
||||||
|
+CONFIG_CLK=y
|
||||||
|
+CONFIG_GPIO_HOG=y
|
||||||
|
+CONFIG_LED=y
|
||||||
|
+CONFIG_LED_BLINK=y
|
||||||
|
+CONFIG_LED_GPIO=y
|
||||||
|
+CONFIG_SUPPORT_EMMC_BOOT=y
|
||||||
|
+CONFIG_MMC_HS200_SUPPORT=y
|
||||||
|
+CONFIG_MMC_MTK=y
|
||||||
|
+CONFIG_PHY_FIXED=y
|
||||||
|
+CONFIG_DM_MDIO=y
|
||||||
|
+CONFIG_MEDIATEK_ETH=y
|
||||||
|
+CONFIG_PHY=y
|
||||||
|
+CONFIG_PHY_MTK_TPHY=y
|
||||||
|
+CONFIG_PINCTRL=y
|
||||||
|
+CONFIG_PINCONF=y
|
||||||
|
+CONFIG_PINCTRL_MT7622=y
|
||||||
|
+CONFIG_PINCTRL_MT7986=y
|
||||||
|
+CONFIG_POWER_DOMAIN=y
|
||||||
|
+CONFIG_MTK_POWER_DOMAIN=y
|
||||||
|
+CONFIG_DM_REGULATOR=y
|
||||||
|
+CONFIG_DM_REGULATOR_FIXED=y
|
||||||
|
+CONFIG_DM_REGULATOR_GPIO=y
|
||||||
|
+CONFIG_DM_PWM=y
|
||||||
|
+CONFIG_PWM_MTK=y
|
||||||
|
+CONFIG_RAM=y
|
||||||
|
+CONFIG_SCSI=y
|
||||||
|
+CONFIG_DM_SCSI=y
|
||||||
|
+CONFIG_DM_SERIAL=y
|
||||||
|
+CONFIG_MTK_SERIAL=y
|
||||||
|
+CONFIG_ZSTD=y
|
||||||
|
+CONFIG_HEXDUMP=y
|
||||||
|
+CONFIG_LMB_MAX_REGIONS=64
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/arch/arm/dts/mt7986a-jdcloud_re-cp-03.dts
|
||||||
|
@@ -0,0 +1,148 @@
|
||||||
|
+// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
+
|
||||||
|
+/dts-v1/;
|
||||||
|
+#include <dt-bindings/input/linux-event-codes.h>
|
||||||
|
+#include "mt7986.dtsi"
|
||||||
|
+#include <dt-bindings/gpio/gpio.h>
|
||||||
|
+
|
||||||
|
+/ {
|
||||||
|
+ #address-cells = <1>;
|
||||||
|
+ #size-cells = <1>;
|
||||||
|
+ model = "JDCloud RE-CP-03";
|
||||||
|
+ compatible = "mediatek,mt7986", "mediatek,mt7986-rfb";
|
||||||
|
+
|
||||||
|
+ chosen {
|
||||||
|
+ stdout-path = &uart0;
|
||||||
|
+ tick-timer = &timer0;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ memory@40000000 {
|
||||||
|
+ device_type = "memory";
|
||||||
|
+ reg = <0x40000000 0x40000000>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ gpio-keys {
|
||||||
|
+ compatible = "gpio-keys";
|
||||||
|
+
|
||||||
|
+ button-joylink {
|
||||||
|
+ label = "joylink";
|
||||||
|
+ linux,code = <BTN_0>;
|
||||||
|
+ gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ button-reset {
|
||||||
|
+ label = "reset";
|
||||||
|
+ linux,code = <KEY_RESTART>;
|
||||||
|
+ gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ gpio-leds {
|
||||||
|
+ compatible = "gpio-leds";
|
||||||
|
+
|
||||||
|
+ led-0 {
|
||||||
|
+ label = "blue:status";
|
||||||
|
+ gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
|
||||||
|
+ default-state = "off";
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ led-1 {
|
||||||
|
+ label = "red:status";
|
||||||
|
+ gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
|
||||||
|
+ default-state = "on";
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ led-2 {
|
||||||
|
+ label = "green:status";
|
||||||
|
+ gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
|
||||||
|
+ default-state = "off";
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ reg_1p8v: regulator-1p8v {
|
||||||
|
+ compatible = "regulator-fixed";
|
||||||
|
+ regulator-name = "fixed-1.8V";
|
||||||
|
+ regulator-min-microvolt = <1800000>;
|
||||||
|
+ regulator-max-microvolt = <1800000>;
|
||||||
|
+ regulator-boot-on;
|
||||||
|
+ regulator-always-on;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ reg_3p3v: regulator-3p3v {
|
||||||
|
+ compatible = "regulator-fixed";
|
||||||
|
+ regulator-name = "fixed-3.3V";
|
||||||
|
+ regulator-min-microvolt = <3300000>;
|
||||||
|
+ regulator-max-microvolt = <3300000>;
|
||||||
|
+ regulator-boot-on;
|
||||||
|
+ regulator-always-on;
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+ð {
|
||||||
|
+ status = "okay";
|
||||||
|
+ mediatek,gmac-id = <0>;
|
||||||
|
+ phy-mode = "2500base-x";
|
||||||
|
+ mediatek,switch = "mt7531";
|
||||||
|
+ reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
|
||||||
|
+
|
||||||
|
+ fixed-link {
|
||||||
|
+ speed = <2500>;
|
||||||
|
+ full-duplex;
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&mmc0 {
|
||||||
|
+ bus-width = <8>;
|
||||||
|
+ cap-mmc-highspeed;
|
||||||
|
+ cap-mmc-hw-reset;
|
||||||
|
+ max-frequency = <200000000>;
|
||||||
|
+ non-removable;
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&mmc0_pins_default>;
|
||||||
|
+ vmmc-supply = <®_3p3v>;
|
||||||
|
+ vqmmc-supply = <®_1p8v>;
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&pinctrl {
|
||||||
|
+ mmc0_pins_default: mmc0default {
|
||||||
|
+ mux {
|
||||||
|
+ function = "flash";
|
||||||
|
+ groups = "emmc_51";
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ conf-cmd-dat {
|
||||||
|
+ pins = "EMMC_DATA_0", "EMMC_DATA_1", "EMMC_DATA_2",
|
||||||
|
+ "EMMC_DATA_3", "EMMC_DATA_4", "EMMC_DATA_5",
|
||||||
|
+ "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
|
||||||
|
+ input-enable;
|
||||||
|
+ drive-strength = <MTK_DRIVE_4mA>;
|
||||||
|
+ bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ conf-clk {
|
||||||
|
+ pins = "EMMC_CK";
|
||||||
|
+ drive-strength = <MTK_DRIVE_6mA>;
|
||||||
|
+ bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ conf-dsl {
|
||||||
|
+ pins = "EMMC_DSL";
|
||||||
|
+ bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ conf-rst {
|
||||||
|
+ pins = "EMMC_RSTB";
|
||||||
|
+ drive-strength = <MTK_DRIVE_4mA>;
|
||||||
|
+ bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&uart0 {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&watchdog {
|
||||||
|
+ status = "disabled";
|
||||||
|
+};
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/jdcloud_re-cp-03_env
|
||||||
|
@@ -0,0 +1,55 @@
|
||||||
|
+ipaddr=192.168.1.1
|
||||||
|
+serverip=192.168.1.254
|
||||||
|
+loadaddr=0x46000000
|
||||||
|
+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
|
||||||
|
+bootargs=root=/dev/mmcblk0p65
|
||||||
|
+bootcmd=if pstore check ; then run boot_recovery ; else run boot_emmc ; fi
|
||||||
|
+bootconf=config-1
|
||||||
|
+bootdelay=0
|
||||||
|
+bootfile=openwrt-mediatek-filogic-jdcloud_re-cp-03-initramfs-recovery.itb
|
||||||
|
+bootfile_bl2=openwrt-mediatek-filogic-jdcloud_re-cp-03-preloader.bin
|
||||||
|
+bootfile_fip=openwrt-mediatek-filogic-jdcloud_re-cp-03-bl31-uboot.fip
|
||||||
|
+bootfile_upg=openwrt-mediatek-filogic-jdcloud_re-cp-03-squashfs-sysupgrade.itb
|
||||||
|
+bootled_pwr=red:status
|
||||||
|
+bootled_rec=blue:status
|
||||||
|
+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
|
||||||
|
+bootmenu_default=0
|
||||||
|
+bootmenu_delay=0
|
||||||
|
+bootmenu_title= [0;34m( ( ( [1;39mOpenWrt[0;34m ) ) )
|
||||||
|
+bootmenu_0=Initialize environment.=run _firstboot
|
||||||
|
+bootmenu_0d=Run default boot command.=run boot_default
|
||||||
|
+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
|
||||||
|
+bootmenu_2=Boot production system from eMMC.=run boot_production ; run bootmenu_confirm_return
|
||||||
|
+bootmenu_3=Boot recovery system from eMMC.=run boot_recovery ; run bootmenu_confirm_return
|
||||||
|
+bootmenu_4=Load production system via TFTP then write to eMMC.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
|
||||||
|
+bootmenu_5=Load recovery system via TFTP then write to eMMC.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
|
||||||
|
+bootmenu_6=[31mLoad BL31+U-Boot FIP via TFTP then write to eMMC.[0m=run boot_tftp_write_fip ; run bootmenu_confirm_return
|
||||||
|
+bootmenu_7=[31mLoad BL2 preloader via TFTP then write to eMMC.[0m=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
|
||||||
|
+bootmenu_8=Reboot.=reset
|
||||||
|
+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
|
||||||
|
+boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
|
||||||
|
+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
|
||||||
|
+boot_production=led $bootled_pwr on ; run emmc_read_production && bootm $loadaddr#$bootconf ; led $bootled_pwr off
|
||||||
|
+boot_recovery=led $bootled_rec on ; run emmc_read_recovery && bootm $loadaddr#$bootconf ; led $bootled_rec off
|
||||||
|
+boot_emmc=run boot_production ; run boot_recovery
|
||||||
|
+boot_tftp_forever=led $bootled_rec on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
|
||||||
|
+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run emmc_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
|
||||||
|
+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run emmc_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
|
||||||
|
+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run emmc_write_fip
|
||||||
|
+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run emmc_write_bl2
|
||||||
|
+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
|
||||||
|
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$image_size && mmc write $loadaddr 0x$part_addr 0x$image_size
|
||||||
|
+mmc_read_vol=mmc read $loadaddr $part_addr 0x100 && imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc read $loadaddr 0x$part_addr 0x$image_size && setexpr filesize $image_size * 0x200
|
||||||
|
+part_default=production
|
||||||
|
+part_recovery=recovery
|
||||||
|
+reset_factory=eraseenv && reset
|
||||||
|
+emmc_read_production=part start mmc 0 $part_default part_addr && part size mmc 0 $part_default part_size && run mmc_read_vol
|
||||||
|
+emmc_read_recovery=part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_read_vol
|
||||||
|
+emmc_write_bl2=mmc partconf 0 1 1 1 && mmc erase 0x0 0x400 && mmc write $fileaddr 0x0 0x400 ; mmc partconf 0 1 1 0
|
||||||
|
+emmc_write_fip=mmc erase 0x3400 0x2000 && mmc write $fileaddr 0x3400 0x2000 && mmc erase 0x2000 0x800
|
||||||
|
+emmc_write_production=part start mmc 0 $part_default part_addr && part size mmc 0 $part_default part_size && run mmc_write_vol
|
||||||
|
+emmc_write_recovery=part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_write_vol
|
||||||
|
+_init_env=setenv _init_env ; setenv _create_env ; saveenv ; saveenv
|
||||||
|
+_firstboot=setenv _firstboot ; run _switch_to_menu ; run _init_env ; run boot_first
|
||||||
|
+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
|
||||||
|
+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title [33m$ver[0m"
|
||||||
|
|
@ -0,0 +1,414 @@
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/configs/mt7981_xiaomi_mi-router-ax3000t_defconfig
|
||||||
|
@@ -0,0 +1,163 @@
|
||||||
|
+CONFIG_ARM=y
|
||||||
|
+CONFIG_POSITION_INDEPENDENT=y
|
||||||
|
+CONFIG_ARCH_MEDIATEK=y
|
||||||
|
+CONFIG_TARGET_MT7981=y
|
||||||
|
+CONFIG_TEXT_BASE=0x41e00000
|
||||||
|
+CONFIG_SYS_MALLOC_F_LEN=0x4000
|
||||||
|
+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
|
||||||
|
+CONFIG_NR_DRAM_BANKS=1
|
||||||
|
+CONFIG_DEFAULT_DEVICE_TREE="mt7981_xiaomi_mi-router-ax3000t"
|
||||||
|
+CONFIG_DEFAULT_ENV_FILE="xiaomi_mi-router-ax3000t_env"
|
||||||
|
+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7981_xiaomi_mi-router-ax3000t.dtb"
|
||||||
|
+CONFIG_OF_LIBFDT_OVERLAY=y
|
||||||
|
+CONFIG_DEBUG_UART_BASE=0x11002000
|
||||||
|
+CONFIG_DEBUG_UART_CLOCK=40000000
|
||||||
|
+CONFIG_DEBUG_UART=y
|
||||||
|
+CONFIG_SYS_LOAD_ADDR=0x46000000
|
||||||
|
+CONFIG_SMBIOS_PRODUCT_NAME=""
|
||||||
|
+CONFIG_AUTOBOOT_KEYED=y
|
||||||
|
+CONFIG_BOOTDELAY=30
|
||||||
|
+CONFIG_AUTOBOOT_MENU_SHOW=y
|
||||||
|
+CONFIG_CFB_CONSOLE_ANSI=y
|
||||||
|
+CONFIG_BOARD_LATE_INIT=y
|
||||||
|
+CONFIG_BUTTON=y
|
||||||
|
+CONFIG_BUTTON_GPIO=y
|
||||||
|
+CONFIG_GPIO_HOG=y
|
||||||
|
+CONFIG_CMD_ENV_FLAGS=y
|
||||||
|
+CONFIG_FIT=y
|
||||||
|
+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
|
||||||
|
+CONFIG_LED=y
|
||||||
|
+CONFIG_LED_BLINK=y
|
||||||
|
+CONFIG_LED_GPIO=y
|
||||||
|
+CONFIG_LOGLEVEL=7
|
||||||
|
+CONFIG_LOG=y
|
||||||
|
+CONFIG_SYS_PROMPT="MT7981> "
|
||||||
|
+CONFIG_CMD_BOOTMENU=y
|
||||||
|
+CONFIG_CMD_BOOTP=y
|
||||||
|
+CONFIG_CMD_BUTTON=y
|
||||||
|
+CONFIG_CMD_CACHE=y
|
||||||
|
+CONFIG_CMD_CDP=y
|
||||||
|
+CONFIG_CMD_CPU=y
|
||||||
|
+CONFIG_CMD_DHCP=y
|
||||||
|
+CONFIG_CMD_DM=y
|
||||||
|
+CONFIG_CMD_DNS=y
|
||||||
|
+CONFIG_CMD_ECHO=y
|
||||||
|
+CONFIG_CMD_ENV_READMEM=y
|
||||||
|
+CONFIG_CMD_ERASEENV=y
|
||||||
|
+# CONFIG_CMD_EXT4 is not set
|
||||||
|
+# CONFIG_CMD_FAT is not set
|
||||||
|
+CONFIG_CMD_FDT=y
|
||||||
|
+# CONFIG_CMD_FS_GENERIC is not set
|
||||||
|
+# CONFIG_CMD_FS_UUID is not set
|
||||||
|
+CONFIG_CMD_GPIO=y
|
||||||
|
+CONFIG_CMD_GPT=y
|
||||||
|
+CONFIG_CMD_HASH=y
|
||||||
|
+CONFIG_CMD_ITEST=y
|
||||||
|
+CONFIG_CMD_LED=y
|
||||||
|
+CONFIG_CMD_LICENSE=y
|
||||||
|
+CONFIG_CMD_LINK_LOCAL=y
|
||||||
|
+# CONFIG_CMD_MBR is not set
|
||||||
|
+CONFIG_CMD_MTD=y
|
||||||
|
+# CONFIG_CMD_PCI is not set
|
||||||
|
+CONFIG_CMD_PSTORE=y
|
||||||
|
+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
|
||||||
|
+CONFIG_CMD_SF_TEST=y
|
||||||
|
+CONFIG_CMD_PING=y
|
||||||
|
+CONFIG_CMD_PXE=y
|
||||||
|
+# CONFIG_CMD_PWM is not set
|
||||||
|
+CONFIG_CMD_SMC=y
|
||||||
|
+CONFIG_CMD_TFTPBOOT=y
|
||||||
|
+CONFIG_CMD_TFTPSRV=y
|
||||||
|
+CONFIG_CMD_UBI=y
|
||||||
|
+CONFIG_CMD_UBI_RENAME=y
|
||||||
|
+CONFIG_CMD_UBIFS=y
|
||||||
|
+CONFIG_CMD_ASKENV=y
|
||||||
|
+CONFIG_CMD_PART=y
|
||||||
|
+CONFIG_CMD_RARP=y
|
||||||
|
+CONFIG_CMD_SETEXPR=y
|
||||||
|
+CONFIG_CMD_SLEEP=y
|
||||||
|
+CONFIG_CMD_SNTP=y
|
||||||
|
+CONFIG_CMD_SOURCE=y
|
||||||
|
+CONFIG_CMD_STRINGS=y
|
||||||
|
+# CONFIG_CMD_USB is not set
|
||||||
|
+# CONFIG_CMD_FLASH is not set
|
||||||
|
+CONFIG_CMD_UUID=y
|
||||||
|
+CONFIG_DISPLAY_CPUINFO=y
|
||||||
|
+CONFIG_DM_MTD=y
|
||||||
|
+CONFIG_DM_REGULATOR=y
|
||||||
|
+CONFIG_DM_REGULATOR_FIXED=y
|
||||||
|
+CONFIG_DM_REGULATOR_GPIO=y
|
||||||
|
+# CONFIG_DM_USB is not set
|
||||||
|
+# CONFIG_DM_PWM is not set
|
||||||
|
+# CONFIG_PWM_MTK is not set
|
||||||
|
+CONFIG_HUSH_PARSER=y
|
||||||
|
+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
|
||||||
|
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||||
|
+CONFIG_VERSION_VARIABLE=y
|
||||||
|
+CONFIG_PARTITION_UUIDS=y
|
||||||
|
+CONFIG_NETCONSOLE=y
|
||||||
|
+CONFIG_REGMAP=y
|
||||||
|
+CONFIG_SYSCON=y
|
||||||
|
+CONFIG_CLK=y
|
||||||
|
+CONFIG_DM_GPIO=y
|
||||||
|
+# CONFIG_DM_SCSI is not set
|
||||||
|
+# CONFIG_AHCI is not set
|
||||||
|
+CONFIG_PHY=y
|
||||||
|
+# CONFIG_PHY_MTK_TPHY is not set
|
||||||
|
+CONFIG_PHY_FIXED=y
|
||||||
|
+CONFIG_MTK_AHCI=y
|
||||||
|
+CONFIG_DM_ETH=y
|
||||||
|
+CONFIG_MEDIATEK_ETH=y
|
||||||
|
+# CONFIG_PCI is not set
|
||||||
|
+# CONFIG_MMC is not set
|
||||||
|
+# CONFIG_DM_MMC is not set
|
||||||
|
+CONFIG_MTD=y
|
||||||
|
+CONFIG_MTD_UBI_FASTMAP=y
|
||||||
|
+# CONFIG_DM_PCI is not set
|
||||||
|
+# CONFIG_PCIE_MEDIATEK is not set
|
||||||
|
+CONFIG_PINCTRL=y
|
||||||
|
+CONFIG_PINCONF=y
|
||||||
|
+CONFIG_PINCTRL_MT7981=y
|
||||||
|
+CONFIG_POWER_DOMAIN=y
|
||||||
|
+CONFIG_PRE_CONSOLE_BUFFER=y
|
||||||
|
+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
|
||||||
|
+CONFIG_MTK_POWER_DOMAIN=y
|
||||||
|
+CONFIG_RAM=y
|
||||||
|
+CONFIG_DM_SERIAL=y
|
||||||
|
+CONFIG_MTK_SERIAL=y
|
||||||
|
+CONFIG_SPI=y
|
||||||
|
+CONFIG_DM_SPI=y
|
||||||
|
+CONFIG_MTK_SPI_NAND=y
|
||||||
|
+CONFIG_MTK_SPI_NAND_MTD=y
|
||||||
|
+CONFIG_SYSRESET_WATCHDOG=y
|
||||||
|
+CONFIG_WDT_MTK=y
|
||||||
|
+CONFIG_LZO=y
|
||||||
|
+CONFIG_ZSTD=y
|
||||||
|
+CONFIG_HEXDUMP=y
|
||||||
|
+CONFIG_RANDOM_UUID=y
|
||||||
|
+CONFIG_REGEX=y
|
||||||
|
+# CONFIG_USB is not set
|
||||||
|
+# CONFIG_USB_HOST is not set
|
||||||
|
+# CONFIG_USB_XHCI_HCD is not set
|
||||||
|
+# CONFIG_USB_XHCI_MTK is not set
|
||||||
|
+# CONFIG_USB_STORAGE is not set
|
||||||
|
+CONFIG_OF_EMBED=y
|
||||||
|
+CONFIG_ENV_OVERWRITE=y
|
||||||
|
+CONFIG_ENV_IS_IN_UBI=y
|
||||||
|
+CONFIG_ENV_UBI_PART="ubi"
|
||||||
|
+CONFIG_ENV_SIZE=0x1f000
|
||||||
|
+CONFIG_ENV_SIZE_REDUND=0x1f000
|
||||||
|
+CONFIG_ENV_UBI_VOLUME="ubootenv"
|
||||||
|
+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
|
||||||
|
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
||||||
|
+CONFIG_NET_RANDOM_ETHADDR=y
|
||||||
|
+CONFIG_USE_DEFAULT_ENV_FILE=y
|
||||||
|
+CONFIG_MTD_SPI_NAND=y
|
||||||
|
+CONFIG_MTK_SPIM=y
|
||||||
|
+CONFIG_CMD_NAND=y
|
||||||
|
+CONFIG_CMD_NAND_TRIMFFS=y
|
||||||
|
+CONFIG_LMB_MAX_REGIONS=64
|
||||||
|
+CONFIG_USE_IPADDR=y
|
||||||
|
+CONFIG_IPADDR="192.168.1.1"
|
||||||
|
+CONFIG_USE_SERVERIP=y
|
||||||
|
+CONFIG_SERVERIP="192.168.1.254"
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/arch/arm/dts/mt7981_xiaomi_mi-router-ax3000t.dts
|
||||||
|
@@ -0,0 +1,187 @@
|
||||||
|
+// SPDX-License-Identifier: GPL-2.0
|
||||||
|
+/*
|
||||||
|
+ * Copyright (c) 2022 MediaTek Inc.
|
||||||
|
+ * Author: Sam Shih <sam.shih@mediatek.com>
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+/dts-v1/;
|
||||||
|
+#include "mt7981.dtsi"
|
||||||
|
+#include <dt-bindings/gpio/gpio.h>
|
||||||
|
+#include <dt-bindings/input/linux-event-codes.h>
|
||||||
|
+
|
||||||
|
+/ {
|
||||||
|
+ #address-cells = <1>;
|
||||||
|
+ #size-cells = <1>;
|
||||||
|
+ model = "Xiaomi Router AX3000T";
|
||||||
|
+ compatible = "mediatek,mt7981", "mediatek,mt7981-rfb";
|
||||||
|
+
|
||||||
|
+ chosen {
|
||||||
|
+ stdout-path = &uart0;
|
||||||
|
+ tick-timer = &timer0;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ memory@40000000 {
|
||||||
|
+ device_type = "memory";
|
||||||
|
+ reg = <0x40000000 0x10000000>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ gpio-keys {
|
||||||
|
+ compatible = "gpio-keys";
|
||||||
|
+
|
||||||
|
+ reset {
|
||||||
|
+ label = "reset";
|
||||||
|
+ gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
|
||||||
|
+ linux,code = <KEY_RESTART>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ mesh {
|
||||||
|
+ label = "mesh";
|
||||||
|
+ gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
|
||||||
|
+ linux,code = <BTN_9>;
|
||||||
|
+ linux,input-type = <EV_SW>;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ leds {
|
||||||
|
+ compatible = "gpio-leds";
|
||||||
|
+
|
||||||
|
+ led_status_blue {
|
||||||
|
+ label = "blue:status";
|
||||||
|
+ gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ led_status_yellow {
|
||||||
|
+ label = "yellow:status";
|
||||||
|
+ gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&uart0 {
|
||||||
|
+ mediatek,force-highspeed;
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+ð {
|
||||||
|
+ status = "okay";
|
||||||
|
+ mediatek,gmac-id = <0>;
|
||||||
|
+ phy-mode = "2500base-x";
|
||||||
|
+ mediatek,switch = "mt7531";
|
||||||
|
+ reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>;
|
||||||
|
+
|
||||||
|
+ fixed-link {
|
||||||
|
+ speed = <2500>;
|
||||||
|
+ full-duplex;
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&pinctrl {
|
||||||
|
+ spic_pins: spi1-pins-func-1 {
|
||||||
|
+ mux {
|
||||||
|
+ function = "spi";
|
||||||
|
+ groups = "spi1_1";
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ uart1_pins: spi1-pins-func-3 {
|
||||||
|
+ mux {
|
||||||
|
+ function = "uart";
|
||||||
|
+ groups = "uart1_2";
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ spi_flash_pins: spi0-pins-func-1 {
|
||||||
|
+ mux {
|
||||||
|
+ function = "flash";
|
||||||
|
+ groups = "spi0", "spi0_wp_hold";
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ conf-pu {
|
||||||
|
+ pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
|
||||||
|
+ drive-strength = <MTK_DRIVE_8mA>;
|
||||||
|
+ bias-pull-up = <MTK_PUPD_SET_R1R0_11>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ conf-pd {
|
||||||
|
+ pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
|
||||||
|
+ drive-strength = <MTK_DRIVE_8mA>;
|
||||||
|
+ bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&spi0 {
|
||||||
|
+ #address-cells = <1>;
|
||||||
|
+ #size-cells = <0>;
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&spi_flash_pins>;
|
||||||
|
+ status = "okay";
|
||||||
|
+ must_tx;
|
||||||
|
+ enhance_timing;
|
||||||
|
+ dma_ext;
|
||||||
|
+ ipm_design;
|
||||||
|
+ support_quad;
|
||||||
|
+ tick_dly = <2>;
|
||||||
|
+ sample_sel = <0>;
|
||||||
|
+
|
||||||
|
+ spi_nand@0 {
|
||||||
|
+ compatible = "spi-nand";
|
||||||
|
+ reg = <0>;
|
||||||
|
+ spi-max-frequency = <52000000>;
|
||||||
|
+
|
||||||
|
+ partitions {
|
||||||
|
+ compatible = "fixed-partitions";
|
||||||
|
+ #address-cells = <1>;
|
||||||
|
+ #size-cells = <1>;
|
||||||
|
+
|
||||||
|
+ partition@0 {
|
||||||
|
+ label = "bl2";
|
||||||
|
+ reg = <0x00 0x100000>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ partition@100000 {
|
||||||
|
+ label = "Nvram";
|
||||||
|
+ reg = <0x100000 0x40000>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ partition@140000 {
|
||||||
|
+ label = "Bdata";
|
||||||
|
+ reg = <0x140000 0x40000>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ partition@180000 {
|
||||||
|
+ label = "factory";
|
||||||
|
+ reg = <0x180000 0x200000>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ partition@380000 {
|
||||||
|
+ label = "fip";
|
||||||
|
+ reg = <0x380000 0x200000>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ partition@580000 {
|
||||||
|
+ label = "crash";
|
||||||
|
+ reg = <0x580000 0x40000>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ partition@5c0000 {
|
||||||
|
+ label = "crash_log";
|
||||||
|
+ reg = <0x5c0000 0x40000>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ partition@600000 {
|
||||||
|
+ label = "ubi";
|
||||||
|
+ reg = <0x600000 0x7000000>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ partition@7600000 {
|
||||||
|
+ label = "KF";
|
||||||
|
+ reg = <0x7600000 0x40000>;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&watchdog {
|
||||||
|
+ status = "disabled";
|
||||||
|
+};
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/xiaomi_mi-router-ax3000t_env
|
||||||
|
@@ -0,0 +1,55 @@
|
||||||
|
+ipaddr=192.168.1.1
|
||||||
|
+serverip=192.168.1.254
|
||||||
|
+loadaddr=0x46000000
|
||||||
|
+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
|
||||||
|
+bootargs=console=ttyS0,115200n8 console_msg_format=syslog
|
||||||
|
+bootcmd=if pstore check ; then run boot_recovery ; else run boot_ubi ; fi
|
||||||
|
+bootconf=config-1
|
||||||
|
+bootdelay=0
|
||||||
|
+bootfile=openwrt-mediatek-filogic-xiaomi_mi-router-ax3000t-ubootmod-initramfs-recovery.itb
|
||||||
|
+bootfile_bl2=openwrt-mediatek-filogic-xiaomi_mi-router-ax3000t-ubootmod-preloader.bin
|
||||||
|
+bootfile_fip=openwrt-mediatek-filogic-xiaomi_mi-router-ax3000t-ubootmod-bl31-uboot.fip
|
||||||
|
+bootfile_upg=openwrt-mediatek-filogic-xiaomi_mi-router-ax3000t-ubootmod-squashfs-sysupgrade.itb
|
||||||
|
+bootled_pwr=yellow:status
|
||||||
|
+bootled_rec=blue:status
|
||||||
|
+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
|
||||||
|
+bootmenu_default=0
|
||||||
|
+bootmenu_delay=0
|
||||||
|
+bootmenu_title= [0;34m( ( ( [1;39mOpenWrt[0;34m ) ) )
|
||||||
|
+bootmenu_0=Initialize environment.=run _firstboot
|
||||||
|
+bootmenu_0d=Run default boot command.=run boot_default
|
||||||
|
+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
|
||||||
|
+bootmenu_2=Boot production system from NAND.=run boot_production ; run bootmenu_confirm_return
|
||||||
|
+bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
|
||||||
|
+bootmenu_4=Load production system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
|
||||||
|
+bootmenu_5=Load recovery system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
|
||||||
|
+bootmenu_6=[31mLoad BL31+U-Boot FIP via TFTP then write to NAND.[0m=run boot_tftp_write_fip ; run bootmenu_confirm_return
|
||||||
|
+bootmenu_7=[31mLoad BL2 preloader via TFTP then write to NAND.[0m=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
|
||||||
|
+bootmenu_8=Reboot.=reset
|
||||||
|
+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
|
||||||
|
+boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
|
||||||
|
+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
|
||||||
|
+boot_production=led $bootled_pwr on ; run ubi_read_production && bootm $loadaddr#$bootconf ; led $bootled_pwr off
|
||||||
|
+boot_recovery=led $bootled_rec on ; run ubi_read_recovery && bootm $loadaddr#$bootconf ; led $bootled_rec off
|
||||||
|
+boot_ubi=run boot_production ; run boot_recovery ; run boot_tftp_forever
|
||||||
|
+boot_tftp_forever=led $bootled_rec on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
|
||||||
|
+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run ubi_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
|
||||||
|
+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run ubi_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
|
||||||
|
+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
|
||||||
|
+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run mtd_write_fip && run reset_factory
|
||||||
|
+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run mtd_write_bl2
|
||||||
|
+reset_factory=ubi part ubi ; mw $loadaddr 0x0 0x800 ; ubi write $loadaddr ubootenv 0x800 ; ubi write $loadaddr ubootenv2 0x800
|
||||||
|
+mtd_write_fip=mtd erase fip && mtd write fip $loadaddr
|
||||||
|
+mtd_write_bl2=mtd erase bl2 && mtd write bl2 $loadaddr
|
||||||
|
+ubi_create_env=ubi check ubootenv || ubi create ubootenv 0x100000 dynamic 0 || run ubi_format ; ubi check ubootenv2 || ubi create ubootenv2 0x100000 dynamic 1 || run ubi_format
|
||||||
|
+ubi_format=ubi detach ; mtd erase ubi && ubi part ubi ; reset
|
||||||
|
+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
|
||||||
|
+ubi_read_production=ubi read $loadaddr fit && iminfo $loadaddr && run ubi_prepare_rootfs
|
||||||
|
+ubi_read_recovery=ubi check recovery && ubi read $loadaddr recovery
|
||||||
|
+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
|
||||||
|
+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic 2 && ubi write $loadaddr fit $filesize
|
||||||
|
+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic 3 && ubi write $loadaddr recovery $filesize
|
||||||
|
+_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
|
||||||
|
+_firstboot=setenv _firstboot ; run _switch_to_menu ; run _init_env ; run boot_first
|
||||||
|
+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
|
||||||
|
+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title [33m$ver[0m"
|
||||||
|
|
@ -5,9 +5,9 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
include $(INCLUDE_DIR)/kernel.mk
|
include $(INCLUDE_DIR)/kernel.mk
|
||||||
|
|
||||||
PKG_VERSION:=2023.07.02
|
PKG_VERSION:=2024.01
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
PKG_HASH:=6b6a48581c14abb0f95bd87c1af4d740922406d7b801002a9f94727fdde021d5
|
PKG_HASH:=b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3
|
||||||
|
|
||||||
PKG_MAINTAINER:=Tobias Maedel <openwrt@tbspace.de>
|
PKG_MAINTAINER:=Tobias Maedel <openwrt@tbspace.de>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,594 +0,0 @@
|
||||||
From 89afb631d965292aaf433806d8224b53d9e74036 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tianling Shen <cnsztl@gmail.com>
|
|
||||||
Date: Sat, 20 May 2023 18:50:38 +0800
|
|
||||||
Subject: [PATCH] rockchip: rk3328: Add support for Orange Pi R1 Plus
|
|
||||||
|
|
||||||
Orange Pi R1 Plus is a Rockchip RK3328 based SBC by Xunlong.
|
|
||||||
|
|
||||||
This device is similar to the NanoPi R2S, and has a 16MB
|
|
||||||
SPI NOR (mx25l12805d). The reset button is changed to
|
|
||||||
directly reset the power supply, another detail is that
|
|
||||||
both network ports have independent MAC addresses.
|
|
||||||
|
|
||||||
The device tree and description are taken from kernel v6.3-rc1.
|
|
||||||
|
|
||||||
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
|
|
||||||
Signed-off-by: Tianling Shen <cnsztl@gmail.com>
|
|
||||||
---
|
|
||||||
arch/arm/dts/Makefile | 1 +
|
|
||||||
.../dts/rk3328-orangepi-r1-plus-u-boot.dtsi | 46 +++
|
|
||||||
arch/arm/dts/rk3328-orangepi-r1-plus.dts | 373 ++++++++++++++++++
|
|
||||||
board/rockchip/evb_rk3328/MAINTAINERS | 6 +
|
|
||||||
configs/orangepi-r1-plus-rk3328_defconfig | 114 ++++++
|
|
||||||
5 files changed, 540 insertions(+)
|
|
||||||
create mode 100644 arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi
|
|
||||||
create mode 100644 arch/arm/dts/rk3328-orangepi-r1-plus.dts
|
|
||||||
create mode 100644 configs/orangepi-r1-plus-rk3328_defconfig
|
|
||||||
|
|
||||||
--- a/arch/arm/dts/Makefile
|
|
||||||
+++ b/arch/arm/dts/Makefile
|
|
||||||
@@ -125,6 +125,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3328) += \
|
|
||||||
rk3328-evb.dtb \
|
|
||||||
rk3328-nanopi-r2c.dtb \
|
|
||||||
rk3328-nanopi-r2s.dtb \
|
|
||||||
+ rk3328-orangepi-r1-plus.dtb \
|
|
||||||
rk3328-roc-cc.dtb \
|
|
||||||
rk3328-rock64.dtb \
|
|
||||||
rk3328-rock-pi-e.dtb
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi
|
|
||||||
@@ -0,0 +1,46 @@
|
|
||||||
+// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
+/*
|
|
||||||
+ * (C) Copyright 2018-2019 Rockchip Electronics Co., Ltd
|
|
||||||
+ * (C) Copyright 2020 David Bauer
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#include "rk3328-u-boot.dtsi"
|
|
||||||
+#include "rk3328-sdram-ddr4-666.dtsi"
|
|
||||||
+/ {
|
|
||||||
+ chosen {
|
|
||||||
+ u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&gpio0 {
|
|
||||||
+ bootph-pre-ram;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&pinctrl {
|
|
||||||
+ bootph-pre-ram;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&sdmmc0m1_pin {
|
|
||||||
+ bootph-pre-ram;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&pcfg_pull_up_4ma {
|
|
||||||
+ bootph-pre-ram;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+/* Need this and all the pinctrl/gpio stuff above to set pinmux */
|
|
||||||
+&vcc_sd {
|
|
||||||
+ bootph-pre-ram;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&gmac2io {
|
|
||||||
+ snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
|
|
||||||
+ snps,reset-active-low;
|
|
||||||
+ snps,reset-delays-us = <0 10000 50000>;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&spi0 {
|
|
||||||
+ spi_flash: spiflash@0 {
|
|
||||||
+ bootph-all;
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/arch/arm/dts/rk3328-orangepi-r1-plus.dts
|
|
||||||
@@ -0,0 +1,373 @@
|
|
||||||
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
||||||
+/*
|
|
||||||
+ * Based on rk3328-nanopi-r2s.dts, which is:
|
|
||||||
+ * Copyright (c) 2020 David Bauer <mail@david-bauer.net>
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+/dts-v1/;
|
|
||||||
+
|
|
||||||
+#include <dt-bindings/gpio/gpio.h>
|
|
||||||
+#include <dt-bindings/leds/common.h>
|
|
||||||
+#include "rk3328.dtsi"
|
|
||||||
+
|
|
||||||
+/ {
|
|
||||||
+ model = "Xunlong Orange Pi R1 Plus";
|
|
||||||
+ compatible = "xunlong,orangepi-r1-plus", "rockchip,rk3328";
|
|
||||||
+
|
|
||||||
+ aliases {
|
|
||||||
+ ethernet1 = &rtl8153;
|
|
||||||
+ mmc0 = &sdmmc;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ chosen {
|
|
||||||
+ stdout-path = "serial2:1500000n8";
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ gmac_clk: gmac-clock {
|
|
||||||
+ compatible = "fixed-clock";
|
|
||||||
+ clock-frequency = <125000000>;
|
|
||||||
+ clock-output-names = "gmac_clkin";
|
|
||||||
+ #clock-cells = <0>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ leds {
|
|
||||||
+ compatible = "gpio-leds";
|
|
||||||
+ pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>;
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+
|
|
||||||
+ led-0 {
|
|
||||||
+ function = LED_FUNCTION_LAN;
|
|
||||||
+ color = <LED_COLOR_ID_GREEN>;
|
|
||||||
+ gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ led-1 {
|
|
||||||
+ function = LED_FUNCTION_STATUS;
|
|
||||||
+ color = <LED_COLOR_ID_RED>;
|
|
||||||
+ gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ linux,default-trigger = "heartbeat";
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ led-2 {
|
|
||||||
+ function = LED_FUNCTION_WAN;
|
|
||||||
+ color = <LED_COLOR_ID_GREEN>;
|
|
||||||
+ gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcc_sd: sdmmc-regulator {
|
|
||||||
+ compatible = "regulator-fixed";
|
|
||||||
+ gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;
|
|
||||||
+ pinctrl-0 = <&sdmmc0m1_pin>;
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ regulator-name = "vcc_sd";
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ vin-supply = <&vcc_io>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcc_sys: vcc-sys-regulator {
|
|
||||||
+ compatible = "regulator-fixed";
|
|
||||||
+ regulator-name = "vcc_sys";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-min-microvolt = <5000000>;
|
|
||||||
+ regulator-max-microvolt = <5000000>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vdd_5v_lan: vdd-5v-lan-regulator {
|
|
||||||
+ compatible = "regulator-fixed";
|
|
||||||
+ enable-active-high;
|
|
||||||
+ gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ pinctrl-0 = <&lan_vdd_pin>;
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ regulator-name = "vdd_5v_lan";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ vin-supply = <&vcc_sys>;
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&cpu0 {
|
|
||||||
+ cpu-supply = <&vdd_arm>;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&cpu1 {
|
|
||||||
+ cpu-supply = <&vdd_arm>;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&cpu2 {
|
|
||||||
+ cpu-supply = <&vdd_arm>;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&cpu3 {
|
|
||||||
+ cpu-supply = <&vdd_arm>;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&display_subsystem {
|
|
||||||
+ status = "disabled";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&gmac2io {
|
|
||||||
+ assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;
|
|
||||||
+ assigned-clock-parents = <&gmac_clk>, <&gmac_clk>;
|
|
||||||
+ clock_in_out = "input";
|
|
||||||
+ phy-handle = <&rtl8211e>;
|
|
||||||
+ phy-mode = "rgmii";
|
|
||||||
+ phy-supply = <&vcc_io>;
|
|
||||||
+ pinctrl-0 = <&rgmiim1_pins>;
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ snps,aal;
|
|
||||||
+ rx_delay = <0x18>;
|
|
||||||
+ tx_delay = <0x24>;
|
|
||||||
+ status = "okay";
|
|
||||||
+
|
|
||||||
+ mdio {
|
|
||||||
+ compatible = "snps,dwmac-mdio";
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <0>;
|
|
||||||
+
|
|
||||||
+ rtl8211e: ethernet-phy@1 {
|
|
||||||
+ reg = <1>;
|
|
||||||
+ pinctrl-0 = <ð_phy_reset_pin>;
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ reset-assert-us = <10000>;
|
|
||||||
+ reset-deassert-us = <50000>;
|
|
||||||
+ reset-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&i2c1 {
|
|
||||||
+ status = "okay";
|
|
||||||
+
|
|
||||||
+ rk805: pmic@18 {
|
|
||||||
+ compatible = "rockchip,rk805";
|
|
||||||
+ reg = <0x18>;
|
|
||||||
+ interrupt-parent = <&gpio1>;
|
|
||||||
+ interrupts = <24 IRQ_TYPE_LEVEL_LOW>;
|
|
||||||
+ #clock-cells = <1>;
|
|
||||||
+ clock-output-names = "xin32k", "rk805-clkout2";
|
|
||||||
+ gpio-controller;
|
|
||||||
+ #gpio-cells = <2>;
|
|
||||||
+ pinctrl-0 = <&pmic_int_l>;
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ rockchip,system-power-controller;
|
|
||||||
+ wakeup-source;
|
|
||||||
+
|
|
||||||
+ vcc1-supply = <&vcc_sys>;
|
|
||||||
+ vcc2-supply = <&vcc_sys>;
|
|
||||||
+ vcc3-supply = <&vcc_sys>;
|
|
||||||
+ vcc4-supply = <&vcc_sys>;
|
|
||||||
+ vcc5-supply = <&vcc_io>;
|
|
||||||
+ vcc6-supply = <&vcc_sys>;
|
|
||||||
+
|
|
||||||
+ regulators {
|
|
||||||
+ vdd_log: DCDC_REG1 {
|
|
||||||
+ regulator-name = "vdd_log";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-min-microvolt = <712500>;
|
|
||||||
+ regulator-max-microvolt = <1450000>;
|
|
||||||
+ regulator-ramp-delay = <12500>;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-on-in-suspend;
|
|
||||||
+ regulator-suspend-microvolt = <1000000>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vdd_arm: DCDC_REG2 {
|
|
||||||
+ regulator-name = "vdd_arm";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-min-microvolt = <712500>;
|
|
||||||
+ regulator-max-microvolt = <1450000>;
|
|
||||||
+ regulator-ramp-delay = <12500>;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-on-in-suspend;
|
|
||||||
+ regulator-suspend-microvolt = <950000>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcc_ddr: DCDC_REG3 {
|
|
||||||
+ regulator-name = "vcc_ddr";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-on-in-suspend;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcc_io: DCDC_REG4 {
|
|
||||||
+ regulator-name = "vcc_io";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-min-microvolt = <3300000>;
|
|
||||||
+ regulator-max-microvolt = <3300000>;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-on-in-suspend;
|
|
||||||
+ regulator-suspend-microvolt = <3300000>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcc_18: LDO_REG1 {
|
|
||||||
+ regulator-name = "vcc_18";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-min-microvolt = <1800000>;
|
|
||||||
+ regulator-max-microvolt = <1800000>;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-on-in-suspend;
|
|
||||||
+ regulator-suspend-microvolt = <1800000>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcc18_emmc: LDO_REG2 {
|
|
||||||
+ regulator-name = "vcc18_emmc";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-min-microvolt = <1800000>;
|
|
||||||
+ regulator-max-microvolt = <1800000>;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-on-in-suspend;
|
|
||||||
+ regulator-suspend-microvolt = <1800000>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vdd_10: LDO_REG3 {
|
|
||||||
+ regulator-name = "vdd_10";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-min-microvolt = <1000000>;
|
|
||||||
+ regulator-max-microvolt = <1000000>;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-on-in-suspend;
|
|
||||||
+ regulator-suspend-microvolt = <1000000>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&io_domains {
|
|
||||||
+ pmuio-supply = <&vcc_io>;
|
|
||||||
+ vccio1-supply = <&vcc_io>;
|
|
||||||
+ vccio2-supply = <&vcc18_emmc>;
|
|
||||||
+ vccio3-supply = <&vcc_io>;
|
|
||||||
+ vccio4-supply = <&vcc_io>;
|
|
||||||
+ vccio5-supply = <&vcc_io>;
|
|
||||||
+ vccio6-supply = <&vcc_io>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&pinctrl {
|
|
||||||
+ gmac2io {
|
|
||||||
+ eth_phy_reset_pin: eth-phy-reset-pin {
|
|
||||||
+ rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ leds {
|
|
||||||
+ lan_led_pin: lan-led-pin {
|
|
||||||
+ rockchip,pins = <2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ sys_led_pin: sys-led-pin {
|
|
||||||
+ rockchip,pins = <3 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ wan_led_pin: wan-led-pin {
|
|
||||||
+ rockchip,pins = <2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ lan {
|
|
||||||
+ lan_vdd_pin: lan-vdd-pin {
|
|
||||||
+ rockchip,pins = <2 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ pmic {
|
|
||||||
+ pmic_int_l: pmic-int-l {
|
|
||||||
+ rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&pwm2 {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&sdmmc {
|
|
||||||
+ bus-width = <4>;
|
|
||||||
+ cap-sd-highspeed;
|
|
||||||
+ disable-wp;
|
|
||||||
+ pinctrl-0 = <&sdmmc0_clk>, <&sdmmc0_cmd>, <&sdmmc0_dectn>, <&sdmmc0_bus4>;
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ vmmc-supply = <&vcc_sd>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&spi0 {
|
|
||||||
+ status = "okay";
|
|
||||||
+
|
|
||||||
+ flash@0 {
|
|
||||||
+ compatible = "jedec,spi-nor";
|
|
||||||
+ reg = <0>;
|
|
||||||
+ spi-max-frequency = <50000000>;
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&tsadc {
|
|
||||||
+ rockchip,hw-tshut-mode = <0>;
|
|
||||||
+ rockchip,hw-tshut-polarity = <0>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&u2phy {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&u2phy_host {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&u2phy_otg {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&uart2 {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&usb20_otg {
|
|
||||||
+ dr_mode = "host";
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&usbdrd3 {
|
|
||||||
+ dr_mode = "host";
|
|
||||||
+ status = "okay";
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <0>;
|
|
||||||
+
|
|
||||||
+ /* Second port is for USB 3.0 */
|
|
||||||
+ rtl8153: device@2 {
|
|
||||||
+ compatible = "usbbda,8153";
|
|
||||||
+ reg = <2>;
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&usb_host0_ehci {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&usb_host0_ohci {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
--- a/board/rockchip/evb_rk3328/MAINTAINERS
|
|
||||||
+++ b/board/rockchip/evb_rk3328/MAINTAINERS
|
|
||||||
@@ -18,6 +18,12 @@ F: configs/nanopi-r2s-rk3328_defcon
|
|
||||||
F: arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
|
|
||||||
F: arch/arm/dts/rk3328-nanopi-r2s.dts
|
|
||||||
|
|
||||||
+ORANGEPI-R1-PLUS-RK3328
|
|
||||||
+M: Tianling Shen <cnsztl@gmail.com>
|
|
||||||
+S: Maintained
|
|
||||||
+F: configs/orangepi-r1-plus-rk3328_defconfig
|
|
||||||
+F: arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi
|
|
||||||
+
|
|
||||||
ROC-RK3328-CC
|
|
||||||
M: Loic Devulder <ldevulder@suse.com>
|
|
||||||
M: Chen-Yu Tsai <wens@csie.org>
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/configs/orangepi-r1-plus-rk3328_defconfig
|
|
||||||
@@ -0,0 +1,114 @@
|
|
||||||
+CONFIG_ARM=y
|
|
||||||
+CONFIG_SKIP_LOWLEVEL_INIT=y
|
|
||||||
+CONFIG_COUNTER_FREQUENCY=24000000
|
|
||||||
+CONFIG_ARCH_ROCKCHIP=y
|
|
||||||
+CONFIG_TEXT_BASE=0x00200000
|
|
||||||
+CONFIG_SPL_GPIO=y
|
|
||||||
+CONFIG_NR_DRAM_BANKS=1
|
|
||||||
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
|
|
||||||
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
|
|
||||||
+CONFIG_ENV_OFFSET=0x3F8000
|
|
||||||
+CONFIG_DEFAULT_DEVICE_TREE="rk3328-orangepi-r1-plus"
|
|
||||||
+CONFIG_DM_RESET=y
|
|
||||||
+CONFIG_ROCKCHIP_RK3328=y
|
|
||||||
+CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
|
|
||||||
+CONFIG_TPL_LIBCOMMON_SUPPORT=y
|
|
||||||
+CONFIG_TPL_LIBGENERIC_SUPPORT=y
|
|
||||||
+CONFIG_SPL_DRIVERS_MISC=y
|
|
||||||
+CONFIG_SPL_STACK_R_ADDR=0x600000
|
|
||||||
+CONFIG_SPL_STACK=0x400000
|
|
||||||
+CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
|
|
||||||
+CONFIG_DEBUG_UART_BASE=0xFF130000
|
|
||||||
+CONFIG_DEBUG_UART_CLOCK=24000000
|
|
||||||
+CONFIG_SYS_LOAD_ADDR=0x800800
|
|
||||||
+CONFIG_DEBUG_UART=y
|
|
||||||
+# CONFIG_ANDROID_BOOT_IMAGE is not set
|
|
||||||
+CONFIG_FIT=y
|
|
||||||
+CONFIG_FIT_VERBOSE=y
|
|
||||||
+CONFIG_SPL_LOAD_FIT=y
|
|
||||||
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-orangepi-r1-plus.dtb"
|
|
||||||
+# CONFIG_DISPLAY_CPUINFO is not set
|
|
||||||
+CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
||||||
+CONFIG_MISC_INIT_R=y
|
|
||||||
+CONFIG_SPL_MAX_SIZE=0x40000
|
|
||||||
+CONFIG_SPL_PAD_TO=0x7f8000
|
|
||||||
+CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
|
|
||||||
+CONFIG_SPL_BSS_START_ADDR=0x2000000
|
|
||||||
+CONFIG_SPL_BSS_MAX_SIZE=0x2000
|
|
||||||
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
|
|
||||||
+# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
|
|
||||||
+CONFIG_SPL_STACK_R=y
|
|
||||||
+CONFIG_SPL_I2C=y
|
|
||||||
+CONFIG_SPL_POWER=y
|
|
||||||
+CONFIG_SPL_ATF=y
|
|
||||||
+CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
|
|
||||||
+CONFIG_TPL_SYS_MALLOC_SIMPLE=y
|
|
||||||
+CONFIG_CMD_BOOTZ=y
|
|
||||||
+CONFIG_CMD_GPT=y
|
|
||||||
+CONFIG_CMD_MMC=y
|
|
||||||
+CONFIG_CMD_USB=y
|
|
||||||
+# CONFIG_CMD_SETEXPR is not set
|
|
||||||
+CONFIG_CMD_TIME=y
|
|
||||||
+CONFIG_SPL_OF_CONTROL=y
|
|
||||||
+CONFIG_TPL_OF_CONTROL=y
|
|
||||||
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
|
|
||||||
+CONFIG_TPL_OF_PLATDATA=y
|
|
||||||
+CONFIG_ENV_IS_IN_MMC=y
|
|
||||||
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
||||||
+CONFIG_SYS_MMC_ENV_DEV=1
|
|
||||||
+CONFIG_NET_RANDOM_ETHADDR=y
|
|
||||||
+CONFIG_TPL_DM=y
|
|
||||||
+CONFIG_REGMAP=y
|
|
||||||
+CONFIG_SPL_REGMAP=y
|
|
||||||
+CONFIG_TPL_REGMAP=y
|
|
||||||
+CONFIG_SYSCON=y
|
|
||||||
+CONFIG_SPL_SYSCON=y
|
|
||||||
+CONFIG_TPL_SYSCON=y
|
|
||||||
+CONFIG_CLK=y
|
|
||||||
+CONFIG_SPL_CLK=y
|
|
||||||
+CONFIG_FASTBOOT_BUF_ADDR=0x800800
|
|
||||||
+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
|
|
||||||
+CONFIG_ROCKCHIP_GPIO=y
|
|
||||||
+CONFIG_SYS_I2C_ROCKCHIP=y
|
|
||||||
+CONFIG_MMC_DW=y
|
|
||||||
+CONFIG_MMC_DW_ROCKCHIP=y
|
|
||||||
+CONFIG_SF_DEFAULT_SPEED=20000000
|
|
||||||
+CONFIG_SPI_FLASH_GIGADEVICE=y
|
|
||||||
+CONFIG_ETH_DESIGNWARE=y
|
|
||||||
+CONFIG_GMAC_ROCKCHIP=y
|
|
||||||
+CONFIG_PINCTRL=y
|
|
||||||
+CONFIG_SPL_PINCTRL=y
|
|
||||||
+CONFIG_DM_PMIC=y
|
|
||||||
+CONFIG_PMIC_RK8XX=y
|
|
||||||
+CONFIG_SPL_PMIC_RK8XX=y
|
|
||||||
+CONFIG_SPL_DM_REGULATOR=y
|
|
||||||
+CONFIG_REGULATOR_PWM=y
|
|
||||||
+CONFIG_DM_REGULATOR_FIXED=y
|
|
||||||
+CONFIG_SPL_DM_REGULATOR_FIXED=y
|
|
||||||
+CONFIG_REGULATOR_RK8XX=y
|
|
||||||
+CONFIG_PWM_ROCKCHIP=y
|
|
||||||
+CONFIG_RAM=y
|
|
||||||
+CONFIG_SPL_RAM=y
|
|
||||||
+CONFIG_TPL_RAM=y
|
|
||||||
+CONFIG_BAUDRATE=1500000
|
|
||||||
+CONFIG_DEBUG_UART_SHIFT=2
|
|
||||||
+CONFIG_SYS_NS16550_MEM32=y
|
|
||||||
+CONFIG_ROCKCHIP_SPI=y
|
|
||||||
+CONFIG_SYSINFO=y
|
|
||||||
+CONFIG_SYSRESET=y
|
|
||||||
+# CONFIG_TPL_SYSRESET is not set
|
|
||||||
+CONFIG_USB=y
|
|
||||||
+CONFIG_USB_XHCI_HCD=y
|
|
||||||
+CONFIG_USB_XHCI_DWC3=y
|
|
||||||
+CONFIG_USB_EHCI_HCD=y
|
|
||||||
+CONFIG_USB_EHCI_GENERIC=y
|
|
||||||
+CONFIG_USB_OHCI_HCD=y
|
|
||||||
+CONFIG_USB_OHCI_GENERIC=y
|
|
||||||
+CONFIG_USB_DWC2=y
|
|
||||||
+CONFIG_USB_DWC3=y
|
|
||||||
+# CONFIG_USB_DWC3_GADGET is not set
|
|
||||||
+CONFIG_USB_GADGET=y
|
|
||||||
+CONFIG_USB_GADGET_DWC2_OTG=y
|
|
||||||
+CONFIG_SPL_TINY_MEMSET=y
|
|
||||||
+CONFIG_TPL_TINY_MEMSET=y
|
|
||||||
+CONFIG_ERRNO_STR=y
|
|
||||||
|
|
@ -1,257 +0,0 @@
|
||||||
From 408fd4570c0f1e6b1fe3722998394651144f2a29 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tianling Shen <cnsztl@gmail.com>
|
|
||||||
Date: Sat, 20 May 2023 18:52:14 +0800
|
|
||||||
Subject: [PATCH] rockchip: rk3328: Add support for Orange Pi R1 Plus LTS
|
|
||||||
|
|
||||||
The OrangePi R1 Plus LTS is a minor variant of OrangePi R1 Plus with
|
|
||||||
the on-board NIC chip changed from rtl8211e to yt8531c, and RAM type
|
|
||||||
changed from DDR4 to LPDDR3.
|
|
||||||
|
|
||||||
The device tree is taken from kernel v6.4-rc1.
|
|
||||||
|
|
||||||
Signed-off-by: Tianling Shen <cnsztl@gmail.com>
|
|
||||||
---
|
|
||||||
arch/arm/dts/Makefile | 1 +
|
|
||||||
.../rk3328-orangepi-r1-plus-lts-u-boot.dtsi | 46 +++++++
|
|
||||||
arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts | 40 ++++++
|
|
||||||
board/rockchip/evb_rk3328/MAINTAINERS | 6 +
|
|
||||||
configs/orangepi-r1-plus-lts-rk3328_defconfig | 114 ++++++++++++++++++
|
|
||||||
5 files changed, 207 insertions(+)
|
|
||||||
create mode 100644 arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi
|
|
||||||
create mode 100644 arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts
|
|
||||||
create mode 100644 configs/orangepi-r1-plus-lts-rk3328_defconfig
|
|
||||||
|
|
||||||
--- a/arch/arm/dts/Makefile
|
|
||||||
+++ b/arch/arm/dts/Makefile
|
|
||||||
@@ -126,6 +126,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3328) += \
|
|
||||||
rk3328-nanopi-r2c.dtb \
|
|
||||||
rk3328-nanopi-r2s.dtb \
|
|
||||||
rk3328-orangepi-r1-plus.dtb \
|
|
||||||
+ rk3328-orangepi-r1-plus-lts.dtb \
|
|
||||||
rk3328-roc-cc.dtb \
|
|
||||||
rk3328-rock64.dtb \
|
|
||||||
rk3328-rock-pi-e.dtb
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi
|
|
||||||
@@ -0,0 +1,46 @@
|
|
||||||
+// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
+/*
|
|
||||||
+ * (C) Copyright 2018-2019 Rockchip Electronics Co., Ltd
|
|
||||||
+ * (C) Copyright 2020 David Bauer
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#include "rk3328-u-boot.dtsi"
|
|
||||||
+#include "rk3328-sdram-lpddr3-666.dtsi"
|
|
||||||
+/ {
|
|
||||||
+ chosen {
|
|
||||||
+ u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&gpio0 {
|
|
||||||
+ bootph-pre-ram;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&pinctrl {
|
|
||||||
+ bootph-pre-ram;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&sdmmc0m1_pin {
|
|
||||||
+ bootph-pre-ram;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&pcfg_pull_up_4ma {
|
|
||||||
+ bootph-pre-ram;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+/* Need this and all the pinctrl/gpio stuff above to set pinmux */
|
|
||||||
+&vcc_sd {
|
|
||||||
+ bootph-pre-ram;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&gmac2io {
|
|
||||||
+ snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
|
|
||||||
+ snps,reset-active-low;
|
|
||||||
+ snps,reset-delays-us = <0 10000 50000>;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&spi0 {
|
|
||||||
+ spi_flash: spiflash@0 {
|
|
||||||
+ bootph-all;
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts
|
|
||||||
@@ -0,0 +1,40 @@
|
|
||||||
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
|
|
||||||
+/*
|
|
||||||
+ * Copyright (c) 2016 Xunlong Software. Co., Ltd.
|
|
||||||
+ * (http://www.orangepi.org)
|
|
||||||
+ *
|
|
||||||
+ * Copyright (c) 2021-2023 Tianling Shen <cnsztl@gmail.com>
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+/dts-v1/;
|
|
||||||
+#include "rk3328-orangepi-r1-plus.dts"
|
|
||||||
+
|
|
||||||
+/ {
|
|
||||||
+ model = "Xunlong Orange Pi R1 Plus LTS";
|
|
||||||
+ compatible = "xunlong,orangepi-r1-plus-lts", "rockchip,rk3328";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&gmac2io {
|
|
||||||
+ phy-handle = <&yt8531c>;
|
|
||||||
+ tx_delay = <0x19>;
|
|
||||||
+ rx_delay = <0x05>;
|
|
||||||
+
|
|
||||||
+ mdio {
|
|
||||||
+ /delete-node/ ethernet-phy@1;
|
|
||||||
+
|
|
||||||
+ yt8531c: ethernet-phy@0 {
|
|
||||||
+ compatible = "ethernet-phy-ieee802.3-c22";
|
|
||||||
+ reg = <0>;
|
|
||||||
+
|
|
||||||
+ motorcomm,clk-out-frequency-hz = <125000000>;
|
|
||||||
+ motorcomm,keep-pll-enabled;
|
|
||||||
+ motorcomm,auto-sleep-disabled;
|
|
||||||
+
|
|
||||||
+ pinctrl-0 = <ð_phy_reset_pin>;
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ reset-assert-us = <15000>;
|
|
||||||
+ reset-deassert-us = <50000>;
|
|
||||||
+ reset-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
--- a/board/rockchip/evb_rk3328/MAINTAINERS
|
|
||||||
+++ b/board/rockchip/evb_rk3328/MAINTAINERS
|
|
||||||
@@ -24,6 +24,12 @@ S: Maintained
|
|
||||||
F: configs/orangepi-r1-plus-rk3328_defconfig
|
|
||||||
F: arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi
|
|
||||||
|
|
||||||
+ORANGEPI-R1-PLUS-LTS-RK3328
|
|
||||||
+M: Tianling Shen <cnsztl@gmail.com>
|
|
||||||
+S: Maintained
|
|
||||||
+F: configs/orangepi-r1-plus-lts-rk3328_defconfig
|
|
||||||
+F: arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi
|
|
||||||
+
|
|
||||||
ROC-RK3328-CC
|
|
||||||
M: Loic Devulder <ldevulder@suse.com>
|
|
||||||
M: Chen-Yu Tsai <wens@csie.org>
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/configs/orangepi-r1-plus-lts-rk3328_defconfig
|
|
||||||
@@ -0,0 +1,114 @@
|
|
||||||
+CONFIG_ARM=y
|
|
||||||
+CONFIG_SKIP_LOWLEVEL_INIT=y
|
|
||||||
+CONFIG_COUNTER_FREQUENCY=24000000
|
|
||||||
+CONFIG_ARCH_ROCKCHIP=y
|
|
||||||
+CONFIG_TEXT_BASE=0x00200000
|
|
||||||
+CONFIG_SPL_GPIO=y
|
|
||||||
+CONFIG_NR_DRAM_BANKS=1
|
|
||||||
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
|
|
||||||
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
|
|
||||||
+CONFIG_ENV_OFFSET=0x3F8000
|
|
||||||
+CONFIG_DEFAULT_DEVICE_TREE="rk3328-orangepi-r1-plus-lts"
|
|
||||||
+CONFIG_DM_RESET=y
|
|
||||||
+CONFIG_ROCKCHIP_RK3328=y
|
|
||||||
+CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
|
|
||||||
+CONFIG_TPL_LIBCOMMON_SUPPORT=y
|
|
||||||
+CONFIG_TPL_LIBGENERIC_SUPPORT=y
|
|
||||||
+CONFIG_SPL_DRIVERS_MISC=y
|
|
||||||
+CONFIG_SPL_STACK_R_ADDR=0x600000
|
|
||||||
+CONFIG_SPL_STACK=0x400000
|
|
||||||
+CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
|
|
||||||
+CONFIG_DEBUG_UART_BASE=0xFF130000
|
|
||||||
+CONFIG_DEBUG_UART_CLOCK=24000000
|
|
||||||
+CONFIG_SYS_LOAD_ADDR=0x800800
|
|
||||||
+CONFIG_DEBUG_UART=y
|
|
||||||
+# CONFIG_ANDROID_BOOT_IMAGE is not set
|
|
||||||
+CONFIG_FIT=y
|
|
||||||
+CONFIG_FIT_VERBOSE=y
|
|
||||||
+CONFIG_SPL_LOAD_FIT=y
|
|
||||||
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-orangepi-r1-plus-lts.dtb"
|
|
||||||
+# CONFIG_DISPLAY_CPUINFO is not set
|
|
||||||
+CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
||||||
+CONFIG_MISC_INIT_R=y
|
|
||||||
+CONFIG_SPL_MAX_SIZE=0x40000
|
|
||||||
+CONFIG_SPL_PAD_TO=0x7f8000
|
|
||||||
+CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
|
|
||||||
+CONFIG_SPL_BSS_START_ADDR=0x2000000
|
|
||||||
+CONFIG_SPL_BSS_MAX_SIZE=0x2000
|
|
||||||
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
|
|
||||||
+# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
|
|
||||||
+CONFIG_SPL_STACK_R=y
|
|
||||||
+CONFIG_SPL_I2C=y
|
|
||||||
+CONFIG_SPL_POWER=y
|
|
||||||
+CONFIG_SPL_ATF=y
|
|
||||||
+CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
|
|
||||||
+CONFIG_TPL_SYS_MALLOC_SIMPLE=y
|
|
||||||
+CONFIG_CMD_BOOTZ=y
|
|
||||||
+CONFIG_CMD_GPT=y
|
|
||||||
+CONFIG_CMD_MMC=y
|
|
||||||
+CONFIG_CMD_USB=y
|
|
||||||
+# CONFIG_CMD_SETEXPR is not set
|
|
||||||
+CONFIG_CMD_TIME=y
|
|
||||||
+CONFIG_SPL_OF_CONTROL=y
|
|
||||||
+CONFIG_TPL_OF_CONTROL=y
|
|
||||||
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
|
|
||||||
+CONFIG_TPL_OF_PLATDATA=y
|
|
||||||
+CONFIG_ENV_IS_IN_MMC=y
|
|
||||||
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
||||||
+CONFIG_SYS_MMC_ENV_DEV=1
|
|
||||||
+CONFIG_NET_RANDOM_ETHADDR=y
|
|
||||||
+CONFIG_TPL_DM=y
|
|
||||||
+CONFIG_REGMAP=y
|
|
||||||
+CONFIG_SPL_REGMAP=y
|
|
||||||
+CONFIG_TPL_REGMAP=y
|
|
||||||
+CONFIG_SYSCON=y
|
|
||||||
+CONFIG_SPL_SYSCON=y
|
|
||||||
+CONFIG_TPL_SYSCON=y
|
|
||||||
+CONFIG_CLK=y
|
|
||||||
+CONFIG_SPL_CLK=y
|
|
||||||
+CONFIG_FASTBOOT_BUF_ADDR=0x800800
|
|
||||||
+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
|
|
||||||
+CONFIG_ROCKCHIP_GPIO=y
|
|
||||||
+CONFIG_SYS_I2C_ROCKCHIP=y
|
|
||||||
+CONFIG_MMC_DW=y
|
|
||||||
+CONFIG_MMC_DW_ROCKCHIP=y
|
|
||||||
+CONFIG_SF_DEFAULT_SPEED=20000000
|
|
||||||
+CONFIG_SPI_FLASH_GIGADEVICE=y
|
|
||||||
+CONFIG_ETH_DESIGNWARE=y
|
|
||||||
+CONFIG_GMAC_ROCKCHIP=y
|
|
||||||
+CONFIG_PINCTRL=y
|
|
||||||
+CONFIG_SPL_PINCTRL=y
|
|
||||||
+CONFIG_DM_PMIC=y
|
|
||||||
+CONFIG_PMIC_RK8XX=y
|
|
||||||
+CONFIG_SPL_PMIC_RK8XX=y
|
|
||||||
+CONFIG_SPL_DM_REGULATOR=y
|
|
||||||
+CONFIG_REGULATOR_PWM=y
|
|
||||||
+CONFIG_DM_REGULATOR_FIXED=y
|
|
||||||
+CONFIG_SPL_DM_REGULATOR_FIXED=y
|
|
||||||
+CONFIG_REGULATOR_RK8XX=y
|
|
||||||
+CONFIG_PWM_ROCKCHIP=y
|
|
||||||
+CONFIG_RAM=y
|
|
||||||
+CONFIG_SPL_RAM=y
|
|
||||||
+CONFIG_TPL_RAM=y
|
|
||||||
+CONFIG_BAUDRATE=1500000
|
|
||||||
+CONFIG_DEBUG_UART_SHIFT=2
|
|
||||||
+CONFIG_SYS_NS16550_MEM32=y
|
|
||||||
+CONFIG_ROCKCHIP_SPI=y
|
|
||||||
+CONFIG_SYSINFO=y
|
|
||||||
+CONFIG_SYSRESET=y
|
|
||||||
+# CONFIG_TPL_SYSRESET is not set
|
|
||||||
+CONFIG_USB=y
|
|
||||||
+CONFIG_USB_XHCI_HCD=y
|
|
||||||
+CONFIG_USB_XHCI_DWC3=y
|
|
||||||
+CONFIG_USB_EHCI_HCD=y
|
|
||||||
+CONFIG_USB_EHCI_GENERIC=y
|
|
||||||
+CONFIG_USB_OHCI_HCD=y
|
|
||||||
+CONFIG_USB_OHCI_GENERIC=y
|
|
||||||
+CONFIG_USB_DWC2=y
|
|
||||||
+CONFIG_USB_DWC3=y
|
|
||||||
+# CONFIG_USB_DWC3_GADGET is not set
|
|
||||||
+CONFIG_USB_GADGET=y
|
|
||||||
+CONFIG_USB_GADGET_DWC2_OTG=y
|
|
||||||
+CONFIG_SPL_TINY_MEMSET=y
|
|
||||||
+CONFIG_TPL_TINY_MEMSET=y
|
|
||||||
+CONFIG_ERRNO_STR=y
|
|
||||||
|
|
@ -1,917 +0,0 @@
|
||||||
From c84214aab0e4c5b2f619dd89655f27b3ae40e82b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tianling Shen <cnsztl@gmail.com>
|
|
||||||
Date: Tue, 30 May 2023 15:00:33 +0800
|
|
||||||
Subject: [PATCH] rockchip: rk3568: Add support for FriendlyARM NanoPi R5S
|
|
||||||
|
|
||||||
FriendlyARM NanoPi R5S is an open-sourced mini IoT gateway device.
|
|
||||||
|
|
||||||
Board Specifications
|
|
||||||
- Rockchip RK3568
|
|
||||||
- 2 or 4GB LPDDR4X
|
|
||||||
- 8GB or 16GB eMMC, SD card slot
|
|
||||||
- GbE LAN (Native)
|
|
||||||
- 2x 2.5G LAN (PCIe)
|
|
||||||
- M.2 Connector
|
|
||||||
- HDMI 2.0, MIPI DSI/CSI
|
|
||||||
- 2xUSB 3.0 Host
|
|
||||||
- USB Type C PD, 5V/9V/12V
|
|
||||||
- GPIO: 12-pin 0.5mm FPC connector
|
|
||||||
|
|
||||||
The device tree is taken from kernel v6.4-rc1.
|
|
||||||
|
|
||||||
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
|
|
||||||
Signed-off-by: Tianling Shen <cnsztl@gmail.com>
|
|
||||||
---
|
|
||||||
arch/arm/dts/Makefile | 1 +
|
|
||||||
arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi | 31 ++
|
|
||||||
arch/arm/dts/rk3568-nanopi-r5s.dts | 136 +++++
|
|
||||||
arch/arm/dts/rk3568-nanopi-r5s.dtsi | 590 +++++++++++++++++++++
|
|
||||||
board/rockchip/evb_rk3568/MAINTAINERS | 8 +
|
|
||||||
configs/nanopi-r5s-rk3568_defconfig | 85 +++
|
|
||||||
6 files changed, 851 insertions(+)
|
|
||||||
create mode 100644 arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi
|
|
||||||
create mode 100644 arch/arm/dts/rk3568-nanopi-r5s.dts
|
|
||||||
create mode 100644 arch/arm/dts/rk3568-nanopi-r5s.dtsi
|
|
||||||
create mode 100644 configs/nanopi-r5s-rk3568_defconfig
|
|
||||||
|
|
||||||
--- a/arch/arm/dts/Makefile
|
|
||||||
+++ b/arch/arm/dts/Makefile
|
|
||||||
@@ -171,6 +171,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3568) += \
|
|
||||||
rk3566-anbernic-rgxx3.dtb \
|
|
||||||
rk3566-radxa-cm3-io.dtb \
|
|
||||||
rk3568-evb.dtb \
|
|
||||||
+ rk3568-nanopi-r5s.dtb \
|
|
||||||
rk3568-rock-3a.dtb
|
|
||||||
|
|
||||||
dtb-$(CONFIG_ROCKCHIP_RK3588) += \
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi
|
|
||||||
@@ -0,0 +1,31 @@
|
|
||||||
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
|
|
||||||
+/*
|
|
||||||
+ * Copyright (c) 2022 FriendlyElec Computer Tech. Co., Ltd.
|
|
||||||
+ * (http://www.friendlyelec.com)
|
|
||||||
+ *
|
|
||||||
+ * Copyright (c) 2023 Tianling Shen <cnsztl@gmail.com>
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#include "rk356x-u-boot.dtsi"
|
|
||||||
+
|
|
||||||
+/ {
|
|
||||||
+ chosen {
|
|
||||||
+ stdout-path = &uart2;
|
|
||||||
+ u-boot,spl-boot-order = "same-as-spl", &sdmmc0, &sdhci;
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&sdhci {
|
|
||||||
+ cap-mmc-highspeed;
|
|
||||||
+ mmc-ddr-1_8v;
|
|
||||||
+ mmc-hs200-1_8v;
|
|
||||||
+ mmc-hs400-1_8v;
|
|
||||||
+ mmc-hs400-enhanced-strobe;
|
|
||||||
+ pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&uart2 {
|
|
||||||
+ clock-frequency = <24000000>;
|
|
||||||
+ bootph-all;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/arch/arm/dts/rk3568-nanopi-r5s.dts
|
|
||||||
@@ -0,0 +1,136 @@
|
|
||||||
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
|
|
||||||
+/*
|
|
||||||
+ * Copyright (c) 2022 FriendlyElec Computer Tech. Co., Ltd.
|
|
||||||
+ * (http://www.friendlyelec.com)
|
|
||||||
+ *
|
|
||||||
+ * Copyright (c) 2023 Tianling Shen <cnsztl@gmail.com>
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+/dts-v1/;
|
|
||||||
+#include "rk3568-nanopi-r5s.dtsi"
|
|
||||||
+
|
|
||||||
+/ {
|
|
||||||
+ model = "FriendlyElec NanoPi R5S";
|
|
||||||
+ compatible = "friendlyarm,nanopi-r5s", "rockchip,rk3568";
|
|
||||||
+
|
|
||||||
+ aliases {
|
|
||||||
+ ethernet0 = &gmac0;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ gpio-leds {
|
|
||||||
+ compatible = "gpio-leds";
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&lan1_led_pin>, <&lan2_led_pin>, <&power_led_pin>, <&wan_led_pin>;
|
|
||||||
+
|
|
||||||
+ led-lan1 {
|
|
||||||
+ color = <LED_COLOR_ID_GREEN>;
|
|
||||||
+ function = LED_FUNCTION_LAN;
|
|
||||||
+ function-enumerator = <1>;
|
|
||||||
+ gpios = <&gpio3 RK_PD6 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ led-lan2 {
|
|
||||||
+ color = <LED_COLOR_ID_GREEN>;
|
|
||||||
+ function = LED_FUNCTION_LAN;
|
|
||||||
+ function-enumerator = <2>;
|
|
||||||
+ gpios = <&gpio3 RK_PD7 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ power_led: led-power {
|
|
||||||
+ color = <LED_COLOR_ID_RED>;
|
|
||||||
+ function = LED_FUNCTION_POWER;
|
|
||||||
+ linux,default-trigger = "heartbeat";
|
|
||||||
+ gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ led-wan {
|
|
||||||
+ color = <LED_COLOR_ID_GREEN>;
|
|
||||||
+ function = LED_FUNCTION_WAN;
|
|
||||||
+ gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&gmac0 {
|
|
||||||
+ assigned-clocks = <&cru SCLK_GMAC0_RX_TX>, <&cru SCLK_GMAC0>;
|
|
||||||
+ assigned-clock-parents = <&cru SCLK_GMAC0_RGMII_SPEED>, <&cru CLK_MAC0_2TOP>;
|
|
||||||
+ assigned-clock-rates = <0>, <125000000>;
|
|
||||||
+ clock_in_out = "output";
|
|
||||||
+ phy-handle = <&rgmii_phy0>;
|
|
||||||
+ phy-mode = "rgmii";
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&gmac0_miim
|
|
||||||
+ &gmac0_tx_bus2
|
|
||||||
+ &gmac0_rx_bus2
|
|
||||||
+ &gmac0_rgmii_clk
|
|
||||||
+ &gmac0_rgmii_bus>;
|
|
||||||
+ snps,reset-gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_LOW>;
|
|
||||||
+ snps,reset-active-low;
|
|
||||||
+ /* Reset time is 15ms, 50ms for rtl8211f */
|
|
||||||
+ snps,reset-delays-us = <0 15000 50000>;
|
|
||||||
+ tx_delay = <0x3c>;
|
|
||||||
+ rx_delay = <0x2f>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&mdio0 {
|
|
||||||
+ rgmii_phy0: ethernet-phy@1 {
|
|
||||||
+ compatible = "ethernet-phy-ieee802.3-c22";
|
|
||||||
+ reg = <1>;
|
|
||||||
+ pinctrl-0 = <ð_phy0_reset_pin>;
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&pcie2x1 {
|
|
||||||
+ num-lanes = <1>;
|
|
||||||
+ reset-gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&pcie30phy {
|
|
||||||
+ data-lanes = <1 2>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&pcie3x1 {
|
|
||||||
+ num-lanes = <1>;
|
|
||||||
+ reset-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ vpcie3v3-supply = <&vcc3v3_pcie>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&pcie3x2 {
|
|
||||||
+ num-lanes = <1>;
|
|
||||||
+ num-ib-windows = <8>;
|
|
||||||
+ num-ob-windows = <8>;
|
|
||||||
+ reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ vpcie3v3-supply = <&vcc3v3_pcie>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&pinctrl {
|
|
||||||
+ gmac0 {
|
|
||||||
+ eth_phy0_reset_pin: eth-phy0-reset-pin {
|
|
||||||
+ rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_up>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ gpio-leds {
|
|
||||||
+ lan1_led_pin: lan1-led-pin {
|
|
||||||
+ rockchip,pins = <3 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ lan2_led_pin: lan2-led-pin {
|
|
||||||
+ rockchip,pins = <3 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ power_led_pin: power-led-pin {
|
|
||||||
+ rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ wan_led_pin: wan-led-pin {
|
|
||||||
+ rockchip,pins = <2 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/arch/arm/dts/rk3568-nanopi-r5s.dtsi
|
|
||||||
@@ -0,0 +1,590 @@
|
|
||||||
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
|
|
||||||
+/*
|
|
||||||
+ * Copyright (c) 2022 FriendlyElec Computer Tech. Co., Ltd.
|
|
||||||
+ * (http://www.friendlyelec.com)
|
|
||||||
+ *
|
|
||||||
+ * Copyright (c) 2023 Tianling Shen <cnsztl@gmail.com>
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+/dts-v1/;
|
|
||||||
+#include <dt-bindings/gpio/gpio.h>
|
|
||||||
+#include <dt-bindings/input/input.h>
|
|
||||||
+#include <dt-bindings/leds/common.h>
|
|
||||||
+#include <dt-bindings/pinctrl/rockchip.h>
|
|
||||||
+#include <dt-bindings/soc/rockchip,vop2.h>
|
|
||||||
+#include "rk3568.dtsi"
|
|
||||||
+
|
|
||||||
+/ {
|
|
||||||
+ aliases {
|
|
||||||
+ mmc0 = &sdmmc0;
|
|
||||||
+ mmc1 = &sdhci;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ chosen: chosen {
|
|
||||||
+ stdout-path = "serial2:1500000n8";
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ hdmi-con {
|
|
||||||
+ compatible = "hdmi-connector";
|
|
||||||
+ type = "a";
|
|
||||||
+
|
|
||||||
+ port {
|
|
||||||
+ hdmi_con_in: endpoint {
|
|
||||||
+ remote-endpoint = <&hdmi_out_con>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vdd_usbc: vdd-usbc-regulator {
|
|
||||||
+ compatible = "regulator-fixed";
|
|
||||||
+ regulator-name = "vdd_usbc";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-min-microvolt = <5000000>;
|
|
||||||
+ regulator-max-microvolt = <5000000>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcc3v3_sys: vcc3v3-sys-regulator {
|
|
||||||
+ compatible = "regulator-fixed";
|
|
||||||
+ regulator-name = "vcc3v3_sys";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-min-microvolt = <3300000>;
|
|
||||||
+ regulator-max-microvolt = <3300000>;
|
|
||||||
+ vin-supply = <&vdd_usbc>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcc5v0_sys: vcc5v0-sys-regulator {
|
|
||||||
+ compatible = "regulator-fixed";
|
|
||||||
+ regulator-name = "vcc5v0_sys";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-min-microvolt = <5000000>;
|
|
||||||
+ regulator-max-microvolt = <5000000>;
|
|
||||||
+ vin-supply = <&vdd_usbc>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcc3v3_pcie: vcc3v3-pcie-regulator {
|
|
||||||
+ compatible = "regulator-fixed";
|
|
||||||
+ regulator-name = "vcc3v3_pcie";
|
|
||||||
+ regulator-min-microvolt = <3300000>;
|
|
||||||
+ regulator-max-microvolt = <3300000>;
|
|
||||||
+ enable-active-high;
|
|
||||||
+ gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ startup-delay-us = <200000>;
|
|
||||||
+ vin-supply = <&vcc5v0_sys>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcc5v0_usb: vcc5v0-usb-regulator {
|
|
||||||
+ compatible = "regulator-fixed";
|
|
||||||
+ regulator-name = "vcc5v0_usb";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-min-microvolt = <5000000>;
|
|
||||||
+ regulator-max-microvolt = <5000000>;
|
|
||||||
+ vin-supply = <&vdd_usbc>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcc5v0_usb_host: vcc5v0-usb-host-regulator {
|
|
||||||
+ compatible = "regulator-fixed";
|
|
||||||
+ enable-active-high;
|
|
||||||
+ gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&vcc5v0_usb_host_en>;
|
|
||||||
+ regulator-name = "vcc5v0_usb_host";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-min-microvolt = <5000000>;
|
|
||||||
+ regulator-max-microvolt = <5000000>;
|
|
||||||
+ vin-supply = <&vcc5v0_usb>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcc5v0_usb_otg: vcc5v0-usb-otg-regulator {
|
|
||||||
+ compatible = "regulator-fixed";
|
|
||||||
+ enable-active-high;
|
|
||||||
+ gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&vcc5v0_usb_otg_en>;
|
|
||||||
+ regulator-name = "vcc5v0_usb_otg";
|
|
||||||
+ regulator-min-microvolt = <5000000>;
|
|
||||||
+ regulator-max-microvolt = <5000000>;
|
|
||||||
+ vin-supply = <&vcc5v0_usb>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ pcie30_avdd0v9: pcie30-avdd0v9-regulator {
|
|
||||||
+ compatible = "regulator-fixed";
|
|
||||||
+ regulator-name = "pcie30_avdd0v9";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-min-microvolt = <900000>;
|
|
||||||
+ regulator-max-microvolt = <900000>;
|
|
||||||
+ vin-supply = <&vcc3v3_sys>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ pcie30_avdd1v8: pcie30-avdd1v8-regulator {
|
|
||||||
+ compatible = "regulator-fixed";
|
|
||||||
+ regulator-name = "pcie30_avdd1v8";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-min-microvolt = <1800000>;
|
|
||||||
+ regulator-max-microvolt = <1800000>;
|
|
||||||
+ vin-supply = <&vcc3v3_sys>;
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&combphy0 {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&combphy1 {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&combphy2 {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&cpu0 {
|
|
||||||
+ cpu-supply = <&vdd_cpu>;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&cpu1 {
|
|
||||||
+ cpu-supply = <&vdd_cpu>;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&cpu2 {
|
|
||||||
+ cpu-supply = <&vdd_cpu>;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&cpu3 {
|
|
||||||
+ cpu-supply = <&vdd_cpu>;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&gpu {
|
|
||||||
+ mali-supply = <&vdd_gpu>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&hdmi {
|
|
||||||
+ avdd-0v9-supply = <&vdda0v9_image>;
|
|
||||||
+ avdd-1v8-supply = <&vcca1v8_image>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&hdmi_in {
|
|
||||||
+ hdmi_in_vp0: endpoint {
|
|
||||||
+ remote-endpoint = <&vp0_out_hdmi>;
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&hdmi_out {
|
|
||||||
+ hdmi_out_con: endpoint {
|
|
||||||
+ remote-endpoint = <&hdmi_con_in>;
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&hdmi_sound {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&i2c0 {
|
|
||||||
+ status = "okay";
|
|
||||||
+
|
|
||||||
+ vdd_cpu: regulator@1c {
|
|
||||||
+ compatible = "tcs,tcs4525";
|
|
||||||
+ reg = <0x1c>;
|
|
||||||
+ fcs,suspend-voltage-selector = <1>;
|
|
||||||
+ regulator-name = "vdd_cpu";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-min-microvolt = <800000>;
|
|
||||||
+ regulator-max-microvolt = <1150000>;
|
|
||||||
+ regulator-ramp-delay = <2300>;
|
|
||||||
+ vin-supply = <&vcc5v0_sys>;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-off-in-suspend;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ rk809: pmic@20 {
|
|
||||||
+ compatible = "rockchip,rk809";
|
|
||||||
+ reg = <0x20>;
|
|
||||||
+ interrupt-parent = <&gpio0>;
|
|
||||||
+ interrupts = <RK_PA3 IRQ_TYPE_LEVEL_LOW>;
|
|
||||||
+ #clock-cells = <1>;
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&pmic_int>;
|
|
||||||
+ rockchip,system-power-controller;
|
|
||||||
+ vcc1-supply = <&vcc3v3_sys>;
|
|
||||||
+ vcc2-supply = <&vcc3v3_sys>;
|
|
||||||
+ vcc3-supply = <&vcc3v3_sys>;
|
|
||||||
+ vcc4-supply = <&vcc3v3_sys>;
|
|
||||||
+ vcc5-supply = <&vcc3v3_sys>;
|
|
||||||
+ vcc6-supply = <&vcc3v3_sys>;
|
|
||||||
+ vcc7-supply = <&vcc3v3_sys>;
|
|
||||||
+ vcc8-supply = <&vcc3v3_sys>;
|
|
||||||
+ vcc9-supply = <&vcc3v3_sys>;
|
|
||||||
+ wakeup-source;
|
|
||||||
+
|
|
||||||
+ regulators {
|
|
||||||
+ vdd_logic: DCDC_REG1 {
|
|
||||||
+ regulator-name = "vdd_logic";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-init-microvolt = <900000>;
|
|
||||||
+ regulator-initial-mode = <0x2>;
|
|
||||||
+ regulator-min-microvolt = <500000>;
|
|
||||||
+ regulator-max-microvolt = <1350000>;
|
|
||||||
+ regulator-ramp-delay = <6001>;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-off-in-suspend;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vdd_gpu: DCDC_REG2 {
|
|
||||||
+ regulator-name = "vdd_gpu";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-init-microvolt = <900000>;
|
|
||||||
+ regulator-initial-mode = <0x2>;
|
|
||||||
+ regulator-min-microvolt = <500000>;
|
|
||||||
+ regulator-max-microvolt = <1350000>;
|
|
||||||
+ regulator-ramp-delay = <6001>;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-off-in-suspend;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcc_ddr: DCDC_REG3 {
|
|
||||||
+ regulator-name = "vcc_ddr";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-initial-mode = <0x2>;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-on-in-suspend;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vdd_npu: DCDC_REG4 {
|
|
||||||
+ regulator-name = "vdd_npu";
|
|
||||||
+ regulator-init-microvolt = <900000>;
|
|
||||||
+ regulator-initial-mode = <0x2>;
|
|
||||||
+ regulator-min-microvolt = <500000>;
|
|
||||||
+ regulator-max-microvolt = <1350000>;
|
|
||||||
+ regulator-ramp-delay = <6001>;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-off-in-suspend;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcc_1v8: DCDC_REG5 {
|
|
||||||
+ regulator-name = "vcc_1v8";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-min-microvolt = <1800000>;
|
|
||||||
+ regulator-max-microvolt = <1800000>;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-off-in-suspend;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vdda0v9_image: LDO_REG1 {
|
|
||||||
+ regulator-name = "vdda0v9_image";
|
|
||||||
+ regulator-min-microvolt = <950000>;
|
|
||||||
+ regulator-max-microvolt = <950000>;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-off-in-suspend;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vdda_0v9: LDO_REG2 {
|
|
||||||
+ regulator-name = "vdda_0v9";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-min-microvolt = <900000>;
|
|
||||||
+ regulator-max-microvolt = <900000>;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-off-in-suspend;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vdda0v9_pmu: LDO_REG3 {
|
|
||||||
+ regulator-name = "vdda0v9_pmu";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-min-microvolt = <900000>;
|
|
||||||
+ regulator-max-microvolt = <900000>;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-on-in-suspend;
|
|
||||||
+ regulator-suspend-microvolt = <900000>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vccio_acodec: LDO_REG4 {
|
|
||||||
+ regulator-name = "vccio_acodec";
|
|
||||||
+ regulator-min-microvolt = <3300000>;
|
|
||||||
+ regulator-max-microvolt = <3300000>;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-off-in-suspend;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vccio_sd: LDO_REG5 {
|
|
||||||
+ regulator-name = "vccio_sd";
|
|
||||||
+ regulator-min-microvolt = <1800000>;
|
|
||||||
+ regulator-max-microvolt = <3300000>;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-off-in-suspend;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcc3v3_pmu: LDO_REG6 {
|
|
||||||
+ regulator-name = "vcc3v3_pmu";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-min-microvolt = <3300000>;
|
|
||||||
+ regulator-max-microvolt = <3300000>;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-on-in-suspend;
|
|
||||||
+ regulator-suspend-microvolt = <3300000>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcca_1v8: LDO_REG7 {
|
|
||||||
+ regulator-name = "vcca_1v8";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-min-microvolt = <1800000>;
|
|
||||||
+ regulator-max-microvolt = <1800000>;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-off-in-suspend;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcca1v8_pmu: LDO_REG8 {
|
|
||||||
+ regulator-name = "vcca1v8_pmu";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+ regulator-min-microvolt = <1800000>;
|
|
||||||
+ regulator-max-microvolt = <1800000>;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-on-in-suspend;
|
|
||||||
+ regulator-suspend-microvolt = <1800000>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcca1v8_image: LDO_REG9 {
|
|
||||||
+ regulator-name = "vcca1v8_image";
|
|
||||||
+ regulator-min-microvolt = <1800000>;
|
|
||||||
+ regulator-max-microvolt = <1800000>;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-off-in-suspend;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcc_3v3: SWITCH_REG1 {
|
|
||||||
+ regulator-name = "vcc_3v3";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-off-in-suspend;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcc3v3_sd: SWITCH_REG2 {
|
|
||||||
+ regulator-name = "vcc3v3_sd";
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
+
|
|
||||||
+ regulator-state-mem {
|
|
||||||
+ regulator-off-in-suspend;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&i2c5 {
|
|
||||||
+ status = "okay";
|
|
||||||
+
|
|
||||||
+ hym8563: rtc@51 {
|
|
||||||
+ compatible = "haoyu,hym8563";
|
|
||||||
+ reg = <0x51>;
|
|
||||||
+ interrupt-parent = <&gpio0>;
|
|
||||||
+ interrupts = <RK_PD3 IRQ_TYPE_LEVEL_LOW>;
|
|
||||||
+ #clock-cells = <0>;
|
|
||||||
+ clock-output-names = "rtcic_32kout";
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&hym8563_int>;
|
|
||||||
+ wakeup-source;
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&i2s0_8ch {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&pcie30phy {
|
|
||||||
+ data-lanes = <1 2>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&pinctrl {
|
|
||||||
+ hym8563 {
|
|
||||||
+ hym8563_int: hym8563-int {
|
|
||||||
+ rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ pmic {
|
|
||||||
+ pmic_int: pmic-int {
|
|
||||||
+ rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ usb {
|
|
||||||
+ vcc5v0_usb_host_en: vcc5v0-usb-host-en {
|
|
||||||
+ rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcc5v0_usb_otg_en: vcc5v0-usb-otg-en {
|
|
||||||
+ rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&pmu_io_domains {
|
|
||||||
+ pmuio1-supply = <&vcc3v3_pmu>;
|
|
||||||
+ pmuio2-supply = <&vcc3v3_pmu>;
|
|
||||||
+ vccio1-supply = <&vccio_acodec>;
|
|
||||||
+ vccio3-supply = <&vccio_sd>;
|
|
||||||
+ vccio4-supply = <&vcc_1v8>;
|
|
||||||
+ vccio5-supply = <&vcc_3v3>;
|
|
||||||
+ vccio6-supply = <&vcc_1v8>;
|
|
||||||
+ vccio7-supply = <&vcc_3v3>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&saradc {
|
|
||||||
+ vref-supply = <&vcca_1v8>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&sdhci {
|
|
||||||
+ bus-width = <8>;
|
|
||||||
+ max-frequency = <200000000>;
|
|
||||||
+ non-removable;
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&sdmmc0 {
|
|
||||||
+ max-frequency = <150000000>;
|
|
||||||
+ no-sdio;
|
|
||||||
+ no-mmc;
|
|
||||||
+ bus-width = <4>;
|
|
||||||
+ cap-mmc-highspeed;
|
|
||||||
+ cap-sd-highspeed;
|
|
||||||
+ disable-wp;
|
|
||||||
+ vmmc-supply = <&vcc3v3_sd>;
|
|
||||||
+ vqmmc-supply = <&vccio_sd>;
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd &sdmmc0_det>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&tsadc {
|
|
||||||
+ rockchip,hw-tshut-mode = <1>;
|
|
||||||
+ rockchip,hw-tshut-polarity = <0>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&uart2 {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&usb_host0_ehci {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&usb_host0_ohci {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&usb_host0_xhci {
|
|
||||||
+ extcon = <&usb2phy0>;
|
|
||||||
+ dr_mode = "host";
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&usb_host1_ehci {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&usb_host1_ohci {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&usb_host1_xhci {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&usb2phy0 {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&usb2phy0_host {
|
|
||||||
+ phy-supply = <&vcc5v0_usb_host>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&usb2phy0_otg {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&usb2phy1 {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&usb2phy1_host {
|
|
||||||
+ phy-supply = <&vcc5v0_usb_otg>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&usb2phy1_otg {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&vop {
|
|
||||||
+ assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
|
|
||||||
+ assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&vop_mmu {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&vp0 {
|
|
||||||
+ vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
|
|
||||||
+ reg = <ROCKCHIP_VOP2_EP_HDMI0>;
|
|
||||||
+ remote-endpoint = <&hdmi_in_vp0>;
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
--- a/board/rockchip/evb_rk3568/MAINTAINERS
|
|
||||||
+++ b/board/rockchip/evb_rk3568/MAINTAINERS
|
|
||||||
@@ -7,6 +7,14 @@ F: configs/evb-rk3568_defconfig
|
|
||||||
F: arch/arm/dts/rk3568-evb-boot.dtsi
|
|
||||||
F: arch/arm/dts/rk3568-evb.dts
|
|
||||||
|
|
||||||
+NANOPI-R5S
|
|
||||||
+M: Tianling Shen <cnsztl@gmail.com>
|
|
||||||
+S: Maintained
|
|
||||||
+F: configs/nanopi-r5s-rk3568_defconfig
|
|
||||||
+F: arch/arm/dts/rk3568-nanopi-r5s.dts
|
|
||||||
+F: arch/arm/dts/rk3568-nanopi-r5s.dtsi
|
|
||||||
+F: arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi
|
|
||||||
+
|
|
||||||
RADXA-CM3
|
|
||||||
M: Jagan Teki <jagan@amarulasolutions.com>
|
|
||||||
S: Maintained
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/configs/nanopi-r5s-rk3568_defconfig
|
|
||||||
@@ -0,0 +1,85 @@
|
|
||||||
+CONFIG_ARM=y
|
|
||||||
+CONFIG_SKIP_LOWLEVEL_INIT=y
|
|
||||||
+CONFIG_COUNTER_FREQUENCY=24000000
|
|
||||||
+CONFIG_ARCH_ROCKCHIP=y
|
|
||||||
+CONFIG_TEXT_BASE=0x00a00000
|
|
||||||
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
|
|
||||||
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
|
|
||||||
+CONFIG_NR_DRAM_BANKS=2
|
|
||||||
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
|
|
||||||
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc00000
|
|
||||||
+CONFIG_DEFAULT_DEVICE_TREE="rk3568-nanopi-r5s"
|
|
||||||
+CONFIG_ROCKCHIP_RK3568=y
|
|
||||||
+CONFIG_SPL_ROCKCHIP_COMMON_BOARD=y
|
|
||||||
+CONFIG_SPL_SERIAL=y
|
|
||||||
+CONFIG_SPL_STACK_R_ADDR=0x600000
|
|
||||||
+CONFIG_TARGET_EVB_RK3568=y
|
|
||||||
+CONFIG_SPL_STACK=0x400000
|
|
||||||
+CONFIG_DEBUG_UART_BASE=0xFE660000
|
|
||||||
+CONFIG_DEBUG_UART_CLOCK=24000000
|
|
||||||
+CONFIG_SYS_LOAD_ADDR=0xc00800
|
|
||||||
+CONFIG_DEBUG_UART=y
|
|
||||||
+CONFIG_FIT=y
|
|
||||||
+CONFIG_FIT_VERBOSE=y
|
|
||||||
+CONFIG_SPL_LOAD_FIT=y
|
|
||||||
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-nanopi-r5s.dtb"
|
|
||||||
+# CONFIG_DISPLAY_CPUINFO is not set
|
|
||||||
+CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
||||||
+CONFIG_SPL_MAX_SIZE=0x40000
|
|
||||||
+CONFIG_SPL_PAD_TO=0x7f8000
|
|
||||||
+CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
|
|
||||||
+CONFIG_SPL_BSS_START_ADDR=0x4000000
|
|
||||||
+CONFIG_SPL_BSS_MAX_SIZE=0x4000
|
|
||||||
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
|
|
||||||
+# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
|
|
||||||
+CONFIG_SPL_STACK_R=y
|
|
||||||
+CONFIG_SPL_ATF=y
|
|
||||||
+CONFIG_CMD_GPIO=y
|
|
||||||
+CONFIG_CMD_GPT=y
|
|
||||||
+CONFIG_CMD_I2C=y
|
|
||||||
+CONFIG_CMD_MMC=y
|
|
||||||
+CONFIG_CMD_USB=y
|
|
||||||
+CONFIG_CMD_PMIC=y
|
|
||||||
+CONFIG_CMD_REGULATOR=y
|
|
||||||
+# CONFIG_SPL_DOS_PARTITION is not set
|
|
||||||
+CONFIG_SPL_OF_CONTROL=y
|
|
||||||
+CONFIG_OF_LIVE=y
|
|
||||||
+CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
|
|
||||||
+CONFIG_SPL_DM_WARN=y
|
|
||||||
+CONFIG_SPL_REGMAP=y
|
|
||||||
+CONFIG_SPL_SYSCON=y
|
|
||||||
+CONFIG_SPL_CLK=y
|
|
||||||
+CONFIG_ROCKCHIP_GPIO=y
|
|
||||||
+CONFIG_SYS_I2C_ROCKCHIP=y
|
|
||||||
+CONFIG_MISC=y
|
|
||||||
+CONFIG_SUPPORT_EMMC_RPMB=y
|
|
||||||
+CONFIG_MMC_DW=y
|
|
||||||
+CONFIG_MMC_DW_ROCKCHIP=y
|
|
||||||
+CONFIG_MMC_SDHCI=y
|
|
||||||
+CONFIG_MMC_SDHCI_SDMA=y
|
|
||||||
+CONFIG_MMC_SDHCI_ROCKCHIP=y
|
|
||||||
+CONFIG_ETH_DESIGNWARE=y
|
|
||||||
+CONFIG_GMAC_ROCKCHIP=y
|
|
||||||
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
|
|
||||||
+CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
|
|
||||||
+CONFIG_POWER_DOMAIN=y
|
|
||||||
+CONFIG_DM_PMIC=y
|
|
||||||
+CONFIG_PMIC_RK8XX=y
|
|
||||||
+CONFIG_SPL_DM_REGULATOR_FIXED=y
|
|
||||||
+CONFIG_REGULATOR_RK8XX=y
|
|
||||||
+CONFIG_PWM_ROCKCHIP=y
|
|
||||||
+CONFIG_SPL_RAM=y
|
|
||||||
+CONFIG_BAUDRATE=1500000
|
|
||||||
+CONFIG_DEBUG_UART_SHIFT=2
|
|
||||||
+CONFIG_SYS_NS16550_MEM32=y
|
|
||||||
+CONFIG_SYSRESET=y
|
|
||||||
+CONFIG_SYSRESET_PSCI=y
|
|
||||||
+CONFIG_USB=y
|
|
||||||
+CONFIG_USB_XHCI_HCD=y
|
|
||||||
+CONFIG_USB_XHCI_DWC3=y
|
|
||||||
+CONFIG_USB_EHCI_HCD=y
|
|
||||||
+CONFIG_USB_EHCI_GENERIC=y
|
|
||||||
+CONFIG_USB_OHCI_HCD=y
|
|
||||||
+CONFIG_USB_OHCI_GENERIC=y
|
|
||||||
+CONFIG_USB_DWC3=y
|
|
||||||
+CONFIG_ERRNO_STR=y
|
|
||||||
|
|
@ -1,269 +0,0 @@
|
||||||
From 41538742491c46100f570680c02fbdd0d2b6b880 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tianling Shen <cnsztl@gmail.com>
|
|
||||||
Date: Tue, 30 May 2023 15:00:33 +0800
|
|
||||||
Subject: [PATCH] rockchip: rk3568: Add support for FriendlyARM NanoPi R5C
|
|
||||||
|
|
||||||
FriendlyARM NanoPi R5C is an open-sourced mini IoT gateway device.
|
|
||||||
|
|
||||||
Specification:
|
|
||||||
- Rockchip RK3568
|
|
||||||
- 1/4GB LPDDR4X RAM
|
|
||||||
- 8/32GB eMMC
|
|
||||||
- SD card slot
|
|
||||||
- M.2 Connector
|
|
||||||
- 2x USB 3.0 Port
|
|
||||||
- 2x 2500 Base-T (PCIe, r8125)
|
|
||||||
- HDMI 2.0
|
|
||||||
- MIPI DSI/CSI
|
|
||||||
- USB Type C 5V
|
|
||||||
|
|
||||||
The device tree is taken from kernel v6.4-rc1.
|
|
||||||
|
|
||||||
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
|
|
||||||
Signed-off-by: Tianling Shen <cnsztl@gmail.com>
|
|
||||||
---
|
|
||||||
arch/arm/dts/Makefile | 1 +
|
|
||||||
arch/arm/dts/rk3568-nanopi-r5c-u-boot.dtsi | 3 +
|
|
||||||
arch/arm/dts/rk3568-nanopi-r5c.dts | 112 +++++++++++++++++++++
|
|
||||||
board/rockchip/evb_rk3568/MAINTAINERS | 7 ++
|
|
||||||
configs/nanopi-r5c-rk3568_defconfig | 85 ++++++++++++++++
|
|
||||||
5 files changed, 208 insertions(+)
|
|
||||||
create mode 100644 arch/arm/dts/rk3568-nanopi-r5c-u-boot.dtsi
|
|
||||||
create mode 100644 arch/arm/dts/rk3568-nanopi-r5c.dts
|
|
||||||
create mode 100644 configs/nanopi-r5c-rk3568_defconfig
|
|
||||||
|
|
||||||
--- a/arch/arm/dts/Makefile
|
|
||||||
+++ b/arch/arm/dts/Makefile
|
|
||||||
@@ -171,6 +171,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3568) += \
|
|
||||||
rk3566-anbernic-rgxx3.dtb \
|
|
||||||
rk3566-radxa-cm3-io.dtb \
|
|
||||||
rk3568-evb.dtb \
|
|
||||||
+ rk3568-nanopi-r5c.dtb \
|
|
||||||
rk3568-nanopi-r5s.dtb \
|
|
||||||
rk3568-rock-3a.dtb
|
|
||||||
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/arch/arm/dts/rk3568-nanopi-r5c-u-boot.dtsi
|
|
||||||
@@ -0,0 +1,3 @@
|
|
||||||
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
|
|
||||||
+
|
|
||||||
+#include "rk3568-nanopi-r5s-u-boot.dtsi"
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/arch/arm/dts/rk3568-nanopi-r5c.dts
|
|
||||||
@@ -0,0 +1,112 @@
|
|
||||||
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
|
|
||||||
+/*
|
|
||||||
+ * Copyright (c) 2022 FriendlyElec Computer Tech. Co., Ltd.
|
|
||||||
+ * (http://www.friendlyelec.com)
|
|
||||||
+ *
|
|
||||||
+ * Copyright (c) 2023 Tianling Shen <cnsztl@gmail.com>
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+/dts-v1/;
|
|
||||||
+#include "rk3568-nanopi-r5s.dtsi"
|
|
||||||
+
|
|
||||||
+/ {
|
|
||||||
+ model = "FriendlyElec NanoPi R5C";
|
|
||||||
+ compatible = "friendlyarm,nanopi-r5c", "rockchip,rk3568";
|
|
||||||
+
|
|
||||||
+ gpio-keys {
|
|
||||||
+ compatible = "gpio-keys";
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&reset_button_pin>;
|
|
||||||
+
|
|
||||||
+ button-reset {
|
|
||||||
+ debounce-interval = <50>;
|
|
||||||
+ gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_LOW>;
|
|
||||||
+ label = "reset";
|
|
||||||
+ linux,code = <KEY_RESTART>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ gpio-leds {
|
|
||||||
+ compatible = "gpio-leds";
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&lan_led_pin>, <&power_led_pin>, <&wan_led_pin>, <&wlan_led_pin>;
|
|
||||||
+
|
|
||||||
+ led-lan {
|
|
||||||
+ color = <LED_COLOR_ID_GREEN>;
|
|
||||||
+ function = LED_FUNCTION_LAN;
|
|
||||||
+ gpios = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ power_led: led-power {
|
|
||||||
+ color = <LED_COLOR_ID_RED>;
|
|
||||||
+ function = LED_FUNCTION_POWER;
|
|
||||||
+ linux,default-trigger = "heartbeat";
|
|
||||||
+ gpios = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ led-wan {
|
|
||||||
+ color = <LED_COLOR_ID_GREEN>;
|
|
||||||
+ function = LED_FUNCTION_WAN;
|
|
||||||
+ gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ led-wlan {
|
|
||||||
+ color = <LED_COLOR_ID_GREEN>;
|
|
||||||
+ function = LED_FUNCTION_WLAN;
|
|
||||||
+ gpios = <&gpio3 RK_PA5 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&pcie2x1 {
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&pcie20_reset_pin>;
|
|
||||||
+ reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&pcie3x1 {
|
|
||||||
+ num-lanes = <1>;
|
|
||||||
+ reset-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ vpcie3v3-supply = <&vcc3v3_pcie>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&pcie3x2 {
|
|
||||||
+ num-lanes = <1>;
|
|
||||||
+ reset-gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ vpcie3v3-supply = <&vcc3v3_pcie>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&pinctrl {
|
|
||||||
+ gpio-leds {
|
|
||||||
+ lan_led_pin: lan-led-pin {
|
|
||||||
+ rockchip,pins = <3 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ power_led_pin: power-led-pin {
|
|
||||||
+ rockchip,pins = <3 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ wan_led_pin: wan-led-pin {
|
|
||||||
+ rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ wlan_led_pin: wlan-led-pin {
|
|
||||||
+ rockchip,pins = <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ pcie {
|
|
||||||
+ pcie20_reset_pin: pcie20-reset-pin {
|
|
||||||
+ rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ rockchip-key {
|
|
||||||
+ reset_button_pin: reset-button-pin {
|
|
||||||
+ rockchip,pins = <4 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
--- a/board/rockchip/evb_rk3568/MAINTAINERS
|
|
||||||
+++ b/board/rockchip/evb_rk3568/MAINTAINERS
|
|
||||||
@@ -7,6 +7,13 @@ F: configs/evb-rk3568_defconfig
|
|
||||||
F: arch/arm/dts/rk3568-evb-boot.dtsi
|
|
||||||
F: arch/arm/dts/rk3568-evb.dts
|
|
||||||
|
|
||||||
+NANOPI-R5C
|
|
||||||
+M: Tianling Shen <cnsztl@gmail.com>
|
|
||||||
+S: Maintained
|
|
||||||
+F: configs/nanopi-r5c-rk3568_defconfig
|
|
||||||
+F: arch/arm/dts/rk3568-nanopi-r5c.dts
|
|
||||||
+F: arch/arm/dts/rk3568-nanopi-r5c-u-boot.dtsi
|
|
||||||
+
|
|
||||||
NANOPI-R5S
|
|
||||||
M: Tianling Shen <cnsztl@gmail.com>
|
|
||||||
S: Maintained
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/configs/nanopi-r5c-rk3568_defconfig
|
|
||||||
@@ -0,0 +1,85 @@
|
|
||||||
+CONFIG_ARM=y
|
|
||||||
+CONFIG_SKIP_LOWLEVEL_INIT=y
|
|
||||||
+CONFIG_COUNTER_FREQUENCY=24000000
|
|
||||||
+CONFIG_ARCH_ROCKCHIP=y
|
|
||||||
+CONFIG_TEXT_BASE=0x00a00000
|
|
||||||
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
|
|
||||||
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
|
|
||||||
+CONFIG_NR_DRAM_BANKS=2
|
|
||||||
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
|
|
||||||
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc00000
|
|
||||||
+CONFIG_DEFAULT_DEVICE_TREE="rk3568-nanopi-r5c"
|
|
||||||
+CONFIG_ROCKCHIP_RK3568=y
|
|
||||||
+CONFIG_SPL_ROCKCHIP_COMMON_BOARD=y
|
|
||||||
+CONFIG_SPL_SERIAL=y
|
|
||||||
+CONFIG_SPL_STACK_R_ADDR=0x600000
|
|
||||||
+CONFIG_TARGET_EVB_RK3568=y
|
|
||||||
+CONFIG_SPL_STACK=0x400000
|
|
||||||
+CONFIG_DEBUG_UART_BASE=0xFE660000
|
|
||||||
+CONFIG_DEBUG_UART_CLOCK=24000000
|
|
||||||
+CONFIG_SYS_LOAD_ADDR=0xc00800
|
|
||||||
+CONFIG_DEBUG_UART=y
|
|
||||||
+CONFIG_FIT=y
|
|
||||||
+CONFIG_FIT_VERBOSE=y
|
|
||||||
+CONFIG_SPL_LOAD_FIT=y
|
|
||||||
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-nanopi-r5c.dtb"
|
|
||||||
+# CONFIG_DISPLAY_CPUINFO is not set
|
|
||||||
+CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
||||||
+CONFIG_SPL_MAX_SIZE=0x40000
|
|
||||||
+CONFIG_SPL_PAD_TO=0x7f8000
|
|
||||||
+CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
|
|
||||||
+CONFIG_SPL_BSS_START_ADDR=0x4000000
|
|
||||||
+CONFIG_SPL_BSS_MAX_SIZE=0x4000
|
|
||||||
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
|
|
||||||
+# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
|
|
||||||
+CONFIG_SPL_STACK_R=y
|
|
||||||
+CONFIG_SPL_ATF=y
|
|
||||||
+CONFIG_CMD_GPIO=y
|
|
||||||
+CONFIG_CMD_GPT=y
|
|
||||||
+CONFIG_CMD_I2C=y
|
|
||||||
+CONFIG_CMD_MMC=y
|
|
||||||
+CONFIG_CMD_USB=y
|
|
||||||
+CONFIG_CMD_PMIC=y
|
|
||||||
+CONFIG_CMD_REGULATOR=y
|
|
||||||
+# CONFIG_SPL_DOS_PARTITION is not set
|
|
||||||
+CONFIG_SPL_OF_CONTROL=y
|
|
||||||
+CONFIG_OF_LIVE=y
|
|
||||||
+CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
|
|
||||||
+CONFIG_SPL_DM_WARN=y
|
|
||||||
+CONFIG_SPL_REGMAP=y
|
|
||||||
+CONFIG_SPL_SYSCON=y
|
|
||||||
+CONFIG_SPL_CLK=y
|
|
||||||
+CONFIG_ROCKCHIP_GPIO=y
|
|
||||||
+CONFIG_SYS_I2C_ROCKCHIP=y
|
|
||||||
+CONFIG_MISC=y
|
|
||||||
+CONFIG_SUPPORT_EMMC_RPMB=y
|
|
||||||
+CONFIG_MMC_DW=y
|
|
||||||
+CONFIG_MMC_DW_ROCKCHIP=y
|
|
||||||
+CONFIG_MMC_SDHCI=y
|
|
||||||
+CONFIG_MMC_SDHCI_SDMA=y
|
|
||||||
+CONFIG_MMC_SDHCI_ROCKCHIP=y
|
|
||||||
+CONFIG_ETH_DESIGNWARE=y
|
|
||||||
+CONFIG_GMAC_ROCKCHIP=y
|
|
||||||
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
|
|
||||||
+CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
|
|
||||||
+CONFIG_POWER_DOMAIN=y
|
|
||||||
+CONFIG_DM_PMIC=y
|
|
||||||
+CONFIG_PMIC_RK8XX=y
|
|
||||||
+CONFIG_SPL_DM_REGULATOR_FIXED=y
|
|
||||||
+CONFIG_REGULATOR_RK8XX=y
|
|
||||||
+CONFIG_PWM_ROCKCHIP=y
|
|
||||||
+CONFIG_SPL_RAM=y
|
|
||||||
+CONFIG_BAUDRATE=1500000
|
|
||||||
+CONFIG_DEBUG_UART_SHIFT=2
|
|
||||||
+CONFIG_SYS_NS16550_MEM32=y
|
|
||||||
+CONFIG_SYSRESET=y
|
|
||||||
+CONFIG_SYSRESET_PSCI=y
|
|
||||||
+CONFIG_USB=y
|
|
||||||
+CONFIG_USB_XHCI_HCD=y
|
|
||||||
+CONFIG_USB_XHCI_DWC3=y
|
|
||||||
+CONFIG_USB_EHCI_HCD=y
|
|
||||||
+CONFIG_USB_EHCI_GENERIC=y
|
|
||||||
+CONFIG_USB_OHCI_HCD=y
|
|
||||||
+CONFIG_USB_OHCI_GENERIC=y
|
|
||||||
+CONFIG_USB_DWC3=y
|
|
||||||
+CONFIG_ERRNO_STR=y
|
|
||||||
|
|
@ -12,8 +12,6 @@ Signed-off-by: Lu jicong <jiconglu58@gmail.com>
|
||||||
arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi | 2 +-
|
arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi | 2 +-
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi b/arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi
|
|
||||||
index 17201bcf41..8b6c9059ab 100644
|
|
||||||
--- a/arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi
|
--- a/arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi
|
||||||
+++ b/arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi
|
+++ b/arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi
|
||||||
@@ -4,4 +4,4 @@
|
@@ -4,4 +4,4 @@
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=gdb
|
PKG_NAME:=gdb
|
||||||
PKG_VERSION:=13.2
|
PKG_VERSION:=14.1
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=@GNU/gdb
|
PKG_SOURCE_URL:=@GNU/gdb
|
||||||
PKG_HASH:=fd5bebb7be1833abdb6e023c2f498a354498281df9d05523d8915babeb893f0a
|
PKG_HASH:=d66df51276143451fcbff464cc8723d68f1e9df45a6a2d5635a54e71643edb80
|
||||||
|
|
||||||
PKG_BUILD_PARALLEL:=1
|
PKG_BUILD_PARALLEL:=1
|
||||||
PKG_INSTALL:=1
|
PKG_INSTALL:=1
|
||||||
|
|
@ -33,7 +33,7 @@ endef
|
||||||
define Package/gdb
|
define Package/gdb
|
||||||
$(call Package/gdb/Default)
|
$(call Package/gdb/Default)
|
||||||
TITLE:=GNU Debugger
|
TITLE:=GNU Debugger
|
||||||
DEPENDS+=+libreadline +libncurses +zlib +libgmp
|
DEPENDS+=+libreadline +libncurses +zlib +libgmp +libmpfr
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/gdb/description
|
define Package/gdb/description
|
||||||
|
|
@ -64,8 +64,6 @@ CONFIGURE_ARGS+= \
|
||||||
--disable-sim \
|
--disable-sim \
|
||||||
--disable-werror \
|
--disable-werror \
|
||||||
--disable-source-highlight \
|
--disable-source-highlight \
|
||||||
--without-mpc \
|
|
||||||
--without-mpfr \
|
|
||||||
--without-isl \
|
--without-isl \
|
||||||
--without-xxhash \
|
--without-xxhash \
|
||||||
--with-libgmp-prefix=$(STAGING_DIR)/usr
|
--with-libgmp-prefix=$(STAGING_DIR)/usr
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/configure.ac
|
--- a/configure.ac
|
||||||
+++ b/configure.ac
|
+++ b/configure.ac
|
||||||
@@ -1435,13 +1435,13 @@ if test -z "$LD"; then
|
@@ -1400,13 +1400,13 @@ if test -z "$LD"; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
AC_LANG_PUSH(C++)
|
AC_LANG_PUSH(C++)
|
||||||
AC_LINK_IFELSE([AC_LANG_SOURCE([
|
AC_LINK_IFELSE([AC_LANG_SOURCE([
|
||||||
#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
|
#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
|
||||||
@@ -1838,7 +1838,7 @@ AC_ARG_WITH(stage1-ldflags,
|
@@ -1836,7 +1836,7 @@ AC_ARG_WITH(stage1-ldflags,
|
||||||
# trust that they are doing what they want.
|
# trust that they are doing what they want.
|
||||||
if test "$with_static_standard_libraries" = yes -a "$stage1_libs" = "" \
|
if test "$with_static_standard_libraries" = yes -a "$stage1_libs" = "" \
|
||||||
-a "$have_static_libs" = yes; then
|
-a "$have_static_libs" = yes; then
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
fi])
|
fi])
|
||||||
AC_SUBST(stage1_ldflags)
|
AC_SUBST(stage1_ldflags)
|
||||||
|
|
||||||
@@ -1867,7 +1867,7 @@ AC_ARG_WITH(boot-ldflags,
|
@@ -1865,7 +1865,7 @@ AC_ARG_WITH(boot-ldflags,
|
||||||
# statically. But if the user explicitly specified the libraries to
|
# statically. But if the user explicitly specified the libraries to
|
||||||
# use, trust that they are doing what they want.
|
# use, trust that they are doing what they want.
|
||||||
if test "$poststage1_libs" = ""; then
|
if test "$poststage1_libs" = ""; then
|
||||||
|
|
@ -37,7 +37,7 @@
|
||||||
|
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -5442,14 +5442,14 @@ if test -z "$LD"; then
|
@@ -5413,14 +5413,14 @@ if test -z "$LD"; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -56,7 +56,7 @@
|
||||||
ac_ext=cpp
|
ac_ext=cpp
|
||||||
ac_cpp='$CXXCPP $CPPFLAGS'
|
ac_cpp='$CXXCPP $CPPFLAGS'
|
||||||
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||||
@@ -8440,7 +8440,7 @@ else
|
@@ -8464,7 +8464,7 @@ else
|
||||||
# trust that they are doing what they want.
|
# trust that they are doing what they want.
|
||||||
if test "$with_static_standard_libraries" = yes -a "$stage1_libs" = "" \
|
if test "$with_static_standard_libraries" = yes -a "$stage1_libs" = "" \
|
||||||
-a "$have_static_libs" = yes; then
|
-a "$have_static_libs" = yes; then
|
||||||
|
|
@ -65,7 +65,7 @@
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -8476,7 +8476,7 @@ else
|
@@ -8500,7 +8500,7 @@ else
|
||||||
# statically. But if the user explicitly specified the libraries to
|
# statically. But if the user explicitly specified the libraries to
|
||||||
# use, trust that they are doing what they want.
|
# use, trust that they are doing what they want.
|
||||||
if test "$poststage1_libs" = ""; then
|
if test "$poststage1_libs" = ""; then
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
|
||||||
--- a/gdbserver/linux-low.cc
|
--- a/gdbserver/linux-low.cc
|
||||||
+++ b/gdbserver/linux-low.cc
|
+++ b/gdbserver/linux-low.cc
|
||||||
@@ -5467,7 +5467,7 @@ linux_process_target::request_interrupt
|
@@ -5481,7 +5481,7 @@ linux_process_target::request_interrupt
|
||||||
{
|
{
|
||||||
/* Send a SIGINT to the process group. This acts just like the user
|
/* Send a SIGINT to the process group. This acts just like the user
|
||||||
typed a ^C on the controlling terminal. */
|
typed a ^C on the controlling terminal. */
|
||||||
|
|
|
||||||
|
|
@ -6,9 +6,9 @@ PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_URL=$(PROJECT_GIT)/project/firmware/qca-wireless.git
|
PKG_SOURCE_URL=$(PROJECT_GIT)/project/firmware/qca-wireless.git
|
||||||
PKG_SOURCE_DATE:=2023-11-10
|
PKG_SOURCE_DATE:=2024-01-06
|
||||||
PKG_SOURCE_VERSION:=0c2e810e71ed0a59fb00246c7fa2c236ff67a0ee
|
PKG_SOURCE_VERSION:=71f45cff8944405b7cc2bf5c19df2bd8fe7f2421
|
||||||
PKG_MIRROR_HASH:=fc6016540bd2c67484952d0e4432d740f0e022d9b688e851bb6321def8d36844
|
PKG_MIRROR_HASH:=90c3c1659c54cdb4685d0a71633746c1000230e459801eb8ce12c805a994cc37
|
||||||
|
|
||||||
PKG_FLAGS:=nonshared
|
PKG_FLAGS:=nonshared
|
||||||
|
|
||||||
|
|
@ -34,6 +34,7 @@ ALLWIFIBOARDS:= \
|
||||||
dynalink_dl-wrx36 \
|
dynalink_dl-wrx36 \
|
||||||
edgecore_eap102 \
|
edgecore_eap102 \
|
||||||
edimax_cax1800 \
|
edimax_cax1800 \
|
||||||
|
linksys_mx4200 \
|
||||||
netgear_rax120v2 \
|
netgear_rax120v2 \
|
||||||
netgear_wax218 \
|
netgear_wax218 \
|
||||||
netgear_wax620 \
|
netgear_wax620 \
|
||||||
|
|
@ -83,7 +84,7 @@ define ipq-wifi-install-one
|
||||||
$(call ipq-wifi-install-one-to,$(1),$(2),QCA9984/hw1.0),\
|
$(call ipq-wifi-install-one-to,$(1),$(2),QCA9984/hw1.0),\
|
||||||
$(if $(filter $(suffix $(1)),.QCA99X0 .qca99x0),\
|
$(if $(filter $(suffix $(1)),.QCA99X0 .qca99x0),\
|
||||||
$(call ipq-wifi-install-one-to,$(1),$(2),QCA99X0/hw2.0),\
|
$(call ipq-wifi-install-one-to,$(1),$(2),QCA99X0/hw2.0),\
|
||||||
$(if $(filter $(suffix $(1)),.IPQ8074 .ipq8074),\
|
$(if $(filter $(suffix $(1)),.IPQ8074 .ipq8074 .ipq8174),\
|
||||||
$(call ipq-wifi-install-ath11-one-to,$(1),$(2),IPQ8074/hw2.0),\
|
$(call ipq-wifi-install-ath11-one-to,$(1),$(2),IPQ8074/hw2.0),\
|
||||||
$(if $(filter $(suffix $(1)),.QCN9074 .qcn9074),\
|
$(if $(filter $(suffix $(1)),.QCN9074 .qcn9074),\
|
||||||
$(call ipq-wifi-install-ath11-one-to,$(1),$(2),QCN9074/hw1.0),\
|
$(call ipq-wifi-install-ath11-one-to,$(1),$(2),QCN9074/hw1.0),\
|
||||||
|
|
@ -144,6 +145,7 @@ $(eval $(call generate-ipq-wifi-package,compex_wpq873,Compex WPQ-873))
|
||||||
$(eval $(call generate-ipq-wifi-package,dynalink_dl-wrx36,Dynalink DL-WRX36))
|
$(eval $(call generate-ipq-wifi-package,dynalink_dl-wrx36,Dynalink DL-WRX36))
|
||||||
$(eval $(call generate-ipq-wifi-package,edgecore_eap102,Edgecore EAP102))
|
$(eval $(call generate-ipq-wifi-package,edgecore_eap102,Edgecore EAP102))
|
||||||
$(eval $(call generate-ipq-wifi-package,edimax_cax1800,Edimax CAX1800))
|
$(eval $(call generate-ipq-wifi-package,edimax_cax1800,Edimax CAX1800))
|
||||||
|
$(eval $(call generate-ipq-wifi-package,linksys_mx4200,Linksys MX4200))
|
||||||
$(eval $(call generate-ipq-wifi-package,netgear_rax120v2,Netgear RAX120v2))
|
$(eval $(call generate-ipq-wifi-package,netgear_rax120v2,Netgear RAX120v2))
|
||||||
$(eval $(call generate-ipq-wifi-package,netgear_wax218,Netgear WAX218))
|
$(eval $(call generate-ipq-wifi-package,netgear_wax218,Netgear WAX218))
|
||||||
$(eval $(call generate-ipq-wifi-package,netgear_wax620,Netgear WAX620))
|
$(eval $(call generate-ipq-wifi-package,netgear_wax620,Netgear WAX620))
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=linux-firmware
|
PKG_NAME:=linux-firmware
|
||||||
PKG_VERSION:=20231211
|
PKG_VERSION:=20231211
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
|
|
||||||
PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware
|
PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
|
|
|
||||||
|
|
@ -125,9 +125,15 @@ define Package/brcmfmac-nvram-43455-sdio/install
|
||||||
$(LN) \
|
$(LN) \
|
||||||
brcmfmac43455-sdio.raspberrypi,4-model-b.txt \
|
brcmfmac43455-sdio.raspberrypi,4-model-b.txt \
|
||||||
$(1)/lib/firmware/brcm/brcmfmac43455-sdio.Raspberry\ Pi\ Foundation-Raspberry\ Pi\ 4\ Model\ B.txt
|
$(1)/lib/firmware/brcm/brcmfmac43455-sdio.Raspberry\ Pi\ Foundation-Raspberry\ Pi\ 4\ Model\ B.txt
|
||||||
|
$(LN) \
|
||||||
|
brcmfmac43455-sdio.raspberrypi,4-model-b.txt \
|
||||||
|
$(1)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.txt
|
||||||
$(LN) \
|
$(LN) \
|
||||||
brcmfmac43455-sdio.raspberrypi,4-model-b.txt \
|
brcmfmac43455-sdio.raspberrypi,4-model-b.txt \
|
||||||
$(1)/lib/firmware/brcm/brcmfmac43455-sdio.Raspberry\ Pi\ Foundation-Raspberry\ Pi\ Compute\ Module\ 4.txt
|
$(1)/lib/firmware/brcm/brcmfmac43455-sdio.Raspberry\ Pi\ Foundation-Raspberry\ Pi\ Compute\ Module\ 4.txt
|
||||||
|
$(LN) \
|
||||||
|
brcmfmac43455-sdio.raspberrypi,4-model-b.txt \
|
||||||
|
$(1)/lib/firmware/brcm/brcmfmac43455-sdio.Raspberry\ Pi\ Foundation-Raspberry\ Pi\ 5\ Model\ B.txt
|
||||||
$(INSTALL_DATA) \
|
$(INSTALL_DATA) \
|
||||||
$(PKG_BUILD_DIR)/brcm/brcmfmac43455-sdio.MINIX-NEO\ Z83-4.txt \
|
$(PKG_BUILD_DIR)/brcm/brcmfmac43455-sdio.MINIX-NEO\ Z83-4.txt \
|
||||||
$(1)/lib/firmware/brcm/
|
$(1)/lib/firmware/brcm/
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,8 @@ include $(TOPDIR)/rules.mk
|
||||||
include $(INCLUDE_DIR)/kernel.mk
|
include $(INCLUDE_DIR)/kernel.mk
|
||||||
|
|
||||||
PKG_NAME:=bcm27xx-gpu-fw
|
PKG_NAME:=bcm27xx-gpu-fw
|
||||||
PKG_VERSION:=2022-05-16
|
PKG_VERSION:=2024-01-11
|
||||||
PKG_RELEASE:=3673be308132de102fdff491d1333d9d0f823557
|
PKG_RELEASE:=0968de28716a9b1f106b8492646d0ed0a2800152
|
||||||
|
|
||||||
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)/rpi-firmware-$(PKG_RELEASE)
|
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)/rpi-firmware-$(PKG_RELEASE)
|
||||||
|
|
||||||
|
|
@ -26,7 +26,7 @@ define Download/bootcode_bin
|
||||||
FILE:=$(RPI_FIRMWARE_FILE)-bootcode.bin
|
FILE:=$(RPI_FIRMWARE_FILE)-bootcode.bin
|
||||||
URL:=$(RPI_FIRMWARE_URL)
|
URL:=$(RPI_FIRMWARE_URL)
|
||||||
URL_FILE:=bootcode.bin
|
URL_FILE:=bootcode.bin
|
||||||
HASH:=69309823da13dc96b89e3d82b44f820e4f84efa79d207adad2c8784559794f03
|
HASH:=af603ebd97e7b692c30195563f7b25656eb05d57838cf1a715ebb470d1614ce4
|
||||||
endef
|
endef
|
||||||
$(eval $(call Download,bootcode_bin))
|
$(eval $(call Download,bootcode_bin))
|
||||||
|
|
||||||
|
|
@ -34,7 +34,7 @@ define Download/fixup_dat
|
||||||
FILE:=$(RPI_FIRMWARE_FILE)-fixup.dat
|
FILE:=$(RPI_FIRMWARE_FILE)-fixup.dat
|
||||||
URL:=$(RPI_FIRMWARE_URL)
|
URL:=$(RPI_FIRMWARE_URL)
|
||||||
URL_FILE:=fixup.dat
|
URL_FILE:=fixup.dat
|
||||||
HASH:=921f56c62ad1995addb984b156c869202dc5d46bbe9ebcbd02c20f0def9058e3
|
HASH:=c28ea955e672e374016dca61d63afa026490f0473a98115908586ab48e324aeb
|
||||||
endef
|
endef
|
||||||
$(eval $(call Download,fixup_dat))
|
$(eval $(call Download,fixup_dat))
|
||||||
|
|
||||||
|
|
@ -42,7 +42,7 @@ define Download/fixup_cd_dat
|
||||||
FILE:=$(RPI_FIRMWARE_FILE)-fixup_cd.dat
|
FILE:=$(RPI_FIRMWARE_FILE)-fixup_cd.dat
|
||||||
URL:=$(RPI_FIRMWARE_URL)
|
URL:=$(RPI_FIRMWARE_URL)
|
||||||
URL_FILE:=fixup_cd.dat
|
URL_FILE:=fixup_cd.dat
|
||||||
HASH:=83a985aa0d73844786f3b3bf674826c520212f6f72fc6a890f2ebb5f87de5d8c
|
HASH:=3cf1aef5f596ca106203ed5dac9ad45e85929ec55ce44c813588645e174442ec
|
||||||
endef
|
endef
|
||||||
$(eval $(call Download,fixup_cd_dat))
|
$(eval $(call Download,fixup_cd_dat))
|
||||||
|
|
||||||
|
|
@ -50,7 +50,7 @@ define Download/fixup_x_dat
|
||||||
FILE:=$(RPI_FIRMWARE_FILE)-fixup_x.dat
|
FILE:=$(RPI_FIRMWARE_FILE)-fixup_x.dat
|
||||||
URL:=$(RPI_FIRMWARE_URL)
|
URL:=$(RPI_FIRMWARE_URL)
|
||||||
URL_FILE:=fixup_x.dat
|
URL_FILE:=fixup_x.dat
|
||||||
HASH:=8b00b00678adafe01e087240d156dbc87822e745b269be4f282596b69265cd1e
|
HASH:=56525c8feabde1ab86f36bb09bc55171659b2993f94132cf81ffc4293d62269d
|
||||||
endef
|
endef
|
||||||
$(eval $(call Download,fixup_x_dat))
|
$(eval $(call Download,fixup_x_dat))
|
||||||
|
|
||||||
|
|
@ -58,7 +58,7 @@ define Download/fixup4_dat
|
||||||
FILE:=$(RPI_FIRMWARE_FILE)-fixup4.dat
|
FILE:=$(RPI_FIRMWARE_FILE)-fixup4.dat
|
||||||
URL:=$(RPI_FIRMWARE_URL)
|
URL:=$(RPI_FIRMWARE_URL)
|
||||||
URL_FILE:=fixup4.dat
|
URL_FILE:=fixup4.dat
|
||||||
HASH:=ef2b5d2a0a95ca48e00a1ce78b7650ee9e947cc1c588704c8ae30c1623122e2f
|
HASH:=615f8595801bf52373039f73ad5ad9513f83400d355eb1b2c075c7ae907e927c
|
||||||
endef
|
endef
|
||||||
$(eval $(call Download,fixup4_dat))
|
$(eval $(call Download,fixup4_dat))
|
||||||
|
|
||||||
|
|
@ -66,7 +66,7 @@ define Download/fixup4cd_dat
|
||||||
FILE:=$(RPI_FIRMWARE_FILE)-fixup4cd.dat
|
FILE:=$(RPI_FIRMWARE_FILE)-fixup4cd.dat
|
||||||
URL:=$(RPI_FIRMWARE_URL)
|
URL:=$(RPI_FIRMWARE_URL)
|
||||||
URL_FILE:=fixup4cd.dat
|
URL_FILE:=fixup4cd.dat
|
||||||
HASH:=83a985aa0d73844786f3b3bf674826c520212f6f72fc6a890f2ebb5f87de5d8c
|
HASH:=3cf1aef5f596ca106203ed5dac9ad45e85929ec55ce44c813588645e174442ec
|
||||||
endef
|
endef
|
||||||
$(eval $(call Download,fixup4cd_dat))
|
$(eval $(call Download,fixup4cd_dat))
|
||||||
|
|
||||||
|
|
@ -74,7 +74,7 @@ define Download/fixup4x_dat
|
||||||
FILE:=$(RPI_FIRMWARE_FILE)-fixup4x.dat
|
FILE:=$(RPI_FIRMWARE_FILE)-fixup4x.dat
|
||||||
URL:=$(RPI_FIRMWARE_URL)
|
URL:=$(RPI_FIRMWARE_URL)
|
||||||
URL_FILE:=fixup4x.dat
|
URL_FILE:=fixup4x.dat
|
||||||
HASH:=a6c4e30ada5a00fe7de83c460638ca824647651bb4a3644b8c65d7ba1d9f2d2b
|
HASH:=6d27a4b8ecb78cef9e1f03751b4aaec5ce8749d36988f381145a8a41dbf164ae
|
||||||
endef
|
endef
|
||||||
$(eval $(call Download,fixup4x_dat))
|
$(eval $(call Download,fixup4x_dat))
|
||||||
|
|
||||||
|
|
@ -82,7 +82,7 @@ define Download/start_elf
|
||||||
FILE:=$(RPI_FIRMWARE_FILE)-start.elf
|
FILE:=$(RPI_FIRMWARE_FILE)-start.elf
|
||||||
URL:=$(RPI_FIRMWARE_URL)
|
URL:=$(RPI_FIRMWARE_URL)
|
||||||
URL_FILE:=start.elf
|
URL_FILE:=start.elf
|
||||||
HASH:=5455c148f4b8b04c553809bd22b995ee49ba5279ca3848df8bde6f80a388f7e0
|
HASH:=e8348e88522e7a1d0e2b0944ab66d7d8f4f30da98f326e2b3c123522e45f71b2
|
||||||
endef
|
endef
|
||||||
$(eval $(call Download,start_elf))
|
$(eval $(call Download,start_elf))
|
||||||
|
|
||||||
|
|
@ -90,7 +90,7 @@ define Download/start_cd_elf
|
||||||
FILE:=$(RPI_FIRMWARE_FILE)-start_cd.elf
|
FILE:=$(RPI_FIRMWARE_FILE)-start_cd.elf
|
||||||
URL:=$(RPI_FIRMWARE_URL)
|
URL:=$(RPI_FIRMWARE_URL)
|
||||||
URL_FILE:=start_cd.elf
|
URL_FILE:=start_cd.elf
|
||||||
HASH:=168c0a9178d5a3b4bd89ef770826a85b4ea3132560ba3600c212c0cec4c575c6
|
HASH:=c9b4de3f12bec7808868b898c49f656b5378ddc315f12ccab83d6519bad51680
|
||||||
endef
|
endef
|
||||||
$(eval $(call Download,start_cd_elf))
|
$(eval $(call Download,start_cd_elf))
|
||||||
|
|
||||||
|
|
@ -98,7 +98,7 @@ define Download/start_x_elf
|
||||||
FILE:=$(RPI_FIRMWARE_FILE)-start_x.elf
|
FILE:=$(RPI_FIRMWARE_FILE)-start_x.elf
|
||||||
URL:=$(RPI_FIRMWARE_URL)
|
URL:=$(RPI_FIRMWARE_URL)
|
||||||
URL_FILE:=start_x.elf
|
URL_FILE:=start_x.elf
|
||||||
HASH:=30c6a7f32a25185053ca3ca9e4bcfe932246ed42a1b7c37f8803209f93d86404
|
HASH:=0b5c06c109984361eeed0ab14d146f686d8aa8da2025689b887e9cb098636db9
|
||||||
endef
|
endef
|
||||||
$(eval $(call Download,start_x_elf))
|
$(eval $(call Download,start_x_elf))
|
||||||
|
|
||||||
|
|
@ -106,7 +106,7 @@ define Download/start4_elf
|
||||||
FILE:=$(RPI_FIRMWARE_FILE)-start4.elf
|
FILE:=$(RPI_FIRMWARE_FILE)-start4.elf
|
||||||
URL:=$(RPI_FIRMWARE_URL)
|
URL:=$(RPI_FIRMWARE_URL)
|
||||||
URL_FILE:=start4.elf
|
URL_FILE:=start4.elf
|
||||||
HASH:=be8bbff41dba2749b7b0e812f0a9d87a9122d18508f7b5ff3cd20f303d15bc07
|
HASH:=fedc4ecd72c9d21018e210240dcd2e41a8bb5f936fb5674c3351f2a447a22203
|
||||||
endef
|
endef
|
||||||
$(eval $(call Download,start4_elf))
|
$(eval $(call Download,start4_elf))
|
||||||
|
|
||||||
|
|
@ -114,7 +114,7 @@ define Download/start4cd_elf
|
||||||
FILE:=$(RPI_FIRMWARE_FILE)-start4cd.elf
|
FILE:=$(RPI_FIRMWARE_FILE)-start4cd.elf
|
||||||
URL:=$(RPI_FIRMWARE_URL)
|
URL:=$(RPI_FIRMWARE_URL)
|
||||||
URL_FILE:=start4cd.elf
|
URL_FILE:=start4cd.elf
|
||||||
HASH:=000372e9cf6815ade595948dbd6328665f2a535eeee44e74b0ec8e56b6fbbf90
|
HASH:=ea22282a77666801378137a651e7e0b17cc186f63cdbdc8b9bb98749cd12b256
|
||||||
endef
|
endef
|
||||||
$(eval $(call Download,start4cd_elf))
|
$(eval $(call Download,start4cd_elf))
|
||||||
|
|
||||||
|
|
@ -122,7 +122,7 @@ define Download/start4x_elf
|
||||||
FILE:=$(RPI_FIRMWARE_FILE)-start4x.elf
|
FILE:=$(RPI_FIRMWARE_FILE)-start4x.elf
|
||||||
URL:=$(RPI_FIRMWARE_URL)
|
URL:=$(RPI_FIRMWARE_URL)
|
||||||
URL_FILE:=start4x.elf
|
URL_FILE:=start4x.elf
|
||||||
HASH:=48895858f7936570dfab44c67bdcb0357ac8fcd630162c36ac9ed8f2de85c038
|
HASH:=c509e73a9cba7af3223dea885f58294bd04845e822aa3d6278500fa4dcdb112f
|
||||||
endef
|
endef
|
||||||
$(eval $(call Download,start4x_elf))
|
$(eval $(call Download,start4x_elf))
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,12 @@ define Package/kernel
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/kernel/install
|
define Package/kernel/install
|
||||||
# nothing to do
|
$(INSTALL_DIR) $(1)/$(MODULES_SUBDIR)
|
||||||
|
$(INSTALL_DATA) $(LINUX_DIR)/modules.builtin $(1)/$(MODULES_SUBDIR)
|
||||||
|
$(SED) 's,.*/,,' $(1)/$(MODULES_SUBDIR)/modules.builtin
|
||||||
|
strings $(LINUX_DIR)/modules.builtin.modinfo | \
|
||||||
|
grep -E -v "\.(file$(if CONFIG_MODULE_STRIPPED,|parmtype))=" | \
|
||||||
|
tr '\n' '\0' > $(1)/$(MODULES_SUBDIR)/modules.builtin.modinfo
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/kernel/extra_provides
|
define Package/kernel/extra_provides
|
||||||
|
|
|
||||||
|
|
@ -359,8 +359,7 @@ define KernelPackage/fs-ksmbd
|
||||||
DEPENDS:= \
|
DEPENDS:= \
|
||||||
+kmod-nls-base \
|
+kmod-nls-base \
|
||||||
+kmod-nls-utf8 \
|
+kmod-nls-utf8 \
|
||||||
+kmod-crypto-md4 \
|
+kmod-crypto-md5 \
|
||||||
+kmod-crypto-md5 \
|
|
||||||
+kmod-crypto-hmac \
|
+kmod-crypto-hmac \
|
||||||
+kmod-crypto-ecb \
|
+kmod-crypto-ecb \
|
||||||
+kmod-crypto-des \
|
+kmod-crypto-des \
|
||||||
|
|
|
||||||
|
|
@ -261,3 +261,37 @@ define KernelPackage/input-leds/description
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(eval $(call KernelPackage,input-leds))
|
$(eval $(call KernelPackage,input-leds))
|
||||||
|
|
||||||
|
|
||||||
|
define KernelPackage/leds-lp55xx-common
|
||||||
|
SUBMENU:=$(LEDS_MENU)
|
||||||
|
TITLE:=LED common driver for LP5521/LP5523/LP55231/LP5562 controllers
|
||||||
|
DEPENDS:=+kmod-i2c-core
|
||||||
|
KCONFIG:=CONFIG_LEDS_LP55XX_COMMON
|
||||||
|
FILES:=$(LINUX_DIR)/drivers/leds/leds-lp55xx-common.ko
|
||||||
|
AUTOLOAD:=$(call AutoLoad,60,leds-lp55xx-common,1)
|
||||||
|
endef
|
||||||
|
|
||||||
|
define KernelPackage/leds-lp55xx-common/description
|
||||||
|
This option enables support for Texas Instruments
|
||||||
|
LP5521/LP5523/LP55231/LP5562 common driver.
|
||||||
|
endef
|
||||||
|
|
||||||
|
$(eval $(call KernelPackage,leds-lp55xx-common))
|
||||||
|
|
||||||
|
|
||||||
|
define KernelPackage/leds-lp5562
|
||||||
|
SUBMENU:=$(LEDS_MENU)
|
||||||
|
TITLE:=LED driver for LP5562 controllers
|
||||||
|
DEPENDS:=+kmod-i2c-core +kmod-leds-lp55xx-common
|
||||||
|
KCONFIG:=CONFIG_LEDS_LP5562
|
||||||
|
FILES:=$(LINUX_DIR)/drivers/leds/leds-lp5562.ko
|
||||||
|
AUTOLOAD:=$(call AutoLoad,60,leds-lp5562,1)
|
||||||
|
endef
|
||||||
|
|
||||||
|
define KernelPackage/leds-lp5562/description
|
||||||
|
This option enables support for Texas Instruments LP5562
|
||||||
|
LED controllers.
|
||||||
|
endef
|
||||||
|
|
||||||
|
$(eval $(call KernelPackage,leds-lp5562))
|
||||||
|
|
@ -380,9 +380,7 @@ define KernelPackage/phy-aquantia
|
||||||
TITLE:=Aquantia Ethernet PHYs
|
TITLE:=Aquantia Ethernet PHYs
|
||||||
DEPENDS:=+kmod-libphy +kmod-hwmon-core +kmod-lib-crc-ccitt
|
DEPENDS:=+kmod-libphy +kmod-hwmon-core +kmod-lib-crc-ccitt
|
||||||
KCONFIG:=CONFIG_AQUANTIA_PHY
|
KCONFIG:=CONFIG_AQUANTIA_PHY
|
||||||
FILES:= \
|
FILES:=$(LINUX_DIR)/drivers/net/phy/aquantia/aquantia.ko
|
||||||
$(LINUX_DIR)/drivers/net/phy/aquantia.ko@lt6.1 \
|
|
||||||
$(LINUX_DIR)/drivers/net/phy/aquantia/aquantia.ko@ge6.1
|
|
||||||
AUTOLOAD:=$(call AutoLoad,18,aquantia,1)
|
AUTOLOAD:=$(call AutoLoad,18,aquantia,1)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,10 @@ wdev_tool() {
|
||||||
ucode /usr/share/hostap/wdev.uc "$@"
|
ucode /usr/share/hostap/wdev.uc "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ubus_call() {
|
||||||
|
flock /var/run/hostapd.lock ubus call "$@"
|
||||||
|
}
|
||||||
|
|
||||||
drv_mac80211_init_device_config() {
|
drv_mac80211_init_device_config() {
|
||||||
hostapd_common_add_device_config
|
hostapd_common_add_device_config
|
||||||
|
|
||||||
|
|
@ -145,7 +149,7 @@ mac80211_hostapd_setup_base() {
|
||||||
[ "$auto_channel" = 0 ] && [ -z "$channel_list" ] && \
|
[ "$auto_channel" = 0 ] && [ -z "$channel_list" ] && \
|
||||||
channel_list="$channel"
|
channel_list="$channel"
|
||||||
|
|
||||||
[ "$min_tx_power" -gt 0 ] && append base_cfg "min_tx_power=$min_tx_power"
|
[ "$min_tx_power" -gt 0 ] && append base_cfg "min_tx_power=$min_tx_power" "$N"
|
||||||
|
|
||||||
set_default noscan 0
|
set_default noscan 0
|
||||||
|
|
||||||
|
|
@ -327,6 +331,11 @@ mac80211_hostapd_setup_base() {
|
||||||
[ "$rx_stbc" -lt "$cap_rx_stbc" ] && cap_rx_stbc="$rx_stbc"
|
[ "$rx_stbc" -lt "$cap_rx_stbc" ] && cap_rx_stbc="$rx_stbc"
|
||||||
vht_cap="$(( ($vht_cap & ~(0x700)) | ($cap_rx_stbc << 8) ))"
|
vht_cap="$(( ($vht_cap & ~(0x700)) | ($cap_rx_stbc << 8) ))"
|
||||||
|
|
||||||
|
[ "$vht_oper_chwidth" -lt 2 ] && {
|
||||||
|
vht160=0
|
||||||
|
short_gi_160=0
|
||||||
|
}
|
||||||
|
|
||||||
mac80211_add_capabilities vht_capab $vht_cap \
|
mac80211_add_capabilities vht_capab $vht_cap \
|
||||||
RXLDPC:0x10::$rxldpc \
|
RXLDPC:0x10::$rxldpc \
|
||||||
SHORT-GI-80:0x20::$short_gi_80 \
|
SHORT-GI-80:0x20::$short_gi_80 \
|
||||||
|
|
@ -550,7 +559,7 @@ get_board_phy_name() (
|
||||||
local ref_path="$3"
|
local ref_path="$3"
|
||||||
|
|
||||||
json_select "$key"
|
json_select "$key"
|
||||||
json_get_values path
|
json_get_vars path
|
||||||
json_select ..
|
json_select ..
|
||||||
|
|
||||||
[ "${ref_path%+*}" = "$path" ] && fallback_phy=$key
|
[ "${ref_path%+*}" = "$path" ] && fallback_phy=$key
|
||||||
|
|
@ -582,7 +591,7 @@ rename_board_phy_by_name() (
|
||||||
json_load_file /etc/board.json
|
json_load_file /etc/board.json
|
||||||
json_select wlan
|
json_select wlan
|
||||||
json_select "${phy%.*}" || return 0
|
json_select "${phy%.*}" || return 0
|
||||||
json_get_values path
|
json_get_vars path
|
||||||
|
|
||||||
prev_phy="$(iwinfo nl80211 phyname "path=$path${suffix:++$suffix}")"
|
prev_phy="$(iwinfo nl80211 phyname "path=$path${suffix:++$suffix}")"
|
||||||
[ -n "$prev_phy" ] || return 0
|
[ -n "$prev_phy" ] || return 0
|
||||||
|
|
@ -898,7 +907,7 @@ wpa_supplicant_set_config() {
|
||||||
ubus wait_for wpa_supplicant
|
ubus wait_for wpa_supplicant
|
||||||
}
|
}
|
||||||
|
|
||||||
local supplicant_res="$(ubus call wpa_supplicant config_set "$data")"
|
local supplicant_res="$(ubus_call wpa_supplicant config_set "$data")"
|
||||||
ret="$?"
|
ret="$?"
|
||||||
[ "$ret" != 0 -o -z "$supplicant_res" ] && wireless_setup_vif_failed WPA_SUPPLICANT_FAILED
|
[ "$ret" != 0 -o -z "$supplicant_res" ] && wireless_setup_vif_failed WPA_SUPPLICANT_FAILED
|
||||||
|
|
||||||
|
|
@ -908,12 +917,12 @@ wpa_supplicant_set_config() {
|
||||||
|
|
||||||
hostapd_set_config() {
|
hostapd_set_config() {
|
||||||
[ -n "$hostapd_ctrl" ] || {
|
[ -n "$hostapd_ctrl" ] || {
|
||||||
ubus call hostapd config_set '{ "phy": "'"$phy"'", "config": "", "prev_config": "'"${hostapd_conf_file}.prev"'" }' > /dev/null
|
ubus_call hostapd config_set '{ "phy": "'"$phy"'", "config": "", "prev_config": "'"${hostapd_conf_file}.prev"'" }' > /dev/null
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
ubus wait_for hostapd
|
ubus wait_for hostapd
|
||||||
local hostapd_res="$(ubus call hostapd config_set "{ \"phy\": \"$phy\", \"config\":\"${hostapd_conf_file}\", \"prev_config\": \"${hostapd_conf_file}.prev\"}")"
|
local hostapd_res="$(ubus_call hostapd config_set "{ \"phy\": \"$phy\", \"config\":\"${hostapd_conf_file}\", \"prev_config\": \"${hostapd_conf_file}.prev\"}")"
|
||||||
ret="$?"
|
ret="$?"
|
||||||
[ "$ret" != 0 -o -z "$hostapd_res" ] && {
|
[ "$ret" != 0 -o -z "$hostapd_res" ] && {
|
||||||
wireless_setup_failed HOSTAPD_START_FAILED
|
wireless_setup_failed HOSTAPD_START_FAILED
|
||||||
|
|
@ -928,7 +937,7 @@ wpa_supplicant_start() {
|
||||||
|
|
||||||
[ -n "$wpa_supp_init" ] || return 0
|
[ -n "$wpa_supp_init" ] || return 0
|
||||||
|
|
||||||
ubus call wpa_supplicant config_set '{ "phy": "'"$phy"'" }' > /dev/null
|
ubus_call wpa_supplicant config_set '{ "phy": "'"$phy"'" }' > /dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
mac80211_setup_supplicant() {
|
mac80211_setup_supplicant() {
|
||||||
|
|
@ -1029,15 +1038,15 @@ mac80211_set_noscan() {
|
||||||
}
|
}
|
||||||
|
|
||||||
drv_mac80211_cleanup() {
|
drv_mac80211_cleanup() {
|
||||||
hostapd_common_cleanup
|
:
|
||||||
}
|
}
|
||||||
|
|
||||||
mac80211_reset_config() {
|
mac80211_reset_config() {
|
||||||
local phy="$1"
|
local phy="$1"
|
||||||
|
|
||||||
hostapd_conf_file="/var/run/hostapd-$phy.conf"
|
hostapd_conf_file="/var/run/hostapd-$phy.conf"
|
||||||
ubus call hostapd config_set '{ "phy": "'"$phy"'", "config": "", "prev_config": "'"$hostapd_conf_file"'" }' > /dev/null
|
ubus_call hostapd config_set '{ "phy": "'"$phy"'", "config": "", "prev_config": "'"$hostapd_conf_file"'" }' > /dev/null
|
||||||
ubus call wpa_supplicant config_set '{ "phy": "'"$phy"'", "config": [] }' > /dev/null
|
ubus_call wpa_supplicant config_set '{ "phy": "'"$phy"'", "config": [] }' > /dev/null
|
||||||
wdev_tool "$phy" set_config '{}'
|
wdev_tool "$phy" set_config '{}'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -79,7 +79,7 @@
|
||||||
}
|
}
|
||||||
--- a/drivers/net/wireless/ath/ath9k/common-debug.c
|
--- a/drivers/net/wireless/ath/ath9k/common-debug.c
|
||||||
+++ b/drivers/net/wireless/ath/ath9k/common-debug.c
|
+++ b/drivers/net/wireless/ath/ath9k/common-debug.c
|
||||||
@@ -316,3 +316,55 @@ void ath9k_cmn_debug_eeprom(struct dentr
|
@@ -315,3 +315,55 @@ void ath9k_cmn_debug_eeprom(struct dentr
|
||||||
&fops_eeprom);
|
&fops_eeprom);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(ath9k_cmn_debug_eeprom);
|
EXPORT_SYMBOL(ath9k_cmn_debug_eeprom);
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
--- a/drivers/net/wireless/ath/ath9k/debug.c
|
--- a/drivers/net/wireless/ath/ath9k/debug.c
|
||||||
+++ b/drivers/net/wireless/ath/ath9k/debug.c
|
+++ b/drivers/net/wireless/ath/ath9k/debug.c
|
||||||
@@ -1562,6 +1562,50 @@ static const struct file_operations fops
|
@@ -1468,6 +1468,50 @@ void ath9k_deinit_debug(struct ath_softc
|
||||||
#endif
|
ath9k_cmn_spectral_deinit_debug(&sc->spec_priv);
|
||||||
|
}
|
||||||
|
|
||||||
+static ssize_t read_file_diag(struct file *file, char __user *user_buf,
|
+static ssize_t read_file_diag(struct file *file, char __user *user_buf,
|
||||||
+ size_t count, loff_t *ppos)
|
+ size_t count, loff_t *ppos)
|
||||||
|
|
@ -51,7 +51,7 @@
|
||||||
int ath9k_init_debug(struct ath_hw *ah)
|
int ath9k_init_debug(struct ath_hw *ah)
|
||||||
{
|
{
|
||||||
struct ath_common *common = ath9k_hw_common(ah);
|
struct ath_common *common = ath9k_hw_common(ah);
|
||||||
@@ -1589,6 +1633,8 @@ int ath9k_init_debug(struct ath_hw *ah)
|
@@ -1491,6 +1535,8 @@ int ath9k_init_debug(struct ath_hw *ah)
|
||||||
debugfs_create_file("gpio_led", S_IWUSR,
|
debugfs_create_file("gpio_led", S_IWUSR,
|
||||||
sc->debug.debugfs_phy, sc, &fops_gpio_led);
|
sc->debug.debugfs_phy, sc, &fops_gpio_led);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@
|
||||||
ops->spectral_scan_config = ar9003_hw_spectral_scan_config;
|
ops->spectral_scan_config = ar9003_hw_spectral_scan_config;
|
||||||
--- a/drivers/net/wireless/ath/ath9k/init.c
|
--- a/drivers/net/wireless/ath/ath9k/init.c
|
||||||
+++ b/drivers/net/wireless/ath/ath9k/init.c
|
+++ b/drivers/net/wireless/ath/ath9k/init.c
|
||||||
@@ -870,7 +870,8 @@ static void ath9k_init_txpower_limits(st
|
@@ -871,7 +871,8 @@ static void ath9k_init_txpower_limits(st
|
||||||
if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ)
|
if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ)
|
||||||
ath9k_init_band_txpower(sc, NL80211_BAND_5GHZ);
|
ath9k_init_band_txpower(sc, NL80211_BAND_5GHZ);
|
||||||
|
|
||||||
|
|
@ -65,7 +65,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct ieee80211_iface_limit if_limits[] = {
|
static const struct ieee80211_iface_limit if_limits[] = {
|
||||||
@@ -1048,6 +1049,18 @@ static void ath9k_set_hw_capab(struct at
|
@@ -1049,6 +1050,18 @@ static void ath9k_set_hw_capab(struct at
|
||||||
wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_CAN_REPLACE_PTK0);
|
wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_CAN_REPLACE_PTK0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -84,7 +84,7 @@
|
||||||
int ath9k_init_device(u16 devid, struct ath_softc *sc,
|
int ath9k_init_device(u16 devid, struct ath_softc *sc,
|
||||||
const struct ath_bus_ops *bus_ops)
|
const struct ath_bus_ops *bus_ops)
|
||||||
{
|
{
|
||||||
@@ -1095,6 +1108,8 @@ int ath9k_init_device(u16 devid, struct
|
@@ -1096,6 +1109,8 @@ int ath9k_init_device(u16 devid, struct
|
||||||
|
|
||||||
wiphy_read_of_freq_limits(hw->wiphy);
|
wiphy_read_of_freq_limits(hw->wiphy);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
|
static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
|
||||||
const struct ath_bus_ops *bus_ops)
|
const struct ath_bus_ops *bus_ops)
|
||||||
{
|
{
|
||||||
@@ -803,6 +809,9 @@ static int ath9k_init_softc(u16 devid, s
|
@@ -804,6 +810,9 @@ static int ath9k_init_softc(u16 devid, s
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err_hw;
|
goto err_hw;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,191 +0,0 @@
|
||||||
From 4e32024cbb14230af3048e249e84f8c2b25ce45a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Phil Elwell <phil@raspberrypi.com>
|
|
||||||
Date: Thu, 28 Oct 2021 15:03:16 +0100
|
|
||||||
Subject: [PATCH] brcmfmac: Read alternative firmware names from DT
|
|
||||||
|
|
||||||
Add the ability to load the names of alternative firmwares from the
|
|
||||||
Device Tree node. This permits separate firmwares for 43436s and 43438
|
|
||||||
and allows downstream firmwares to coexist with upstream.
|
|
||||||
|
|
||||||
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
||||||
---
|
|
||||||
.../wireless/broadcom/brcm80211/brcmfmac/of.c | 36 ++++++++++++++
|
|
||||||
.../wireless/broadcom/brcm80211/brcmfmac/of.h | 7 +++
|
|
||||||
.../broadcom/brcm80211/brcmfmac/sdio.c | 47 +++++++++++++++++--
|
|
||||||
3 files changed, 87 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
|
|
||||||
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
|
|
||||||
@@ -11,6 +11,7 @@
|
|
||||||
#include "debug.h"
|
|
||||||
#include "core.h"
|
|
||||||
#include "common.h"
|
|
||||||
+#include "firmware.h"
|
|
||||||
#include "of.h"
|
|
||||||
|
|
||||||
static int brcmf_of_get_country_codes(struct device *dev,
|
|
||||||
@@ -175,3 +176,38 @@ void brcmf_of_probe(struct device *dev,
|
|
||||||
sdio->oob_irq_nr = irq;
|
|
||||||
sdio->oob_irq_flags = irqf;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+struct brcmf_firmware_mapping *
|
|
||||||
+brcmf_of_fwnames(struct device *dev, u32 *fwname_count)
|
|
||||||
+{
|
|
||||||
+ struct device_node *np = dev->of_node;
|
|
||||||
+ struct brcmf_firmware_mapping *fwnames;
|
|
||||||
+ struct device_node *map_np, *fw_np;
|
|
||||||
+ int of_count;
|
|
||||||
+ int count = 0;
|
|
||||||
+
|
|
||||||
+ map_np = of_get_child_by_name(np, "firmwares");
|
|
||||||
+ of_count = of_get_child_count(map_np);
|
|
||||||
+ if (!of_count)
|
|
||||||
+ return NULL;
|
|
||||||
+
|
|
||||||
+ fwnames = devm_kcalloc(dev, of_count,
|
|
||||||
+ sizeof(struct brcmf_firmware_mapping),
|
|
||||||
+ GFP_KERNEL);
|
|
||||||
+
|
|
||||||
+ for_each_child_of_node(map_np, fw_np)
|
|
||||||
+ {
|
|
||||||
+ struct brcmf_firmware_mapping *cur = &fwnames[count];
|
|
||||||
+
|
|
||||||
+ if (of_property_read_u32(fw_np, "chipid", &cur->chipid) ||
|
|
||||||
+ of_property_read_u32(fw_np, "revmask", &cur->revmask))
|
|
||||||
+ continue;
|
|
||||||
+ cur->fw_base = of_get_property(fw_np, "fw_base", NULL);
|
|
||||||
+ if (cur->fw_base)
|
|
||||||
+ count++;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ *fwname_count = count;
|
|
||||||
+
|
|
||||||
+ return count ? fwnames : NULL;
|
|
||||||
+}
|
|
||||||
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h
|
|
||||||
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h
|
|
||||||
@@ -5,9 +5,20 @@
|
|
||||||
#ifdef CONFIG_OF
|
|
||||||
void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,
|
|
||||||
struct brcmf_mp_device *settings);
|
|
||||||
+#ifdef CPTCFG_BRCMFMAC_SDIO
|
|
||||||
+struct brcmf_firmware_mapping *
|
|
||||||
+brcmf_of_fwnames(struct device *dev, u32 *map_count);
|
|
||||||
+#endif
|
|
||||||
#else
|
|
||||||
static void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,
|
|
||||||
struct brcmf_mp_device *settings)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
+#ifdef CPTCFG_BRCMFMAC_SDIO
|
|
||||||
+static struct brcmf_firmware_mapping *
|
|
||||||
+brcmf_of_fwnames(struct device *dev, u32 *map_count)
|
|
||||||
+{
|
|
||||||
+ return NULL;
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
#endif /* CONFIG_OF */
|
|
||||||
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
|
|
||||||
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
|
|
||||||
@@ -35,6 +35,7 @@
|
|
||||||
#include "core.h"
|
|
||||||
#include "common.h"
|
|
||||||
#include "bcdc.h"
|
|
||||||
+#include "of.h"
|
|
||||||
|
|
||||||
#define DCMD_RESP_TIMEOUT msecs_to_jiffies(2500)
|
|
||||||
#define CTL_DONE_TIMEOUT msecs_to_jiffies(2500)
|
|
||||||
@@ -632,7 +633,7 @@ MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "b
|
|
||||||
/* per-board firmware binaries */
|
|
||||||
MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-sdio.*.bin");
|
|
||||||
|
|
||||||
-static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
|
|
||||||
+static const struct brcmf_firmware_mapping sdio_fwnames[] = {
|
|
||||||
BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),
|
|
||||||
BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0x0000001F, 43241B0),
|
|
||||||
BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0x00000020, 43241B4),
|
|
||||||
@@ -660,6 +661,9 @@ static const struct brcmf_firmware_mappi
|
|
||||||
BRCMF_FW_ENTRY(CY_CC_43752_CHIP_ID, 0xFFFFFFFF, 43752)
|
|
||||||
};
|
|
||||||
|
|
||||||
+static const struct brcmf_firmware_mapping *brcmf_sdio_fwnames = sdio_fwnames;
|
|
||||||
+static u32 brcmf_sdio_fwnames_count = ARRAY_SIZE(sdio_fwnames);
|
|
||||||
+
|
|
||||||
#define TXCTL_CREDITS 2
|
|
||||||
|
|
||||||
static void pkt_align(struct sk_buff *p, int len, int align)
|
|
||||||
@@ -4201,6 +4205,9 @@ static const struct brcmf_bus_ops brcmf_
|
|
||||||
#define BRCMF_SDIO_FW_NVRAM 1
|
|
||||||
#define BRCMF_SDIO_FW_CLM 2
|
|
||||||
|
|
||||||
+static struct brcmf_fw_request *
|
|
||||||
+brcmf_sdio_prepare_fw_request(struct brcmf_sdio *bus);
|
|
||||||
+
|
|
||||||
static void brcmf_sdio_firmware_callback(struct device *dev, int err,
|
|
||||||
struct brcmf_fw_request *fwreq)
|
|
||||||
{
|
|
||||||
@@ -4216,6 +4223,22 @@ static void brcmf_sdio_firmware_callback
|
|
||||||
|
|
||||||
brcmf_dbg(TRACE, "Enter: dev=%s, err=%d\n", dev_name(dev), err);
|
|
||||||
|
|
||||||
+ if (err && brcmf_sdio_fwnames != sdio_fwnames) {
|
|
||||||
+ /* Try again with the standard firmware names */
|
|
||||||
+ brcmf_sdio_fwnames = sdio_fwnames;
|
|
||||||
+ brcmf_sdio_fwnames_count = ARRAY_SIZE(sdio_fwnames);
|
|
||||||
+ kfree(fwreq);
|
|
||||||
+ fwreq = brcmf_sdio_prepare_fw_request(bus);
|
|
||||||
+ if (!fwreq) {
|
|
||||||
+ err = -ENOMEM;
|
|
||||||
+ goto fail;
|
|
||||||
+ }
|
|
||||||
+ err = brcmf_fw_get_firmwares(dev, fwreq,
|
|
||||||
+ brcmf_sdio_firmware_callback);
|
|
||||||
+ if (!err)
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (err)
|
|
||||||
goto fail;
|
|
||||||
|
|
||||||
@@ -4426,7 +4449,7 @@ brcmf_sdio_prepare_fw_request(struct brc
|
|
||||||
|
|
||||||
fwreq = brcmf_fw_alloc_request(bus->ci->chip, bus->ci->chiprev,
|
|
||||||
brcmf_sdio_fwnames,
|
|
||||||
- ARRAY_SIZE(brcmf_sdio_fwnames),
|
|
||||||
+ brcmf_sdio_fwnames_count,
|
|
||||||
fwnames, ARRAY_SIZE(fwnames));
|
|
||||||
if (!fwreq)
|
|
||||||
return NULL;
|
|
||||||
@@ -4446,6 +4469,9 @@ struct brcmf_sdio *brcmf_sdio_probe(stru
|
|
||||||
struct brcmf_sdio *bus;
|
|
||||||
struct workqueue_struct *wq;
|
|
||||||
struct brcmf_fw_request *fwreq;
|
|
||||||
+ struct brcmf_firmware_mapping *of_fwnames, *fwnames = NULL;
|
|
||||||
+ const int fwname_size = sizeof(struct brcmf_firmware_mapping);
|
|
||||||
+ u32 of_fw_count;
|
|
||||||
|
|
||||||
brcmf_dbg(TRACE, "Enter\n");
|
|
||||||
|
|
||||||
@@ -4528,6 +4554,21 @@ struct brcmf_sdio *brcmf_sdio_probe(stru
|
|
||||||
|
|
||||||
brcmf_dbg(INFO, "completed!!\n");
|
|
||||||
|
|
||||||
+ of_fwnames = brcmf_of_fwnames(sdiodev->dev, &of_fw_count);
|
|
||||||
+ if (of_fwnames)
|
|
||||||
+ fwnames = devm_kcalloc(sdiodev->dev,
|
|
||||||
+ of_fw_count + brcmf_sdio_fwnames_count,
|
|
||||||
+ fwname_size, GFP_KERNEL);
|
|
||||||
+
|
|
||||||
+ if (fwnames) {
|
|
||||||
+ /* The array is scanned in order, so overrides come first */
|
|
||||||
+ memcpy(fwnames, of_fwnames, of_fw_count * fwname_size);
|
|
||||||
+ memcpy(fwnames + of_fw_count, sdio_fwnames,
|
|
||||||
+ brcmf_sdio_fwnames_count * fwname_size);
|
|
||||||
+ brcmf_sdio_fwnames = fwnames;
|
|
||||||
+ brcmf_sdio_fwnames_count += of_fw_count;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
fwreq = brcmf_sdio_prepare_fw_request(bus);
|
|
||||||
if (!fwreq) {
|
|
||||||
ret = -ENOMEM;
|
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
brcmfmac: disable dump_survey on Raspberry Pi
|
||||||
|
|
||||||
|
Enabling this causes slow iwinfo calls on Raspberry Pi and LuCI slows down
|
||||||
|
when wireless is enabled.
|
||||||
|
https://github.com/openwrt/openwrt/issues/14013
|
||||||
|
|
||||||
|
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
||||||
|
---
|
||||||
|
|
||||||
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
|
||||||
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
|
||||||
|
@@ -8361,8 +8361,10 @@ struct brcmf_cfg80211_info *brcmf_cfg802
|
||||||
|
if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_WOWL_GTK))
|
||||||
|
ops->set_rekey_data = brcmf_cfg80211_set_rekey_data;
|
||||||
|
#endif
|
||||||
|
+#if !defined(CONFIG_ARCH_BCM2835)
|
||||||
|
if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_DUMP_OBSS))
|
||||||
|
ops->dump_survey = brcmf_cfg80211_dump_survey;
|
||||||
|
+#endif /* CONFIG_ARCH_BCM2835 */
|
||||||
|
|
||||||
|
err = wiphy_register(wiphy);
|
||||||
|
if (err < 0) {
|
||||||
|
|
@ -0,0 +1,34 @@
|
||||||
|
From: Felix Fietkau <nbd@nbd.name>
|
||||||
|
Date: Wed, 3 Jan 2024 15:10:18 +0100
|
||||||
|
Subject: [PATCH] wifi: mac80211: fix race condition on enabling fast-xmit
|
||||||
|
|
||||||
|
fast-xmit must only be enabled after the sta has been uploaded to the driver,
|
||||||
|
otherwise it could end up passing the not-yet-uploaded sta via drv_tx calls
|
||||||
|
to the driver, leading to potential crashes because of uninitialized drv_priv
|
||||||
|
data.
|
||||||
|
Add a missing sta->uploaded check and re-check fast xmit after inserting a sta.
|
||||||
|
|
||||||
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
|
---
|
||||||
|
|
||||||
|
--- a/net/mac80211/sta_info.c
|
||||||
|
+++ b/net/mac80211/sta_info.c
|
||||||
|
@@ -911,6 +911,7 @@ static int sta_info_insert_finish(struct
|
||||||
|
|
||||||
|
if (ieee80211_vif_is_mesh(&sdata->vif))
|
||||||
|
mesh_accept_plinks_update(sdata);
|
||||||
|
+ ieee80211_check_fast_xmit(sta);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
out_remove:
|
||||||
|
--- a/net/mac80211/tx.c
|
||||||
|
+++ b/net/mac80211/tx.c
|
||||||
|
@@ -3033,7 +3033,7 @@ void ieee80211_check_fast_xmit(struct st
|
||||||
|
sdata->vif.type == NL80211_IFTYPE_STATION)
|
||||||
|
goto out;
|
||||||
|
|
||||||
|
- if (!test_sta_flag(sta, WLAN_STA_AUTHORIZED))
|
||||||
|
+ if (!test_sta_flag(sta, WLAN_STA_AUTHORIZED) || !sta->uploaded)
|
||||||
|
goto out;
|
||||||
|
|
||||||
|
if (test_sta_flag(sta, WLAN_STA_PS_STA) ||
|
||||||
|
|
@ -0,0 +1,34 @@
|
||||||
|
From: David Bauer <mail@david-bauer.net>
|
||||||
|
Date: Thu, 30 Nov 2023 07:32:52 +0100
|
||||||
|
Subject: [PATCH] mac80211: avoid crashing on invalid band info
|
||||||
|
|
||||||
|
Frequent crashes have been observed on MT7916 based platforms. While the
|
||||||
|
root of these crashes are currently unknown, they happen when decoding
|
||||||
|
rate information of connected STAs in AP mode. The rate-information is
|
||||||
|
associated with a band which is not available on the PHY.
|
||||||
|
|
||||||
|
Check for this condition in order to avoid crashing the whole system.
|
||||||
|
This patch should be removed once the roout cause has been found and
|
||||||
|
fixed.
|
||||||
|
|
||||||
|
Link: https://github.com/freifunk-gluon/gluon/issues/2980
|
||||||
|
|
||||||
|
Signed-off-by: David Bauer <mail@david-bauer.net>
|
||||||
|
---
|
||||||
|
|
||||||
|
--- a/net/mac80211/sta_info.c
|
||||||
|
+++ b/net/mac80211/sta_info.c
|
||||||
|
@@ -2423,6 +2423,13 @@ static void sta_stats_decode_rate(struct
|
||||||
|
|
||||||
|
sband = local->hw.wiphy->bands[band];
|
||||||
|
|
||||||
|
+ if (!sband) {
|
||||||
|
+ wiphy_warn(local->hw.wiphy,
|
||||||
|
+ "Invalid band %d\n",
|
||||||
|
+ band);
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (WARN_ON_ONCE(!sband->bitrates))
|
||||||
|
break;
|
||||||
|
|
||||||
|
|
@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=
|
||||||
|
|
||||||
PKG_SOURCE_URL:=https://github.com/openwrt/mt76
|
PKG_SOURCE_URL:=https://github.com/openwrt/mt76
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_DATE:=2023-12-18
|
PKG_SOURCE_DATE:=2024-01-18
|
||||||
PKG_SOURCE_VERSION:=bebd9cffc2aeb2cecb40aadbb8c6eab3bdf7971b
|
PKG_SOURCE_VERSION:=f77188160441d5f77f08dd517632ae3f60c653b0
|
||||||
PKG_MIRROR_HASH:=580261755bc3f251b8bc5f7f610274693c067432187570694d2f2ccab0edb62b
|
PKG_MIRROR_HASH:=133a5e44624fe1933c893ee0b8ac75a847753f3490c26518c2ed9798f9ef53e0
|
||||||
|
|
||||||
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
|
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
|
||||||
PKG_USE_NINJA:=0
|
PKG_USE_NINJA:=0
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,8 @@ PKG_INSTALL:=1
|
||||||
PKG_BUILD_DEPENDS:=gettext-full/host libunistring libxml2
|
PKG_BUILD_DEPENDS:=gettext-full/host libunistring libxml2
|
||||||
PKG_BUILD_PARALLEL:=0
|
PKG_BUILD_PARALLEL:=0
|
||||||
|
|
||||||
|
PKG_FIXUP:=autoreconf
|
||||||
|
|
||||||
HOST_BUILD_DEPENDS:=gperf/host libunistring/host libxml2/host
|
HOST_BUILD_DEPENDS:=gperf/host libunistring/host libxml2/host
|
||||||
HOST_BUILD_PARALLEL:=0
|
HOST_BUILD_PARALLEL:=0
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,12 +6,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=libnl
|
PKG_NAME:=libnl
|
||||||
PKG_VERSION:=3.8.0
|
PKG_VERSION:=3.9.0
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://github.com/thom311/libnl/releases/download/libnl$(subst .,_,$(PKG_VERSION))
|
PKG_SOURCE_URL:=https://github.com/thom311/libnl/releases/download/libnl$(subst .,_,$(PKG_VERSION))
|
||||||
PKG_HASH:=bb726c6d7a08b121978d73ff98425bf313fa26a27a331d465e4f1d7ec5b838c6
|
PKG_HASH:=aed507004d728a5cf11eab48ca4bf9e6e1874444e33939b9d3dfed25018ee9bb
|
||||||
|
|
||||||
PKG_LICENSE:=LGPL-2.1
|
PKG_LICENSE:=LGPL-2.1
|
||||||
PKG_LICENSE_FILES:=COPYING
|
PKG_LICENSE_FILES:=COPYING
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=libtraceevent
|
PKG_NAME:=libtraceevent
|
||||||
PKG_VERSION:=1.7.3
|
PKG_VERSION:=1.8.2
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/
|
PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/
|
||||||
PKG_HASH:=097b72e0d907f3107825fb2edf0188324bf70dc9da360f6efa68dc484ffde541
|
PKG_HASH:=919f0c024c7b5059eace52d854d4df00ae7e361a4033e1b4d6fe01d97064a1b9
|
||||||
|
|
||||||
PKG_MAINTAINER:=Nick Hainke <vincent@systemli.org>
|
PKG_MAINTAINER:=Nick Hainke <vincent@systemli.org>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=libtracefs
|
PKG_NAME:=libtracefs
|
||||||
PKG_VERSION:=1.7.0
|
PKG_VERSION:=1.8.0
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/
|
PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/
|
||||||
PKG_HASH:=411fcbf3434ecbaefa6c2b1bf092266293a672e2d7ee46fdd6b402753cb8bd16
|
PKG_HASH:=f92475d5c4cb509983697fb359ee615bef4f08ed8bdc9c690f6118ba68886de0
|
||||||
|
|
||||||
PKG_MAINTAINER:=Nick Hainke <vincent@systemli.org>
|
PKG_MAINTAINER:=Nick Hainke <vincent@systemli.org>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,9 +5,9 @@ PKG_RELEASE=1
|
||||||
|
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git
|
PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git
|
||||||
PKG_MIRROR_HASH:=daf411244a7f87c09c383c6fb69636a038c85f351bba93e80cc9aa530301199e
|
PKG_MIRROR_HASH:=071139fed757bea240d4ba8f55a0ff5a81862d23e16b39fc871ae07da78ae6a4
|
||||||
PKG_SOURCE_DATE:=2023-12-04.1
|
PKG_SOURCE_DATE:=2024-01-26
|
||||||
PKG_SOURCE_VERSION:=ca3f6d0cdb1e588283c42d039779ceab303ceef2
|
PKG_SOURCE_VERSION:=c1be505732e6d254464973bdeacb955214c76c46
|
||||||
PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
|
PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
|
||||||
CMAKE_INSTALL:=1
|
CMAKE_INSTALL:=1
|
||||||
|
|
||||||
|
|
@ -105,6 +105,14 @@ CMAKE_HOST_OPTIONS += \
|
||||||
-DCMAKE_MACOSX_RPATH=1 \
|
-DCMAKE_MACOSX_RPATH=1 \
|
||||||
-DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOST}/lib" \
|
-DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOST}/lib" \
|
||||||
|
|
||||||
|
ifeq ($(HOST_OS),Darwin)
|
||||||
|
define Host/Install
|
||||||
|
$(Host/Install/Default)
|
||||||
|
$(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/lib
|
||||||
|
cd "$(STAGING_DIR_HOSTPKG)/lib" && ln -sf ../../host/lib/libubox.* .
|
||||||
|
endef
|
||||||
|
endif
|
||||||
|
|
||||||
$(eval $(call BuildPackage,libubox))
|
$(eval $(call BuildPackage,libubox))
|
||||||
$(eval $(call BuildPackage,libblobmsg-json))
|
$(eval $(call BuildPackage,libblobmsg-json))
|
||||||
$(eval $(call BuildPackage,jshn))
|
$(eval $(call BuildPackage,jshn))
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=libxml2
|
PKG_NAME:=libxml2
|
||||||
PKG_VERSION:=2.12.1
|
PKG_VERSION:=2.12.4
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=@GNOME/libxml2/$(basename $(PKG_VERSION))
|
PKG_SOURCE_URL:=@GNOME/libxml2/$(basename $(PKG_VERSION))
|
||||||
PKG_HASH:=8982b9ccdf7f456e30d8f7012d50858c6623e495333b6191def455c7e95427eb
|
PKG_HASH:=497360e423cf0bd99eacdb7c6215dea92e6d6e89ee940393c2bae0e77cb9b7d0
|
||||||
|
|
||||||
PKG_LICENSE:=MIT
|
PKG_LICENSE:=MIT
|
||||||
PKG_LICENSE_FILES:=COPYING
|
PKG_LICENSE_FILES:=COPYING
|
||||||
|
|
|
||||||
64
package/libs/mpfr/Makefile
Normal file
64
package/libs/mpfr/Makefile
Normal file
|
|
@ -0,0 +1,64 @@
|
||||||
|
#
|
||||||
|
# Copyright (C) 2023 Jeffery To
|
||||||
|
#
|
||||||
|
# This is free software, licensed under the GNU General Public License v2.
|
||||||
|
# See /LICENSE for more information.
|
||||||
|
#
|
||||||
|
|
||||||
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
|
PKG_NAME:=mpfr
|
||||||
|
PKG_VERSION:=4.2.1
|
||||||
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
|
PKG_SOURCE_URL:=@GNU/mpfr http://www.mpfr.org/mpfr-$(PKG_VERSION)
|
||||||
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
|
PKG_HASH:=277807353a6726978996945af13e52829e3abd7a9a5b7fb2793894e18f1fcbb2
|
||||||
|
|
||||||
|
PKG_LICENSE:=LGPL-3.0-or-later
|
||||||
|
PKG_LICENSE_FILES:=COPYING.LESSER
|
||||||
|
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
|
||||||
|
PKG_CPE_ID:=cpe:/a:mpfr:gnu_mpfr
|
||||||
|
|
||||||
|
PKG_BUILD_PARALLEL:=1
|
||||||
|
PKG_FIXUP:=autoreconf
|
||||||
|
PKG_INSTALL:=1
|
||||||
|
|
||||||
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
define Package/libmpfr
|
||||||
|
SECTION:=libs
|
||||||
|
CATEGORY:=Libraries
|
||||||
|
TITLE:=GNU MPFR library
|
||||||
|
URL:=https://www.mpfr.org/
|
||||||
|
DEPENDS:=+libgmp
|
||||||
|
ABI_VERSION:=6
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/libmpfr/description
|
||||||
|
MPFR is a portable library written in C for arbitrary precision
|
||||||
|
arithmetic on floating-point numbers. It is based on the GNU MP library.
|
||||||
|
It aims to provide a class of floating-point numbers with precise
|
||||||
|
semantics.
|
||||||
|
endef
|
||||||
|
|
||||||
|
CONFIGURE_ARGS += \
|
||||||
|
--enable-thread-safe
|
||||||
|
|
||||||
|
define Build/InstallDev
|
||||||
|
$(INSTALL_DIR) $(1)/usr/include
|
||||||
|
$(CP) $(PKG_INSTALL_DIR)/usr/include/mpf* $(1)/usr/include/
|
||||||
|
|
||||||
|
$(INSTALL_DIR) $(1)/usr/lib
|
||||||
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmpfr.{a,so*} $(1)/usr/lib/
|
||||||
|
|
||||||
|
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
|
||||||
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/mpfr.pc $(1)/usr/lib/pkgconfig/
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/libmpfr/install
|
||||||
|
$(INSTALL_DIR) $(1)/usr/lib
|
||||||
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmpfr.so.* $(1)/usr/lib/
|
||||||
|
endef
|
||||||
|
|
||||||
|
$(eval $(call BuildPackage,libmpfr))
|
||||||
22
package/libs/mpfr/patches/001-only-src.patch
Normal file
22
package/libs/mpfr/patches/001-only-src.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
||||||
|
--- a/Makefile.am
|
||||||
|
+++ b/Makefile.am
|
||||||
|
@@ -38,7 +38,7 @@ AUTOMAKE_OPTIONS = gnu
|
||||||
|
# old Automake version.
|
||||||
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
|
-SUBDIRS = doc src tests tune tools/bench
|
||||||
|
+SUBDIRS = src
|
||||||
|
|
||||||
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
|
pkgconfig_DATA = mpfr.pc
|
||||||
|
--- a/Makefile.in
|
||||||
|
+++ b/Makefile.in
|
||||||
|
@@ -401,7 +401,7 @@ AUTOMAKE_OPTIONS = gnu
|
||||||
|
# libtoolize and in case some developer needs to switch back to an
|
||||||
|
# old Automake version.
|
||||||
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
-SUBDIRS = doc src tests tune tools/bench
|
||||||
|
+SUBDIRS = src
|
||||||
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
|
pkgconfig_DATA = mpfr.pc
|
||||||
|
nobase_dist_doc_DATA = AUTHORS BUGS COPYING COPYING.LESSER NEWS TODO \
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=wolfssl
|
PKG_NAME:=wolfssl
|
||||||
PKG_VERSION:=5.6.4-stable
|
PKG_VERSION:=5.6.6-stable
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://github.com/wolfSSL/wolfssl/archive/v$(PKG_VERSION)
|
PKG_SOURCE_URL:=https://github.com/wolfSSL/wolfssl/archive/v$(PKG_VERSION)
|
||||||
PKG_HASH:=031691906794ff45e1e792561cf31759f5d29ac74936bc8dffb8b14f16d820b4
|
PKG_HASH:=3d2ca672d41c2c2fa667885a80d6fa03c3e91f0f4f72f87aef2bc947e8c87237
|
||||||
|
|
||||||
PKG_FIXUP:=libtool libtool-abiver
|
PKG_FIXUP:=libtool libtool-abiver
|
||||||
PKG_INSTALL:=1
|
PKG_INSTALL:=1
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/wolfssl/wolfcrypt/settings.h
|
--- a/wolfssl/wolfcrypt/settings.h
|
||||||
+++ b/wolfssl/wolfcrypt/settings.h
|
+++ b/wolfssl/wolfcrypt/settings.h
|
||||||
@@ -2630,7 +2630,7 @@ extern void uITRON4_free(void *p) ;
|
@@ -2774,7 +2774,7 @@ extern void uITRON4_free(void *p) ;
|
||||||
|
|
||||||
/* warning for not using harden build options (default with ./configure) */
|
/* warning for not using harden build options (default with ./configure) */
|
||||||
/* do not warn if big integer support is disabled */
|
/* do not warn if big integer support is disabled */
|
||||||
|
|
|
||||||
|
|
@ -5,9 +5,9 @@ PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
|
PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
|
||||||
PKG_SOURCE_DATE:=2023-12-19
|
PKG_SOURCE_DATE:=2024-01-04
|
||||||
PKG_SOURCE_VERSION:=a2d32f0dcf16880226680d07b07b249f77a3af58
|
PKG_SOURCE_VERSION:=f01345ec13b9b27ffd314d8689fb2d3f9c81a47d
|
||||||
PKG_MIRROR_HASH:=765f51335ffa0a143421efbe129d484a90d7c4a0f3e08cb7840cc85408f3e60c
|
PKG_MIRROR_HASH:=58e92e9ce1a2c8ccb487e95dadf806f38b38abbe7cb3cde61ff880de5eb85c2f
|
||||||
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
|
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
|
||||||
|
|
||||||
PKG_LICENSE:=GPL-2.0
|
PKG_LICENSE:=GPL-2.0
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ hostapd_append_wpa_key_mgmt() {
|
||||||
case "$auth_type" in
|
case "$auth_type" in
|
||||||
psk|eap)
|
psk|eap)
|
||||||
append wpa_key_mgmt "WPA-$auth_type_l"
|
append wpa_key_mgmt "WPA-$auth_type_l"
|
||||||
[ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-${auth_type_l}"
|
[ "${wpa:-2}" -ge 2 ] && [ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-${auth_type_l}"
|
||||||
[ "${ieee80211w:-0}" -gt 0 ] && append wpa_key_mgmt "WPA-${auth_type_l}-SHA256"
|
[ "${ieee80211w:-0}" -gt 0 ] && append wpa_key_mgmt "WPA-${auth_type_l}-SHA256"
|
||||||
;;
|
;;
|
||||||
eap192)
|
eap192)
|
||||||
|
|
@ -897,10 +897,21 @@ hostapd_set_bss_options() {
|
||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
json_get_vars ieee80211r
|
||||||
|
set_default ieee80211r 0
|
||||||
if [ "$wpa" -ge "1" ]; then
|
if [ "$wpa" -ge "1" ]; then
|
||||||
json_get_vars ieee80211r
|
if [ "$fils" -gt 0 ]; then
|
||||||
set_default ieee80211r 0
|
json_get_vars fils_realm
|
||||||
|
set_default fils_realm "$(echo "$ssid" | md5sum | head -c 8)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
append bss_conf "wpa_disable_eapol_key_retries=$wpa_disable_eapol_key_retries" "$N"
|
||||||
|
|
||||||
|
hostapd_append_wpa_key_mgmt
|
||||||
|
[ -n "$wpa_key_mgmt" ] && append bss_conf "wpa_key_mgmt=$wpa_key_mgmt" "$N"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$wpa" -ge "2" ]; then
|
||||||
if [ "$ieee80211r" -gt "0" ]; then
|
if [ "$ieee80211r" -gt "0" ]; then
|
||||||
json_get_vars mobility_domain ft_psk_generate_local ft_over_ds reassociation_deadline
|
json_get_vars mobility_domain ft_psk_generate_local ft_over_ds reassociation_deadline
|
||||||
|
|
||||||
|
|
@ -909,7 +920,7 @@ hostapd_set_bss_options() {
|
||||||
set_default reassociation_deadline 1000
|
set_default reassociation_deadline 1000
|
||||||
|
|
||||||
case "$auth_type" in
|
case "$auth_type" in
|
||||||
psk|sae|psk-sae)
|
psk)
|
||||||
set_default ft_psk_generate_local 1
|
set_default ft_psk_generate_local 1
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|
@ -932,6 +943,10 @@ hostapd_set_bss_options() {
|
||||||
set_default pmk_r1_push 0
|
set_default pmk_r1_push 0
|
||||||
|
|
||||||
[ -n "$r0kh" -a -n "$r1kh" ] || {
|
[ -n "$r0kh" -a -n "$r1kh" ] || {
|
||||||
|
if [ -z "$auth_secret" -a -z "$key" ]; then
|
||||||
|
wireless_setup_vif_failed FT_KEY_CANT_BE_DERIVED
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
ft_key=`echo -n "$mobility_domain/${auth_secret:-${key}}" | md5sum | awk '{print $1}'`
|
ft_key=`echo -n "$mobility_domain/${auth_secret:-${key}}" | md5sum | awk '{print $1}'`
|
||||||
|
|
||||||
set_default r0kh "ff:ff:ff:ff:ff:ff,*,$ft_key"
|
set_default r0kh "ff:ff:ff:ff:ff:ff,*,$ft_key"
|
||||||
|
|
@ -950,18 +965,7 @@ hostapd_set_bss_options() {
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if [ "$fils" -gt 0 ]; then
|
|
||||||
json_get_vars fils_realm
|
|
||||||
set_default fils_realm "$(echo "$ssid" | md5sum | head -c 8)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
append bss_conf "wpa_disable_eapol_key_retries=$wpa_disable_eapol_key_retries" "$N"
|
|
||||||
|
|
||||||
hostapd_append_wpa_key_mgmt
|
|
||||||
[ -n "$wpa_key_mgmt" ] && append bss_conf "wpa_key_mgmt=$wpa_key_mgmt" "$N"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$wpa" -ge "2" ]; then
|
|
||||||
if [ -n "$network_bridge" -a "$rsn_preauth" = 1 ]; then
|
if [ -n "$network_bridge" -a "$rsn_preauth" = 1 ]; then
|
||||||
set_default auth_cache 1
|
set_default auth_cache 1
|
||||||
append bss_conf "rsn_preauth=1" "$N"
|
append bss_conf "rsn_preauth=1" "$N"
|
||||||
|
|
@ -1592,7 +1596,3 @@ EOF
|
||||||
fi
|
fi
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
hostapd_common_cleanup() {
|
|
||||||
killall meshd-nl80211
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,10 @@ let libubus = require("ubus");
|
||||||
import { open, readfile } from "fs";
|
import { open, readfile } from "fs";
|
||||||
import { wdev_create, wdev_remove, is_equal, vlist_new, phy_is_fullmac, phy_open } from "common";
|
import { wdev_create, wdev_remove, is_equal, vlist_new, phy_is_fullmac, phy_open } from "common";
|
||||||
|
|
||||||
let ubus = libubus.connect();
|
let ubus = libubus.connect(null, 60);
|
||||||
|
|
||||||
hostapd.data.config = {};
|
hostapd.data.config = {};
|
||||||
|
hostapd.data.pending_config = {};
|
||||||
|
|
||||||
hostapd.data.file_fields = {
|
hostapd.data.file_fields = {
|
||||||
vlan_file: true,
|
vlan_file: true,
|
||||||
|
|
@ -127,12 +128,114 @@ function iface_update_supplicant_macaddr(phy, config)
|
||||||
let macaddr_list = [];
|
let macaddr_list = [];
|
||||||
for (let i = 0; i < length(config.bss); i++)
|
for (let i = 0; i < length(config.bss); i++)
|
||||||
push(macaddr_list, config.bss[i].bssid);
|
push(macaddr_list, config.bss[i].bssid);
|
||||||
ubus.call("wpa_supplicant", "phy_set_macaddr_list", { phy: phy, macaddr: macaddr_list });
|
ubus.defer("wpa_supplicant", "phy_set_macaddr_list", { phy: phy, macaddr: macaddr_list });
|
||||||
|
}
|
||||||
|
|
||||||
|
function __iface_pending_next(pending, state, ret, data)
|
||||||
|
{
|
||||||
|
let config = pending.config;
|
||||||
|
let phydev = pending.phydev;
|
||||||
|
let phy = pending.phy;
|
||||||
|
let bss = config.bss[0];
|
||||||
|
|
||||||
|
if (pending.defer)
|
||||||
|
pending.defer.abort();
|
||||||
|
delete pending.defer;
|
||||||
|
switch (state) {
|
||||||
|
case "init":
|
||||||
|
let macaddr_list = [];
|
||||||
|
for (let i = 0; i < length(config.bss); i++)
|
||||||
|
push(macaddr_list, config.bss[i].bssid);
|
||||||
|
pending.call("wpa_supplicant", "phy_set_macaddr_list", { phy: phy, macaddr: macaddr_list });
|
||||||
|
return "create_bss";
|
||||||
|
case "create_bss":
|
||||||
|
let err = wdev_create(phy, bss.ifname, { mode: "ap" });
|
||||||
|
if (err) {
|
||||||
|
hostapd.printf(`Failed to create ${bss.ifname} on phy ${phy}: ${err}`);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
pending.call("wpa_supplicant", "phy_status", { phy: phy });
|
||||||
|
return "check_phy";
|
||||||
|
case "check_phy":
|
||||||
|
let phy_status = data;
|
||||||
|
if (phy_status && phy_status.state == "COMPLETED") {
|
||||||
|
if (iface_add(phy, config, phy_status))
|
||||||
|
return "done";
|
||||||
|
|
||||||
|
hostapd.printf(`Failed to bring up phy ${phy} ifname=${bss.ifname} with supplicant provided frequency`);
|
||||||
|
}
|
||||||
|
pending.call("wpa_supplicant", "phy_set_state", { phy: phy, stop: true });
|
||||||
|
return "wpas_stopped";
|
||||||
|
case "wpas_stopped":
|
||||||
|
if (!iface_add(phy, config))
|
||||||
|
hostapd.printf(`hostapd.add_iface failed for phy ${phy} ifname=${bss.ifname}`);
|
||||||
|
pending.call("wpa_supplicant", "phy_set_state", { phy: phy, stop: false });
|
||||||
|
return null;
|
||||||
|
case "done":
|
||||||
|
default:
|
||||||
|
delete hostapd.data.pending_config[phy];
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function iface_pending_next(ret, data)
|
||||||
|
{
|
||||||
|
let pending = true;
|
||||||
|
let cfg = this;
|
||||||
|
|
||||||
|
while (pending) {
|
||||||
|
this.next_state = __iface_pending_next(cfg, this.next_state, ret, data);
|
||||||
|
if (!this.next_state) {
|
||||||
|
__iface_pending_next(cfg, "done");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
pending = !this.defer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function iface_pending_abort()
|
||||||
|
{
|
||||||
|
this.next_state = "done";
|
||||||
|
this.next();
|
||||||
|
}
|
||||||
|
|
||||||
|
function iface_pending_ubus_call(obj, method, arg)
|
||||||
|
{
|
||||||
|
let ubus = hostapd.data.ubus;
|
||||||
|
let pending = this;
|
||||||
|
this.defer = ubus.defer(obj, method, arg, (ret, data) => { delete pending.defer; pending.next(ret, data) });
|
||||||
|
}
|
||||||
|
|
||||||
|
const iface_pending_proto = {
|
||||||
|
next: iface_pending_next,
|
||||||
|
call: iface_pending_ubus_call,
|
||||||
|
abort: iface_pending_abort,
|
||||||
|
};
|
||||||
|
|
||||||
|
function iface_pending_init(phydev, config)
|
||||||
|
{
|
||||||
|
let phy = phydev.name;
|
||||||
|
|
||||||
|
let pending = proto({
|
||||||
|
next_state: "init",
|
||||||
|
phydev: phydev,
|
||||||
|
phy: phy,
|
||||||
|
config: config,
|
||||||
|
next: iface_pending_next,
|
||||||
|
}, iface_pending_proto);
|
||||||
|
|
||||||
|
hostapd.data.pending_config[phy] = pending;
|
||||||
|
pending.next();
|
||||||
}
|
}
|
||||||
|
|
||||||
function iface_restart(phydev, config, old_config)
|
function iface_restart(phydev, config, old_config)
|
||||||
{
|
{
|
||||||
let phy = phydev.name;
|
let phy = phydev.name;
|
||||||
|
let pending = hostapd.data.pending_config[phy];
|
||||||
|
|
||||||
|
if (pending)
|
||||||
|
pending.abort();
|
||||||
|
|
||||||
hostapd.remove_iface(phy);
|
hostapd.remove_iface(phy);
|
||||||
iface_remove(old_config);
|
iface_remove(old_config);
|
||||||
|
|
@ -150,26 +253,7 @@ function iface_restart(phydev, config, old_config)
|
||||||
bss.bssid = phydev.macaddr_next();
|
bss.bssid = phydev.macaddr_next();
|
||||||
}
|
}
|
||||||
|
|
||||||
iface_update_supplicant_macaddr(phy, config);
|
iface_pending_init(phydev, config);
|
||||||
|
|
||||||
let bss = config.bss[0];
|
|
||||||
let err = wdev_create(phy, bss.ifname, { mode: "ap" });
|
|
||||||
if (err)
|
|
||||||
hostapd.printf(`Failed to create ${bss.ifname} on phy ${phy}: ${err}`);
|
|
||||||
|
|
||||||
let ubus = hostapd.data.ubus;
|
|
||||||
let phy_status = ubus.call("wpa_supplicant", "phy_status", { phy: phy });
|
|
||||||
if (phy_status && phy_status.state == "COMPLETED") {
|
|
||||||
if (iface_add(phy, config, phy_status))
|
|
||||||
return;
|
|
||||||
|
|
||||||
hostapd.printf(`Failed to bring up phy ${phy} ifname=${bss.ifname} with supplicant provided frequency`);
|
|
||||||
}
|
|
||||||
|
|
||||||
ubus.call("wpa_supplicant", "phy_set_state", { phy: phy, stop: true });
|
|
||||||
if (!iface_add(phy, config))
|
|
||||||
hostapd.printf(`hostapd.add_iface failed for phy ${phy} ifname=${bss.ifname}`);
|
|
||||||
ubus.call("wpa_supplicant", "phy_set_state", { phy: phy, stop: false });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function array_to_obj(arr, key, start)
|
function array_to_obj(arr, key, start)
|
||||||
|
|
@ -274,6 +358,9 @@ function iface_reload_config(phydev, config, old_config)
|
||||||
if (is_equal(old_config.bss, config.bss))
|
if (is_equal(old_config.bss, config.bss))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
if (hostapd.data.pending_config[phy])
|
||||||
|
return false;
|
||||||
|
|
||||||
if (!old_config.bss || !old_config.bss[0])
|
if (!old_config.bss || !old_config.bss[0])
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
From 7a733993211ad46cf3032038c1e7e6bdc2322336 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael-CY Lee <michael-cy.lee@mediatek.com>
|
||||||
|
Date: Tue, 5 Sep 2023 09:43:25 +0800
|
||||||
|
Subject: [PATCH] ACS: Fix typo in bw_40 frequency array
|
||||||
|
|
||||||
|
The range for the 5 GHz channel 118 was encoded with an incorrect
|
||||||
|
channel number.
|
||||||
|
|
||||||
|
Fixes: ed8e13decc71 (ACS: Extract bw40/80/160 freqs out of acs_usable_bwXXX_chan())
|
||||||
|
Signed-off-by: Michael Lee <michael-cy.lee@mediatek.com>
|
||||||
|
---
|
||||||
|
src/ap/acs.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
--- a/src/ap/acs.c
|
||||||
|
+++ b/src/ap/acs.c
|
||||||
|
@@ -256,7 +256,7 @@ struct bw_item {
|
||||||
|
static const struct bw_item bw_40[] = {
|
||||||
|
{ 5180, 5200, 38 }, { 5220, 5240, 46 }, { 5260, 5280, 54 },
|
||||||
|
{ 5300, 5320, 62 }, { 5500, 5520, 102 }, { 5540, 5560, 110 },
|
||||||
|
- { 5580, 5600, 110 }, { 5620, 5640, 126}, { 5660, 5680, 134 },
|
||||||
|
+ { 5580, 5600, 118 }, { 5620, 5640, 126 }, { 5660, 5680, 134 },
|
||||||
|
{ 5700, 5720, 142 }, { 5745, 5765, 151 }, { 5785, 5805, 159 },
|
||||||
|
{ 5825, 5845, 167 }, { 5865, 5885, 175 },
|
||||||
|
{ 5955, 5975, 3 }, { 5995, 6015, 11 }, { 6035, 6055, 19 },
|
||||||
|
|
@ -1907,6 +1907,9 @@ void hostapd_ubus_notify_radar_detected(struct hostapd_iface *iface, int frequen
|
||||||
struct hostapd_data *hapd;
|
struct hostapd_data *hapd;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
if (!ctx)
|
||||||
|
return;
|
||||||
|
|
||||||
blob_buf_init(&b, 0);
|
blob_buf_init(&b, 0);
|
||||||
blobmsg_add_u16(&b, "frequency", frequency);
|
blobmsg_add_u16(&b, "frequency", frequency);
|
||||||
blobmsg_add_u16(&b, "width", chan_width);
|
blobmsg_add_u16(&b, "width", chan_width);
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=uhttpd
|
PKG_NAME:=uhttpd
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
|
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git
|
PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git
|
||||||
|
|
@ -107,6 +107,13 @@ define Package/uhttpd-mod-ubus/install
|
||||||
$(INSTALL_DATA) ./files/ubus.default $(1)/etc/uci-defaults/00_uhttpd_ubus
|
$(INSTALL_DATA) ./files/ubus.default $(1)/etc/uci-defaults/00_uhttpd_ubus
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
define Package/uhttpd-mod-ubus/postinst
|
||||||
|
#!/bin/sh
|
||||||
|
if [ -z "$${IPKG_INSTROOT}" ]; then
|
||||||
|
/etc/init.d/uhttpd reload
|
||||||
|
fi
|
||||||
|
endef
|
||||||
|
|
||||||
define Package/uhttpd-mod-ucode/install
|
define Package/uhttpd-mod-ucode/install
|
||||||
$(INSTALL_DIR) $(1)/usr/lib
|
$(INSTALL_DIR) $(1)/usr/lib
|
||||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/uhttpd_ucode.so $(1)/usr/lib/
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/uhttpd_ucode.so $(1)/usr/lib/
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,11 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
commit=0
|
|
||||||
|
|
||||||
if [ -z "$(uci -q get uhttpd.main.ubus_prefix)" ]; then
|
if [ -z "$(uci -q get uhttpd.main.ubus_prefix)" ]; then
|
||||||
uci set uhttpd.main.ubus_prefix=/ubus
|
uci set uhttpd.main.ubus_prefix=/ubus
|
||||||
commit=1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[ "$(uci -q get uhttpd.main.ubus_socket)" = "/var/run/ubus.sock" ] && {
|
[ "$(uci -q get uhttpd.main.ubus_socket)" = "/var/run/ubus.sock" ] && {
|
||||||
uci set uhttpd.main.ubus_socket='/var/run/ubus/ubus.sock'
|
uci set uhttpd.main.ubus_socket='/var/run/ubus/ubus.sock'
|
||||||
commit=1
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[ "$commit" = 1 ] && uci commit uhttpd && /etc/init.d/uhttpd reload
|
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=iproute2
|
PKG_NAME:=iproute2
|
||||||
PKG_VERSION:=6.6.0
|
PKG_VERSION:=6.7.0
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
|
PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
|
||||||
PKG_HASH:=8738c804afd09f0bf756937f0c3de23117832a98d8cbbf50386cf5005cd613ce
|
PKG_HASH:=ff942dd9828d7d1f867f61fe72ce433078c31e5d8e4a78e20f02cb5892e8841d
|
||||||
PKG_BUILD_PARALLEL:=1
|
PKG_BUILD_PARALLEL:=1
|
||||||
PKG_BUILD_DEPENDS:=iptables
|
PKG_BUILD_DEPENDS:=iptables
|
||||||
PKG_LICENSE:=GPL-2.0
|
PKG_LICENSE:=GPL-2.0
|
||||||
|
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
--- a/configure
|
|
||||||
+++ b/configure
|
|
||||||
@@ -36,7 +36,8 @@ int main(int argc, char **argv) {
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
|
|
||||||
- if $CC -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1; then
|
|
||||||
+# OpenWrt: disable ATM support even if present on host system
|
|
||||||
+ if [ 1 -eq 0 ]; then
|
|
||||||
echo "TC_CONFIG_ATM:=y" >>$CONFIG
|
|
||||||
echo yes
|
|
||||||
else
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/Makefile
|
--- a/Makefile
|
||||||
+++ b/Makefile
|
+++ b/Makefile
|
||||||
@@ -67,9 +67,9 @@ WFLAGS += -Wmissing-declarations -Wold-s
|
@@ -68,9 +68,9 @@ WFLAGS += -Wmissing-declarations -Wold-s
|
||||||
CFLAGS := $(WFLAGS) $(CCOPTS) -I../include -I../include/uapi $(DEFINES) $(CFLAGS)
|
CFLAGS := $(WFLAGS) $(CCOPTS) -I../include -I../include/uapi $(DEFINES) $(CFLAGS)
|
||||||
YACCFLAGS = -d -t -v
|
YACCFLAGS = -d -t -v
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -411,7 +411,7 @@ check_tirpc()
|
@@ -391,7 +391,7 @@ check_tirpc()
|
||||||
|
|
||||||
check_mnl()
|
check_mnl()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -266,7 +266,7 @@ EOF
|
@@ -246,7 +246,7 @@ EOF
|
||||||
|
|
||||||
check_elf()
|
check_elf()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -469,7 +469,7 @@ EOF
|
@@ -449,7 +449,7 @@ EOF
|
||||||
|
|
||||||
check_cap()
|
check_cap()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -398,7 +398,7 @@ check_selinux()
|
@@ -378,7 +378,7 @@ check_selinux()
|
||||||
|
|
||||||
check_tirpc()
|
check_tirpc()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -290,7 +290,7 @@ int main(int argc, char **argv) {
|
@@ -270,7 +270,7 @@ int main(int argc, char **argv) {
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
local ret=$?
|
local ret=$?
|
||||||
|
|
||||||
rm -f $TMPDIR/libbpf_test.c $TMPDIR/libbpf_test
|
rm -f $TMPDIR/libbpf_test.c $TMPDIR/libbpf_test
|
||||||
@@ -308,7 +308,7 @@ int main(int argc, char **argv) {
|
@@ -288,7 +288,7 @@ int main(int argc, char **argv) {
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -455,14 +455,8 @@ EOF
|
@@ -435,14 +435,8 @@ EOF
|
||||||
if $CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1; then
|
if $CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1; then
|
||||||
echo "no"
|
echo "no"
|
||||||
else
|
else
|
||||||
- if ${PKG_CONFIG} libbsd --exists; then
|
- if ${PKG_CONFIG} libbsd --exists; then
|
||||||
- echo 'CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
|
- echo 'CFLAGS += -DHAVE_LIBBSD' "$(${PKG_CONFIG} libbsd --cflags)" >>$CONFIG
|
||||||
- echo 'LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
|
- echo 'LDLIBS +=' "$(${PKG_CONFIG} libbsd --libs)" >> $CONFIG
|
||||||
- echo "no"
|
- echo "no"
|
||||||
- else
|
- else
|
||||||
- echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG
|
- echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -385,7 +385,7 @@ check_libbpf()
|
@@ -365,7 +365,7 @@ check_libbpf()
|
||||||
check_selinux()
|
check_selinux()
|
||||||
# SELinux is a compile time option in the ss utility
|
# SELinux is a compile time option in the ss utility
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -11,9 +11,9 @@ PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_URL=$(PROJECT_GIT)/project/iwinfo.git
|
PKG_SOURCE_URL=$(PROJECT_GIT)/project/iwinfo.git
|
||||||
PKG_SOURCE_DATE:=2023-07-01
|
PKG_SOURCE_DATE:=2023-11-19
|
||||||
PKG_SOURCE_VERSION:=ca79f64154b107f192ec3c1ba631816cb8b07922
|
PKG_SOURCE_VERSION:=a34977c0760c93480491c8eb94da656b57d7f4cc
|
||||||
PKG_MIRROR_HASH:=5eddf584a1c3ed5637162d6bfc573ed1ce3691fcb38bdd55bf9f1e11e82ccc46
|
PKG_MIRROR_HASH:=cb01671a2a9155f8ba55751ab1fe28488c5821212dd97ba5b79653640abb787e
|
||||||
PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
|
PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
|
||||||
PKG_LICENSE:=GPL-2.0
|
PKG_LICENSE:=GPL-2.0
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,9 +5,9 @@ PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_URL=$(PROJECT_GIT)/project/uqmi.git
|
PKG_SOURCE_URL=$(PROJECT_GIT)/project/uqmi.git
|
||||||
PKG_SOURCE_DATE:=2023-10-29
|
PKG_SOURCE_DATE:=2024-01-16
|
||||||
PKG_SOURCE_VERSION:=eea292401c388a4eb59c0caf5d00aa046c6059f4
|
PKG_SOURCE_VERSION:=c3488b831ce6285c8107704156b9b8ed7d59deb3
|
||||||
PKG_MIRROR_HASH:=744f7e2010bd16ca08b03551287a0e1d119e1e6e099f8abf935328d3d1344893
|
PKG_MIRROR_HASH:=3ca47f2ae22bc1adcb05560e6dbea824063fa914670c13f107e7e78f33399779
|
||||||
PKG_MAINTAINER:=Matti Laakso <malaakso@elisanet.fi>
|
PKG_MAINTAINER:=Matti Laakso <malaakso@elisanet.fi>
|
||||||
|
|
||||||
PKG_LICENSE:=GPL-2.0
|
PKG_LICENSE:=GPL-2.0
|
||||||
|
|
|
||||||
|
|
@ -85,8 +85,8 @@ proto_qmi_setup() {
|
||||||
echo "Waiting for SIM initialization"
|
echo "Waiting for SIM initialization"
|
||||||
local uninitialized_timeout=0
|
local uninitialized_timeout=0
|
||||||
# timeout 3s for first call to avoid hanging uqmi
|
# timeout 3s for first call to avoid hanging uqmi
|
||||||
uqmi -d "$device" --get-pin-status -t 3000 > /dev/null 2>&1
|
uqmi -d "$device" -t 3000 --get-pin-status > /dev/null 2>&1
|
||||||
while uqmi -s -d "$device" --get-pin-status | grep '"UIM uninitialized"' > /dev/null; do
|
while uqmi -s -d "$device" -t 1000 --get-pin-status | grep '"UIM uninitialized"' > /dev/null; do
|
||||||
[ -e "$device" ] || return 1
|
[ -e "$device" ] || return 1
|
||||||
if [ "$uninitialized_timeout" -lt "$timeout" -o "$timeout" = "0" ]; then
|
if [ "$uninitialized_timeout" -lt "$timeout" -o "$timeout" = "0" ]; then
|
||||||
let uninitialized_timeout++
|
let uninitialized_timeout++
|
||||||
|
|
@ -102,7 +102,7 @@ proto_qmi_setup() {
|
||||||
# Check if UIM application is stuck in illegal state
|
# Check if UIM application is stuck in illegal state
|
||||||
local uim_state_timeout=0
|
local uim_state_timeout=0
|
||||||
while true; do
|
while true; do
|
||||||
json_load "$(uqmi -s -d "$device" --uim-get-sim-state)"
|
json_load "$(uqmi -s -d "$device" -t 1000 --uim-get-sim-state)"
|
||||||
json_get_var card_application_state card_application_state
|
json_get_var card_application_state card_application_state
|
||||||
|
|
||||||
# SIM card is either completely absent or state is labeled as illegal
|
# SIM card is either completely absent or state is labeled as illegal
|
||||||
|
|
@ -111,9 +111,9 @@ proto_qmi_setup() {
|
||||||
echo "SIM in illegal state - Power-cycling SIM"
|
echo "SIM in illegal state - Power-cycling SIM"
|
||||||
|
|
||||||
# Try to reset SIM application
|
# Try to reset SIM application
|
||||||
uqmi -d "$device" --uim-power-off --uim-slot 1
|
uqmi -d "$device" -t 1000 --uim-power-off --uim-slot 1
|
||||||
sleep 3
|
sleep 3
|
||||||
uqmi -d "$device" --uim-power-on --uim-slot 1
|
uqmi -d "$device" -t 1000 --uim-power-on --uim-slot 1
|
||||||
|
|
||||||
if [ "$uim_state_timeout" -lt "$timeout" ] || [ "$timeout" = "0" ]; then
|
if [ "$uim_state_timeout" -lt "$timeout" ] || [ "$timeout" = "0" ]; then
|
||||||
let uim_state_timeout++
|
let uim_state_timeout++
|
||||||
|
|
@ -130,10 +130,10 @@ proto_qmi_setup() {
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
if uqmi -s -d "$device" --uim-get-sim-state | grep -q '"Not supported"\|"Invalid QMI command"' &&
|
if uqmi -s -d "$device" -t 1000 --uim-get-sim-state | grep -q '"Not supported"\|"Invalid QMI command"' &&
|
||||||
uqmi -s -d "$device" --get-pin-status | grep -q '"Not supported"\|"Invalid QMI command"' ; then
|
uqmi -s -d "$device" -t 1000 --get-pin-status | grep -q '"Not supported"\|"Invalid QMI command"' ; then
|
||||||
[ -n "$pincode" ] && {
|
[ -n "$pincode" ] && {
|
||||||
uqmi -s -d "$device" --verify-pin1 "$pincode" > /dev/null || uqmi -s -d "$device" --uim-verify-pin1 "$pincode" > /dev/null || {
|
uqmi -s -d "$device" -t 1000 --verify-pin1 "$pincode" > /dev/null || uqmi -s -d "$device" -t 1000 --uim-verify-pin1 "$pincode" > /dev/null || {
|
||||||
echo "Unable to verify PIN"
|
echo "Unable to verify PIN"
|
||||||
proto_notify_error "$interface" PIN_FAILED
|
proto_notify_error "$interface" PIN_FAILED
|
||||||
proto_block_restart "$interface"
|
proto_block_restart "$interface"
|
||||||
|
|
@ -141,10 +141,10 @@ proto_qmi_setup() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
json_load "$(uqmi -s -d "$device" --get-pin-status)"
|
json_load "$(uqmi -s -d "$device" -t 1000 --get-pin-status)"
|
||||||
json_get_var pin1_status pin1_status
|
json_get_var pin1_status pin1_status
|
||||||
if [ -z "$pin1_status" ]; then
|
if [ -z "$pin1_status" ]; then
|
||||||
json_load "$(uqmi -s -d "$device" --uim-get-sim-state)"
|
json_load "$(uqmi -s -d "$device" -t 1000 --uim-get-sim-state)"
|
||||||
json_get_var pin1_status pin1_status
|
json_get_var pin1_status pin1_status
|
||||||
fi
|
fi
|
||||||
json_get_var pin1_verify_tries pin1_verify_tries
|
json_get_var pin1_verify_tries pin1_verify_tries
|
||||||
|
|
@ -167,7 +167,7 @@ proto_qmi_setup() {
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
if [ -n "$pincode" ]; then
|
if [ -n "$pincode" ]; then
|
||||||
uqmi -s -d "$device" --verify-pin1 "$pincode" > /dev/null 2>&1 || uqmi -s -d "$device" --uim-verify-pin1 "$pincode" > /dev/null 2>&1 || {
|
uqmi -s -d "$device" -t 1000 --verify-pin1 "$pincode" > /dev/null 2>&1 || uqmi -s -d "$device" -t 1000 --uim-verify-pin1 "$pincode" > /dev/null 2>&1 || {
|
||||||
echo "Unable to verify PIN"
|
echo "Unable to verify PIN"
|
||||||
proto_notify_error "$interface" PIN_FAILED
|
proto_notify_error "$interface" PIN_FAILED
|
||||||
proto_block_restart "$interface"
|
proto_block_restart "$interface"
|
||||||
|
|
@ -194,7 +194,7 @@ proto_qmi_setup() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$plmn" ]; then
|
if [ -n "$plmn" ]; then
|
||||||
json_load "$(uqmi -s -d "$device" --get-plmn)"
|
json_load "$(uqmi -s -d "$device" -t 1000 --get-plmn)"
|
||||||
json_get_var plmn_mode mode
|
json_get_var plmn_mode mode
|
||||||
json_get_vars mcc mnc || {
|
json_get_vars mcc mnc || {
|
||||||
mcc=0
|
mcc=0
|
||||||
|
|
@ -218,16 +218,16 @@ proto_qmi_setup() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Cleanup current state if any
|
# Cleanup current state if any
|
||||||
uqmi -s -d "$device" --stop-network 0xffffffff --autoconnect > /dev/null 2>&1
|
uqmi -s -d "$device" -t 1000 --stop-network 0xffffffff --autoconnect > /dev/null 2>&1
|
||||||
uqmi -s -d "$device" --set-ip-family ipv6 --stop-network 0xffffffff --autoconnect > /dev/null 2>&1
|
uqmi -s -d "$device" -t 1000 --set-ip-family ipv6 --stop-network 0xffffffff --autoconnect > /dev/null 2>&1
|
||||||
|
|
||||||
# Go online
|
# Go online
|
||||||
uqmi -s -d "$device" --set-device-operating-mode online > /dev/null 2>&1
|
uqmi -s -d "$device" -t 1000 --set-device-operating-mode online > /dev/null 2>&1
|
||||||
|
|
||||||
# Set IP format
|
# Set IP format
|
||||||
uqmi -s -d "$device" --set-data-format 802.3 > /dev/null 2>&1
|
uqmi -s -d "$device" -t 1000 --set-data-format 802.3 > /dev/null 2>&1
|
||||||
uqmi -s -d "$device" --wda-set-data-format 802.3 > /dev/null 2>&1
|
uqmi -s -d "$device" -t 1000 --wda-set-data-format 802.3 > /dev/null 2>&1
|
||||||
dataformat="$(uqmi -s -d "$device" --wda-get-data-format)"
|
dataformat="$(uqmi -s -d "$device" -t 1000 --wda-get-data-format)"
|
||||||
|
|
||||||
if [ "$dataformat" = '"raw-ip"' ]; then
|
if [ "$dataformat" = '"raw-ip"' ]; then
|
||||||
|
|
||||||
|
|
@ -240,13 +240,13 @@ proto_qmi_setup() {
|
||||||
echo "Y" > /sys/class/net/$ifname/qmi/raw_ip
|
echo "Y" > /sys/class/net/$ifname/qmi/raw_ip
|
||||||
fi
|
fi
|
||||||
|
|
||||||
uqmi -s -d "$device" --sync > /dev/null 2>&1
|
uqmi -s -d "$device" -t 1000 --sync > /dev/null 2>&1
|
||||||
|
|
||||||
uqmi -s -d "$device" --network-register > /dev/null 2>&1
|
uqmi -s -d "$device" -t 20000 --network-register > /dev/null 2>&1
|
||||||
|
|
||||||
# PLMN selection must happen after the call to network-register
|
# PLMN selection must happen after the call to network-register
|
||||||
if [ -n "$mcc" -a -n "$mnc" ]; then
|
if [ -n "$mcc" -a -n "$mnc" ]; then
|
||||||
uqmi -s -d "$device" --set-plmn --mcc "$mcc" --mnc "$mnc" > /dev/null 2>&1 || {
|
uqmi -s -d "$device" -t 1000 --set-plmn --mcc "$mcc" --mnc "$mnc" > /dev/null 2>&1 || {
|
||||||
echo "Unable to set PLMN"
|
echo "Unable to set PLMN"
|
||||||
proto_notify_error "$interface" PLMN_FAILED
|
proto_notify_error "$interface" PLMN_FAILED
|
||||||
proto_block_restart "$interface"
|
proto_block_restart "$interface"
|
||||||
|
|
@ -255,10 +255,10 @@ proto_qmi_setup() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[ -n "$modes" ] && {
|
[ -n "$modes" ] && {
|
||||||
uqmi -s -d "$device" --set-network-modes "$modes" > /dev/null 2>&1
|
uqmi -s -d "$device" -t 1000 --set-network-modes "$modes" > /dev/null 2>&1
|
||||||
sleep 3
|
sleep 3
|
||||||
# Scan network to not rely on registration-timeout after RAT change
|
# Scan network to not rely on registration-timeout after RAT change
|
||||||
uqmi -s -d "$device" --network-scan > /dev/null 2>&1
|
uqmi -s -d "$device" -t 30000 --network-scan > /dev/null 2>&1
|
||||||
}
|
}
|
||||||
|
|
||||||
echo "Waiting for network registration"
|
echo "Waiting for network registration"
|
||||||
|
|
@ -266,7 +266,7 @@ proto_qmi_setup() {
|
||||||
local registration_timeout=0
|
local registration_timeout=0
|
||||||
local registration_state=""
|
local registration_state=""
|
||||||
while true; do
|
while true; do
|
||||||
registration_state=$(uqmi -s -d "$device" --get-serving-system 2>/dev/null | jsonfilter -e "@.registration" 2>/dev/null)
|
registration_state=$(uqmi -s -d "$device" -t 1000 --get-serving-system 2>/dev/null | jsonfilter -e "@.registration" 2>/dev/null)
|
||||||
|
|
||||||
[ "$registration_state" = "registered" ] && break
|
[ "$registration_state" = "registered" ] && break
|
||||||
|
|
||||||
|
|
@ -274,7 +274,7 @@ proto_qmi_setup() {
|
||||||
if [ "$registration_timeout" -lt "$timeout" ] || [ "$timeout" = "0" ]; then
|
if [ "$registration_timeout" -lt "$timeout" ] || [ "$timeout" = "0" ]; then
|
||||||
[ "$registration_state" = "searching" ] || {
|
[ "$registration_state" = "searching" ] || {
|
||||||
echo "Device stopped network registration. Restart network registration"
|
echo "Device stopped network registration. Restart network registration"
|
||||||
uqmi -s -d "$device" --network-register > /dev/null 2>&1
|
uqmi -s -d "$device" -t 20000 --network-register > /dev/null 2>&1
|
||||||
}
|
}
|
||||||
let registration_timeout++
|
let registration_timeout++
|
||||||
sleep 1
|
sleep 1
|
||||||
|
|
@ -302,7 +302,7 @@ proto_qmi_setup() {
|
||||||
# establish a non-LTE data session.
|
# establish a non-LTE data session.
|
||||||
profile_pdptype="$pdptype"
|
profile_pdptype="$pdptype"
|
||||||
[ "$profile_pdptype" = "ip" ] && profile_pdptype="ipv4"
|
[ "$profile_pdptype" = "ip" ] && profile_pdptype="ipv4"
|
||||||
uqmi -s -d "$device" --modify-profile "3gpp,1" --apn "$apn" --pdp-type "$profile_pdptype" > /dev/null 2>&1
|
uqmi -s -d "$device" -t 1000 --modify-profile "3gpp,1" --apn "$apn" --pdp-type "$profile_pdptype" > /dev/null 2>&1
|
||||||
|
|
||||||
if [ "$pdptype" = "ip" ]; then
|
if [ "$pdptype" = "ip" ]; then
|
||||||
[ -z "$autoconnect" ] && autoconnect=1
|
[ -z "$autoconnect" ] && autoconnect=1
|
||||||
|
|
@ -312,16 +312,16 @@ proto_qmi_setup() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[ "$pdptype" = "ip" -o "$pdptype" = "ipv4v6" ] && {
|
[ "$pdptype" = "ip" -o "$pdptype" = "ipv4v6" ] && {
|
||||||
cid_4=$(uqmi -s -d "$device" --get-client-id wds)
|
cid_4=$(uqmi -s -d "$device" -t 1000 --get-client-id wds)
|
||||||
if ! [ "$cid_4" -eq "$cid_4" ] 2> /dev/null; then
|
if ! [ "$cid_4" -eq "$cid_4" ] 2> /dev/null; then
|
||||||
echo "Unable to obtain client ID"
|
echo "Unable to obtain client ID"
|
||||||
proto_notify_error "$interface" NO_CID
|
proto_notify_error "$interface" NO_CID
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
uqmi -s -d "$device" --set-client-id wds,"$cid_4" --set-ip-family ipv4 > /dev/null 2>&1
|
uqmi -s -d "$device" -t 1000 --set-client-id wds,"$cid_4" --set-ip-family ipv4 > /dev/null 2>&1
|
||||||
|
|
||||||
pdh_4=$(uqmi -s -d "$device" --set-client-id wds,"$cid_4" \
|
pdh_4=$(uqmi -s -d "$device" -t 5000 --set-client-id wds,"$cid_4" \
|
||||||
--start-network \
|
--start-network \
|
||||||
${apn:+--apn $apn} \
|
${apn:+--apn $apn} \
|
||||||
${profile:+--profile $profile} \
|
${profile:+--profile $profile} \
|
||||||
|
|
@ -333,35 +333,35 @@ proto_qmi_setup() {
|
||||||
# pdh_4 is a numeric value on success
|
# pdh_4 is a numeric value on success
|
||||||
if ! [ "$pdh_4" -eq "$pdh_4" ] 2> /dev/null; then
|
if ! [ "$pdh_4" -eq "$pdh_4" ] 2> /dev/null; then
|
||||||
echo "Unable to connect IPv4"
|
echo "Unable to connect IPv4"
|
||||||
uqmi -s -d "$device" --set-client-id wds,"$cid_4" --release-client-id wds > /dev/null 2>&1
|
uqmi -s -d "$device" -t 1000 --set-client-id wds,"$cid_4" --release-client-id wds > /dev/null 2>&1
|
||||||
proto_notify_error "$interface" CALL_FAILED
|
proto_notify_error "$interface" CALL_FAILED
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check data connection state
|
# Check data connection state
|
||||||
connstat=$(uqmi -s -d "$device" --set-client-id wds,"$cid_4" --get-data-status)
|
connstat=$(uqmi -s -d "$device" -t 1000 --set-client-id wds,"$cid_4" --get-data-status)
|
||||||
[ "$connstat" == '"connected"' ] || {
|
[ "$connstat" == '"connected"' ] || {
|
||||||
echo "No data link!"
|
echo "No data link!"
|
||||||
uqmi -s -d "$device" --set-client-id wds,"$cid_4" --release-client-id wds > /dev/null 2>&1
|
uqmi -s -d "$device" -t 1000 --set-client-id wds,"$cid_4" --release-client-id wds > /dev/null 2>&1
|
||||||
proto_notify_error "$interface" CALL_FAILED
|
proto_notify_error "$interface" CALL_FAILED
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[ "$pdptype" = "ipv6" -o "$pdptype" = "ipv4v6" ] && {
|
[ "$pdptype" = "ipv6" -o "$pdptype" = "ipv4v6" ] && {
|
||||||
cid_6=$(uqmi -s -d "$device" --get-client-id wds)
|
cid_6=$(uqmi -s -d "$device" -t 1000 --get-client-id wds)
|
||||||
if ! [ "$cid_6" -eq "$cid_6" ] 2> /dev/null; then
|
if ! [ "$cid_6" -eq "$cid_6" ] 2> /dev/null; then
|
||||||
echo "Unable to obtain client ID"
|
echo "Unable to obtain client ID"
|
||||||
proto_notify_error "$interface" NO_CID
|
proto_notify_error "$interface" NO_CID
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
uqmi -s -d "$device" --set-client-id wds,"$cid_6" --set-ip-family ipv6 > /dev/null 2>&1
|
uqmi -s -d "$device" -t 1000 --set-client-id wds,"$cid_6" --set-ip-family ipv6 > /dev/null 2>&1
|
||||||
|
|
||||||
: "${v6apn:=${apn}}"
|
: "${v6apn:=${apn}}"
|
||||||
: "${v6profile:=${profile}}"
|
: "${v6profile:=${profile}}"
|
||||||
|
|
||||||
pdh_6=$(uqmi -s -d "$device" --set-client-id wds,"$cid_6" \
|
pdh_6=$(uqmi -s -d "$device" -t 5000 --set-client-id wds,"$cid_6" \
|
||||||
--start-network \
|
--start-network \
|
||||||
${v6apn:+--apn $v6apn} \
|
${v6apn:+--apn $v6apn} \
|
||||||
${v6profile:+--profile $v6profile} \
|
${v6profile:+--profile $v6profile} \
|
||||||
|
|
@ -373,16 +373,16 @@ proto_qmi_setup() {
|
||||||
# pdh_6 is a numeric value on success
|
# pdh_6 is a numeric value on success
|
||||||
if ! [ "$pdh_6" -eq "$pdh_6" ] 2> /dev/null; then
|
if ! [ "$pdh_6" -eq "$pdh_6" ] 2> /dev/null; then
|
||||||
echo "Unable to connect IPv6"
|
echo "Unable to connect IPv6"
|
||||||
uqmi -s -d "$device" --set-client-id wds,"$cid_6" --release-client-id wds > /dev/null 2>&1
|
uqmi -s -d "$device" -t 1000 --set-client-id wds,"$cid_6" --release-client-id wds > /dev/null 2>&1
|
||||||
proto_notify_error "$interface" CALL_FAILED
|
proto_notify_error "$interface" CALL_FAILED
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check data connection state
|
# Check data connection state
|
||||||
connstat=$(uqmi -s -d "$device" --set-client-id wds,"$cid_6" --set-ip-family ipv6 --get-data-status)
|
connstat=$(uqmi -s -d "$device" -t 1000 --set-client-id wds,"$cid_6" --set-ip-family ipv6 --get-data-status)
|
||||||
[ "$connstat" == '"connected"' ] || {
|
[ "$connstat" == '"connected"' ] || {
|
||||||
echo "No data link!"
|
echo "No data link!"
|
||||||
uqmi -s -d "$device" --set-client-id wds,"$cid_6" --release-client-id wds > /dev/null 2>&1
|
uqmi -s -d "$device" -t 1000 --set-client-id wds,"$cid_6" --release-client-id wds > /dev/null 2>&1
|
||||||
proto_notify_error "$interface" CALL_FAILED
|
proto_notify_error "$interface" CALL_FAILED
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
@ -407,7 +407,7 @@ proto_qmi_setup() {
|
||||||
|
|
||||||
[ -n "$pdh_6" ] && {
|
[ -n "$pdh_6" ] && {
|
||||||
if [ -z "$dhcpv6" -o "$dhcpv6" = 0 ]; then
|
if [ -z "$dhcpv6" -o "$dhcpv6" = 0 ]; then
|
||||||
json_load "$(uqmi -s -d $device --set-client-id wds,$cid_6 --get-current-settings)"
|
json_load "$(uqmi -s -d $device -t 1000 --set-client-id wds,$cid_6 --get-current-settings)"
|
||||||
json_select ipv6
|
json_select ipv6
|
||||||
json_get_var ip_6 ip
|
json_get_var ip_6 ip
|
||||||
json_get_var gateway_6 gateway
|
json_get_var gateway_6 gateway
|
||||||
|
|
@ -449,7 +449,7 @@ proto_qmi_setup() {
|
||||||
|
|
||||||
[ -n "$pdh_4" ] && {
|
[ -n "$pdh_4" ] && {
|
||||||
if [ "$dhcp" = 0 ]; then
|
if [ "$dhcp" = 0 ]; then
|
||||||
json_load "$(uqmi -s -d $device --set-client-id wds,$cid_4 --get-current-settings)"
|
json_load "$(uqmi -s -d $device -t 1000 --set-client-id wds,$cid_4 --get-current-settings)"
|
||||||
json_select ipv4
|
json_select ipv4
|
||||||
json_get_var ip_4 ip
|
json_get_var ip_4 ip
|
||||||
json_get_var gateway_4 gateway
|
json_get_var gateway_4 gateway
|
||||||
|
|
@ -492,16 +492,16 @@ qmi_wds_stop() {
|
||||||
|
|
||||||
[ -n "$cid" ] || return
|
[ -n "$cid" ] || return
|
||||||
|
|
||||||
uqmi -s -d "$device" --set-client-id wds,"$cid" \
|
uqmi -s -d "$device" -t 1000 --set-client-id wds,"$cid" \
|
||||||
--stop-network 0xffffffff \
|
--stop-network 0xffffffff \
|
||||||
--autoconnect > /dev/null 2>&1
|
--autoconnect > /dev/null 2>&1
|
||||||
|
|
||||||
[ -n "$pdh" ] && {
|
[ -n "$pdh" ] && {
|
||||||
uqmi -s -d "$device" --set-client-id wds,"$cid" \
|
uqmi -s -d "$device" -t 1000 --set-client-id wds,"$cid" \
|
||||||
--stop-network "$pdh" > /dev/null 2>&1
|
--stop-network "$pdh" > /dev/null 2>&1
|
||||||
}
|
}
|
||||||
|
|
||||||
uqmi -s -d "$device" --set-client-id wds,"$cid" \
|
uqmi -s -d "$device" -t 1000 --set-client-id wds,"$cid" \
|
||||||
--release-client-id wds > /dev/null 2>&1
|
--release-client-id wds > /dev/null 2>&1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
|
||||||
PKG_NAME:=wireguard-tools
|
PKG_NAME:=wireguard-tools
|
||||||
|
|
||||||
PKG_VERSION:=1.0.20210914
|
PKG_VERSION:=1.0.20210914
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=3
|
||||||
|
|
||||||
PKG_SOURCE:=wireguard-tools-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=wireguard-tools-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-tools/snapshot/
|
PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-tools/snapshot/
|
||||||
|
|
|
||||||
|
|
@ -59,7 +59,7 @@ check_peer_activity() {
|
||||||
}
|
}
|
||||||
|
|
||||||
# query ubus for all active wireguard interfaces
|
# query ubus for all active wireguard interfaces
|
||||||
wg_ifaces=$(ubus -S call network.interface dump | jsonfilter -e '@.interface[@.up=true]' | jsonfilter -a -e '@[@.proto="wireguard"].interface' | tr "\n" " ")
|
eval $(ubus -S call network.interface dump | jsonfilter -e 'wg_ifaces=@.interface[@.up=true && @.proto="wireguard"].interface')
|
||||||
|
|
||||||
# check every peer in every active wireguard interface
|
# check every peer in every active wireguard interface
|
||||||
config_load network
|
config_load network
|
||||||
|
|
|
||||||
|
|
@ -12,9 +12,9 @@ PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git
|
PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git
|
||||||
PKG_MIRROR_HASH:=e9953b038a2c2ed2c4783b66d1c0d0cea0deab2f2bfa6712929243e3197c3bdd
|
PKG_MIRROR_HASH:=32e39891455b602e9deb367c9ce2d099dc72353fad0bf0433307416925f7b393
|
||||||
PKG_SOURCE_DATE:=2023-05-28
|
PKG_SOURCE_DATE:=2024-01-22
|
||||||
PKG_SOURCE_VERSION:=3a07943e1e60699ba952e605f0cf23c82de356cb
|
PKG_SOURCE_VERSION:=08cd7083cac4bddf88459efa0881ee52858e7d0a
|
||||||
CMAKE_INSTALL:=1
|
CMAKE_INSTALL:=1
|
||||||
|
|
||||||
PKG_LICENSE:=GPL-2.0
|
PKG_LICENSE:=GPL-2.0
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@ obj.mvebu = linksys_bootcount.o
|
||||||
obj.kirkwood = linksys_bootcount.o
|
obj.kirkwood = linksys_bootcount.o
|
||||||
obj.ipq806x = linksys_bootcount.o
|
obj.ipq806x = linksys_bootcount.o
|
||||||
obj.ipq40xx = linksys_bootcount.o
|
obj.ipq40xx = linksys_bootcount.o
|
||||||
|
obj.qualcommax = linksys_bootcount.o
|
||||||
|
|
||||||
ifdef FIS_SUPPORT
|
ifdef FIS_SUPPORT
|
||||||
obj += fis.o
|
obj += fis.o
|
||||||
|
|
|
||||||
|
|
@ -5,9 +5,9 @@ PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubox.git
|
PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubox.git
|
||||||
PKG_SOURCE_DATE:=2023-11-30
|
PKG_SOURCE_DATE:=2024-01-24
|
||||||
PKG_SOURCE_VERSION:=c08709cceb554cba02c935d1442f6a042fe6b2a8
|
PKG_SOURCE_VERSION:=2c5887cb46883a28d69071c4349c3dabbbe3972c
|
||||||
PKG_MIRROR_HASH:=719ae701546df7c5972352d778a980cbc9f48623dda86443398698837124818b
|
PKG_MIRROR_HASH:=0ded95382fd3a2e9751ea5fdd16c2afb7dcc52499f6ab47951c5db9525a4faa9
|
||||||
CMAKE_INSTALL:=1
|
CMAKE_INSTALL:=1
|
||||||
|
|
||||||
PKG_LICENSE:=GPL-2.0
|
PKG_LICENSE:=GPL-2.0
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=bcm27xx-userland
|
PKG_NAME:=bcm27xx-userland
|
||||||
PKG_VERSION:=c4fd1b8986c6d6d4ae5cd51e65a8bbeb495dfa4e
|
PKG_VERSION:=96a7334ae9d5fc9db7ac92e59852377df63f1848
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://codeload.github.com/raspberrypi/userland/tar.gz/$(PKG_VERSION)?
|
PKG_SOURCE_URL:=https://codeload.github.com/raspberrypi/userland/tar.gz/$(PKG_VERSION)?
|
||||||
PKG_HASH:=ab8a5b27c34cf1b97de87b895448a6355229f73b679866b47c51a723273cc8ae
|
PKG_HASH:=557ee8390de5db1ed90386c1ba0221e7f6f9dd87e858a00a34be3b1f9ede193f
|
||||||
|
|
||||||
PKG_FLAGS:=nonshared
|
PKG_FLAGS:=nonshared
|
||||||
|
|
||||||
|
|
@ -41,7 +41,6 @@ define Package/bcm27xx-userland
|
||||||
CATEGORY:=Utilities
|
CATEGORY:=Utilities
|
||||||
DEPENDS:=@TARGET_bcm27xx
|
DEPENDS:=@TARGET_bcm27xx
|
||||||
TITLE:=BCM27xx userland tools
|
TITLE:=BCM27xx userland tools
|
||||||
DEFAULT:=y if TARGET_bcm27xx
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/bcm27xx-userland/description
|
define Package/bcm27xx-userland/description
|
||||||
|
|
|
||||||
64
package/utils/bcm27xx-utils/Makefile
Normal file
64
package/utils/bcm27xx-utils/Makefile
Normal file
|
|
@ -0,0 +1,64 @@
|
||||||
|
# SPDX-License-Identifier: GPL-2.0-only
|
||||||
|
|
||||||
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
|
PKG_NAME:=bcm27xx-utils
|
||||||
|
PKG_VERSION:=2024-01-18
|
||||||
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
|
PKG_SOURCE_PROTO:=git
|
||||||
|
PKG_SOURCE_URL:=https://github.com/raspberrypi/utils.git
|
||||||
|
PKG_SOURCE_VERSION:=e65f5ec102e74218cda7da9fdc8b1caa0fd1127d
|
||||||
|
PKG_MIRROR_HASH:=14f4aa1a8115240d702251bc399b53cbfa0928813f70a73ca27b22da94b696d2
|
||||||
|
|
||||||
|
PKG_FLAGS:=nonshared
|
||||||
|
PKG_BUILD_FLAGS:=no-lto
|
||||||
|
|
||||||
|
PKG_LICENSE:=BSD-3-Clause
|
||||||
|
PKG_LICENSE_FILES:=LICENCE
|
||||||
|
|
||||||
|
CMAKE_INSTALL:=1
|
||||||
|
|
||||||
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
include $(INCLUDE_DIR)/cmake.mk
|
||||||
|
|
||||||
|
define Package/bcm27xx-utils
|
||||||
|
SECTION:=utils
|
||||||
|
CATEGORY:=Utilities
|
||||||
|
DEPENDS:=@TARGET_bcm27xx +libfdt
|
||||||
|
TITLE:=BCM27xx scripts and simple applications
|
||||||
|
PROVIDES:=bcm27xx-userland
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/bcm27xx-utils/description
|
||||||
|
BCM27xx scripts and simple applications.
|
||||||
|
Replaces bcm27xx-userland scripts and applications.
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/bcm27xx-utils/install
|
||||||
|
$(INSTALL_DIR) $(1)/usr/bin
|
||||||
|
|
||||||
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtmerge $(1)/usr/bin
|
||||||
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtoverlay $(1)/usr/bin
|
||||||
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtparam $(1)/usr/bin
|
||||||
|
|
||||||
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/eepdump $(1)/usr/bin
|
||||||
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/eepflash.sh $(1)/usr/bin
|
||||||
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/eepmake $(1)/usr/bin
|
||||||
|
|
||||||
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/otpset $(1)/usr/bin
|
||||||
|
|
||||||
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/overlaycheck $(1)/usr/bin
|
||||||
|
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/bin/overlaycheck_exclusions.txt $(1)/usr/bin
|
||||||
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ovmerge $(1)/usr/bin
|
||||||
|
|
||||||
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pinctrl $(1)/usr/bin
|
||||||
|
|
||||||
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/raspinfo $(1)/usr/bin
|
||||||
|
|
||||||
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vcgencmd $(1)/usr/bin
|
||||||
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vclog $(1)/usr/bin
|
||||||
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vcmailbox $(1)/usr/bin
|
||||||
|
endef
|
||||||
|
|
||||||
|
$(eval $(call BuildPackage,bcm27xx-utils))
|
||||||
|
|
@ -0,0 +1,255 @@
|
||||||
|
From 0db3fb3119eda8c2360454c2a01f84602a879c38 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
|
||||||
|
Date: Tue, 16 Jan 2024 15:32:12 +0100
|
||||||
|
Subject: [PATCH] raspinfo: adapt to OpenWrt
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
||||||
|
---
|
||||||
|
raspinfo/raspinfo | 186 ++++------------------------------------------
|
||||||
|
1 file changed, 13 insertions(+), 173 deletions(-)
|
||||||
|
|
||||||
|
--- a/raspinfo/raspinfo
|
||||||
|
+++ b/raspinfo/raspinfo
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-#!/bin/bash
|
||||||
|
+#!/bin/sh
|
||||||
|
|
||||||
|
# Some of the regex's used in sed
|
||||||
|
# Catch basic IP6 address "s/\([0-9a-fA-F]\{1,4\}:\)\{7,7\}[0-9a-fA-F]\{1,4\}/y.y.y.y.y.y.y.y/g"
|
||||||
|
@@ -6,147 +6,6 @@
|
||||||
|
# IP4 d.d.d.d decimal "s/\([0-9]\{1,3\}\.\)\{3,3\}[0-9]\{1,3\}/x.x.x.x/g"
|
||||||
|
# mac address "s/\([0-9a-fA-F]\{2,2\}\:\)\{5,5\}[0-9a-fA-F]\{2,2\}/m.m.m.m/g"
|
||||||
|
|
||||||
|
-
|
||||||
|
-display_info_drm() {
|
||||||
|
- # If running X then can use xrandr, otherwise
|
||||||
|
- # dump the /sys/class entries for the displays
|
||||||
|
- if command -v xrandr > /dev/null &&
|
||||||
|
- DISPLAY=${DISPLAY:-:0} xrandr --listmonitors &>/dev/null;
|
||||||
|
- then
|
||||||
|
- echo "Running (F)KMS and X"
|
||||||
|
- echo
|
||||||
|
-
|
||||||
|
- DISPLAY=${DISPLAY:-:0} xrandr --verbose
|
||||||
|
- else
|
||||||
|
- echo "Running (F)KMS, console"
|
||||||
|
- echo
|
||||||
|
-
|
||||||
|
- for card in /sys/class/drm/card[0-9]-*;
|
||||||
|
- do
|
||||||
|
- echo $card
|
||||||
|
-
|
||||||
|
- # if kmsprint isn't installed print basic mode info
|
||||||
|
- if ! command -v kmsprint > /dev/null; then
|
||||||
|
- if [ -f $card/modes ];
|
||||||
|
- then
|
||||||
|
- cat $card/modes
|
||||||
|
- else
|
||||||
|
- echo "No modes found"
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
-
|
||||||
|
- if [ -f $card/edid ];
|
||||||
|
- then
|
||||||
|
- base64 $card/edid
|
||||||
|
- else
|
||||||
|
- echo "No EDID found"
|
||||||
|
- fi
|
||||||
|
- echo
|
||||||
|
- done
|
||||||
|
- fi
|
||||||
|
-
|
||||||
|
- # kmsprint is more useful, but not always installed
|
||||||
|
- echo
|
||||||
|
- if command -v kmsprint > /dev/null; then
|
||||||
|
- kmsprint
|
||||||
|
- echo
|
||||||
|
- kmsprint -m
|
||||||
|
- else
|
||||||
|
- echo "kmsprint is not installed. Install with: sudo apt install kms++-utils"
|
||||||
|
- fi
|
||||||
|
-
|
||||||
|
- echo
|
||||||
|
-
|
||||||
|
- # dump the /sys/class entries for the displays
|
||||||
|
- cardfound=0
|
||||||
|
- for card in `seq 0 9`;
|
||||||
|
- do
|
||||||
|
- if sudo test -f "/sys/kernel/debug/dri/${card}/state";
|
||||||
|
- then
|
||||||
|
- for hdmi in 0 1;
|
||||||
|
- do
|
||||||
|
- if sudo test -f "/sys/kernel/debug/dri/${card}/hdmi${hdmi}_regs";
|
||||||
|
- then
|
||||||
|
- echo "HDMI${hdmi}: $(sudo cat /sys/kernel/debug/dri/$card/hdmi${hdmi}_regs | grep HOTPLUG)"
|
||||||
|
- fi
|
||||||
|
- done
|
||||||
|
- echo
|
||||||
|
- echo "/sys/kernel/debug/dri/$card/state:"
|
||||||
|
- sudo cat "/sys/kernel/debug/dri/$card/state"
|
||||||
|
- echo
|
||||||
|
- cardfound=1
|
||||||
|
- fi
|
||||||
|
- done
|
||||||
|
- if [ "$cardfound" == "0" ];
|
||||||
|
- then
|
||||||
|
- echo "kms state not found"
|
||||||
|
- fi
|
||||||
|
- echo
|
||||||
|
-
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-display_info_legacy() {
|
||||||
|
- # Legacy mode
|
||||||
|
- echo "Running Legacy framebuffer"
|
||||||
|
- echo
|
||||||
|
-
|
||||||
|
- for card in `seq 0 9`;
|
||||||
|
- do
|
||||||
|
- F="/dev/fb${card}"
|
||||||
|
- if test -e $F;
|
||||||
|
- then
|
||||||
|
- echo Framebuffer: $F
|
||||||
|
- fbset -s -fb $F
|
||||||
|
- fi
|
||||||
|
- done
|
||||||
|
-
|
||||||
|
- disps=`tvservice -l | awk '/Display Number/{print substr($3,1,1)}'`
|
||||||
|
-
|
||||||
|
- tmp=$(mktemp)
|
||||||
|
-
|
||||||
|
- for display in $disps
|
||||||
|
- do
|
||||||
|
- echo
|
||||||
|
- echo "Display: " $display
|
||||||
|
-
|
||||||
|
- tvservice -v $display -s
|
||||||
|
- tvservice -v $display -n
|
||||||
|
- tvservice -v $display -m CEA
|
||||||
|
- tvservice -v $display -m DMT
|
||||||
|
-
|
||||||
|
- echo
|
||||||
|
- tvservice -v $display -d $tmp > /dev/null
|
||||||
|
- base64 $tmp
|
||||||
|
- done
|
||||||
|
-
|
||||||
|
- rm $tmp
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-display_info() {
|
||||||
|
- # Check if we are running a KMS/DRM system
|
||||||
|
-
|
||||||
|
- if [ -d "/dev/dri" ];
|
||||||
|
- then
|
||||||
|
- display_info_drm
|
||||||
|
- else
|
||||||
|
- display_info_legacy
|
||||||
|
- fi
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-audio_info() {
|
||||||
|
- aplay -l
|
||||||
|
- echo
|
||||||
|
- aplay -L
|
||||||
|
- echo
|
||||||
|
- systemctl --user status pipewire.socket pipewire.service pulseaudio.service pulseaudio.socket
|
||||||
|
- echo
|
||||||
|
- if command -v pactl > /dev/null; then
|
||||||
|
- pactl info
|
||||||
|
- else
|
||||||
|
- echo pactl not installed
|
||||||
|
- fi
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
OUT=raspinfo.txt
|
||||||
|
|
||||||
|
rm -f $OUT
|
||||||
|
@@ -163,8 +22,6 @@ echo
|
||||||
|
cat /etc/os-release | head -4
|
||||||
|
echo
|
||||||
|
|
||||||
|
-cat /etc/rpi-issue
|
||||||
|
-echo
|
||||||
|
uname -a
|
||||||
|
|
||||||
|
cat /proc/cpuinfo | tail -3
|
||||||
|
@@ -190,17 +47,6 @@ echo
|
||||||
|
cat /proc/swaps
|
||||||
|
|
||||||
|
echo
|
||||||
|
-echo "Package version information"
|
||||||
|
-echo "---------------------------"
|
||||||
|
-
|
||||||
|
-apt-cache policy raspberrypi-ui-mods | head -2
|
||||||
|
-apt-cache policy raspberrypi-sys-mods | head -2
|
||||||
|
-apt-cache policy openbox | head -2
|
||||||
|
-apt-cache policy lxpanel | head -2
|
||||||
|
-apt-cache policy pcmanfm | head -2
|
||||||
|
-apt-cache policy rpd-plym-splash | head -2
|
||||||
|
-
|
||||||
|
-echo
|
||||||
|
echo "Networking Information"
|
||||||
|
echo "----------------------"
|
||||||
|
echo
|
||||||
|
@@ -212,21 +58,11 @@ echo "USB Information"
|
||||||
|
echo "---------------"
|
||||||
|
echo
|
||||||
|
|
||||||
|
-lsusb -t
|
||||||
|
-
|
||||||
|
-echo
|
||||||
|
-echo "Display Information"
|
||||||
|
-echo "-------------------"
|
||||||
|
-echo
|
||||||
|
-
|
||||||
|
-display_info
|
||||||
|
-
|
||||||
|
-echo
|
||||||
|
-echo "Audio Information"
|
||||||
|
-echo "-------------------"
|
||||||
|
-echo
|
||||||
|
-
|
||||||
|
-audio_info
|
||||||
|
+if command -v lsusb > /dev/null; then
|
||||||
|
+ lsusb -t
|
||||||
|
+else
|
||||||
|
+ echo usbutils not installed
|
||||||
|
+fi
|
||||||
|
|
||||||
|
echo
|
||||||
|
echo "config.txt"
|
||||||
|
@@ -250,7 +86,7 @@ echo "-----------------"
|
||||||
|
echo
|
||||||
|
|
||||||
|
if command -v pinctrl > /dev/null; then
|
||||||
|
- sudo pinctrl 2>&1
|
||||||
|
+ pinctrl 2>&1
|
||||||
|
elif command -v raspi-gpio > /dev/null; then
|
||||||
|
raspi-gpio get 2>&1
|
||||||
|
else
|
||||||
|
@@ -263,9 +99,9 @@ echo "------------------"
|
||||||
|
echo
|
||||||
|
|
||||||
|
if command -v vcdbg > /dev/null; then
|
||||||
|
- sudo vcdbg log msg 2>&1
|
||||||
|
+ vcdbg log msg 2>&1
|
||||||
|
elif command -v vclog > /dev/null; then
|
||||||
|
- sudo vclog --msg 2>&1
|
||||||
|
+ vclog --msg 2>&1
|
||||||
|
else
|
||||||
|
echo "vcdbg not found"
|
||||||
|
fi
|
||||||
|
@@ -284,5 +120,9 @@ echo
|
||||||
|
echo "EEPROM"
|
||||||
|
echo "------"
|
||||||
|
echo
|
||||||
|
-sudo rpi-eeprom-update
|
||||||
|
+if command -v rpi-eeprom-update > /dev/null; then
|
||||||
|
+ rpi-eeprom-update
|
||||||
|
+else
|
||||||
|
+ echo bcm27xx-eeprom not installed
|
||||||
|
+fi
|
||||||
|
fi
|
||||||
|
|
@ -1333,7 +1333,7 @@ config BUSYBOX_DEFAULT_USE_BB_CRYPT
|
||||||
default n
|
default n
|
||||||
config BUSYBOX_DEFAULT_USE_BB_CRYPT_SHA
|
config BUSYBOX_DEFAULT_USE_BB_CRYPT_SHA
|
||||||
bool
|
bool
|
||||||
default n
|
default y
|
||||||
config BUSYBOX_DEFAULT_ADD_SHELL
|
config BUSYBOX_DEFAULT_ADD_SHELL
|
||||||
bool
|
bool
|
||||||
default n
|
default n
|
||||||
|
|
@ -1366,7 +1366,7 @@ config BUSYBOX_DEFAULT_CHPASSWD
|
||||||
default n
|
default n
|
||||||
config BUSYBOX_DEFAULT_FEATURE_DEFAULT_PASSWD_ALGO
|
config BUSYBOX_DEFAULT_FEATURE_DEFAULT_PASSWD_ALGO
|
||||||
string
|
string
|
||||||
default "md5"
|
default "sha256"
|
||||||
config BUSYBOX_DEFAULT_CRYPTPW
|
config BUSYBOX_DEFAULT_CRYPTPW
|
||||||
bool
|
bool
|
||||||
default n
|
default n
|
||||||
|
|
|
||||||
|
|
@ -5,9 +5,9 @@ PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_URL=$(PROJECT_GIT)/project/jsonpath.git
|
PKG_SOURCE_URL=$(PROJECT_GIT)/project/jsonpath.git
|
||||||
PKG_SOURCE_DATE:=2018-02-04
|
PKG_SOURCE_DATE:=2024-01-23
|
||||||
PKG_SOURCE_VERSION:=c7e938d6582a436dddc938539e72dd1320625c54
|
PKG_SOURCE_VERSION:=594cfa86469c005972ba750614f5b3f1af84d0f6
|
||||||
PKG_MIRROR_HASH:=0601b4d7aa5ee096e99388a57cb0701673ab58fccd6ed2984a2abbd4f846e045
|
PKG_MIRROR_HASH:=70d2e0870b746920af4569631218c38c1dddfee4f5d029ec8ea0a67999bdafcd
|
||||||
CMAKE_INSTALL:=1
|
CMAKE_INSTALL:=1
|
||||||
|
|
||||||
PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
|
PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
|
||||||
|
|
|
||||||
|
|
@ -181,7 +181,7 @@ for file_mode in $file_modes; do
|
||||||
done
|
done
|
||||||
$TAR -X "$tmp_dir"/tarX --format=gnu --numeric-owner --sort=name -cpf - --mtime="$TIMESTAMP" . | gzip -n - > "$tmp_dir"/data.tar.gz
|
$TAR -X "$tmp_dir"/tarX --format=gnu --numeric-owner --sort=name -cpf - --mtime="$TIMESTAMP" . | gzip -n - > "$tmp_dir"/data.tar.gz
|
||||||
|
|
||||||
installed_size=$(stat -c "%s" "$tmp_dir"/data.tar.gz)
|
installed_size=$(zcat < "$tmp_dir"/data.tar.gz | wc -c)
|
||||||
sed -i -e "s/^Installed-Size: .*/Installed-Size: $installed_size/" \
|
sed -i -e "s/^Installed-Size: .*/Installed-Size: $installed_size/" \
|
||||||
"$pkg_dir"/$CONTROL/control
|
"$pkg_dir"/$CONTROL/control
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -55,9 +55,9 @@ if output:
|
||||||
"target/linux/",
|
"target/linux/",
|
||||||
"val.DEFAULT_PACKAGES",
|
"val.DEFAULT_PACKAGES",
|
||||||
"val.ARCH_PACKAGES",
|
"val.ARCH_PACKAGES",
|
||||||
|
"V=s",
|
||||||
],
|
],
|
||||||
stdout=PIPE,
|
stdout=PIPE,
|
||||||
stderr=PIPE,
|
|
||||||
check=True,
|
check=True,
|
||||||
env=environ.copy().update({"TOPDIR": Path().cwd()}),
|
env=environ.copy().update({"TOPDIR": Path().cwd()}),
|
||||||
universal_newlines=True,
|
universal_newlines=True,
|
||||||
|
|
|
||||||
|
|
@ -257,6 +257,7 @@ sub parse_package_metadata($) {
|
||||||
/^License: \s*(.+)\s*$/ and $pkg->{license} = $1;
|
/^License: \s*(.+)\s*$/ and $pkg->{license} = $1;
|
||||||
/^LicenseFiles: \s*(.+)\s*$/ and $pkg->{licensefiles} = $1;
|
/^LicenseFiles: \s*(.+)\s*$/ and $pkg->{licensefiles} = $1;
|
||||||
/^CPE-ID: \s*(.+)\s*$/ and $pkg->{cpe_id} = $1;
|
/^CPE-ID: \s*(.+)\s*$/ and $pkg->{cpe_id} = $1;
|
||||||
|
/^URL: \s*(.+)\s*$/ and $pkg->{url} = $1;
|
||||||
/^ABI-Version: \s*(.+)\s*$/ and $pkg->{abi_version} = $1;
|
/^ABI-Version: \s*(.+)\s*$/ and $pkg->{abi_version} = $1;
|
||||||
/^Default: \s*(.+)\s*$/ and $pkg->{default} = $1;
|
/^Default: \s*(.+)\s*$/ and $pkg->{default} = $1;
|
||||||
/^Provides: \s*(.+)\s*$/ and do {
|
/^Provides: \s*(.+)\s*$/ and do {
|
||||||
|
|
@ -344,6 +345,7 @@ sub parse_package_manifest_metadata($) {
|
||||||
/^Section:\s*(.+)\s*$/ and $pkg->{section} = $1;
|
/^Section:\s*(.+)\s*$/ and $pkg->{section} = $1;
|
||||||
/^SourceDateEpoch: \s*(.+)\s*$/ and $pkg->{sourcedateepoch} = $1;
|
/^SourceDateEpoch: \s*(.+)\s*$/ and $pkg->{sourcedateepoch} = $1;
|
||||||
/^CPE-ID:\s*(.+)\s*$/ and $pkg->{cpe_id} = $1;
|
/^CPE-ID:\s*(.+)\s*$/ and $pkg->{cpe_id} = $1;
|
||||||
|
/^URL:\s*(.+)\s*$/ and $pkg->{url} = $1;
|
||||||
/^Architecture:\s*(.+)\s*$/ and $pkg->{architecture} = $1;
|
/^Architecture:\s*(.+)\s*$/ and $pkg->{architecture} = $1;
|
||||||
/^Installed-Size:\s*(.+)\s*$/ and $pkg->{installedsize} = $1;
|
/^Installed-Size:\s*(.+)\s*$/ and $pkg->{installedsize} = $1;
|
||||||
/^Filename:\s*(.+)\s*$/ and $pkg->{filename} = $1;
|
/^Filename:\s*(.+)\s*$/ and $pkg->{filename} = $1;
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ TARGETS=$*
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
find $TARGETS -type f -a -exec file {} \; | \
|
find $TARGETS -not -path \*/lib/firmware/\* -a -type f -a -exec file {} \; | \
|
||||||
sed -n -e 's/^\(.*\):.*ELF.*\(executable\|relocatable\|shared object\).*,.*/\1:\2/p' | \
|
sed -n -e 's/^\(.*\):.*ELF.*\(executable\|relocatable\|shared object\).*,.*/\1:\2/p' | \
|
||||||
(
|
(
|
||||||
IFS=":"
|
IFS=":"
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ all: compile
|
||||||
$(BIN_DIR)/$(IB_NAME).tar.xz: clean
|
$(BIN_DIR)/$(IB_NAME).tar.xz: clean
|
||||||
rm -rf $(PKG_BUILD_DIR)
|
rm -rf $(PKG_BUILD_DIR)
|
||||||
mkdir -p $(IB_KDIR) $(IB_LDIR) $(PKG_BUILD_DIR)/staging_dir/host/lib \
|
mkdir -p $(IB_KDIR) $(IB_LDIR) $(PKG_BUILD_DIR)/staging_dir/host/lib \
|
||||||
$(PKG_BUILD_DIR)/target $(PKG_BUILD_DIR)/scripts $(IB_DTSDIR)
|
$(PKG_BUILD_DIR)/target/linux $(PKG_BUILD_DIR)/scripts $(IB_DTSDIR)
|
||||||
-cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config
|
-cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config
|
||||||
$(SED) 's/^CONFIG_BINARY_FOLDER=.*/# CONFIG_BINARY_FOLDER is not set/' $(PKG_BUILD_DIR)/.config
|
$(SED) 's/^CONFIG_BINARY_FOLDER=.*/# CONFIG_BINARY_FOLDER is not set/' $(PKG_BUILD_DIR)/.config
|
||||||
$(SED) 's/^CONFIG_DOWNLOAD_FOLDER=.*/# CONFIG_DOWNLOAD_FOLDER is not set/' $(PKG_BUILD_DIR)/.config
|
$(SED) 's/^CONFIG_DOWNLOAD_FOLDER=.*/# CONFIG_DOWNLOAD_FOLDER is not set/' $(PKG_BUILD_DIR)/.config
|
||||||
|
|
@ -78,7 +78,9 @@ ifneq ($(CONFIG_SIGNATURE_CHECK),)
|
||||||
$(CP) -L $(STAGING_DIR_ROOT)/usr/sbin/opkg-key $(PKG_BUILD_DIR)/scripts/
|
$(CP) -L $(STAGING_DIR_ROOT)/usr/sbin/opkg-key $(PKG_BUILD_DIR)/scripts/
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(CP) -L $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/
|
$(CP) -L $(TOPDIR)/target/linux/Makefile $(PKG_BUILD_DIR)/target/linux
|
||||||
|
$(CP) -L $(TOPDIR)/target/linux/generic $(PKG_BUILD_DIR)/target/linux
|
||||||
|
$(CP) -L $(TOPDIR)/target/linux/$(BOARD) $(PKG_BUILD_DIR)/target/linux
|
||||||
if [ -d $(TOPDIR)/staging_dir/host/lib/grub ]; then \
|
if [ -d $(TOPDIR)/staging_dir/host/lib/grub ]; then \
|
||||||
$(CP) $(TOPDIR)/staging_dir/host/lib/grub/ $(PKG_BUILD_DIR)/staging_dir/host/lib; \
|
$(CP) $(TOPDIR)/staging_dir/host/lib/grub/ $(PKG_BUILD_DIR)/staging_dir/host/lib; \
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
|
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
|
||||||
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
|
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
|
||||||
@@ -3611,7 +3611,7 @@ static int dpaa2_eth_setup_dpni(struct f
|
@@ -3614,7 +3614,7 @@ static int dpaa2_eth_setup_dpni(struct f
|
||||||
dev_err(dev, "DPNI version %u.%u not supported, need >= %u.%u\n",
|
dev_err(dev, "DPNI version %u.%u not supported, need >= %u.%u\n",
|
||||||
priv->dpni_ver_major, priv->dpni_ver_minor,
|
priv->dpni_ver_major, priv->dpni_ver_minor,
|
||||||
DPNI_VER_MAJOR, DPNI_VER_MINOR);
|
DPNI_VER_MAJOR, DPNI_VER_MINOR);
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue