jeans/operating-system
jeans/operating-system
1
0
Fork 0
mirror of https://github.com/home-assistant/operating-system.git synced 2025-07-27 06:56:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix boot (#459)

Browse Source 
* Fix permission check

* Remove fails on copy

* Disable FB_BCM2708

* Don't touch the memory map from first stage

* bootcode.bin is not needed on rpi4
This commit is contained in:
Pascal Vizeli 2019-08-28 10:32:46 +02:00 committed by GitHub
parent 9f06ffbbd5
commit d1d3593d65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,11 +7,9 @@ function hassos_pre_image() {
cp -t "${BOOT_DATA}" \ cp -t "${BOOT_DATA}" \
"${BINARIES_DIR}/u-boot.bin" \ "${BINARIES_DIR}/u-boot.bin" \
"${BINARIES_DIR}/boot.scr" "${BINARIES_DIR}/boot.scr"
cp -t "${BOOT_DATA}" \ cp "${BINARIES_DIR}"/*.dtb "${BOOT_DATA}/"
"${BINARIES_DIR}"/*.dtb \
"${BINARIES_DIR}/rpi-firmware/bootcode.bin"
cp -r "${BINARIES_DIR}/rpi-firmware/overlays" "${BOOT_DATA}/" cp -r "${BINARIES_DIR}/rpi-firmware/overlays" "${BOOT_DATA}/"
cp -f "${BOARD_DIR}/../boot-env.txt" "${BOOT_DATA}/config.txt" cp "${BOARD_DIR}/../boot-env.txt" "${BOOT_DATA}/config.txt"
# Firmware # Firmware
if [[ "${BOARD_ID}" =~ "rpi4" ]]; then if [[ "${BOARD_ID}" =~ "rpi4" ]]; then
@ -21,7 +19,8 @@ function hassos_pre_image() {
else else
cp -t "${BOOT_DATA}" \ cp -t "${BOOT_DATA}" \
"${BINARIES_DIR}/rpi-firmware/fixup.dat" \ "${BINARIES_DIR}/rpi-firmware/fixup.dat" \
"${BINARIES_DIR}/rpi-firmware/start.elf" "${BINARIES_DIR}/rpi-firmware/start.elf" \
"${BINARIES_DIR}/rpi-firmware/bootcode.bin"
fi fi
# Set cmd options # Set cmd options

1
buildroot-external/board/raspberrypi/kernel.config
View File

@ -1 +1,2 @@
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
# CONFIG_FB_BCM2708 is not set

1
buildroot-external/board/raspberrypi/uboot.config
View File

@ -7,3 +7,4 @@ CONFIG_USB_FUNCTION_MASS_STORAGE=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD=y
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set

2
buildroot-external/scripts/hdd-image.sh
View File

@ -91,7 +91,7 @@ function create_kernel_image() {
# Mount / init file structs # Mount / init file structs
sudo mkdir -p /mnt/data/ sudo mkdir -p /mnt/data/
sudo mount -o loop "${kernel_img}" /mnt/data sudo mount -o loop "${kernel_img}" /mnt/data
sudo cp -f "${kernel}" /mnt/data/ sudo cp "${kernel}" /mnt/data/
sudo umount /mnt/data sudo umount /mnt/data
} }

2
scripts/entry.sh
View File

@ -7,7 +7,7 @@ USER="root"
dockerd -s vfs &> /dev/null & dockerd -s vfs &> /dev/null &
# Setup local user # Setup local user
if [ "${BUILDER_UID:0}" -ne 0 ] && [ "${BUILDER_GID:0}" -ne 0 ]; then if [ "${BUILDER_UID:-0}" -ne 0 ] && [ "${BUILDER_GID:-0}" -ne 0 ]; then
groupadd -g "${BUILDER_GID}" builder groupadd -g "${BUILDER_GID}" builder
useradd -m -u "${BUILDER_UID}" -g "${BUILDER_GID}" -G docker,sudo builder useradd -m -u "${BUILDER_UID}" -g "${BUILDER_GID}" -G docker,sudo builder
echo "builder ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers echo "builder ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers