From 034aa79592f9cb4f09782ecc2ee6baf93ab3107d Mon Sep 17 00:00:00 2001 From: Dzmitry Sankouski Date: Wed, 11 Jun 2025 07:51:44 +0300 Subject: [PATCH] u-boot-starqltechn: fix compiler warnings Patch adjustments to fix compiler warnings. Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6638 [ci:skip-build]: already built successfully in CI --- .../0002-sdm845-save-relocaddr-to-env-variables.patch | 2 +- ...t-do-not-override-console-when-stdin-and-device-.patch | 2 +- ...qltechn-use-button-kbd-driver-for-navigating-boo.patch | 2 +- device/testing/u-boot-starqltechn/APKBUILD | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/device/testing/u-boot-starqltechn/0002-sdm845-save-relocaddr-to-env-variables.patch b/device/testing/u-boot-starqltechn/0002-sdm845-save-relocaddr-to-env-variables.patch index e1bd62ed5..97612d919 100644 --- a/device/testing/u-boot-starqltechn/0002-sdm845-save-relocaddr-to-env-variables.patch +++ b/device/testing/u-boot-starqltechn/0002-sdm845-save-relocaddr-to-env-variables.patch @@ -20,7 +20,7 @@ index 5f53c21947..1f22aee7f6 100644 } else { env_set("key_power", "0"); } -+ env_set_addr("relocaddr", gd->relocaddr); ++ env_set_hex("relocaddr", gd->relocaddr); return 0; } diff --git a/device/testing/u-boot-starqltechn/0003-input-do-not-override-console-when-stdin-and-device-.patch b/device/testing/u-boot-starqltechn/0003-input-do-not-override-console-when-stdin-and-device-.patch index 99b952a75..64654b96b 100644 --- a/device/testing/u-boot-starqltechn/0003-input-do-not-override-console-when-stdin-and-device-.patch +++ b/device/testing/u-boot-starqltechn/0003-input-do-not-override-console-when-stdin-and-device-.patch @@ -17,7 +17,7 @@ index a4341e8c7c..a4eeba13a5 100644 #if !defined(CONFIG_SPL_BUILD) || CONFIG_IS_ENABLED(ENV_SUPPORT) /* check if this is the standard input device */ - if (!error && strcmp(env_get("stdin"), dev->name) == 0) { -+ if (!error && !dev->name && strcmp(env_get("stdin"), dev->name) == 0) { ++ if (0) { /* reassign the console */ if (OVERWRITE_CONSOLE || console_assign(stdin, dev->name)) diff --git a/device/testing/u-boot-starqltechn/0005-starqltechn-use-button-kbd-driver-for-navigating-boo.patch b/device/testing/u-boot-starqltechn/0005-starqltechn-use-button-kbd-driver-for-navigating-boo.patch index 87121d2df..4dacdfc35 100644 --- a/device/testing/u-boot-starqltechn/0005-starqltechn-use-button-kbd-driver-for-navigating-boo.patch +++ b/device/testing/u-boot-starqltechn/0005-starqltechn-use-button-kbd-driver-for-navigating-boo.patch @@ -78,7 +78,7 @@ index 1f22aee7f6..cbbe1d5c76 100644 - } else { - env_set("key_power", "0"); - } - env_set_addr("relocaddr", gd->relocaddr); + env_set_hex("relocaddr", gd->relocaddr); return 0; diff --git a/configs/starqltechn_defconfig b/configs/starqltechn_defconfig diff --git a/device/testing/u-boot-starqltechn/APKBUILD b/device/testing/u-boot-starqltechn/APKBUILD index 538330178..6159e6d0f 100644 --- a/device/testing/u-boot-starqltechn/APKBUILD +++ b/device/testing/u-boot-starqltechn/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dzmitry Sankouski pkgname=u-boot-starqltechn pkgver=2023.01_rc2 -pkgrel=2 +pkgrel=3 pkgdesc="U-Boot bootloader for the Samsung SM-G9600 starqltechn" url="https://source.denx.de/u-boot" arch="aarch64" @@ -44,9 +44,9 @@ package() { sha512sums=" 5e570a0070cd31bb4d9541542532229dbe15e28955428e8a6659de5e4140c89f82d635045d5594e6b9cc6b4bb3037ea4e2c6236433d65a7c814a0ec9c0f32004 u-boot-v2023.01-rc2.tar.gz 068453a2eb3e2e6a950a31cd014f1dd4eed99f327f09aae69f4e4e55edf99cbef640d2361ada5844c5a02b2242c5668800d6b88599886c257764378615b351f8 0001-starqltechn-enable-serial-console.patch -5e0dbe9a99c3931aba8d67510453058722f028ca3dbaeb8f12523b76b60349d2394175ffc25a6ea2395f5f65c5e86f563cd4db3794e17986c1085ca444613b0b 0002-sdm845-save-relocaddr-to-env-variables.patch -ea3e3c270d04da74a7ab993802467631af7c47a14b78dcb3e185b234ceec804841eb4b6c0919d6bdd30157126fdb44a99e829712f3b44c60dd794a2a3acb812c 0003-input-do-not-override-console-when-stdin-and-device-.patch +ba3b62e7428e40f8a95e7ada27528f8b866daea5c0a4addc6a8520198ae8d6ec89b5dcd325080e24ce00c5ad9be460801789b120b864f6bbd17609be442f1fe6 0002-sdm845-save-relocaddr-to-env-variables.patch +71aa514ffbbdf2ca267f89eff84dfa8e76904e280ab5196e9e8446c6d54100661aacd0027e504f31c489d20d71481880f5615eabb079125003a60e93c0d6370a 0003-input-do-not-override-console-when-stdin-and-device-.patch 72b78a26737d9ee21854b71036ec5e31206be7cfe70e11ba583eb3e699da674db0db45ce9e51c30f1935aa8bcfa8ed6157899f129de55fb5966892490e6e7eb3 0004-wip-input-driver-for-gpio-buttons.patch -1060f0517d5fe7ad36156313b50f7814e73b1ccfec96fa01cfb66bd63c6d6e5343121024c6ccc32ecbf12eeed499b00de5d7df73882edafac65a4bd7cacb7067 0005-starqltechn-use-button-kbd-driver-for-navigating-boo.patch +552eb9b05ba74dda0eb571b48cc8492377c627c96bacb061973ce8b34c01f3cd2003cd9759d89e620ede08ebfa88d854fc0cd5c12b3f8b208406f08d1aca8886 0005-starqltechn-use-button-kbd-driver-for-navigating-boo.patch e6217387c7e5f5766602feca99d3973c0a1780069d279e279b413425dc7ab1b6f4227eb0d108f17e6ccbeddb6ab99c5a6b236678980cf5a77dbff36fd1b1d2b0 0006-bootmenu-loop-over-menu-entries-with-one-key.patch "