Skip to content

Commit 6730416

Browse files
committed
Merge branch 'main' into R3
2 parents 9683221 + 5c2df13 commit 6730416

Some content is hidden

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

60 files changed

+3209
-3013
lines changed

board/raspberrypi/post-build.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@
33
set -u
44
set -e
55

6-
# Add a console on tty1
7-
if [ -e ${TARGET_DIR}/etc/inittab ]; then
8-
grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \
9-
sed -i '/GENERIC_SERIAL/a\
10-
tty1::respawn:/sbin/getty -L tty1 0 vt100 # HDMI console' ${TARGET_DIR}/etc/inittab
11-
fi
12-
136
if grep -q "^BR2_TARGET_ROOTFS_INITRAMFS=y$" "${BR2_CONFIG}"; then
147

158
mkdir -p "${TARGET_DIR}/boot"

board/raspberrypi/post-image.sh

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,6 @@ __EOF__
1919
fi
2020
fi
2121

22-
if [ ! "x${BLUETOOTH}" = "x" ]; then
23-
if ! grep -qE '^enable_uart=1' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
24-
echo "Adding serial console to /dev/ttyS0 to config.txt."
25-
sed -i 's/ttyAMA0/ttyS0/g' "${BINARIES_DIR}/rpi-firmware/cmdline.txt"
26-
cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
27-
# Fixes rpi3 ttyS0 serial console
28-
enable_uart=1
29-
__EOF__
30-
fi
31-
fi
32-
3322
for arg in "$@"
3423
do
3524
case "${arg}" in
@@ -88,14 +77,13 @@ __EOF__
8877
cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
8978
9079
# Overclock
91-
force_turbo=1
9280
[pi0]
9381
[pi0w]
9482
[pi1]
9583
[pi2]
9684
arm_freq=1000
97-
gpu_freq=500
98-
sdram_freq=500
85+
core_freq=400
86+
sdram_freq=450
9987
over_voltage=6
10088
[pi3]
10189
arm_freq=1350
Lines changed: 312 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,312 @@
1+
# CONFIG_LOCALVERSION_AUTO is not set
2+
CONFIG_SYSVIPC=y
3+
CONFIG_POSIX_MQUEUE=y
4+
CONFIG_NO_HZ=y
5+
CONFIG_HIGH_RES_TIMERS=y
6+
CONFIG_PREEMPT_VOLUNTARY=y
7+
CONFIG_BLK_DEV_INITRD=y
8+
# CONFIG_RD_BZIP2 is not set
9+
# CONFIG_RD_LZMA is not set
10+
# CONFIG_RD_XZ is not set
11+
# CONFIG_RD_LZO is not set
12+
# CONFIG_RD_LZ4 is not set
13+
# CONFIG_PRINTK is not set
14+
# CONFIG_BUG is not set
15+
# CONFIG_KALLSYMS is not set
16+
CONFIG_EMBEDDED=y
17+
# CONFIG_COMPAT_BRK is not set
18+
CONFIG_ARCH_MULTI_V6=y
19+
# CONFIG_ARCH_MULTI_V7 is not set
20+
CONFIG_ARCH_BCM=y
21+
CONFIG_ARCH_BCM2835=y
22+
# CONFIG_CACHE_L2X0 is not set
23+
CONFIG_UACCESS_WITH_MEMCPY=y
24+
# CONFIG_ATAGS is not set
25+
CONFIG_CPU_FREQ=y
26+
CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y
27+
CONFIG_VFP=y
28+
# CONFIG_SUSPEND is not set
29+
CONFIG_PM=y
30+
CONFIG_RASPBERRYPI_FIRMWARE=y
31+
CONFIG_ARM_CRYPTO=y
32+
CONFIG_CRYPTO_SHA1_ARM=y
33+
CONFIG_CRYPTO_SHA512_ARM=y
34+
CONFIG_CRYPTO_AES_ARM=y
35+
CONFIG_JUMP_LABEL=y
36+
CONFIG_MODULES=y
37+
CONFIG_MODULE_UNLOAD=y
38+
# CONFIG_BLK_DEV_BSG is not set
39+
CONFIG_CMA=y
40+
CONFIG_NET=y
41+
CONFIG_PACKET=y
42+
CONFIG_UNIX=y
43+
CONFIG_INET=y
44+
CONFIG_IP_MULTICAST=y
45+
CONFIG_IP_PNP=y
46+
CONFIG_IP_PNP_DHCP=y
47+
CONFIG_IP_PNP_BOOTP=y
48+
CONFIG_IP_PNP_RARP=y
49+
CONFIG_NET_IPIP=y
50+
CONFIG_SYN_COOKIES=y
51+
CONFIG_IPV6_MULTIPLE_TABLES=y
52+
CONFIG_NETFILTER=y
53+
CONFIG_IP_NF_IPTABLES=y
54+
CONFIG_IP_NF_FILTER=y
55+
CONFIG_VLAN_8021Q=y
56+
CONFIG_BPF_JIT=y
57+
CONFIG_BT=y
58+
CONFIG_BT_HCIUART=y
59+
CONFIG_CFG80211=y
60+
CONFIG_DEVTMPFS=y
61+
CONFIG_DEVTMPFS_MOUNT=y
62+
# CONFIG_ALLOW_DEV_COREDUMP is not set
63+
CONFIG_CONNECTOR=y
64+
CONFIG_OF_OVERLAY=y
65+
# CONFIG_BLK_DEV is not set
66+
CONFIG_BCM2835_SMI=y
67+
CONFIG_NETDEVICES=y
68+
# CONFIG_ETHERNET is not set
69+
CONFIG_USB_USBNET=y
70+
# CONFIG_USB_NET_CDCETHER is not set
71+
# CONFIG_USB_NET_CDC_NCM is not set
72+
CONFIG_USB_NET_SMSC95XX=y
73+
# CONFIG_USB_NET_NET1080 is not set
74+
# CONFIG_USB_NET_CDC_SUBSET is not set
75+
# CONFIG_USB_NET_ZAURUS is not set
76+
# CONFIG_WLAN is not set
77+
CONFIG_INPUT_EVDEV=y
78+
# CONFIG_INPUT_KEYBOARD is not set
79+
# CONFIG_INPUT_MOUSE is not set
80+
CONFIG_INPUT_JOYSTICK=y
81+
CONFIG_INPUT_TOUCHSCREEN=y
82+
CONFIG_INPUT_MISC=y
83+
CONFIG_INPUT_UINPUT=y
84+
# CONFIG_SERIO is not set
85+
CONFIG_BRCM_CHAR_DRIVERS=y
86+
CONFIG_BCM_VCIO=y
87+
CONFIG_BCM2835_DEVGPIOMEM=y
88+
CONFIG_BCM2835_SMI_DEV=y
89+
CONFIG_RPIVID_MEM=y
90+
# CONFIG_LEGACY_PTYS is not set
91+
CONFIG_SERIAL_AMBA_PL011=y
92+
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
93+
CONFIG_HW_RANDOM=y
94+
CONFIG_RAW_DRIVER=y
95+
CONFIG_I2C=y
96+
# CONFIG_I2C_COMPAT is not set
97+
CONFIG_I2C_CHARDEV=y
98+
CONFIG_I2C_BCM2835=y
99+
# CONFIG_I2C_BRCMSTB is not set
100+
CONFIG_SPI=y
101+
CONFIG_SPI_BCM2835=y
102+
CONFIG_SPI_PL022=y
103+
CONFIG_SPI_SPIDEV=y
104+
CONFIG_GPIO_SYSFS=y
105+
CONFIG_W1=y
106+
CONFIG_W1_MASTER_GPIO=y
107+
# CONFIG_HWMON is not set
108+
CONFIG_WATCHDOG=y
109+
CONFIG_BCM2835_WDT=y
110+
CONFIG_MEDIA_SUPPORT=y
111+
CONFIG_V4L_PLATFORM_DRIVERS=y
112+
# CONFIG_MEDIA_TUNER_TDA18250 is not set
113+
# CONFIG_MEDIA_TUNER_TDA8290 is not set
114+
# CONFIG_MEDIA_TUNER_TDA827X is not set
115+
# CONFIG_MEDIA_TUNER_TDA18271 is not set
116+
CONFIG_MEDIA_TUNER_TDA9887=y
117+
# CONFIG_MEDIA_TUNER_TEA5761 is not set
118+
# CONFIG_MEDIA_TUNER_TEA5767 is not set
119+
# CONFIG_MEDIA_TUNER_MSI001 is not set
120+
# CONFIG_MEDIA_TUNER_MT20XX is not set
121+
# CONFIG_MEDIA_TUNER_MT2060 is not set
122+
# CONFIG_MEDIA_TUNER_MT2063 is not set
123+
# CONFIG_MEDIA_TUNER_MT2266 is not set
124+
# CONFIG_MEDIA_TUNER_MT2131 is not set
125+
# CONFIG_MEDIA_TUNER_QT1010 is not set
126+
# CONFIG_MEDIA_TUNER_XC2028 is not set
127+
# CONFIG_MEDIA_TUNER_XC5000 is not set
128+
# CONFIG_MEDIA_TUNER_XC4000 is not set
129+
# CONFIG_MEDIA_TUNER_MXL5005S is not set
130+
# CONFIG_MEDIA_TUNER_MXL5007T is not set
131+
# CONFIG_MEDIA_TUNER_MC44S803 is not set
132+
# CONFIG_MEDIA_TUNER_MAX2165 is not set
133+
# CONFIG_MEDIA_TUNER_TDA18218 is not set
134+
# CONFIG_MEDIA_TUNER_FC0011 is not set
135+
# CONFIG_MEDIA_TUNER_FC0012 is not set
136+
# CONFIG_MEDIA_TUNER_FC0013 is not set
137+
# CONFIG_MEDIA_TUNER_TDA18212 is not set
138+
# CONFIG_MEDIA_TUNER_E4000 is not set
139+
# CONFIG_MEDIA_TUNER_FC2580 is not set
140+
# CONFIG_MEDIA_TUNER_M88RS6000T is not set
141+
# CONFIG_MEDIA_TUNER_TUA9001 is not set
142+
# CONFIG_MEDIA_TUNER_SI2157 is not set
143+
# CONFIG_MEDIA_TUNER_IT913X is not set
144+
# CONFIG_MEDIA_TUNER_R820T is not set
145+
# CONFIG_MEDIA_TUNER_MXL301RF is not set
146+
# CONFIG_MEDIA_TUNER_QM1D1C0042 is not set
147+
# CONFIG_MEDIA_TUNER_QM1D1B0004 is not set
148+
# CONFIG_DVB_STB0899 is not set
149+
# CONFIG_DVB_STB6100 is not set
150+
# CONFIG_DVB_STV090x is not set
151+
# CONFIG_DVB_STV0910 is not set
152+
# CONFIG_DVB_STV6110x is not set
153+
# CONFIG_DVB_STV6111 is not set
154+
# CONFIG_DVB_MXL5XX is not set
155+
# CONFIG_DVB_DRXK is not set
156+
# CONFIG_DVB_TDA18271C2DD is not set
157+
# CONFIG_DVB_SI2165 is not set
158+
# CONFIG_DVB_MN88472 is not set
159+
# CONFIG_DVB_MN88473 is not set
160+
# CONFIG_DVB_CX24110 is not set
161+
# CONFIG_DVB_CX24123 is not set
162+
# CONFIG_DVB_MT312 is not set
163+
# CONFIG_DVB_ZL10036 is not set
164+
# CONFIG_DVB_ZL10039 is not set
165+
# CONFIG_DVB_S5H1420 is not set
166+
# CONFIG_DVB_STV0288 is not set
167+
# CONFIG_DVB_STB6000 is not set
168+
# CONFIG_DVB_STV0299 is not set
169+
# CONFIG_DVB_STV6110 is not set
170+
# CONFIG_DVB_STV0900 is not set
171+
# CONFIG_DVB_TDA8083 is not set
172+
# CONFIG_DVB_TDA10086 is not set
173+
# CONFIG_DVB_TDA8261 is not set
174+
# CONFIG_DVB_VES1X93 is not set
175+
# CONFIG_DVB_TUNER_ITD1000 is not set
176+
# CONFIG_DVB_TUNER_CX24113 is not set
177+
# CONFIG_DVB_TDA826X is not set
178+
# CONFIG_DVB_TUA6100 is not set
179+
# CONFIG_DVB_CX24116 is not set
180+
# CONFIG_DVB_CX24117 is not set
181+
# CONFIG_DVB_CX24120 is not set
182+
# CONFIG_DVB_SI21XX is not set
183+
# CONFIG_DVB_TS2020 is not set
184+
# CONFIG_DVB_DS3000 is not set
185+
# CONFIG_DVB_MB86A16 is not set
186+
# CONFIG_DVB_TDA10071 is not set
187+
# CONFIG_DVB_SP8870 is not set
188+
# CONFIG_DVB_SP887X is not set
189+
# CONFIG_DVB_CX22700 is not set
190+
# CONFIG_DVB_CX22702 is not set
191+
# CONFIG_DVB_S5H1432 is not set
192+
# CONFIG_DVB_DRXD is not set
193+
# CONFIG_DVB_L64781 is not set
194+
# CONFIG_DVB_TDA1004X is not set
195+
# CONFIG_DVB_NXT6000 is not set
196+
# CONFIG_DVB_MT352 is not set
197+
# CONFIG_DVB_ZL10353 is not set
198+
# CONFIG_DVB_DIB3000MB is not set
199+
# CONFIG_DVB_DIB3000MC is not set
200+
# CONFIG_DVB_DIB7000M is not set
201+
# CONFIG_DVB_DIB7000P is not set
202+
# CONFIG_DVB_DIB9000 is not set
203+
# CONFIG_DVB_TDA10048 is not set
204+
# CONFIG_DVB_EC100 is not set
205+
# CONFIG_DVB_STV0367 is not set
206+
# CONFIG_DVB_CXD2820R is not set
207+
# CONFIG_DVB_CXD2841ER is not set
208+
# CONFIG_DVB_ZD1301_DEMOD is not set
209+
# CONFIG_DVB_VES1820 is not set
210+
# CONFIG_DVB_TDA10021 is not set
211+
# CONFIG_DVB_TDA10023 is not set
212+
# CONFIG_DVB_STV0297 is not set
213+
# CONFIG_DVB_NXT200X is not set
214+
# CONFIG_DVB_OR51211 is not set
215+
# CONFIG_DVB_OR51132 is not set
216+
# CONFIG_DVB_BCM3510 is not set
217+
# CONFIG_DVB_LGDT330X is not set
218+
# CONFIG_DVB_LGDT3305 is not set
219+
# CONFIG_DVB_LG2160 is not set
220+
# CONFIG_DVB_S5H1409 is not set
221+
# CONFIG_DVB_AU8522_DTV is not set
222+
# CONFIG_DVB_AU8522_V4L is not set
223+
# CONFIG_DVB_S5H1411 is not set
224+
# CONFIG_DVB_S921 is not set
225+
# CONFIG_DVB_DIB8000 is not set
226+
# CONFIG_DVB_MB86A20S is not set
227+
# CONFIG_DVB_TC90522 is not set
228+
# CONFIG_DVB_MN88443X is not set
229+
# CONFIG_DVB_PLL is not set
230+
# CONFIG_DVB_TUNER_DIB0070 is not set
231+
# CONFIG_DVB_TUNER_DIB0090 is not set
232+
# CONFIG_DVB_DRX39XYJ is not set
233+
# CONFIG_DVB_LNBH25 is not set
234+
# CONFIG_DVB_LNBH29 is not set
235+
# CONFIG_DVB_LNBP21 is not set
236+
# CONFIG_DVB_LNBP22 is not set
237+
# CONFIG_DVB_ISL6405 is not set
238+
# CONFIG_DVB_ISL6421 is not set
239+
# CONFIG_DVB_ISL6423 is not set
240+
# CONFIG_DVB_A8293 is not set
241+
# CONFIG_DVB_LGS8GL5 is not set
242+
# CONFIG_DVB_LGS8GXX is not set
243+
# CONFIG_DVB_ATBM8830 is not set
244+
# CONFIG_DVB_TDA665x is not set
245+
# CONFIG_DVB_IX2505V is not set
246+
# CONFIG_DVB_M88RS2000 is not set
247+
# CONFIG_DVB_AF9033 is not set
248+
# CONFIG_DVB_HORUS3A is not set
249+
# CONFIG_DVB_ASCOT2E is not set
250+
# CONFIG_DVB_HELENE is not set
251+
# CONFIG_DVB_SP2 is not set
252+
CONFIG_FB=y
253+
CONFIG_FB_BCM2708=y
254+
CONFIG_FRAMEBUFFER_CONSOLE=y
255+
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
256+
CONFIG_SOUND=y
257+
CONFIG_SND=y
258+
# CONFIG_SND_SUPPORT_OLD_API is not set
259+
# CONFIG_SND_VERBOSE_PROCFS is not set
260+
# CONFIG_SND_SPI is not set
261+
CONFIG_HID_MULTITOUCH=y
262+
CONFIG_USB=y
263+
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
264+
CONFIG_USB_DYNAMIC_MINORS=y
265+
CONFIG_USB_DWCOTG=y
266+
CONFIG_USB_ACM=y
267+
CONFIG_MMC=y
268+
CONFIG_MMC_BCM2835_SDHOST=y
269+
CONFIG_MMC_SDHCI=y
270+
CONFIG_MMC_SDHCI_PLTFM=y
271+
CONFIG_MMC_BCM2835=y
272+
CONFIG_DMADEVICES=y
273+
CONFIG_DMA_BCM2835=y
274+
CONFIG_DMA_BCM2708=y
275+
# CONFIG_VIRTIO_MENU is not set
276+
# CONFIG_VHOST_MENU is not set
277+
CONFIG_STAGING=y
278+
CONFIG_SND_BCM2835=y
279+
CONFIG_VIDEO_BCM2835=y
280+
CONFIG_MAILBOX=y
281+
CONFIG_BCM2835_MBOX=y
282+
# CONFIG_IOMMU_SUPPORT is not set
283+
CONFIG_RASPBERRYPI_POWER=y
284+
CONFIG_EXT2_FS=y
285+
CONFIG_EXT4_FS=y
286+
# CONFIG_FILE_LOCKING is not set
287+
# CONFIG_DNOTIFY is not set
288+
CONFIG_MSDOS_FS=y
289+
CONFIG_VFAT_FS=y
290+
CONFIG_FAT_DEFAULT_CODEPAGE=850
291+
CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
292+
CONFIG_TMPFS=y
293+
CONFIG_TMPFS_POSIX_ACL=y
294+
# CONFIG_MISC_FILESYSTEMS is not set
295+
# CONFIG_NETWORK_FILESYSTEMS is not set
296+
CONFIG_NLS_DEFAULT="utf8"
297+
CONFIG_NLS_CODEPAGE_437=y
298+
CONFIG_NLS_CODEPAGE_850=y
299+
CONFIG_NLS_ASCII=y
300+
CONFIG_NLS_ISO8859_1=y
301+
CONFIG_NLS_ISO8859_15=y
302+
CONFIG_NLS_UTF8=y
303+
CONFIG_CRYPTO_ECHAINIV=y
304+
CONFIG_CRYPTO_ANSI_CPRNG=y
305+
# CONFIG_CRYPTO_HW is not set
306+
CONFIG_DMA_CMA=y
307+
CONFIG_CMA_SIZE_MBYTES=5
308+
CONFIG_STRIP_ASM_SYMS=y
309+
# CONFIG_DEBUG_MISC is not set
310+
# CONFIG_SCHED_DEBUG is not set
311+
# CONFIG_FTRACE is not set
312+
# CONFIG_RUNTIME_TESTING_MENU is not set

0 commit comments

Comments
 (0)