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

Commit 541f47e

Browse files
XECDesignXECDesign
committed
Change NOOBS version to 2.0
Bump firmware and kernel versions Copy *.dtbo instead of *.dtb files Enable CONFIG_DMA_BCM2835 Run kernel config through savedefconfig
1 parent 44cda0c commit 541f47e

File tree

5 files changed

+19
-27
lines changed

5 files changed

+19
-27
lines changed

‎buildroot/.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,8 @@ 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="20fe468af4bb40fec0f81753da4b20a8bfc259c9"
311-
BR2_LINUX_KERNEL_VERSION="20fe468af4bb40fec0f81753da4b20a8bfc259c9"
310+
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="2d31cd571e6f2ac61a3eda273d973058e1bb1f58"
311+
BR2_LINUX_KERNEL_VERSION="2d31cd571e6f2ac61a3eda273d973058e1bb1f58"
312312
BR2_LINUX_KERNEL_PATCH=""
313313
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
314314
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y

‎buildroot/kernelconfig-recovery.armv6‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# CONFIG_ARM_PATCH_PHYS_VIRT is not set
22
CONFIG_PHYS_OFFSET=0
33
CONFIG_LOCALVERSION="-rescue"
4-
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
54
# CONFIG_LOCALVERSION_AUTO is not set
65
# CONFIG_SWAP is not set
76
CONFIG_SYSVIPC=y
@@ -11,13 +10,11 @@ CONFIG_HIGH_RES_TIMERS=y
1110
CONFIG_IKCONFIG=y
1211
CONFIG_IKCONFIG_PROC=y
1312
CONFIG_BLK_DEV_INITRD=y
14-
CONFIG_RD_LZO=y
1513
CONFIG_EMBEDDED=y
1614
# CONFIG_SLUB_DEBUG is not set
1715
# CONFIG_COMPAT_BRK is not set
1816
# CONFIG_BLK_DEV_BSG is not set
1917
CONFIG_ARCH_BCM2708=y
20-
CONFIG_BCM2708_DT=y
2118
CONFIG_PREEMPT=y
2219
CONFIG_AEABI=y
2320
CONFIG_CMA=y
@@ -46,6 +43,7 @@ CONFIG_SYN_COOKIES=y
4643
CONFIG_CFG80211=y
4744
CONFIG_DEVTMPFS=y
4845
CONFIG_DEVTMPFS_MOUNT=y
46+
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
4947
CONFIG_DMA_CMA=y
5048
CONFIG_CMA_SIZE_MBYTES=5
5149
CONFIG_BLK_DEV_LOOP=y
@@ -62,7 +60,6 @@ CONFIG_USB_NET_SMSC95XX=y
6260
# CONFIG_USB_NET_CDC_SUBSET is not set
6361
# CONFIG_USB_NET_ZAURUS is not set
6462
CONFIG_BRCMFMAC=y
65-
CONFIG_BRCMFMAC_SDIO=y
6663
CONFIG_BRCMFMAC_USB=y
6764
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
6865
CONFIG_INPUT_EVDEV=y
@@ -71,14 +68,14 @@ CONFIG_INPUT_EVDEV=y
7168
CONFIG_INPUT_TOUCHSCREEN=y
7269
CONFIG_TOUCHSCREEN_RPI_FT5406=y
7370
# CONFIG_SERIO is not set
71+
CONFIG_BRCM_CHAR_DRIVERS=y
72+
CONFIG_BCM_VC_CMA=y
7473
# CONFIG_LEGACY_PTYS is not set
7574
# CONFIG_DEVKMEM is not set
7675
CONFIG_SERIAL_AMBA_PL011=y
7776
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
7877
# CONFIG_HW_RANDOM is not set
7978
CONFIG_RAW_DRIVER=y
80-
CONFIG_BRCM_CHAR_DRIVERS=y
81-
CONFIG_BCM_VC_CMA=y
8279
CONFIG_GPIO_SYSFS=y
8380
# CONFIG_HWMON is not set
8481
CONFIG_THERMAL=y
@@ -105,11 +102,11 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
105102
CONFIG_USB_DWCOTG=y
106103
CONFIG_MMC=y
107104
CONFIG_MMC_BLOCK_MINORS=32
108-
CONFIG_MMC_SDHCI=y
109-
CONFIG_MMC_SDHCI_PLTFM=y
110105
CONFIG_MMC_BCM2835=y
111106
CONFIG_MMC_BCM2835_DMA=y
112107
CONFIG_MMC_BCM2835_SDHOST=y
108+
CONFIG_MMC_SDHCI=y
109+
CONFIG_MMC_SDHCI_PLTFM=y
113110
CONFIG_NEW_LEDS=y
114111
CONFIG_LEDS_CLASS=y
115112
CONFIG_LEDS_GPIO=y
@@ -123,6 +120,7 @@ CONFIG_LEDS_TRIGGER_GPIO=y
123120
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
124121
CONFIG_LEDS_TRIGGER_INPUT=y
125122
CONFIG_DMADEVICES=y
123+
CONFIG_DMA_BCM2835=y
126124
CONFIG_DMA_BCM2708=y
127125
CONFIG_MAILBOX=y
128126
CONFIG_BCM2835_MBOX=y
@@ -131,15 +129,14 @@ CONFIG_RASPBERRYPI_FIRMWARE=y
131129
CONFIG_EXT4_FS=y
132130
CONFIG_FANOTIFY=y
133131
CONFIG_FUSE_FS=y
134-
CONFIG_UDF_FS=y
135132
CONFIG_FSCACHE=y
136133
CONFIG_CACHEFILES=y
134+
CONFIG_UDF_FS=y
137135
CONFIG_MSDOS_FS=y
138136
CONFIG_VFAT_FS=y
139137
CONFIG_TMPFS=y
140138
CONFIG_TMPFS_POSIX_ACL=y
141139
CONFIG_CONFIGFS_FS=y
142-
CONFIG_MISC_FILESYSTEMS=y
143140
CONFIG_SQUASHFS=y
144141
CONFIG_SQUASHFS_LZO=y
145142
# CONFIG_NETWORK_FILESYSTEMS is not set
@@ -166,5 +163,4 @@ CONFIG_MAGIC_SYSRQ=y
166163
# CONFIG_DEBUG_BUGVERBOSE is not set
167164
# CONFIG_FTRACE is not set
168165
# CONFIG_ARM_UNWIND is not set
169-
# CONFIG_CRYPTO_ANSI_CPRNG is not set
170166
# CONFIG_CRYPTO_HW is not set

‎buildroot/kernelconfig-recovery.armv7‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
CONFIG_LOCALVERSION="-rescue-v7"
2-
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
32
# CONFIG_LOCALVERSION_AUTO is not set
43
# CONFIG_SWAP is not set
54
CONFIG_SYSVIPC=y
@@ -9,14 +8,12 @@ CONFIG_HIGH_RES_TIMERS=y
98
CONFIG_IKCONFIG=y
109
CONFIG_IKCONFIG_PROC=y
1110
CONFIG_BLK_DEV_INITRD=y
12-
CONFIG_RD_LZO=y
1311
CONFIG_EMBEDDED=y
1412
# CONFIG_SLUB_DEBUG is not set
1513
# CONFIG_COMPAT_BRK is not set
1614
# CONFIG_BLK_DEV_BSG is not set
1715
CONFIG_ARCH_BCM2709=y
1816
# CONFIG_ARM_THUMB is not set
19-
CONFIG_BCM2709_DT=y
2017
# CONFIG_CACHE_L2X0 is not set
2118
CONFIG_SMP=y
2219
CONFIG_HAVE_ARM_ARCH_TIMER=y
@@ -51,6 +48,7 @@ CONFIG_SYN_COOKIES=y
5148
CONFIG_CFG80211=y
5249
CONFIG_DEVTMPFS=y
5350
CONFIG_DEVTMPFS_MOUNT=y
51+
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
5452
CONFIG_DMA_CMA=y
5553
CONFIG_CMA_SIZE_MBYTES=5
5654
CONFIG_BLK_DEV_LOOP=y
@@ -67,7 +65,6 @@ CONFIG_USB_NET_SMSC95XX=y
6765
# CONFIG_USB_NET_CDC_SUBSET is not set
6866
# CONFIG_USB_NET_ZAURUS is not set
6967
CONFIG_BRCMFMAC=y
70-
CONFIG_BRCMFMAC_SDIO=y
7168
CONFIG_BRCMFMAC_USB=y
7269
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
7370
CONFIG_INPUT_EVDEV=y
@@ -76,14 +73,14 @@ CONFIG_INPUT_EVDEV=y
7673
CONFIG_INPUT_TOUCHSCREEN=y
7774
CONFIG_TOUCHSCREEN_RPI_FT5406=y
7875
# CONFIG_SERIO is not set
76+
CONFIG_BRCM_CHAR_DRIVERS=y
77+
CONFIG_BCM_VC_CMA=y
7978
# CONFIG_LEGACY_PTYS is not set
8079
# CONFIG_DEVKMEM is not set
8180
CONFIG_SERIAL_AMBA_PL011=y
8281
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
8382
# CONFIG_HW_RANDOM is not set
8483
CONFIG_RAW_DRIVER=y
85-
CONFIG_BRCM_CHAR_DRIVERS=y
86-
CONFIG_BCM_VC_CMA=y
8784
CONFIG_GPIO_SYSFS=y
8885
# CONFIG_HWMON is not set
8986
CONFIG_THERMAL=y
@@ -110,11 +107,11 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
110107
CONFIG_USB_DWCOTG=y
111108
CONFIG_MMC=y
112109
CONFIG_MMC_BLOCK_MINORS=32
113-
CONFIG_MMC_SDHCI=y
114-
CONFIG_MMC_SDHCI_PLTFM=y
115110
CONFIG_MMC_BCM2835=y
116111
CONFIG_MMC_BCM2835_DMA=y
117112
CONFIG_MMC_BCM2835_SDHOST=y
113+
CONFIG_MMC_SDHCI=y
114+
CONFIG_MMC_SDHCI_PLTFM=y
118115
CONFIG_NEW_LEDS=y
119116
CONFIG_LEDS_CLASS=y
120117
CONFIG_LEDS_GPIO=y
@@ -128,6 +125,7 @@ CONFIG_LEDS_TRIGGER_GPIO=y
128125
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
129126
CONFIG_LEDS_TRIGGER_INPUT=y
130127
CONFIG_DMADEVICES=y
128+
CONFIG_DMA_BCM2835=y
131129
CONFIG_DMA_BCM2708=y
132130
CONFIG_MAILBOX=y
133131
CONFIG_BCM2835_MBOX=y
@@ -136,15 +134,14 @@ CONFIG_RASPBERRYPI_FIRMWARE=y
136134
CONFIG_EXT4_FS=y
137135
CONFIG_FANOTIFY=y
138136
CONFIG_FUSE_FS=y
139-
CONFIG_UDF_FS=y
140137
CONFIG_FSCACHE=y
141138
CONFIG_CACHEFILES=y
139+
CONFIG_UDF_FS=y
142140
CONFIG_MSDOS_FS=y
143141
CONFIG_VFAT_FS=y
144142
CONFIG_TMPFS=y
145143
CONFIG_TMPFS_POSIX_ACL=y
146144
CONFIG_CONFIGFS_FS=y
147-
CONFIG_MISC_FILESYSTEMS=y
148145
CONFIG_SQUASHFS=y
149146
CONFIG_SQUASHFS_LZO=y
150147
# CONFIG_NETWORK_FILESYSTEMS is not set
@@ -171,5 +168,4 @@ CONFIG_MAGIC_SYSRQ=y
171168
# CONFIG_DEBUG_BUGVERBOSE is not set
172169
# CONFIG_FTRACE is not set
173170
# CONFIG_ARM_UNWIND is not set
174-
# CONFIG_CRYPTO_ANSI_CPRNG is not set
175171
# CONFIG_CRYPTO_HW is not set

‎buildroot/package/rpi-firmware/rpi-firmware.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
RPI_FIRMWARE_VERSION = 951799bbcd795ddf27769d14acf4813fdcbe53dc
7+
RPI_FIRMWARE_VERSION = ec63df146f454e8cab7080380f9138246d877013
88
RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
99
RPI_FIRMWARE_LICENSE = BSD-3c
1010
RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
@@ -24,7 +24,7 @@ endif
2424

2525
ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS),y)
2626
define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS
27-
for ovldtb in $(@D)/boot/overlays/*.dtb; do \
27+
for ovldtb in $(@D)/boot/overlays/*.dtbo; do \
2828
$(INSTALL) -D -m 0644 $${ovldtb} $(BINARIES_DIR)/rpi-firmware/overlays/$${ovldtb##*/} || exit 1; \
2929
done
3030
endef

‎recovery/config.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define CONFIG_H
33

44
/* Version number displayed in the title bar */
5-
#define VERSION_NUMBER "1.9"
5+
#define VERSION_NUMBER "2.0"
66

77
/* Color of the background */
88
// #define BACKGROUND_COLOR Qt::white

0 commit comments

Comments
 (0)