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

Use file for cmdline.txt (#1568)

Browse Source 
* Remove duplicate config.txt copy statement

* Use static cmdline.txt file

Instead of dynamically creating cmdline.txt use a static version of it.
This aligns with other boot loader/firmware configuration files and makes
it easier to customize the file per board.
This commit is contained in:
Stefan Agner 2021-10-04 14:38:52 +02:00 committed by GitHub
parent 8d69f395c2
commit bdc319d3df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
buildroot-external/board/hardkernel/odroid-c2/cmdline.txt Normal file
View File

@ -0,0 +1 @@
console=tty0 console=ttyAML0,115200n8

3
buildroot-external/board/hardkernel/odroid-c2/hassos-hook.sh
View File

@ -13,8 +13,7 @@ function hassos_pre_image() {
mkdir -p "${BOOT_DATA}/overlays"
cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/"
cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
echo "console=tty0 console=ttyAML0,115200n8" > "${BOOT_DATA}/cmdline.txt"
cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
# SPL
create_spl_image

1
buildroot-external/board/hardkernel/odroid-c4/cmdline.txt Normal file
View File

@ -0,0 +1 @@
console=tty0 console=ttyAML0,115200n8

3
buildroot-external/board/hardkernel/odroid-c4/hassos-hook.sh
View File

@ -12,8 +12,7 @@ function hassos_pre_image() {
mkdir -p "${BOOT_DATA}/overlays"
cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/"
cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
echo "console=tty0 console=ttyAML0,115200n8" > "${BOOT_DATA}/cmdline.txt"
cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
# SPL
create_spl_image

1
buildroot-external/board/hardkernel/odroid-n2/cmdline.txt Normal file
View File

@ -0,0 +1 @@
console=tty0 console=ttyAML0,115200n8

3
buildroot-external/board/hardkernel/odroid-n2/hassos-hook.sh
View File

@ -12,8 +12,7 @@ function hassos_pre_image() {
mkdir -p "${BOOT_DATA}/overlays"
cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/"
cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
echo "console=tty0 console=ttyAML0,115200n8" > "${BOOT_DATA}/cmdline.txt"
cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
# SPL
create_spl_image

1
buildroot-external/board/hardkernel/odroid-xu4/cmdline.txt Normal file
View File

@ -0,0 +1 @@
console=tty1 console=ttySAC2,115200

3
buildroot-external/board/hardkernel/odroid-xu4/hassos-hook.sh
View File

@ -11,8 +11,7 @@ function hassos_pre_image() {
cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr"
cp "${BINARIES_DIR}/exynos5422-odroidxu4.dtb" "${BOOT_DATA}/exynos5422-odroidxu4.dtb"
echo "console=tty1 console=ttySAC2,115200" > "${BOOT_DATA}/cmdline.txt"
cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
# SPL
create_spl_image

1
buildroot-external/board/khadas/vim3/cmdline.txt Normal file
View File

@ -0,0 +1 @@
console=tty0 console=ttyAML0,115200n8

3
buildroot-external/board/khadas/vim3/hassos-hook.sh
View File

@ -10,8 +10,7 @@ function hassos_pre_image() {
cp "${BINARIES_DIR}/meson-g12b-s922x-khadas-vim3.dtb" "${BOOT_DATA}/meson-g12b-s922x-khadas-vim3.dtb"
cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
echo "console=tty0 console=ttyAML0,115200n8" > "${BOOT_DATA}/cmdline.txt"
cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
# SPL
create_spl_image

1
buildroot-external/board/pc/generic-x86-64/cmdline.txt Normal file
View File

@ -0,0 +1 @@
console=tty1

3
buildroot-external/board/pc/generic-x86-64/hassos-hook.sh
View File

@ -9,8 +9,7 @@ function hassos_pre_image() {
cp "${BINARIES_DIR}/barebox.bin" "${BOOT_DATA}/EFI/BOOT/BOOTx64.EFI"
cp "${BR2_EXTERNAL_HASSOS_PATH}/bootloader/barebox-state-efi.dtb" "${BOOT_DATA}/EFI/barebox/state.dtb"
echo "console=tty1" > "${BOOT_DATA}/cmdline.txt"
cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
}

1
buildroot-external/board/pc/ova/cmdline.txt Normal file
View File

@ -0,0 +1 @@
console=ttyS0 console=tty1

3
buildroot-external/board/pc/ova/hassos-hook.sh
View File

@ -9,8 +9,7 @@ function hassos_pre_image() {
cp "${BINARIES_DIR}/barebox.bin" "${BOOT_DATA}/EFI/BOOT/BOOTx64.EFI"
cp "${BR2_EXTERNAL_HASSOS_PATH}/bootloader/barebox-state-efi.dtb" "${BOOT_DATA}/EFI/barebox/state.dtb"
echo "console=ttyS0 console=tty1" > "${BOOT_DATA}/cmdline.txt"
cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
}

1
buildroot-external/board/raspberrypi/cmdline.txt Normal file
View File

@ -0,0 +1 @@
dwc_otg.lpm_enable=0 console=tty1

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

@ -14,7 +14,11 @@ function hassos_pre_image() {
else
cp "${BOARD_DIR}/../config.txt" "${BOOT_DATA}/config.txt"
fi
cp "${BOARD_DIR}/../config.txt" "${BOOT_DATA}/config.txt"
if [ -f "${BOARD_DIR}/cmdline.txt" ]; then
cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
else
cp "${BOARD_DIR}/../cmdline.txt" "${BOOT_DATA}/cmdline.txt"
fi
cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/"
# EEPROM update for Raspberry Pi 4/Compute Module 4
@ -23,9 +27,6 @@ function hassos_pre_image() {
cp "${BINARIES_DIR}/rpi-eeprom/pieeprom.upd" "${BOOT_DATA}/pieeprom.upd"
fi
# Set cmd options
echo "dwc_otg.lpm_enable=0 console=tty1" > "${BOOT_DATA}/cmdline.txt"
# Enable 64bit support
if [[ "${BOARD_ID}" =~ "64" ]]; then
sed -i "s|#arm_64bit|arm_64bit|g" "${BOOT_DATA}/config.txt"