Skip to content
This repository was archived by the owner on Feb 27, 2023. It is now read-only.

Commit 0082207

Browse files
XECDesignXECDesign
committed
3.5 release
1 parent bab5482 commit 0082207

39 files changed

+131
-208
lines changed

‎BUILDME.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ for i in $*; do
124124

125125
# Update raspberrypi/linux rpi-4.1.y HEAD version in buildroot/.config to latest
126126
if [ $i = "update-kernel" ]; then
127-
update_github_kernel_version raspberrypi/linux rpi-4.14.y
127+
update_github_kernel_version raspberrypi/linux rpi-5.4.y
128128
fi
129129

130130
# Option to build just recovery without completely rebuilding both kernels
@@ -176,6 +176,9 @@ cp "$IMAGES_DIR/rootfs.squashfs" "$FINAL_OUTPUT_DIR/recovery.rfs"
176176
# Ensure that final output dir contains files necessary to boot
177177
cp "$IMAGES_DIR/rpi-firmware/start.elf" "$FINAL_OUTPUT_DIR/recovery.elf"
178178
cp "$IMAGES_DIR/rpi-firmware/start4.elf" "$FINAL_OUTPUT_DIR/recover4.elf"
179+
cp "$IMAGES_DIR/rpi-firmware/fixup.dat" "$FINAL_OUTPUT_DIR/fixup_rc.dat"
180+
cp "$IMAGES_DIR/rpi-firmware/fixup4.dat" "$FINAL_OUTPUT_DIR/fixup4rc.dat"
181+
cp "$IMAGES_DIR/rpi-firmware/config.txt" "$FINAL_OUTPUT_DIR"
179182
cp "$IMAGES_DIR/rpi-firmware/bootcode.bin" "$FINAL_OUTPUT_DIR"
180183
cp -a $IMAGES_DIR/*.dtb "$IMAGES_DIR/overlays" "$FINAL_OUTPUT_DIR"
181184
cp "$IMAGES_DIR/cmdline.txt" "$FINAL_OUTPUT_DIR/recovery.cmdline"
@@ -188,7 +191,7 @@ echo "NOOBS Version: $(sed -n 's|.*VERSION_NUMBER.*\"\(.*\)\"|v\1|p' ../recovery
188191
echo "NOOBS Git HEAD @ $(git rev-parse --verify HEAD)" >> "$BUILD_INFO"
189192
echo "rpi-userland Git master @ $(get_package_version rpi-userland)" >> "$BUILD_INFO"
190193
echo "rpi-firmware Git master @ $(get_package_version rpi-firmware)" >> "$BUILD_INFO"
191-
echo "rpi-linux Git rpi-4.14.y @ $(get_kernel_version)" >> "$BUILD_INFO"
194+
echo "rpi-linux Git rpi-5.4.y @ $(get_kernel_version)" >> "$BUILD_INFO"
192195

193196
cd ..
194197

‎buildroot/.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Buildroot 2015.02-git-00095-gb66d01e-dirty Configuration
3+
# Buildroot 2015.02-git-00125-g50a736e Configuration
44
#
55
BR2_HAVE_DOT_CONFIG=y
66

@@ -307,9 +307,9 @@ BR2_LINUX_KERNEL_CUSTOM_GIT=y
307307
# BR2_LINUX_KERNEL_CUSTOM_HG is not set
308308
# BR2_LINUX_KERNEL_CUSTOM_LOCAL is not set
309309
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/raspberrypi/linux.git"
310-
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f16e91dad2af9d57aef477cc1f522040353849f5"
311-
BR2_LINUX_KERNEL_VERSION="f16e91dad2af9d57aef477cc1f522040353849f5"
312-
BR2_LINUX_KERNEL_PATCH=""
310+
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f2f7e4b23d8788e96f81a7522b2f703e51c53e70"
311+
BR2_LINUX_KERNEL_VERSION="f2f7e4b23d8788e96f81a7522b2f703e51c53e70"
312+
BR2_LINUX_KERNEL_PATCH="disable_board.patch cpu_nodes.patch"
313313
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
314314
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
315315
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="kernelconfig-recovery.armv6"

‎buildroot/cpu_nodes.patch

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From a5c01bebc340e223c0ce5328242c867fdbffd08a Mon Sep 17 00:00:00 2001
2+
From: Phil Elwell <[email protected]>
3+
Date: Mon, 24 Aug 2020 18:28:52 +0100
4+
Subject: [PATCH] ARM: dts: bcm2708.dtsi: Don't delete the cpus node
5+
6+
The cpus node was originally deleted to match the then downstream
7+
version of the BCM2835 DTS files, but doing so doesn't seem to make
8+
any material difference. Its presence is necessary for the CPUFREQ_DT
9+
support that is planned in the near future, so remove the deletion.
10+
11+
Signed-off-by: Phil Elwell <[email protected]>
12+
---
13+
arch/arm/boot/dts/bcm2708.dtsi | 2 --
14+
1 file changed, 2 deletions(-)
15+
16+
diff --git a/arch/arm/boot/dts/bcm2708.dtsi b/arch/arm/boot/dts/bcm2708.dtsi
17+
index a32ff21613eda..36ec4989403f5 100644
18+
--- a/arch/arm/boot/dts/bcm2708.dtsi
19+
+++ b/arch/arm/boot/dts/bcm2708.dtsi
20+
@@ -2,8 +2,6 @@
21+
#include "bcm270x.dtsi"
22+
23+
/ {
24+
- /delete-node/ cpus;
25+
-
26+
__overrides__ {
27+
arm_freq;
28+
};

‎buildroot/disable_board.patch

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
2+
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
3+
@@ -621,22 +621,6 @@
4+
struct brcmf_fw_item *cur = &fwctx->req->items[fwctx->curpos];
5+
int ret;
6+
7+
- /* nvram files are board-specific, first try a board-specific path */
8+
- if (cur->type == BRCMF_FW_TYPE_NVRAM && fwctx->req->board_type) {
9+
- char alt_path[BRCMF_FW_NAME_LEN];
10+
-
11+
- strlcpy(alt_path, cur->path, BRCMF_FW_NAME_LEN);
12+
- /* strip .txt at the end */
13+
- alt_path[strlen(alt_path) - 4] = 0;
14+
- strlcat(alt_path, ".", BRCMF_FW_NAME_LEN);
15+
- strlcat(alt_path, fwctx->req->board_type, BRCMF_FW_NAME_LEN);
16+
- strlcat(alt_path, ".txt", BRCMF_FW_NAME_LEN);
17+
-
18+
- ret = request_firmware(fw, alt_path, fwctx->dev);
19+
- if (ret == 0)
20+
- return ret;
21+
- }
22+
-
23+
return request_firmware(fw, cur->path, fwctx->dev);
24+
}
25+

‎buildroot/kernelconfig-recovery.armv6

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
2828
CONFIG_CPU_FREQ_GOV_USERSPACE=y
2929
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
3030
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
31+
CONFIG_CPUFREQ_DT=y
32+
CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
33+
# CONFIG_ARM_BCM2835_CPUFREQ is not set
3134
CONFIG_CPU_IDLE=y
3235
CONFIG_VFP=y
3336
# CONFIG_SUSPEND is not set
@@ -42,18 +45,13 @@ CONFIG_UNIX=y
4245
CONFIG_INET=y
4346
CONFIG_IP_MULTICAST=y
4447
CONFIG_SYN_COOKIES=y
45-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
46-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
47-
# CONFIG_INET_XFRM_MODE_BEET is not set
4848
# CONFIG_INET_DIAG is not set
4949
# CONFIG_IPV6 is not set
5050
CONFIG_CFG80211=y
5151
CONFIG_DEVTMPFS=y
5252
CONFIG_DEVTMPFS_MOUNT=y
5353
CONFIG_FW_LOADER_USER_HELPER=y
5454
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
55-
CONFIG_DMA_CMA=y
56-
CONFIG_CMA_SIZE_MBYTES=5
5755
CONFIG_BLK_DEV_LOOP=y
5856
CONFIG_BLK_DEV_RAM=y
5957
CONFIG_SCSI=y
@@ -63,7 +61,6 @@ CONFIG_NETDEVICES=y
6361
CONFIG_USB_RTL8152=y
6462
CONFIG_USB_LAN78XX=y
6563
CONFIG_USB_USBNET=y
66-
# CONFIG_USB_NET_AX8817X is not set
6764
# CONFIG_USB_NET_AX88179_178A is not set
6865
# CONFIG_USB_NET_CDCETHER is not set
6966
# CONFIG_USB_NET_CDC_NCM is not set
@@ -93,7 +90,7 @@ CONFIG_INPUT_EVDEV=y
9390
# CONFIG_INPUT_KEYBOARD is not set
9491
# CONFIG_INPUT_MOUSE is not set
9592
CONFIG_INPUT_TOUCHSCREEN=y
96-
CONFIG_TOUCHSCREEN_RPI_FT5406=y
93+
CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=y
9794
# CONFIG_SERIO is not set
9895
CONFIG_BRCM_CHAR_DRIVERS=y
9996
# CONFIG_LEGACY_PTYS is not set
@@ -142,20 +139,14 @@ CONFIG_NEW_LEDS=y
142139
CONFIG_LEDS_CLASS=y
143140
CONFIG_LEDS_GPIO=y
144141
CONFIG_LEDS_TRIGGERS=y
145-
CONFIG_LEDS_TRIGGER_TIMER=y
146-
CONFIG_LEDS_TRIGGER_ONESHOT=y
147-
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
148-
CONFIG_LEDS_TRIGGER_BACKLIGHT=y
149-
CONFIG_LEDS_TRIGGER_CPU=y
150-
CONFIG_LEDS_TRIGGER_GPIO=y
151142
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
152-
CONFIG_LEDS_TRIGGER_INPUT=y
153-
CONFIG_LEDS_TRIGGER_PANIC=y
143+
CONFIG_LEDS_TRIGGER_ACTPWR=y
154144
CONFIG_DMADEVICES=y
155145
CONFIG_DMA_BCM2835=y
156146
CONFIG_DMA_BCM2708=y
157147
CONFIG_STAGING=y
158148
CONFIG_BCM2835_VCHIQ=y
149+
CONFIG_CLK_RASPBERRYPI=y
159150
CONFIG_MAILBOX=y
160151
CONFIG_BCM2835_MBOX=y
161152
# CONFIG_IOMMU_SUPPORT is not set
@@ -194,8 +185,9 @@ CONFIG_NLS_ISO8859_14=y
194185
CONFIG_NLS_ISO8859_15=y
195186
CONFIG_NLS_UTF8=y
196187
# CONFIG_CRYPTO_HW is not set
188+
CONFIG_DMA_CMA=y
189+
CONFIG_CMA_SIZE_MBYTES=5
197190
CONFIG_PRINTK_TIME=y
198191
CONFIG_MAGIC_SYSRQ=y
199192
# CONFIG_DEBUG_BUGVERBOSE is not set
200193
# CONFIG_FTRACE is not set
201-
# CONFIG_ARM_UNWIND is not set

‎buildroot/kernelconfig-recovery.armv7

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
2929
CONFIG_CPU_FREQ_GOV_USERSPACE=y
3030
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
3131
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
32+
CONFIG_CPUFREQ_DT=y
33+
CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
34+
# CONFIG_ARM_BCM2835_CPUFREQ is not set
3235
CONFIG_CPU_IDLE=y
3336
CONFIG_VFP=y
3437
# CONFIG_SUSPEND is not set
@@ -43,18 +46,13 @@ CONFIG_UNIX=y
4346
CONFIG_INET=y
4447
CONFIG_IP_MULTICAST=y
4548
CONFIG_SYN_COOKIES=y
46-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
47-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
48-
# CONFIG_INET_XFRM_MODE_BEET is not set
4949
# CONFIG_INET_DIAG is not set
5050
# CONFIG_IPV6 is not set
5151
CONFIG_CFG80211=y
5252
CONFIG_DEVTMPFS=y
5353
CONFIG_DEVTMPFS_MOUNT=y
5454
CONFIG_FW_LOADER_USER_HELPER=y
5555
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
56-
CONFIG_DMA_CMA=y
57-
CONFIG_CMA_SIZE_MBYTES=5
5856
CONFIG_BLK_DEV_LOOP=y
5957
CONFIG_BLK_DEV_RAM=y
6058
CONFIG_SCSI=y
@@ -64,7 +62,6 @@ CONFIG_NETDEVICES=y
6462
CONFIG_USB_RTL8152=y
6563
CONFIG_USB_LAN78XX=y
6664
CONFIG_USB_USBNET=y
67-
# CONFIG_USB_NET_AX8817X is not set
6865
# CONFIG_USB_NET_AX88179_178A is not set
6966
# CONFIG_USB_NET_CDCETHER is not set
7067
# CONFIG_USB_NET_CDC_NCM is not set
@@ -94,7 +91,7 @@ CONFIG_INPUT_EVDEV=y
9491
# CONFIG_INPUT_KEYBOARD is not set
9592
# CONFIG_INPUT_MOUSE is not set
9693
CONFIG_INPUT_TOUCHSCREEN=y
97-
CONFIG_TOUCHSCREEN_RPI_FT5406=y
94+
CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=y
9895
# CONFIG_SERIO is not set
9996
CONFIG_BRCM_CHAR_DRIVERS=y
10097
# CONFIG_LEGACY_PTYS is not set
@@ -144,20 +141,14 @@ CONFIG_NEW_LEDS=y
144141
CONFIG_LEDS_CLASS=y
145142
CONFIG_LEDS_GPIO=y
146143
CONFIG_LEDS_TRIGGERS=y
147-
CONFIG_LEDS_TRIGGER_TIMER=y
148-
CONFIG_LEDS_TRIGGER_ONESHOT=y
149-
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
150-
CONFIG_LEDS_TRIGGER_BACKLIGHT=y
151-
CONFIG_LEDS_TRIGGER_CPU=y
152-
CONFIG_LEDS_TRIGGER_GPIO=y
153144
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
154-
CONFIG_LEDS_TRIGGER_INPUT=y
155-
CONFIG_LEDS_TRIGGER_PANIC=y
145+
CONFIG_LEDS_TRIGGER_ACTPWR=y
156146
CONFIG_DMADEVICES=y
157147
CONFIG_DMA_BCM2835=y
158148
CONFIG_DMA_BCM2708=y
159149
CONFIG_STAGING=y
160150
CONFIG_BCM2835_VCHIQ=y
151+
CONFIG_CLK_RASPBERRYPI=y
161152
CONFIG_MAILBOX=y
162153
CONFIG_BCM2835_MBOX=y
163154
# CONFIG_IOMMU_SUPPORT is not set
@@ -196,9 +187,10 @@ CONFIG_NLS_ISO8859_14=y
196187
CONFIG_NLS_ISO8859_15=y
197188
CONFIG_NLS_UTF8=y
198189
# CONFIG_CRYPTO_HW is not set
190+
CONFIG_DMA_CMA=y
191+
CONFIG_CMA_SIZE_MBYTES=5
199192
CONFIG_PRINTK_TIME=y
200193
CONFIG_MAGIC_SYSRQ=y
201194
# CONFIG_DEBUG_BUGVERBOSE is not set
202195
# CONFIG_RCU_TRACE is not set
203196
# CONFIG_FTRACE is not set
204-
# CONFIG_ARM_UNWIND is not set

‎buildroot/kernelconfig-recovery.armv7l

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
CONFIG_REGULATOR_FIXED_VOLTAGE=y
21
CONFIG_LOCALVERSION="-rescue-v7l"
32
# CONFIG_LOCALVERSION_AUTO is not set
43
# CONFIG_SWAP is not set
@@ -19,9 +18,6 @@ CONFIG_ARCH_BCM2835=y
1918
CONFIG_ARM_LPAE=y
2019
# CONFIG_ARM_THUMB is not set
2120
# CONFIG_CACHE_L2X0 is not set
22-
CONFIG_PCI=y
23-
CONFIG_PCI_MSI=y
24-
CONFIG_PCIE_BRCMSTB=y
2521
CONFIG_SMP=y
2622
CONFIG_HOTPLUG_CPU=y
2723
CONFIG_HIGHMEM=y
@@ -34,6 +30,9 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
3430
CONFIG_CPU_FREQ_GOV_USERSPACE=y
3531
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
3632
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
33+
CONFIG_CPUFREQ_DT=y
34+
CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
35+
# CONFIG_ARM_BCM2835_CPUFREQ is not set
3736
CONFIG_CPU_IDLE=y
3837
CONFIG_VFP=y
3938
# CONFIG_SUSPEND is not set
@@ -48,18 +47,16 @@ CONFIG_UNIX=y
4847
CONFIG_INET=y
4948
CONFIG_IP_MULTICAST=y
5049
CONFIG_SYN_COOKIES=y
51-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
52-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
53-
# CONFIG_INET_XFRM_MODE_BEET is not set
5450
# CONFIG_INET_DIAG is not set
5551
# CONFIG_IPV6 is not set
5652
CONFIG_CFG80211=y
53+
CONFIG_PCI=y
54+
CONFIG_PCI_MSI=y
55+
CONFIG_PCIE_BRCMSTB=y
5756
CONFIG_DEVTMPFS=y
5857
CONFIG_DEVTMPFS_MOUNT=y
5958
CONFIG_FW_LOADER_USER_HELPER=y
6059
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
61-
CONFIG_DMA_CMA=y
62-
CONFIG_CMA_SIZE_MBYTES=5
6360
CONFIG_BLK_DEV_LOOP=y
6461
CONFIG_BLK_DEV_RAM=y
6562
CONFIG_SCSI=y
@@ -98,10 +95,10 @@ CONFIG_BCMGENET=y
9895
# CONFIG_NET_VENDOR_SYNOPSYS is not set
9996
# CONFIG_NET_VENDOR_VIA is not set
10097
# CONFIG_NET_VENDOR_WIZNET is not set
98+
CONFIG_BROADCOM_PHY=y
10199
CONFIG_USB_RTL8152=y
102100
CONFIG_USB_LAN78XX=y
103101
CONFIG_USB_USBNET=y
104-
# CONFIG_USB_NET_AX8817X is not set
105102
# CONFIG_USB_NET_AX88179_178A is not set
106103
# CONFIG_USB_NET_CDCETHER is not set
107104
# CONFIG_USB_NET_CDC_NCM is not set
@@ -131,7 +128,7 @@ CONFIG_INPUT_EVDEV=y
131128
# CONFIG_INPUT_KEYBOARD is not set
132129
# CONFIG_INPUT_MOUSE is not set
133130
CONFIG_INPUT_TOUCHSCREEN=y
134-
CONFIG_TOUCHSCREEN_RPI_FT5406=y
131+
CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=y
135132
# CONFIG_SERIO is not set
136133
CONFIG_BRCM_CHAR_DRIVERS=y
137134
# CONFIG_LEGACY_PTYS is not set
@@ -149,6 +146,7 @@ CONFIG_BCM2835_THERMAL=y
149146
CONFIG_WATCHDOG=y
150147
CONFIG_BCM2835_WDT=y
151148
CONFIG_REGULATOR=y
149+
CONFIG_REGULATOR_FIXED_VOLTAGE=y
152150
CONFIG_REGULATOR_GPIO=y
153151
CONFIG_FB=y
154152
CONFIG_FB_BCM2708=y
@@ -187,24 +185,17 @@ CONFIG_NEW_LEDS=y
187185
CONFIG_LEDS_CLASS=y
188186
CONFIG_LEDS_GPIO=y
189187
CONFIG_LEDS_TRIGGERS=y
190-
CONFIG_LEDS_TRIGGER_TIMER=y
191-
CONFIG_LEDS_TRIGGER_ONESHOT=y
192-
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
193-
CONFIG_LEDS_TRIGGER_BACKLIGHT=y
194-
CONFIG_LEDS_TRIGGER_CPU=y
195-
CONFIG_LEDS_TRIGGER_GPIO=y
196188
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
197-
CONFIG_LEDS_TRIGGER_INPUT=y
198-
CONFIG_LEDS_TRIGGER_PANIC=y
189+
CONFIG_LEDS_TRIGGER_ACTPWR=y
199190
CONFIG_DMADEVICES=y
200191
CONFIG_DMA_BCM2835=y
201192
CONFIG_DMA_BCM2708=y
202193
CONFIG_STAGING=y
203194
CONFIG_BCM2835_VCHIQ=y
195+
CONFIG_CLK_RASPBERRYPI=y
204196
CONFIG_MAILBOX=y
205197
CONFIG_BCM2835_MBOX=y
206198
# CONFIG_IOMMU_SUPPORT is not set
207-
CONFIG_BCM2835_POWER=y
208199
CONFIG_RASPBERRYPI_POWER=y
209200
CONFIG_GENERIC_PHY=y
210201
CONFIG_EXT4_FS=y
@@ -241,9 +232,10 @@ CONFIG_NLS_ISO8859_14=y
241232
CONFIG_NLS_ISO8859_15=y
242233
CONFIG_NLS_UTF8=y
243234
# CONFIG_CRYPTO_HW is not set
235+
CONFIG_DMA_CMA=y
236+
CONFIG_CMA_SIZE_MBYTES=5
244237
CONFIG_PRINTK_TIME=y
245238
CONFIG_MAGIC_SYSRQ=y
246239
# CONFIG_DEBUG_BUGVERBOSE is not set
247240
# CONFIG_RCU_TRACE is not set
248241
# CONFIG_FTRACE is not set
249-
# CONFIG_ARM_UNWIND is not set

‎buildroot/package/recovery/init

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ for F in *; do
2424
done
2525
echo 1 > timeout)
2626

27-
# Set up ACT LED to be triggered by mmc0
28-
echo mmc0 > /sys/class/leds/led0/trigger
29-
3027
# Rescue shell available on tty2 and tty3
3128
echo 2 >/sys/module/vt/parameters/cur_default
3229
/sbin/getty -L tty2 0 vt100 &
@@ -46,7 +43,7 @@ fi
4643
#export QWS_MOUSE_PROTO=:accel=1
4744

4845
# Pi touch screen
49-
if [ -e /sys/devices/platform/rpi_ft5406 ]; then
46+
if [ -d /proc/device-tree/soc/firmware/touchscreen ]; then
5047
export QWS_MOUSE_PROTO="linuxinput:/dev/input/event0:grab=1 intellimouse:/dev/input/mice"
5148
fi
5249

0 commit comments

Comments
 (0)