d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New approach for uboot and rpi 5.4 (#635)

Browse Source 
* New approach for uboot and rpi 5.4

* fix dts

* Update firmware to next
This commit is contained in:
Pascal Vizeli
2020-04-25 11:17:03 +02:00
committed by GitHub
parent c0d8e14c2a
commit 34b7bbd68d
12 changed files with 45 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
buildroot-external/board/raspberrypi/hassos-hook.sh
View File

@@ -7,6 +7,7 @@ function hassos_pre_image() {
cp -t "${BOOT_DATA}" \
"${BINARIES_DIR}/u-boot.bin" \
"${BINARIES_DIR}/boot.scr"
cp "${BINARIES_DIR}"/*.dtb "${BOOT_DATA}/"
cp -r "${BINARIES_DIR}/rpi-firmware/overlays" "${BOOT_DATA}/"
cp "${BOARD_DIR}/../boot-env.txt" "${BOOT_DATA}/config.txt"
@@ -22,29 +23,6 @@ function hassos_pre_image() {
"${BINARIES_DIR}/rpi-firmware/bootcode.bin"
fi
# DTS
if [[ "${BOARD_ID}" == "rpi" ]]; then
cp -t "${BOOT_DATA}" \
"${BINARIES_DIR}/rpi-firmware/bcm2708-rpi-b.dtb" \
"${BINARIES_DIR}/rpi-firmware/bcm2708-rpi-b-plus.dtb" \
"${BINARIES_DIR}/rpi-firmware/bcm2708-rpi-cm.dtb"
elif [[ "${BOARD_ID}" == "rpi0-w" ]]; then
cp -t "${BOOT_DATA}" \
"${BINARIES_DIR}/rpi-firmware/bcm2708-rpi-zero-w.dtb"
elif [[ "${BOARD_ID}" == "rpi2" ]]; then
cp -t "${BOOT_DATA}" \
"${BINARIES_DIR}/rpi-firmware/bcm2709-rpi-2-b.dtb" \
"${BINARIES_DIR}/rpi-firmware/bcm2710-rpi-2-b.dtb"
elif [[ "${BOARD_ID}" =~ "rpi3" ]]; then
cp -t "${BOOT_DATA}" \
"${BINARIES_DIR}/rpi-firmware/bcm2710-rpi-3-b.dtb" \
"${BINARIES_DIR}/rpi-firmware/bcm2710-rpi-3-b-plus.dtb" \
"${BINARIES_DIR}/rpi-firmware/bcm2710-rpi-cm3.dtb"
elif [[ "${BOARD_ID}" =~ "rpi4" ]]; then
cp -t "${BOOT_DATA}" \
"${BINARIES_DIR}/rpi-firmware/bcm2711-rpi-4-b.dtb"
fi
# Set cmd options
echo "dwc_otg.lpm_enable=0 console=tty1" > "${BOOT_DATA}/cmdline.txt"

26
buildroot-external/board/raspberrypi/patches/linux/0001-rpi-dts-allow-uboot-find-serial.patch Normal file
View File

@@ -0,0 +1,26 @@
From b8cabc02384390446cb7f2e34af07b44881246e3 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Fri, 24 Apr 2020 22:03:34 +0000
Subject: [PATCH 1/1] rpi-dts: allow uboot find serial
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
---
arch/arm/boot/dts/bcm283x.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
index 7e95601376d0..82a0ee0d5889 100644
--- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -306,7 +306,7 @@
};
uart0: serial@7e201000 {
- compatible = "arm,pl011", "arm,primecell";
+ compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
reg = <0x7e201000 0x200>;
interrupts = <2 25>;
clocks = <&clocks BCM2835_CLOCK_UART>,
--
2.17.1