Skip to content

Commit 22cb42e

Browse files
committed
[SYNC] Main -> R3
1 parent ab0e334 commit 22cb42e

10,294 files changed

Lines changed: 345377 additions & 303 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

board/bcm/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../raspberrypi/index.html

board/explora/explora.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,3 +185,6 @@ libWPEFrameworkInputSwitch.so
185185
playready
186186
MeteringCertificate.bin
187187
cobalt.json
188+
libpsl.so
189+
*.pem
190+
*.crt

board/raspberrypi/post-image.sh

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,14 @@ __EOF__
114114
;;
115115
--add-vc4-fkms-v3d-overlay)
116116
# Enable VC4 overlay
117-
echo "Adding 'dtoverlay=vc4-fkms-v3d' to config.txt."
118-
cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
117+
if ! grep -qE '^dtoverlay=vc4-fkms-v3d' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
118+
echo "Adding 'dtoverlay=vc4-fkms-v3d' to config.txt."
119+
cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
119120
120-
# Add VC4 GPU support on top of dispmanx
121+
# Add VC4 GPU support
121122
dtoverlay=vc4-fkms-v3d
122123
__EOF__
124+
fi
123125
;;
124126
--add-vc4-kms-v3d-overlay)
125127
# Enable VC4 overlay
@@ -197,6 +199,16 @@ __EOF__
197199
fi
198200
fi
199201
;;
202+
--add-dtparam-audio)
203+
if ! grep -qE '^dtparam=audio=on' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
204+
echo "Adding 'dtparam=audio=on' to config.txt."
205+
cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
206+
207+
# Enable onboard ALSA audio
208+
dtparam=audio=on
209+
__EOF__
210+
fi
211+
;;
200212
esac
201213

202214
done

board/raspberrypi/rpi23-linux-5.10.config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ CONFIG_BRCMFMAC_USB=y
330330
# CONFIG_WLAN_VENDOR_QUANTENNA is not set
331331
CONFIG_INPUT_MOUSEDEV=y
332332
CONFIG_INPUT_JOYDEV=m
333-
CONFIG_INPUT_EVDEV=m
333+
CONFIG_INPUT_EVDEV=y
334334
# CONFIG_KEYBOARD_ATKBD is not set
335335
CONFIG_KEYBOARD_GPIO=m
336336
CONFIG_KEYBOARD_MATRIX=m
@@ -608,7 +608,8 @@ CONFIG_SND_SOC=y
608608
CONFIG_SND_BCM2835_SOC_I2S=y
609609
CONFIG_HID_BATTERY_STRENGTH=y
610610
CONFIG_HIDRAW=y
611-
# CONFIG_HID_GENERIC is not set
611+
CONFIG_HID_GENERIC=y
612+
CONFIG_USB_HID=y
612613
CONFIG_HID_PID=y
613614
CONFIG_USB_HIDDEV=y
614615
CONFIG_USB=y

configs/arrisrdkb0_wpe_ml_defconfig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
1717
BR2_LINUX_KERNEL=y
1818
BR2_LINUX_KERNEL_CUSTOM_GIT=y
1919
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git@github.com:Metrological/bcm-stblinux-4.9.git"
20-
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e25c90d1d2e6af56705e6b46d47797989cfe2676"
20+
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="dae011466609eb35cb5543e281a82207b4f03141"
2121
BR2_LINUX_KERNEL_DEFCONFIG="brcmstb"
2222
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/bcm/config-fragments/cgroups.cfg board/bcm/config-fragments/ipv6.cfg board/bcm/config-fragments/netfilter.cfg board/bcm/config-fragments/wpa-supplicant.cfg board/bcm/config-fragments/no-vdso.cfg board/bcm/config-fragments/bt.cfg"
2323
BR2_PACKAGE_BUSYBOX_SMP=y
@@ -29,13 +29,12 @@ BR2_TARGET_GENERIC_CABUNDLE=y
2929
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
3030

3131
BR2_PACKAGE_BCM_REFSW=y
32-
BR2_PACKAGE_BCM_REFSW_20_2=y
32+
BR2_PACKAGE_BCM_REFSW_19_2=y
3333
BR2_PACKAGE_BCM_REFSW_PLATFORM_72604_B0=y
3434
BR2_PACKAGE_BCM_REFSW_BOXMODE="4"
3535
BR2_PACKAGE_BCM_REFSW_NXCLIENT_EXAMPLES=y
3636
BR2_PACKAGE_BCM_REFSW_SAGE=y
3737
BR2_PACKAGE_BCM_REFSW_BP3=y
38-
BR2_PACKAGE_BCM_WIFI_DHD=y
3938

4039
BR2_PACKAGE_DROPBEAR=y
4140
BR2_PACKAGE_LIBSOUP=y

configs/explora_bcm7267_wpe_ml_defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ BR2_CCACHE=y
66
BR2_OPTIMIZE_2=y
77
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
88
BR2_KERNEL_HEADERS_4_9=y
9-
BR2_PACKAGE_GLIBC_LEGACY=y
109
BR2_GCC_VERSION_9_X=y
1110
BR2_TOOLCHAIN_BUILDROOT_CXX=y
1211
BR2_GCC_ENABLE_LTO=y
@@ -29,7 +28,6 @@ BR2_PACKAGE_NETFLIX52=y
2928
# BR2_PACKAGE_NETFLIX52_AUDIO_MIXER is not set
3029
BR2_PACKAGE_BITSTREAM_VERA=y
3130
BR2_PACKAGE_EXPLORA_SDK=y
32-
BR2_PACKAGE_CA_CERTIFICATES=y
3331
BR2_PACKAGE_WPEFRAMEWORK_PORT="2300"
3432
BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH="/UserApps/metrological/usr/share/WPEFramework"
3533
BR2_PACKAGE_WPEFRAMEWORK_SYSTEM_PATH="/UserApps/metrological/usr/lib/wpeframework/plugins"

configs/raspberrypi3_wpe_defconfig

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,19 @@ BR2_ARM_INSTRUCTIONS_THUMB2=y
66
BR2_TOOLCHAIN_BUILDROOT_CXX=y
77
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
88

9+
BR2_BINUTILS_VERSION_2_33_X=y
10+
BR2_GCC_VERSION_9_X=y
11+
912
BR2_CCACHE=y
1013
BR2_OPTIMIZE_2=y
1114

12-
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
15+
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
1316

1417
BR2_LINUX_KERNEL=y
1518
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
16-
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz"
19+
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz"
1720
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
18-
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/raspberrypi/rpi23-linux-4.19.config"
21+
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/raspberrypi/rpi23-linux-5.10.config"
1922
BR2_LINUX_KERNEL_LZ4=y
2023
BR2_LINUX_KERNEL_DTS_SUPPORT=y
2124
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3"

configs/raspberrypi3_wpe_ml_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC=y
5252
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS=y
5353
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS=y
5454
BR2_PACKAGE_GST_OMX=y
55-
BR2_PACKAGE_GNUTLS_OPENSSL=y
5655
BR2_PACKAGE_MPG123=y
5756
BR2_PACKAGE_NETFLIX52=y
5857
BR2_PACKAGE_NETFLIX52_AUDIO_MIXER=y
Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
BR2_arm=y
2+
BR2_cortex_a53=y
3+
BR2_ARM_FPU_NEON_VFPV4=y
4+
BR2_ARM_INSTRUCTIONS_THUMB2=y
5+
6+
BR2_TOOLCHAIN_BUILDROOT_CXX=y
7+
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
8+
9+
BR2_BINUTILS_VERSION_2_33_X=y
10+
BR2_GCC_VERSION_9_X=y
11+
12+
BR2_CCACHE=y
13+
BR2_OPTIMIZE_2=y
14+
15+
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
16+
17+
BR2_LINUX_KERNEL=y
18+
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
19+
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz"
20+
BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
21+
BR2_LINUX_KERNEL_LZ4=y
22+
BR2_LINUX_KERNEL_DTS_SUPPORT=y
23+
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3"
24+
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
25+
26+
BR2_TARGET_ROOTFS_EXT2=y
27+
BR2_TARGET_ROOTFS_EXT2_4=y
28+
BR2_TARGET_ROOTFS_EXT2_SIZE="512M"
29+
BR2_TARGET_ROOTFS_TAR=y
30+
31+
BR2_TARGET_GENERIC_ROOT_PASSWD="root"
32+
BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh"
33+
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh"
34+
BR2_ROOTFS_POST_SCRIPT_ARGS="--rpi-wifi --add-miniuart-bt-overlay --overclock-pi3 --tvmode-720 --gpu_mem_1024=384 --add-vc4-fkms-v3d-overlay --silent --add-dtparam-audio"
35+
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
36+
37+
BR2_PACKAGE_HOST_DOSFSTOOLS=y
38+
BR2_PACKAGE_HOST_GENIMAGE=y
39+
BR2_PACKAGE_HOST_MTOOLS=y
40+
41+
BR2_PACKAGE_RPI_FIRMWARE=y
42+
BR2_PACKAGE_RPI_VERSION_RPI3=y
43+
BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
44+
45+
BR2_PACKAGE_MESA3D=y
46+
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4=y
47+
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y
48+
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO=y
49+
BR2_PACKAGE_MESA3D_OPENGL_ES=y
50+
BR2_PACKAGE_KMSCUBE=y
51+
52+
BR2_PACKAGE_DROPBEAR=y
53+
BR2_PACKAGE_LIBSOUP=y
54+
BR2_PACKAGE_LIBSOUP_SSL=y
55+
BR2_PACKAGE_BITSTREAM_VERA=y
56+
BR2_PACKAGE_CA_CERTIFICATES=y
57+
BR2_PACKAGE_WEBP=y
58+
BR2_PACKAGE_ORC=y
59+
BR2_PACKAGE_SHARED_MIME_INFO=y
60+
BR2_PACKAGE_XKEYBOARD_CONFIG=y
61+
BR2_PACKAGE_RNG_TOOLS=y
62+
63+
BR2_PACKAGE_WPEBACKEND_RDK=y
64+
BR2_PACKAGE_WPEWEBKIT=y
65+
BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA=y
66+
BR2_PACKAGE_WESTEROS=y
67+
68+
BR2_PACKAGE_WPEFRAMEWORK=y
69+
BR2_PACKAGE_WPEFRAMEWORK_CDMI_CLEARKEY=y
70+
BR2_PACKAGE_WPEFRAMEWORK_COMPOSITOR=y
71+
BR2_PACKAGE_WPEFRAMEWORK_DHCPSERVER=y
72+
BR2_PACKAGE_WPEFRAMEWORK_LOCATIONSYNC=y
73+
BR2_PACKAGE_WPEFRAMEWORK_LOCATIONSYNC_URI="http://jsonip.metrological.com/?maf=true"
74+
BR2_PACKAGE_WPEFRAMEWORK_MONITOR=y
75+
BR2_PACKAGE_WPEFRAMEWORK_REMOTECONTROL=y
76+
BR2_PACKAGE_WPEFRAMEWORK_REMOTECONTROL_DEVINPUT=y
77+
BR2_PACKAGE_WPEFRAMEWORK_SNAPSHOT=n
78+
BR2_PACKAGE_WPEFRAMEWORK_PLAYERINFO=n
79+
BR2_PACKAGE_WPEFRAMEWORK_DISPLAYINFO=n
80+
BR2_PACKAGE_WPEFRAMEWORK_TIMESYNC=y
81+
BR2_PACKAGE_WPEFRAMEWORK_TRACECONTROL=y
82+
BR2_PACKAGE_WPEFRAMEWORK_WEBSERVER=y
83+
BR2_PACKAGE_WPEFRAMEWORK_WIFICONTROL=y
84+
85+
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER=y
86+
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_STARTURL="file:///www/index.html"
87+
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_MEMORYPRESSURE="databaseprocess:50m,networkprocess:80m,webprocess:250m,rpcprocess:80m"
88+
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_DISKCACHE="512m"
89+
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_XHRCACHE=y
90+
BR2_PACKAGE_WPEFRAMEWORK_YOUTUBE=y
91+
BR2_PACKAGE_WPEFRAMEWORK_UX=y
92+
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_THREADEDPAINTING="2"
93+
94+
BR2_PACKAGE_GSTREAMER1=y
95+
BR2_PACKAGE_GST1_PLUGINS_BASE=y
96+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP=y
97+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO=y
98+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK=y
99+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT=y
100+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE=y
101+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT=y
102+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE=y
103+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA=y
104+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OPUS=y
105+
BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL=y
106+
BR2_PACKAGE_GST1_PLUGINS_GOOD=y
107+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT=y
108+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ICYDEMUX=y
109+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ID3DEMUX=y
110+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA=y
111+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MPG123=y
112+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS=y
113+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
114+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
115+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC=y
116+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_INTERLEAVE=y
117+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE=y
118+
BR2_PACKAGE_GST1_PLUGINS_BAD=y
119+
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX=y
120+
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y
121+
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FAAD=y
122+
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC=y
123+
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS=y
124+
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DASH=y
125+
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS=y
126+
127+
BR2_PACKAGE_RDKSPLASHSCREEN=y
128+
BR2_PACKAGE_RDKSPLASHSCREEN_OPERATOR="metrological"

configs/raspberrypi4_64_wpe_ml_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4-64/post-image.sh"
1212
BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay --aarch64 --add-vc4-fkms-v3d-overlay"
1313
BR2_LINUX_KERNEL=y
1414
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
15-
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz"
15+
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,5188f0cf6c768cc791b3283ab6a72cc02b4a2f99)/linux-5188f0cf6c768cc791b3283ab6a72cc02b4a2f99.tar.gz"
1616
BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
1717
BR2_LINUX_KERNEL_DTS_SUPPORT=y
1818
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b"

0 commit comments

Comments
 (0)