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

Commit 2865fa7

Browse files
committed
3.6 release
1 parent 07b189f commit 2865fa7

13 files changed

+181
-1380
lines changed

BUILDME.sh

+2-2
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-5.4.y
127+
update_github_kernel_version raspberrypi/linux rpi-5.10.y
128128
fi
129129

130130
# Option to build just recovery without completely rebuilding both kernels
@@ -191,7 +191,7 @@ echo "NOOBS Version: $(sed -n 's|.*VERSION_NUMBER.*\"\(.*\)\"|v\1|p' ../recovery
191191
echo "NOOBS Git HEAD @ $(git rev-parse --verify HEAD)" >> "$BUILD_INFO"
192192
echo "rpi-userland Git master @ $(get_package_version rpi-userland)" >> "$BUILD_INFO"
193193
echo "rpi-firmware Git master @ $(get_package_version rpi-firmware)" >> "$BUILD_INFO"
194-
echo "rpi-linux Git rpi-5.4.y @ $(get_kernel_version)" >> "$BUILD_INFO"
194+
echo "rpi-linux Git rpi-5.10.y @ $(get_kernel_version)" >> "$BUILD_INFO"
195195

196196
cd ..
197197

buildroot/.config

+8-8
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-00125-g50a736e Configuration
3+
# Buildroot 2015.02-git-00128-ge56129a Configuration
44
#
55
BR2_HAVE_DOT_CONFIG=y
66

@@ -196,15 +196,14 @@ BR2_GCC_NEEDS_MPC=y
196196
BR2_GCC_SUPPORTS_GRAPHITE=y
197197
# BR2_GCC_VERSION_4_5_X is not set
198198
# BR2_GCC_VERSION_4_7_X is not set
199-
BR2_GCC_VERSION_4_8_X=y
200-
# BR2_GCC_VERSION_4_9_X is not set
199+
# BR2_GCC_VERSION_4_8_X is not set
200+
BR2_GCC_VERSION_4_9_X=y
201201
BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
202-
BR2_GCC_VERSION="4.8.4"
202+
BR2_GCC_VERSION="4.9.2"
203203
BR2_EXTRA_GCC_CONFIG_OPTIONS=""
204204
BR2_TOOLCHAIN_BUILDROOT_CXX=y
205205
BR2_GCC_ENABLE_TLS=y
206206
# BR2_GCC_ENABLE_OPENMP is not set
207-
# BR2_GCC_ENABLE_LIBMUDFLAP is not set
208207
# BR2_GCC_ENABLE_GRAPHITE is not set
209208
# BR2_PACKAGE_HOST_GDB is not set
210209
BR2_LARGEFILE=y
@@ -307,9 +306,9 @@ BR2_LINUX_KERNEL_CUSTOM_GIT=y
307306
# BR2_LINUX_KERNEL_CUSTOM_HG is not set
308307
# BR2_LINUX_KERNEL_CUSTOM_LOCAL is not set
309308
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/raspberrypi/linux.git"
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"
309+
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="623ca2ba45d86eb1b0323637330295c3f8d93c76"
310+
BR2_LINUX_KERNEL_VERSION="623ca2ba45d86eb1b0323637330295c3f8d93c76"
311+
BR2_LINUX_KERNEL_PATCH="disable_board.patch"
313312
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
314313
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
315314
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="kernelconfig-recovery.armv6"
@@ -323,6 +322,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
323322
BR2_LINUX_KERNEL_USE_INTREE_DTS=y
324323
# BR2_LINUX_KERNEL_USE_CUSTOM_DTS is not set
325324
# BR2_LINUX_KERNEL_INSTALL_TARGET is not set
325+
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
326326

327327
#
328328
# Linux Kernel Extensions

buildroot/cpu_nodes.patch

-28
This file was deleted.

buildroot/kernelconfig-recovery.armv6

+1-4
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,13 @@ CONFIG_ARCH_BCM2835=y
2121
# CONFIG_CACHE_L2X0 is not set
2222
CONFIG_UACCESS_WITH_MEMCPY=y
2323
# CONFIG_ATAGS is not set
24-
CONFIG_ZBOOT_ROM_TEXT=0x0
25-
CONFIG_ZBOOT_ROM_BSS=0x0
2624
CONFIG_CPU_FREQ=y
2725
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
2826
CONFIG_CPU_FREQ_GOV_USERSPACE=y
2927
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
3028
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
3129
CONFIG_CPUFREQ_DT=y
3230
CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
33-
# CONFIG_ARM_BCM2835_CPUFREQ is not set
3431
CONFIG_CPU_IDLE=y
3532
CONFIG_VFP=y
3633
# CONFIG_SUSPEND is not set
@@ -188,6 +185,6 @@ CONFIG_NLS_UTF8=y
188185
CONFIG_DMA_CMA=y
189186
CONFIG_CMA_SIZE_MBYTES=5
190187
CONFIG_PRINTK_TIME=y
191-
CONFIG_MAGIC_SYSRQ=y
192188
# CONFIG_DEBUG_BUGVERBOSE is not set
189+
CONFIG_MAGIC_SYSRQ=y
193190
# CONFIG_FTRACE is not set

buildroot/kernelconfig-recovery.armv7

+1-4
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,13 @@ CONFIG_VMSPLIT_2G=y
2222
CONFIG_HOTPLUG_CPU=y
2323
CONFIG_UACCESS_WITH_MEMCPY=y
2424
# CONFIG_ATAGS is not set
25-
CONFIG_ZBOOT_ROM_TEXT=0x0
26-
CONFIG_ZBOOT_ROM_BSS=0x0
2725
CONFIG_CPU_FREQ=y
2826
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
2927
CONFIG_CPU_FREQ_GOV_USERSPACE=y
3028
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
3129
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
3230
CONFIG_CPUFREQ_DT=y
3331
CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
34-
# CONFIG_ARM_BCM2835_CPUFREQ is not set
3532
CONFIG_CPU_IDLE=y
3633
CONFIG_VFP=y
3734
# CONFIG_SUSPEND is not set
@@ -190,7 +187,7 @@ CONFIG_NLS_UTF8=y
190187
CONFIG_DMA_CMA=y
191188
CONFIG_CMA_SIZE_MBYTES=5
192189
CONFIG_PRINTK_TIME=y
193-
CONFIG_MAGIC_SYSRQ=y
194190
# CONFIG_DEBUG_BUGVERBOSE is not set
191+
CONFIG_MAGIC_SYSRQ=y
195192
# CONFIG_RCU_TRACE is not set
196193
# CONFIG_FTRACE is not set

buildroot/kernelconfig-recovery.armv7l

+2-5
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,13 @@ CONFIG_HOTPLUG_CPU=y
2323
CONFIG_HIGHMEM=y
2424
CONFIG_UACCESS_WITH_MEMCPY=y
2525
# CONFIG_ATAGS is not set
26-
CONFIG_ZBOOT_ROM_TEXT=0x0
27-
CONFIG_ZBOOT_ROM_BSS=0x0
2826
CONFIG_CPU_FREQ=y
2927
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
3028
CONFIG_CPU_FREQ_GOV_USERSPACE=y
3129
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
3230
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
3331
CONFIG_CPUFREQ_DT=y
3432
CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
35-
# CONFIG_ARM_BCM2835_CPUFREQ is not set
3633
CONFIG_CPU_IDLE=y
3734
CONFIG_VFP=y
3835
# CONFIG_SUSPEND is not set
@@ -95,7 +92,7 @@ CONFIG_BCMGENET=y
9592
# CONFIG_NET_VENDOR_SYNOPSYS is not set
9693
# CONFIG_NET_VENDOR_VIA is not set
9794
# CONFIG_NET_VENDOR_WIZNET is not set
98-
CONFIG_BROADCOM_PHY=y
95+
CONFIG_MICREL_PHY=y
9996
CONFIG_USB_RTL8152=y
10097
CONFIG_USB_LAN78XX=y
10198
CONFIG_USB_USBNET=y
@@ -235,7 +232,7 @@ CONFIG_NLS_UTF8=y
235232
CONFIG_DMA_CMA=y
236233
CONFIG_CMA_SIZE_MBYTES=5
237234
CONFIG_PRINTK_TIME=y
238-
CONFIG_MAGIC_SYSRQ=y
239235
# CONFIG_DEBUG_BUGVERBOSE is not set
236+
CONFIG_MAGIC_SYSRQ=y
240237
# CONFIG_RCU_TRACE is not set
241238
# CONFIG_FTRACE is not set

0 commit comments

Comments
 (0)