Skip to content

Commit 1de7dee

Browse files
committed
p3.3 for Rpi4
4.19 armv6 kernel with new driver patches 4.19 arnv7 kernel with new driver patches 4.19 armv7l kernel with new driver patches Using post-release public repos
1 parent 087fba5 commit 1de7dee

26 files changed

+350037
-124905
lines changed

BUILDME.sh

+49-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
#!/bin/bash
22

3+
#pre-pi4 release
4+
#rpi-linux be0a940de66666c10c9071cddafce6284c400734
5+
6+
#Post Pi4 release
7+
#rpi-linux: 71d47f4c4bd7fd395b87c474498187b2f9be8751
8+
#rpi-firmware: 64b5649a41b69d09bfe0ed05448d28a66be3edfd
9+
#rpi-userland: de4a7f2e3c391e2d3bc76af31864270e7802d9ac
10+
311
# Bash script to rebuild recovery
412

513
set -e
@@ -86,15 +94,30 @@ function update_github_kernel_version {
8694
fi
8795
}
8896

89-
9097
function select_kernelconfig {
9198
ARCH=$1
9299
CONFIG_FILE=.config
93100
CONFIG_VAR=BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE
94101
VAR_PREFIX=kernelconfig-recovery
95102
sed -ri "s/(^$CONFIG_VAR=\"$VAR_PREFIX\.).+(\")$/\1$ARCH\2/" "$CONFIG_FILE"
96-
}
97103

104+
if [ "$ARCH" == "armv6" ]; then
105+
REPO="git:\/\/github.com\/raspberrypi\/linux.git";
106+
VERSION="71d47f4c4bd7fd395b87c474498187b2f9be8751";
107+
elif [ "$ARCH" == "armv7" ]; then
108+
REPO="git:\/\/github.com\/raspberrypi\/linux.git";
109+
VERSION="71d47f4c4bd7fd395b87c474498187b2f9be8751";
110+
elif [ "$ARCH" == "armv7l" ]; then
111+
REPO="git:\/\/github.com\/raspberrypi\/linux.git"
112+
VERSION="71d47f4c4bd7fd395b87c474498187b2f9be8751";
113+
fi
114+
CONFIG_VAR=BR2_LINUX_KERNEL_CUSTOM_REPO_URL
115+
sed -ri "s/(^$CONFIG_VAR=\").+(\")$/\1$REPO\2/" "$CONFIG_FILE"
116+
CONFIG_VAR=BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION
117+
sed -ri "s/(^$CONFIG_VAR=\").+(\")$/\1$VERSION\2/" "$CONFIG_FILE"
118+
CONFIG_VAR=BR2_LINUX_KERNEL_VERSION
119+
sed -ri "s/(^$CONFIG_VAR=\").+(\")$/\1$VERSION\2/" "$CONFIG_FILE"
120+
}
98121

99122
cd buildroot
100123

@@ -105,6 +128,7 @@ IMAGES_DIR="output/images"
105128
SKIP_KERNEL_REBUILD=0
106129
SKIP_KERNEL_6=0
107130
SKIP_KERNEL_7=0
131+
SKIP_KERNEL_7L=0
108132
SKIP_RECOVERY_REBUILD=0
109133
UPDATE_TS=0
110134

@@ -119,9 +143,9 @@ for i in $*; do
119143
update_github_package_version rpi-userland raspberrypi/userland master
120144
fi
121145

122-
# Update raspberrypi/linux rpi-4.9.y HEAD version in buildroot/.config to latest
146+
# Update raspberrypi/linux rpi-4.19.y HEAD version in buildroot/.config to latest
123147
if [ $i = "update-kernel" ]; then
124-
update_github_kernel_version raspberrypi/linux rpi-4.14.y
148+
update_github_kernel_version raspberrypi/linux rpi-4.19.y
125149
fi
126150

127151
# Update language TS files
@@ -143,6 +167,11 @@ for i in $*; do
143167
SKIP_KERNEL_7=1
144168
fi
145169

170+
# Option to build just recovery without completely rebuilding both kernels
171+
if [ $i = "skip-kernel-7l" ]; then
172+
SKIP_KERNEL_7L=1
173+
fi
174+
146175
# Option to build just recovery without completely rebuilding both kernels
147176
if [ $i = "skip-recovery-rebuild" ]; then
148177
SKIP_RECOVERY_REBUILD=1
@@ -175,7 +204,10 @@ if [ $SKIP_RECOVERY_REBUILD -ne 1 ]; then
175204
fi
176205
fi
177206

207+
178208
# Let buildroot build everything
209+
#select_kernelconfig armv6 git://github.com/raspberrypi/linux.git be0a940de66666c10c9071cddafce6284c400734 ???
210+
#select_kernelconfig armv7l "[email protected]:raspberrypi\/linux-vc5.git" "vc5-db83d4b7c10d0a4251780d2c7a033c2a1216d47c"
179211
make
180212

181213
# copy any updated translation files
@@ -191,6 +223,16 @@ cp -r ../sdcontent/* "$FINAL_OUTPUT_DIR"
191223

192224
if [ $SKIP_KERNEL_REBUILD -ne 1 ]; then
193225

226+
if [ $SKIP_KERNEL_7L -ne 1 ]; then
227+
# Rebuild kernel for ARMv7L
228+
select_kernelconfig armv7l
229+
make linux-reconfigure
230+
# copy ARMv7L kernel
231+
cp "$IMAGES_DIR/zImage" "$FINAL_OUTPUT_DIR/recovery7l.img"
232+
else
233+
echo "Warning: kernel armv7l in '$NOOBS_OUTPUT_DIR' directory hasn't been updated"
234+
fi
235+
194236
if [ $SKIP_KERNEL_7 -ne 1 ]; then
195237
# Rebuild kernel for ARMv7
196238
select_kernelconfig armv7
@@ -210,6 +252,7 @@ if [ $SKIP_KERNEL_REBUILD -ne 1 ]; then
210252
else
211253
echo "Warning: kernel armv6 in '$NOOBS_OUTPUT_DIR' directory hasn't been updated"
212254
fi
255+
213256
else
214257
echo "Warning: kernels in '$NOOBS_OUTPUT_DIR' directory haven't been updated"
215258
fi
@@ -223,6 +266,7 @@ cp "$IMAGES_DIR/rpi-firmware/start.elf" "$FINAL_OUTPUT_DIR/recovery.elf"
223266
cp "$IMAGES_DIR/rpi-firmware/bootcode.bin" "$FINAL_OUTPUT_DIR"
224267
cp -a $IMAGES_DIR/*.dtb "$IMAGES_DIR/overlays" "$FINAL_OUTPUT_DIR"
225268
cp "$IMAGES_DIR/cmdline.txt" "$FINAL_OUTPUT_DIR/recovery.cmdline"
269+
cp "$IMAGES_DIR/recovery.cmdline.new" "$FINAL_OUTPUT_DIR"
226270
touch "$FINAL_OUTPUT_DIR/RECOVERY_FILES_DO_NOT_EDIT"
227271

228272
#Use the latest PINN firmware
@@ -239,7 +283,7 @@ echo "PINN Version: $(sed -n 's|.*VERSION_NUMBER.*\"\(.*\)\"|v\1|p' ../recovery/
239283
echo "PINN Git HEAD @ $(git rev-parse --verify HEAD)" >> "$BUILD_INFO"
240284
echo "rpi-userland Git master @ $(get_package_version rpi-userland)" >> "$BUILD_INFO"
241285
echo "rpi-firmware Git master @ $(get_package_version rpi-firmware)" >> "$BUILD_INFO"
242-
echo "rpi-linux Git rpi-4.14.y @ $(get_kernel_version)" >> "$BUILD_INFO"
286+
echo "rpi-linux Git rpi-4.19.y @ $(get_kernel_version)" >> "$BUILD_INFO"
243287

244288
cd ..
245289

README.md

+430-355
Large diffs are not rendered by default.

README_PINN.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
The latest version of [PINN](http://downloads.sourceforge.net/projects/pinn/pinn-lite.zip) can be downloaded from [sourceforge](http://www.sourceforge.net/projects/pinn).
77

8-
This README relates to v3.2.4a
8+
This README relates to v3.3
99

1010
<sup>(PINN-lite does not include any operating systems at all. It is more akin to `NOOBS-lite` rather than `NOOBS`. For that reason, the filename that you download is called `pinn-lite.zip`. More recently, `pinn.zip` has also been made available for download which includes versions of Raspbian and LibreELEC.)</sup>
1111

@@ -375,7 +375,8 @@ from v2.1
375375
from 2.4.5f
376376
* rtl8812
377377

378-
NOTE: Realtek wifi drivers (rtl8188eu, rtl8812au, rtl8192cu) are not present in v2.5.1.
378+
NOTE: Realtek wifi drivers (rtl8188eu, rtl8812au, rtl8192cu) are not present in v2.5.1 onwards.
379+
NOTE: Realtek wifi drivers (rtl8188eu, rtl8192cu) are added back in from v3.2.4b
379380

380381
### Enabling SSH for Raspbian
381382

README_SUM.md

+12
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,18 @@ Please note that in some cases it may extract the files into a folder, if this i
4545

4646
## Change History
4747

48+
### V3.3
49+
50+
-**PI4 support** - Added support for the new RPi4. Includes Raspbian Buster in full version.
51+
52+
### V3.2.4c
53+
54+
-**Hyperpixel** - Fixed hyperpixel 4 overlay file
55+
56+
### V3.2.4b
57+
58+
-**Wifi Drivers** - Re-added Realtek rtl8188eu and rtl8192cu modular wifi drivers.
59+
4860
### V3.2.4a
4961

5062
-**Build** - Modified to build on Ubuntu 18.10 'cosmic'

buildroot/.config

+4-4
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-00005-g3cb24e7 Configuration
3+
# Buildroot 2015.02-git-dirty 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="12d78096b1669a08d440f7ebaddf5d925e52fe79"
311-
BR2_LINUX_KERNEL_VERSION="12d78096b1669a08d440f7ebaddf5d925e52fe79"
312-
BR2_LINUX_KERNEL_PATCH="linux-regdb.patch"
310+
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="71d47f4c4bd7fd395b87c474498187b2f9be8751"
311+
BR2_LINUX_KERNEL_VERSION="71d47f4c4bd7fd395b87c474498187b2f9be8751"
312+
BR2_LINUX_KERNEL_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/kernelconfig-recovery.armv6

+10-20
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,22 @@ CONFIG_LOCALVERSION="-rescue"
33
# CONFIG_SWAP is not set
44
CONFIG_SYSVIPC=y
55
CONFIG_POSIX_MQUEUE=y
6-
# CONFIG_FHANDLE is not set
76
CONFIG_NO_HZ=y
87
CONFIG_HIGH_RES_TIMERS=y
8+
CONFIG_PREEMPT_VOLUNTARY=y
99
CONFIG_IKCONFIG=y
1010
CONFIG_IKCONFIG_PROC=y
1111
CONFIG_BLK_DEV_INITRD=y
12+
# CONFIG_FHANDLE is not set
1213
CONFIG_EMBEDDED=y
1314
# CONFIG_SLUB_DEBUG is not set
1415
# CONFIG_COMPAT_BRK is not set
15-
CONFIG_MODULES=y
16-
# CONFIG_BLK_DEV_BSG is not set
1716
CONFIG_ARCH_MULTI_V6=y
1817
# CONFIG_ARCH_MULTI_V7 is not set
1918
CONFIG_ARCH_BCM=y
2019
CONFIG_ARCH_BCM2835=y
2120
# CONFIG_ARM_THUMB is not set
2221
# CONFIG_CACHE_L2X0 is not set
23-
CONFIG_PREEMPT=y
24-
CONFIG_CMA=y
2522
CONFIG_UACCESS_WITH_MEMCPY=y
2623
# CONFIG_ATAGS is not set
2724
CONFIG_ZBOOT_ROM_TEXT=0x0
@@ -33,9 +30,13 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
3330
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
3431
CONFIG_CPU_IDLE=y
3532
CONFIG_VFP=y
36-
# CONFIG_COREDUMP is not set
3733
# CONFIG_SUSPEND is not set
3834
CONFIG_PM=y
35+
CONFIG_RASPBERRYPI_FIRMWARE=y
36+
CONFIG_MODULES=y
37+
# CONFIG_BLK_DEV_BSG is not set
38+
# CONFIG_COREDUMP is not set
39+
CONFIG_CMA=y
3940
CONFIG_NET=y
4041
CONFIG_PACKET=y
4142
CONFIG_UNIX=y
@@ -48,10 +49,10 @@ CONFIG_SYN_COOKIES=y
4849
# CONFIG_INET_DIAG is not set
4950
# CONFIG_IPV6 is not set
5051
CONFIG_CFG80211=y
51-
CONFIG_CFG80211_INTERNAL_REGDB=y
5252
CONFIG_MAC80211=y
5353
CONFIG_DEVTMPFS=y
5454
CONFIG_DEVTMPFS_MOUNT=y
55+
CONFIG_FW_LOADER_USER_HELPER=y
5556
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
5657
CONFIG_DMA_CMA=y
5758
CONFIG_CMA_SIZE_MBYTES=5
@@ -126,15 +127,6 @@ CONFIG_THERMAL=y
126127
CONFIG_BCM2835_THERMAL=y
127128
CONFIG_WATCHDOG=y
128129
CONFIG_BCM2835_WDT=y
129-
# CONFIG_IR_NEC_DECODER is not set
130-
# CONFIG_IR_RC5_DECODER is not set
131-
# CONFIG_IR_RC6_DECODER is not set
132-
# CONFIG_IR_JVC_DECODER is not set
133-
# CONFIG_IR_SONY_DECODER is not set
134-
# CONFIG_IR_SANYO_DECODER is not set
135-
# CONFIG_IR_SHARP_DECODER is not set
136-
# CONFIG_IR_MCE_KBD_DECODER is not set
137-
# CONFIG_IR_XMP_DECODER is not set
138130
CONFIG_FB=y
139131
CONFIG_FB_BCM2708=y
140132
CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -186,7 +178,6 @@ CONFIG_MAILBOX=y
186178
CONFIG_BCM2835_MBOX=y
187179
# CONFIG_IOMMU_SUPPORT is not set
188180
CONFIG_RASPBERRYPI_POWER=y
189-
CONFIG_RASPBERRYPI_FIRMWARE=y
190181
CONFIG_EXT4_FS=y
191182
CONFIG_EXT4_FS_POSIX_ACL=y
192183
CONFIG_EXT4_FS_SECURITY=y
@@ -221,11 +212,10 @@ CONFIG_NLS_ISO8859_13=y
221212
CONFIG_NLS_ISO8859_14=y
222213
CONFIG_NLS_ISO8859_15=y
223214
CONFIG_NLS_UTF8=y
215+
CONFIG_CRYPTO_ECHAINIV=y
216+
# CONFIG_CRYPTO_HW is not set
224217
CONFIG_PRINTK_TIME=y
225218
CONFIG_MAGIC_SYSRQ=y
226-
# CONFIG_DEBUG_PREEMPT is not set
227219
# CONFIG_DEBUG_BUGVERBOSE is not set
228220
# CONFIG_FTRACE is not set
229221
# CONFIG_ARM_UNWIND is not set
230-
CONFIG_CRYPTO_ECHAINIV=y
231-
# CONFIG_CRYPTO_HW is not set

buildroot/kernelconfig-recovery.armv7

+11-21
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,23 @@ CONFIG_LOCALVERSION="-rescue-v7"
33
# CONFIG_SWAP is not set
44
CONFIG_SYSVIPC=y
55
CONFIG_POSIX_MQUEUE=y
6-
# CONFIG_FHANDLE is not set
76
CONFIG_NO_HZ=y
87
CONFIG_HIGH_RES_TIMERS=y
8+
CONFIG_PREEMPT_VOLUNTARY=y
99
CONFIG_IKCONFIG=y
1010
CONFIG_IKCONFIG_PROC=y
1111
CONFIG_BLK_DEV_INITRD=y
12+
# CONFIG_FHANDLE is not set
1213
CONFIG_EMBEDDED=y
1314
# CONFIG_SLUB_DEBUG is not set
1415
# CONFIG_COMPAT_BRK is not set
15-
CONFIG_MODULES=y
16-
# CONFIG_BLK_DEV_BSG is not set
1716
CONFIG_ARCH_BCM=y
1817
CONFIG_ARCH_BCM2835=y
1918
# CONFIG_ARM_THUMB is not set
2019
# CONFIG_CACHE_L2X0 is not set
2120
CONFIG_SMP=y
2221
CONFIG_VMSPLIT_2G=y
2322
CONFIG_HOTPLUG_CPU=y
24-
CONFIG_PREEMPT=y
25-
CONFIG_CMA=y
2623
CONFIG_UACCESS_WITH_MEMCPY=y
2724
# CONFIG_ATAGS is not set
2825
CONFIG_ZBOOT_ROM_TEXT=0x0
@@ -34,9 +31,13 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
3431
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
3532
CONFIG_CPU_IDLE=y
3633
CONFIG_VFP=y
37-
# CONFIG_COREDUMP is not set
3834
# CONFIG_SUSPEND is not set
3935
CONFIG_PM=y
36+
CONFIG_RASPBERRYPI_FIRMWARE=y
37+
CONFIG_MODULES=y
38+
# CONFIG_BLK_DEV_BSG is not set
39+
# CONFIG_COREDUMP is not set
40+
CONFIG_CMA=y
4041
CONFIG_NET=y
4142
CONFIG_PACKET=y
4243
CONFIG_UNIX=y
@@ -49,10 +50,10 @@ CONFIG_SYN_COOKIES=y
4950
# CONFIG_INET_DIAG is not set
5051
# CONFIG_IPV6 is not set
5152
CONFIG_CFG80211=y
52-
CONFIG_CFG80211_INTERNAL_REGDB=y
5353
CONFIG_MAC80211=y
5454
CONFIG_DEVTMPFS=y
5555
CONFIG_DEVTMPFS_MOUNT=y
56+
CONFIG_FW_LOADER_USER_HELPER=y
5657
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
5758
CONFIG_DMA_CMA=y
5859
CONFIG_CMA_SIZE_MBYTES=5
@@ -120,7 +121,6 @@ CONFIG_I2C=y
120121
# CONFIG_I2C_HELPER_AUTO is not set
121122
CONFIG_I2C_GPIO=y
122123
CONFIG_GPIO_SYSFS=y
123-
CONFIG_GPIO_BCM_EXP=y
124124
CONFIG_GPIO_BCM_VIRT=y
125125
CONFIG_POWER_RESET=y
126126
CONFIG_POWER_RESET_GPIO=y
@@ -129,15 +129,6 @@ CONFIG_THERMAL=y
129129
CONFIG_BCM2835_THERMAL=y
130130
CONFIG_WATCHDOG=y
131131
CONFIG_BCM2835_WDT=y
132-
# CONFIG_IR_NEC_DECODER is not set
133-
# CONFIG_IR_RC5_DECODER is not set
134-
# CONFIG_IR_RC6_DECODER is not set
135-
# CONFIG_IR_JVC_DECODER is not set
136-
# CONFIG_IR_SONY_DECODER is not set
137-
# CONFIG_IR_SANYO_DECODER is not set
138-
# CONFIG_IR_SHARP_DECODER is not set
139-
# CONFIG_IR_MCE_KBD_DECODER is not set
140-
# CONFIG_IR_XMP_DECODER is not set
141132
CONFIG_FB=y
142133
CONFIG_FB_BCM2708=y
143134
CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -189,7 +180,6 @@ CONFIG_MAILBOX=y
189180
CONFIG_BCM2835_MBOX=y
190181
# CONFIG_IOMMU_SUPPORT is not set
191182
CONFIG_RASPBERRYPI_POWER=y
192-
CONFIG_RASPBERRYPI_FIRMWARE=y
193183
CONFIG_EXT4_FS=y
194184
CONFIG_EXT4_FS_POSIX_ACL=y
195185
CONFIG_EXT4_FS_SECURITY=y
@@ -224,11 +214,11 @@ CONFIG_NLS_ISO8859_13=y
224214
CONFIG_NLS_ISO8859_14=y
225215
CONFIG_NLS_ISO8859_15=y
226216
CONFIG_NLS_UTF8=y
217+
CONFIG_CRYPTO_ECHAINIV=y
218+
# CONFIG_CRYPTO_HW is not set
227219
CONFIG_PRINTK_TIME=y
228220
CONFIG_MAGIC_SYSRQ=y
229-
# CONFIG_DEBUG_PREEMPT is not set
230221
# CONFIG_DEBUG_BUGVERBOSE is not set
222+
# CONFIG_RCU_TRACE is not set
231223
# CONFIG_FTRACE is not set
232224
# CONFIG_ARM_UNWIND is not set
233-
CONFIG_CRYPTO_ECHAINIV=y
234-
# CONFIG_CRYPTO_HW is not set

0 commit comments

Comments
 (0)