Skip to content

Commit

Permalink
labsi: use custom kernel (works) + update rpi BL configs
Browse files Browse the repository at this point in the history
  • Loading branch information
niflostancu committed Nov 12, 2023
1 parent fdb28b5 commit e81a690
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
13 changes: 9 additions & 4 deletions configs/labsi-rpi4/config.inc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,17 @@ KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:-"bcm2711_defconfig"}
UBOOT_DEFCONFIG=${UBOOT_DEFCONFIG:-"rpi_4_defconfig"}

RPI_FIRMWARE_FILES=(start4.elf fixup4.dat bcm2711-rpi-4-b.dtb
overlays/overlay_map.dtb overlays/hat_map.dtb overlays/dwc2.dtbo overlays/disable-bt.dtbo)
overlays/overlay_map.dtb overlays/hat_map.dtb overlays/upstream-pi4.dtbo
overlays/dwc2.dtbo overlays/disable-bt.dtbo)

EXTRA_PACKAGES=(raspi-firmware linux-image-generic linux-headers-generic linux-libc-dev)

SKIP_BOOT_FILES=y
RPI_SKIP_IMAGE_GEN=1
LABSI_USE_COMPILED_KERNEL=1
if [[ -n "LABSI_USE_COMPILED_KERNEL" ]]; then
EXTRA_PACKAGES=()
else
EXTRA_PACKAGES=(raspi-firmware linux-image-generic linux-headers-generic linux-libc-dev)
SKIP_BOOT_FILES=y
fi

function rootfs_install_hook() {
# copy custom install scripts to exec. dir
Expand Down
2 changes: 1 addition & 1 deletion configs/labsi-rpi4/files/boot/cmdline.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
earlycon=pl011,mmio32,0xfe201000 console=serial0,115200 root=LABEL=RPI_ROOTFS rw rootwait
earlycon=pl011,mmio32,0xfe201000 console=tty1 console=serial0,115200 root=/dev/mmcblk0p2 rw rootwait fsck.repair=yes
3 changes: 1 addition & 2 deletions configs/labsi-rpi4/files/boot/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@ disable_overscan=1
disable_splash=1

# Use DesignWare Core 2 (SoC's USB 2.0 controller) for Linux OTG support
dtoverlay=upstream-pi4
dtoverlay=dwc2

# Next stage config (run U-Boot)
arm_64bit=1
kernel=u-boot.bin
enable_uart=1
uart_2ndstage=1
# Not usable on latest firmware
#dtoverlay=disable-bt

# include extra config, if any
include extraconfig.txt
2 changes: 1 addition & 1 deletion rootfs-install/files/initramfs/rpi-post-update-hook
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function download_firmware_files() {
# absolute path, copy it
cp -f "$file" "$1/$(basename "$file")"
else
# download the latest rpi firmware files (debian repo is outdated)
mkdir -p "$1/$(dirname "$file")"
wget "https://github.com/raspberrypi/firmware/raw/master/boot/$file" \
-O "$1/$file"
fi
Expand Down

0 comments on commit e81a690

Please sign in to comment.