From 7a19b892a53a65da6fa883f14672f396ed073b0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Tue, 6 Aug 2024 14:45:45 +0200 Subject: [PATCH 1/7] Bump OS to pre-release version 13.0.rc1 --- buildroot-external/meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildroot-external/meta b/buildroot-external/meta index bbec6ccd9cc..9309474e11b 100644 --- a/buildroot-external/meta +++ b/buildroot-external/meta @@ -1,8 +1,8 @@ VERSION_MAJOR="13" VERSION_MINOR="0" -VERSION_SUFFIX="dev0" +VERSION_SUFFIX="rc1" HASSOS_NAME="Home Assistant OS" HASSOS_ID="haos" -DEPLOYMENT="development" +DEPLOYMENT="staging" From ba86720163f09f904177a1f233cbd3253213c8a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Wed, 7 Aug 2024 20:14:06 +0200 Subject: [PATCH 2/7] Bump ODROID N2's U-Boot to v2024.01 again (#3508) We previously reverted the bump because we were unsure where the eMMC issues are coming from. Now we know some of them were caused by incompatible eMMCs then never worked from the beggining, and attempt to fix them (by changing the frequency) caused some other side effects. Bump U-Boot back to the version used generally and continue from there. (cherry picked from commit 50a0062ee64972a7387f8eae549becea38018722) --- buildroot-external/configs/odroid_n2_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot-external/configs/odroid_n2_defconfig b/buildroot-external/configs/odroid_n2_defconfig index ebe18d6fb5f..fa526a8f036 100644 --- a/buildroot-external/configs/odroid_n2_defconfig +++ b/buildroot-external/configs/odroid_n2_defconfig @@ -136,7 +136,7 @@ BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE=262144 BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-n2" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/uboot.config" BR2_PACKAGE_HOST_DOSFSTOOLS=y From 42baa80900cad88f28f34245f590c8434a005d38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Wed, 7 Aug 2024 20:14:13 +0200 Subject: [PATCH 3/7] Increase block size of kernel squashfs image to 128K (#3509) While mksquashfs uses this value by default, Genimage's default is 4K. This is far too low value and results in slower kernel load, especially on embedded boards with a flash drive. Explicitly set it to 128K to generate same images as in pre-genimage builds. (cherry picked from commit edba18f6c41539f18e53f285b2c6cbecd509eab9) --- buildroot-external/genimage/images-os.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/buildroot-external/genimage/images-os.cfg b/buildroot-external/genimage/images-os.cfg index 7a1eaeb8727..d3aa5fe57d9 100644 --- a/buildroot-external/genimage/images-os.cfg +++ b/buildroot-external/genimage/images-os.cfg @@ -4,6 +4,7 @@ image kernel.img { squashfs { compression = "lzo" + block-size = 131072 } } From f292ba02e2374b9113694c4cca6e6b67d344c2ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Thu, 8 Aug 2024 18:40:09 +0200 Subject: [PATCH 4/7] Fix writing U-Boot environment on ODROID-M1 (#3510) Apply the same patch we applied in #3412 for Green. At that time I thought the patch was already applied upstream for M1 and haven't checked, but it turns out it wasn't true. Apply it here before we get U-Boot with that patch series [1] included. [1] https://patchwork.ozlabs.org/project/uboot/cover/20240204205312.2342868-1-jonas@kwiboo.se/ (cherry picked from commit d6fa83a0d38d8716a283e8c0df5f5ef6bc622c9d) --- ...Disable-eMMC-DDR52-mode-enable-HS200.patch | 46 +++++++++++++++++++ .../configs/odroid_m1_defconfig | 2 +- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 buildroot-external/board/hardkernel/odroid-m1/patches/uboot/0001-odroid-m1-Disable-eMMC-DDR52-mode-enable-HS200.patch diff --git a/buildroot-external/board/hardkernel/odroid-m1/patches/uboot/0001-odroid-m1-Disable-eMMC-DDR52-mode-enable-HS200.patch b/buildroot-external/board/hardkernel/odroid-m1/patches/uboot/0001-odroid-m1-Disable-eMMC-DDR52-mode-enable-HS200.patch new file mode 100644 index 00000000000..40dd8754fd9 --- /dev/null +++ b/buildroot-external/board/hardkernel/odroid-m1/patches/uboot/0001-odroid-m1-Disable-eMMC-DDR52-mode-enable-HS200.patch @@ -0,0 +1,46 @@ +From 023bc5bd23d3239494bca81d807d3c093f78c131 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= +Date: Thu, 8 Aug 2024 17:52:47 +0200 +Subject: [PATCH] odroid-m1: Disable eMMC DDR52 mode, enable HS200 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Disable DDR52 mode on odroid-m1 to fix eMMC writes. Also enable HS200, +as it's supposed to work more reliably than slower modes. + +Signed-off-by: Jan Čermák +Upstream: https://patchwork.ozlabs.org/project/uboot/cover/20240204205312.2342868-1-jonas@kwiboo.se/ +--- + arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi | 3 --- + configs/odroid-m1-rk3568_defconfig | 2 ++ + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi b/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi +index 0fc360b06d..f9d34d3b77 100644 +--- a/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi ++++ b/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi +@@ -14,10 +14,7 @@ + + &sdhci { + cap-mmc-highspeed; +- mmc-ddr-1_8v; + mmc-hs200-1_8v; +- mmc-hs400-1_8v; +- mmc-hs400-enhanced-strobe; + pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>; + }; + +diff --git a/configs/odroid-m1-rk3568_defconfig b/configs/odroid-m1-rk3568_defconfig +index 96b4e9ecda..517ac0575d 100644 +--- a/configs/odroid-m1-rk3568_defconfig ++++ b/configs/odroid-m1-rk3568_defconfig +@@ -72,6 +72,8 @@ CONFIG_ROCKCHIP_GPIO=y + CONFIG_SYS_I2C_ROCKCHIP=y + CONFIG_MISC=y + CONFIG_SUPPORT_EMMC_RPMB=y ++CONFIG_MMC_HS200_SUPPORT=y ++CONFIG_SPL_MMC_HS200_SUPPORT=y + CONFIG_MMC_DW=y + CONFIG_MMC_DW_ROCKCHIP=y + CONFIG_MMC_SDHCI=y diff --git a/buildroot-external/configs/odroid_m1_defconfig b/buildroot-external/configs/odroid_m1_defconfig index 4b385439480..28711e2669d 100644 --- a/buildroot-external/configs/odroid_m1_defconfig +++ b/buildroot-external/configs/odroid_m1_defconfig @@ -4,7 +4,7 @@ BR2_DL_DIR="/cache/dl" BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" BR2_ENABLE_LTO=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/patches-rockchip" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/patches-rockchip $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-m1/patches" BR2_SSP_REGULAR=y BR2_TARGET_GENERIC_HOSTNAME="homeassistant" BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant" From 55b3446bd9eb8a7e4e1a1a196d58927fe481d851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Thu, 8 Aug 2024 18:40:20 +0200 Subject: [PATCH 5/7] Enable eMMC HS200 mode in Green's U-Boot defconfig (#3511) Follow-up to #3412. While we haven't seen any issues so far, it's mentioned in the original patch series we took inspiration from that HS200 works more reliably, so enable it in Green's defconfig by amending the patch. (cherry picked from commit 0452965fb04a86712fa1b6f58f9788abb1a8c937) --- ...ot-use-eMMC-DDR52-mode-enable-HS200.patch} | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) rename buildroot-external/board/nabucasa/green/patches/uboot/{0009-green-Do-not-use-eMMC-DDR52-mode.patch => 0009-green-Do-not-use-eMMC-DDR52-mode-enable-HS200.patch} (63%) diff --git a/buildroot-external/board/nabucasa/green/patches/uboot/0009-green-Do-not-use-eMMC-DDR52-mode.patch b/buildroot-external/board/nabucasa/green/patches/uboot/0009-green-Do-not-use-eMMC-DDR52-mode-enable-HS200.patch similarity index 63% rename from buildroot-external/board/nabucasa/green/patches/uboot/0009-green-Do-not-use-eMMC-DDR52-mode.patch rename to buildroot-external/board/nabucasa/green/patches/uboot/0009-green-Do-not-use-eMMC-DDR52-mode-enable-HS200.patch index cb43497880f..df3b2364c0c 100644 --- a/buildroot-external/board/nabucasa/green/patches/uboot/0009-green-Do-not-use-eMMC-DDR52-mode.patch +++ b/buildroot-external/board/nabucasa/green/patches/uboot/0009-green-Do-not-use-eMMC-DDR52-mode-enable-HS200.patch @@ -1,7 +1,7 @@ -From 766d53ce6143b7e5f09a5f478e328cf8a1f183d4 Mon Sep 17 00:00:00 2001 +From 331826e0c52d6bdd65d862e06834f23b3a750276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Wed, 12 Jun 2024 15:20:46 +0200 -Subject: [PATCH] green: Do not use eMMC DDR52 mode +Subject: [PATCH] green: Do not use eMMC DDR52 mode, enable HS200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -11,12 +11,15 @@ DDR52 mode is used. Disable this mode and other HS modes, keep only HS200 which works reliably with the eMMC used on Green. For more details see the upstream commit and mailing list discussion [1]. +Also enable HS200 support in defconfig. + [1] https://patchwork.ozlabs.org/project/uboot/patch/20240204205312.2342868-2-jonas@kwiboo.se/ Signed-off-by: Jan Čermák --- arch/arm/dts/rk3566-ha-green-u-boot.dtsi | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) + configs/green_defconfig | 2 ++ + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/dts/rk3566-ha-green-u-boot.dtsi b/arch/arm/dts/rk3566-ha-green-u-boot.dtsi index 48d7b61513..8dc1585aac 100644 @@ -40,3 +43,16 @@ index 48d7b61513..8dc1585aac 100644 -}; \ No newline at end of file +}; +diff --git a/configs/green_defconfig b/configs/green_defconfig +index 71c9257d7d..7b5a705686 100644 +--- a/configs/green_defconfig ++++ b/configs/green_defconfig +@@ -65,6 +65,8 @@ CONFIG_MISC=y + CONFIG_I2C_EEPROM=y + CONFIG_SYS_I2C_EEPROM_ADDR=0x0 + CONFIG_SUPPORT_EMMC_RPMB=y ++CONFIG_MMC_HS200_SUPPORT=y ++CONFIG_SPL_MMC_HS200_SUPPORT=y + CONFIG_MMC_DW=y + CONFIG_MMC_DW_ROCKCHIP=y + CONFIG_MMC_SDHCI=y From d83602c6d3a9ca68d2e0d2a4a55c3a07ffdf5434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Thu, 8 Aug 2024 18:42:56 +0200 Subject: [PATCH 6/7] Bump OS to pre-release version 13.0.rc2 --- buildroot-external/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot-external/meta b/buildroot-external/meta index 9309474e11b..647cd1711cc 100644 --- a/buildroot-external/meta +++ b/buildroot-external/meta @@ -1,6 +1,6 @@ VERSION_MAJOR="13" VERSION_MINOR="0" -VERSION_SUFFIX="rc1" +VERSION_SUFFIX="rc2" HASSOS_NAME="Home Assistant OS" HASSOS_ID="haos" From 77e2b9297289e686cd4cfb704752d36d917f4ddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Tue, 13 Aug 2024 11:14:31 +0200 Subject: [PATCH 7/7] Bump OS to release version 13.0 --- buildroot-external/meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildroot-external/meta b/buildroot-external/meta index 647cd1711cc..7685636adf3 100644 --- a/buildroot-external/meta +++ b/buildroot-external/meta @@ -1,8 +1,8 @@ VERSION_MAJOR="13" VERSION_MINOR="0" -VERSION_SUFFIX="rc2" +VERSION_SUFFIX="" HASSOS_NAME="Home Assistant OS" HASSOS_ID="haos" -DEPLOYMENT="staging" +DEPLOYMENT="production"