Skip to content

Commit 30b12d1

Browse files
mattiaswalmattiaswal
authored
Merge pull request #1417 from kernelkit/gps
Gps refactor
2 parents 434248a + 6534086 commit 30b12d1

35 files changed

Lines changed: 756 additions & 559 deletions

‎board/aarch64/bananapi-bpi-r3/dts/mediatek/mt7986a-bananapi-bpi-r3.dtsi‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,22 @@
88
};
99
};
1010
};
11+
/*
12+
From 236317dd4e55512933dcdaec3d0b4a0824f5e5bd Mon Sep 17 00:00:00 2001
13+
From: Shiji Yang <yangshiji66@outlook.com>
14+
Date: Sun, 10 Aug 2025 18:11:01 +0800
15+
Subject: [PATCH] arm64: dts: mediatek: mt7986: increase ATF reserved memory to
16+
256 kiB
1117

18+
The latest Mediatek open-source Trusted Firmware-A project has
19+
reserved 256 KiB for BL2 and BL31. It is better to increase the
20+
reserved memory region in the Linux kernel to protect the data.
21+
22+
https://github.com/openwrt/openwrt/blob/main/target/linux/mediatek/patches-6.12/199-arm64-dts-mediatek-mt7986-increase-ATF-reserved-memo.patch
23+
*/
24+
&secmon_reserved {
25+
reg = <0 0x43000000 0 0x40000>;
26+
};
1227
&cpu_thermal {
1328
/delete-node/ trips;
1429
/delete-node/ cooling-maps;

‎buildroot‎

‎configs/aarch64_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ BR2_PACKAGE_DBUS_CXX=y
4141
BR2_PACKAGE_DBUS_GLIB=y
4242
BR2_PACKAGE_EUDEV_RULES_GEN=y
4343
# BR2_PACKAGE_EUDEV_ENABLE_HWDB is not set
44-
BR2_PACKAGE_GPSD_DEVICES="/dev/gps0"
45-
BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE=2
46-
BR2_PACKAGE_GPSD_MAX_DEV_VALUE=1
4744
BR2_PACKAGE_GPTFDISK=y
4845
BR2_PACKAGE_GPTFDISK_SGDISK=y
4946
BR2_PACKAGE_MDIO_TOOLS=y

‎configs/aarch64_minimal_defconfig‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ BR2_PACKAGE_DBUS_CXX=y
4141
BR2_PACKAGE_DBUS_GLIB=y
4242
BR2_PACKAGE_EUDEV_RULES_GEN=y
4343
# BR2_PACKAGE_EUDEV_ENABLE_HWDB is not set
44-
BR2_PACKAGE_GPSD_DEVICES="/dev/gps0"
45-
BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE=2
46-
BR2_PACKAGE_GPSD_MAX_DEV_VALUE=1
4744
BR2_PACKAGE_GPTFDISK=y
4845
BR2_PACKAGE_GPTFDISK_SGDISK=y
4946
BR2_PACKAGE_MDIO_TOOLS=y
@@ -126,7 +123,6 @@ INFIX_DESC="Infix is an immutable, friendly, and secure operating system that tu
126123
INFIX_HOME="https://github.com/kernelkit/infix/"
127124
INFIX_DOC="https://www.kernelkit.org/infix/"
128125
INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
129-
BR2_PACKAGE_FEATURE_GPS=y
130126
BR2_PACKAGE_CONFD=y
131127
BR2_PACKAGE_NETD=y
132128
BR2_PACKAGE_CONFD_TEST_MODE=y

‎configs/arm_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ BR2_PACKAGE_DBUS_CXX=y
4343
BR2_PACKAGE_DBUS_GLIB=y
4444
BR2_PACKAGE_EUDEV_RULES_GEN=y
4545
# BR2_PACKAGE_EUDEV_ENABLE_HWDB is not set
46-
BR2_PACKAGE_GPSD_DEVICES="/dev/gps0"
47-
BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE=2
48-
BR2_PACKAGE_GPSD_MAX_DEV_VALUE=1
4946
BR2_PACKAGE_GPTFDISK=y
5047
BR2_PACKAGE_GPTFDISK_SGDISK=y
5148
BR2_PACKAGE_MDIO_TOOLS=y

‎configs/arm_minimal_defconfig‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ BR2_PACKAGE_DBUS_CXX=y
4343
BR2_PACKAGE_DBUS_GLIB=y
4444
BR2_PACKAGE_EUDEV_RULES_GEN=y
4545
# BR2_PACKAGE_EUDEV_ENABLE_HWDB is not set
46-
BR2_PACKAGE_GPSD_DEVICES="/dev/gps0"
47-
BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE=2
48-
BR2_PACKAGE_GPSD_MAX_DEV_VALUE=1
4946
BR2_PACKAGE_GPTFDISK=y
5047
BR2_PACKAGE_GPTFDISK_SGDISK=y
5148
BR2_PACKAGE_MDIO_TOOLS=y
@@ -126,7 +123,6 @@ INFIX_DESC="Infix is an immutable, friendly, and secure operating system that tu
126123
INFIX_HOME="https://github.com/kernelkit/infix/"
127124
INFIX_DOC="https://www.kernelkit.org/infix/"
128125
INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
129-
BR2_PACKAGE_FEATURE_GPS=y
130126
BR2_PACKAGE_CONFD=y
131127
BR2_PACKAGE_NETD=y
132128
BR2_PACKAGE_CONFD_TEST_MODE=y

‎configs/riscv64_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ BR2_PACKAGE_DBUS_CXX=y
5252
BR2_PACKAGE_DBUS_GLIB=y
5353
BR2_PACKAGE_EUDEV_RULES_GEN=y
5454
# BR2_PACKAGE_EUDEV_ENABLE_HWDB is not set
55-
BR2_PACKAGE_GPSD_DEVICES="/dev/gps0"
56-
BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE=2
57-
BR2_PACKAGE_GPSD_MAX_DEV_VALUE=1
5855
BR2_PACKAGE_GPTFDISK=y
5956
BR2_PACKAGE_GPTFDISK_SGDISK=y
6057
BR2_PACKAGE_MDIO_TOOLS=y

‎configs/x86_64_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ BR2_PACKAGE_DBUS_CXX=y
4141
BR2_PACKAGE_DBUS_GLIB=y
4242
BR2_PACKAGE_EUDEV_RULES_GEN=y
4343
# BR2_PACKAGE_EUDEV_ENABLE_HWDB is not set
44-
BR2_PACKAGE_GPSD_DEVICES="/dev/gps0"
45-
BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE=2
46-
BR2_PACKAGE_GPSD_MAX_DEV_VALUE=1
4744
BR2_PACKAGE_GPTFDISK=y
4845
BR2_PACKAGE_GPTFDISK_SGDISK=y
4946
BR2_PACKAGE_RNG_TOOLS=y

‎configs/x86_64_minimal_defconfig‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ BR2_PACKAGE_DBUS_CXX=y
4141
BR2_PACKAGE_DBUS_GLIB=y
4242
BR2_PACKAGE_EUDEV_RULES_GEN=y
4343
# BR2_PACKAGE_EUDEV_ENABLE_HWDB is not set
44-
BR2_PACKAGE_GPSD_DEVICES="/dev/gps0"
45-
BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE=2
46-
BR2_PACKAGE_GPSD_MAX_DEV_VALUE=1
4744
BR2_PACKAGE_GPTFDISK=y
4845
BR2_PACKAGE_GPTFDISK_SGDISK=y
4946
BR2_PACKAGE_RNG_TOOLS=y
@@ -125,7 +122,6 @@ INFIX_DESC="Infix is an immutable, friendly, and secure operating system that tu
125122
INFIX_HOME="https://github.com/kernelkit/infix/"
126123
INFIX_DOC="https://www.kernelkit.org/infix/"
127124
INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
128-
BR2_PACKAGE_FEATURE_GPS=y
129125
BR2_PACKAGE_CONFD=y
130126
BR2_PACKAGE_NETD=y
131127
BR2_PACKAGE_CONFD_TEST_MODE=y

‎package/confd/confd.mk‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ CONFD_CONF_OPTS += --enable-wifi
3030
else
3131
CONFD_CONF_OPTS += --disable-wifi
3232
endif
33+
ifeq ($(BR2_PACKAGE_FEATURE_GPS),y)
34+
CONFD_CONF_OPTS += --enable-gps
35+
else
36+
CONFD_CONF_OPTS += --disable-gps
37+
endif
3338
define CONFD_INSTALL_EXTRA
3439
for fn in confd.conf resolvconf.conf; do \
3540
cp $(CONFD_PKGDIR)/$$fn $(FINIT_D)/available/; \
@@ -80,6 +85,12 @@ define CONFD_INSTALL_YANG_MODULES_WIFI
8085
$(BR2_EXTERNAL_INFIX_PATH)/utils/srload $(@D)/yang/wifi.inc
8186
endef
8287
endif
88+
ifeq ($(BR2_PACKAGE_FEATURE_GPS),y)
89+
define CONFD_INSTALL_YANG_MODULES_GPS
90+
$(COMMON_SYSREPO_ENV) \
91+
$(BR2_EXTERNAL_INFIX_PATH)/utils/srload $(@D)/yang/gps.inc
92+
endef
93+
endif
8394

8495
# PER_PACKAGE_DIR
8596
# Since the last package in the dependency chain that runs sysrepoctl is confd, we need to
@@ -109,6 +120,7 @@ CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_EXTRA
109120
CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_YANG_MODULES
110121
CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_YANG_MODULES_CONTAINERS
111122
CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_YANG_MODULES_WIFI
123+
CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_YANG_MODULES_GPS
112124
CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_IN_ROMFS
113125
CONFD_TARGET_FINALIZE_HOOKS += CONFD_CLEANUP
114126

0 commit comments

Comments
 (0)