From 113348ef93f963220618ad625ac9586c004c7f15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Thu, 25 Jan 2024 14:26:08 +0100 Subject: [PATCH 1/9] Bump OS to pre-release version 11.5.rc1 --- buildroot-external/meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildroot-external/meta b/buildroot-external/meta index 21367265e..50df988a2 100644 --- a/buildroot-external/meta +++ b/buildroot-external/meta @@ -1,8 +1,8 @@ VERSION_MAJOR="11" VERSION_MINOR="5" -VERSION_SUFFIX="dev0" +VERSION_SUFFIX="rc1" HASSOS_NAME="Home Assistant OS" HASSOS_ID="haos" -DEPLOYMENT="development" +DEPLOYMENT="staging" From 01c8c1a5fa9e26c2dacad449c783a539ee034401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Fri, 26 Jan 2024 14:04:14 +0100 Subject: [PATCH 2/9] Add kernel options missing as a result of enabling CONFIG_EXPERT (#3114) Enabling CONFIG_EXPERT, which was a dependency of some options we try to set by our config fragments, had a side-effect of toggling some other options, most importantly the framebuffer console support. Enable the options found by diffing old and new kernel configs. Fixes #3112 (cherry picked from commit 3d234144a23993b69b569c8d2c666945e2c274a1) --- buildroot-external/board/hardkernel/kernel-amlogic.config | 1 + buildroot-external/board/khadas/kernel-vim.config | 1 + buildroot-external/board/pc/generic-x86-64/kernel.config | 4 ++++ buildroot-external/board/pc/ova/kernel.config | 3 +++ buildroot-external/kernel/device-support.config | 5 +++-- 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/buildroot-external/board/hardkernel/kernel-amlogic.config b/buildroot-external/board/hardkernel/kernel-amlogic.config index 6135f6940..fbc3e5c84 100644 --- a/buildroot-external/board/hardkernel/kernel-amlogic.config +++ b/buildroot-external/board/hardkernel/kernel-amlogic.config @@ -557,6 +557,7 @@ CONFIG_FB_EFI=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_PWM=m CONFIG_BACKLIGHT_LP855X=m +CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_HDA_INTEL=m diff --git a/buildroot-external/board/khadas/kernel-vim.config b/buildroot-external/board/khadas/kernel-vim.config index df486b6bf..db1fd17b3 100644 --- a/buildroot-external/board/khadas/kernel-vim.config +++ b/buildroot-external/board/khadas/kernel-vim.config @@ -484,6 +484,7 @@ CONFIG_DRM_PANFROST=m CONFIG_FB=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_PWM=m +CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_DYNAMIC_MINORS=y diff --git a/buildroot-external/board/pc/generic-x86-64/kernel.config b/buildroot-external/board/pc/generic-x86-64/kernel.config index 72602c5cd..a4ab06b71 100644 --- a/buildroot-external/board/pc/generic-x86-64/kernel.config +++ b/buildroot-external/board/pc/generic-x86-64/kernel.config @@ -22,6 +22,9 @@ CONFIG_SYSFB=y CONFIG_FB=y CONFIG_FB_EFI=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y + CONFIG_DRM=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_AMDGPU=m @@ -129,6 +132,7 @@ CONFIG_SENSORS_CORETEMP=m CONFIG_UHID=y +CONFIG_LPC_ICH=y CONFIG_ITCO_WDT=y CONFIG_IT87_WDT=y diff --git a/buildroot-external/board/pc/ova/kernel.config b/buildroot-external/board/pc/ova/kernel.config index 57a618c39..b02259576 100644 --- a/buildroot-external/board/pc/ova/kernel.config +++ b/buildroot-external/board/pc/ova/kernel.config @@ -85,6 +85,9 @@ CONFIG_SYSFB_SIMPLEFB=y CONFIG_FB=y CONFIG_FB_EFI=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y + CONFIG_MMC=y CONFIG_MMC_BLOCK=y CONFIG_MMC_SDHCI=y diff --git a/buildroot-external/kernel/device-support.config b/buildroot-external/kernel/device-support.config index d7ece4383..123450e25 100644 --- a/buildroot-external/kernel/device-support.config +++ b/buildroot-external/kernel/device-support.config @@ -60,14 +60,15 @@ CONFIG_BT_MTKUART=m # Multimedia core support CONFIG_MEDIA_SUPPORT=y -CONFIG_MEDIA_SUPPORT_FILTER=n +CONFIG_MEDIA_SUPPORT_FILTER=y +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_MEDIA_CONTROLLER_DVB=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_ANALOG_TV_SUPPORT=y CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y -CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_DEV=y CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_VIDEO_TVEEPROM=m CONFIG_VIDEOBUF2_CORE=m From 378b90bc824dd93b487b55fc5a4257f3c465f772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Fri, 26 Jan 2024 14:23:39 +0100 Subject: [PATCH 3/9] Bump OS to pre-release version 11.5.rc2 --- buildroot-external/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot-external/meta b/buildroot-external/meta index 50df988a2..be12712f8 100644 --- a/buildroot-external/meta +++ b/buildroot-external/meta @@ -1,6 +1,6 @@ VERSION_MAJOR="11" VERSION_MINOR="5" -VERSION_SUFFIX="rc1" +VERSION_SUFFIX="rc2" HASSOS_NAME="Home Assistant OS" HASSOS_ID="haos" From e00709d449eb611c830f7981fb705a86c691a5bf Mon Sep 17 00:00:00 2001 From: Jens Maus Date: Tue, 30 Jan 2024 10:12:01 +0100 Subject: [PATCH 4/9] Add optional rpi-rf-mod dtoverlay block for RPi5 (#3080) * added optional rpi-rf-mod dtoverlay block * remove dtoverlay=miniuart-bt as not required. (cherry picked from commit 9102f06fbab258fa33b50b1985fbc86b5ac1d9f4) --- buildroot-external/board/raspberrypi/rpi5-64/config.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/buildroot-external/board/raspberrypi/rpi5-64/config.txt b/buildroot-external/board/raspberrypi/rpi5-64/config.txt index 4d92fa19b..86e54c4e1 100755 --- a/buildroot-external/board/raspberrypi/rpi5-64/config.txt +++ b/buildroot-external/board/raspberrypi/rpi5-64/config.txt @@ -40,6 +40,11 @@ arm_boost=1 os_prefix=slot-A/ cmdline=/cmdline.txt +# Uncomment this to enable GPIO support for RPI-RF-MOD/HM-MOD-RPI-PCB +#enable_uart=1 +#dtparam=i2c_arm=on +#dtoverlay=rpi-rf-mod + [cm4] # Enable host mode on the 2711 built-in XHCI USB controller. # This line should be removed if the legacy DWC2 controller is required From 8eeb85ed170c03e2f09b461d2be9f111a4add364 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 30 Jan 2024 10:12:48 +0100 Subject: [PATCH 5/9] Disable Ethernet in U-Boot if ODROID-M1 (#3122) It seems that the Ethernet initialization in U-Boot causes significant packet drops in Linux on some board. On a ODROID-M1 with 8GB of RAM, a packet loss rate of ~20% has been observed. From the user point of view it feels like a massive slow down (SSH feels very slow, Home Assistant loads very slow or not at all). Disabling the Ethernet controller driver avoids initialization in U-Boot and makes Ethernet work correctly again in Linux. While at it, drop the previously board specific configs. They haven't been used and the board seemed fine without them. (cherry picked from commit bd3cae5300092b9045378939c2de5385d1de3f1a) --- buildroot-external/board/hardkernel/odroid-m1/uboot.config | 7 ++----- buildroot-external/configs/odroid_m1_defconfig | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/buildroot-external/board/hardkernel/odroid-m1/uboot.config b/buildroot-external/board/hardkernel/odroid-m1/uboot.config index 3ae7d802f..6075d6b89 100644 --- a/buildroot-external/board/hardkernel/odroid-m1/uboot.config +++ b/buildroot-external/board/hardkernel/odroid-m1/uboot.config @@ -1,5 +1,2 @@ -CONFIG_DOS_PARTITION=y -# CONFIG_EFI_PARTITION is not set -# CONFIG_USB_STORAGE is not set -CONFIG_DISPLAY_BOARDINFO=y -CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +# CONFIG_DWC_ETH_QOS is not set +# CONFIG_DWC_ETH_QOS_ROCKCHIP is not set diff --git a/buildroot-external/configs/odroid_m1_defconfig b/buildroot-external/configs/odroid_m1_defconfig index 0a0ae880e..e74f59b67 100644 --- a/buildroot-external/configs/odroid_m1_defconfig +++ b/buildroot-external/configs/odroid_m1_defconfig @@ -137,7 +137,7 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/u-boot/u-boot.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-m1-rk3568" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-m1/uboot.config" BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y From f4f7928f17862f1890c15c6f853b14c24cb06532 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 30 Jan 2024 11:47:48 +0100 Subject: [PATCH 6/9] Disable MMC environment on ASUS Tinkerboard (#3124) We don't really use the MMC environment, so disable it by default. This prevents the following warning at startup: Loading Environment from MMC... *** Warning - bad CRC, using default environment (cherry picked from commit f263326ef857fba9189f821444c9f52a7af9ed18) --- buildroot-external/board/asus/tinker/uboot.config | 1 + 1 file changed, 1 insertion(+) diff --git a/buildroot-external/board/asus/tinker/uboot.config b/buildroot-external/board/asus/tinker/uboot.config index 13e696205..b5007a7e7 100644 --- a/buildroot-external/board/asus/tinker/uboot.config +++ b/buildroot-external/board/asus/tinker/uboot.config @@ -1,3 +1,4 @@ # CONFIG_USB_STORAGE is not set # CONFIG_DOS_PARTITION is not set CONFIG_OF_LIBFDT_OVERLAY=y +# CONFIG_ENV_IS_IN_MMC is not set From fd3c1066b8be869977747736af0e4bf03082dec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Tue, 30 Jan 2024 13:48:36 +0100 Subject: [PATCH 7/9] Update ATF and DDR blob for Odroid M1, change 1056->1560 MHz RAM timing (#3125) Odroid M1 was using 1056 MHz blob for RAM training, although it can run at 1560 MHz. Use the correct file for M1 and update it to latest version, along with ARM Trusted Firmware blob. (cherry picked from commit 1f45aaf35955cf25bbf360a4e32c8c5b25011d15) --- buildroot-external/configs/odroid_m1_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/buildroot-external/configs/odroid_m1_defconfig b/buildroot-external/configs/odroid_m1_defconfig index e74f59b67..36e6008bd 100644 --- a/buildroot-external/configs/odroid_m1_defconfig +++ b/buildroot-external/configs/odroid_m1_defconfig @@ -160,9 +160,9 @@ BR2_PACKAGE_HASSIO_MACHINE="odroid-m1" BR2_PACKAGE_OS_AGENT=y BR2_PACKAGE_OS_AGENT_BOARD="OdroidM1" BR2_PACKAGE_ROCKCHIP_BLOBS=y -BR2_PACKAGE_ROCKCHIP_BLOBS_VERSION="6186debcac95553f6b311cee10669e12c9c9963d" -BR2_PACKAGE_ROCKCHIP_BLOBS_ATF="bin/rk35/rk3568_bl31_v1.28.elf" -BR2_PACKAGE_ROCKCHIP_BLOBS_TPL="bin/rk35/rk3568_ddr_1056MHz_v1.09.bin" +BR2_PACKAGE_ROCKCHIP_BLOBS_VERSION="b4558da0860ca48bf1a571dd33ccba580b9abe23" +BR2_PACKAGE_ROCKCHIP_BLOBS_ATF="bin/rk35/rk3568_bl31_v1.43.elf" +BR2_PACKAGE_ROCKCHIP_BLOBS_TPL="bin/rk35/rk3568_ddr_1560MHz_v1.18.bin" BR2_PACKAGE_RPI_RF_MOD=y BR2_PACKAGE_RTL88X2BU=y BR2_PACKAGE_HOST_TEMPIO=y From 1e70dc8edf27d6e693971d0ed7a9440d3a63e479 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Wed, 31 Jan 2024 10:25:40 +0100 Subject: [PATCH 8/9] Bump OS to pre-release version 11.5.rc3 --- buildroot-external/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot-external/meta b/buildroot-external/meta index be12712f8..84a3418b3 100644 --- a/buildroot-external/meta +++ b/buildroot-external/meta @@ -1,6 +1,6 @@ VERSION_MAJOR="11" VERSION_MINOR="5" -VERSION_SUFFIX="rc2" +VERSION_SUFFIX="rc3" HASSOS_NAME="Home Assistant OS" HASSOS_ID="haos" From 0f0eacf46e457469a5b36f285a00f48464392544 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 5 Feb 2024 10:24:38 +0100 Subject: [PATCH 9/9] Bump OS to release version 11.5 --- buildroot-external/meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildroot-external/meta b/buildroot-external/meta index 84a3418b3..27072e12c 100644 --- a/buildroot-external/meta +++ b/buildroot-external/meta @@ -1,8 +1,8 @@ VERSION_MAJOR="11" VERSION_MINOR="5" -VERSION_SUFFIX="rc3" +VERSION_SUFFIX="" HASSOS_NAME="Home Assistant OS" HASSOS_ID="haos" -DEPLOYMENT="staging" +DEPLOYMENT="production"