From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6BCE4C6FD1D for ; Thu, 30 Mar 2023 22:14:51 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9F98585936; Fri, 31 Mar 2023 00:14:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="gKCtAu0Q"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 43FCC85E44; Fri, 31 Mar 2023 00:14:43 +0200 (CEST) Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D48AE85DD5 for ; Fri, 31 Mar 2023 00:14:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=francis.laniel@amarulasolutions.com Received: by mail-ed1-x542.google.com with SMTP id w9so82428541edc.3 for ; Thu, 30 Mar 2023 15:14:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1680214477; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rPsIdul7yi/qSxkEqToe1V3SPyN2idPVF4t+lj+U1CI=; b=gKCtAu0Q7a5MYI8QrIvsMdSZ+m3H+IRmr73DRORj4+HWZteEIToyuFVzL/jGR66mbf y2Jtxy+42Lhsll7SuSZe3UQOBYukqD/xph0Ftov5G6SWCcFcj4u54cK+lrhbpJYz4DG1 gGaJpglyf4gIDcfXOGFMn0ohAz4StuHvZ/XBg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680214477; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rPsIdul7yi/qSxkEqToe1V3SPyN2idPVF4t+lj+U1CI=; b=v8U/qksop0Kvwk8mWn0R9sYdm7NAjWBz1fxYg/f6n+a/L4/SJXiqO9BritnesZ/ejN zJbL9LFKibtKNaMpXSDZ3f/OLEHA4JXmkfkQV3hESvoFejyb4LB+NcsfL45vUyzgQ/ap qmay9VMHsb2h12JytV2RB1qoaSjk+rr1jKbM9ymHFLTjKWdWbO9d2yEdhGrJ1fKBRUdM hXu053q2Vw9+IzPofgVQEc0R7Ai9kTg4AuSFEQs0XofJT8ydUZpAyrudWuYVN0QGnDVU ceR8DtByIvXx9HpYhovA0FiZZ8c5u437UsQVleT6qAayMvgofrsav8Ga2lHVuwiejgvg 4o9Q== X-Gm-Message-State: AAQBX9ex4lchC2wAPYZTnm9ky9sHCzN3AiJPoqpc+qpCY8adh5qDfl5B 9PcSvCUyGsRG7wlLw2xa3QWn0w== X-Google-Smtp-Source: AKy350Zoh4fCOqtqd3thiSLyNU9sBaEf4Nj51GVGkWQRyHXjboJvtffhr2q/I/pKowm+XfHufg4BBQ== X-Received: by 2002:a17:906:9f18:b0:930:f953:962c with SMTP id fy24-20020a1709069f1800b00930f953962cmr23906634ejc.1.1680214477319; Thu, 30 Mar 2023 15:14:37 -0700 (PDT) Received: from pwmachine.localnet ([78.30.11.60]) by smtp.gmail.com with ESMTPSA id t17-20020a1709060c5100b00927341bf69dsm261542ejf.88.2023.03.30.15.14.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 15:14:36 -0700 (PDT) From: Francis Laniel To: Tony Dinh Cc: u-boot@lists.denx.de, Michael Nazzareno Trimarchi , Tom Rini , Simon Glass , Harald Seiler , "Albert ARIBAUD (3ADEV)" , Sergei Antonov , Heinrich Schuchardt , Ilias Apalodimas , Masahisa Kojima , =?UTF-8?Q?Pali_Roh=C3=A1r?= , Stefan Roese , John Keeping , Neil Armstrong , Roger Knecht , Sughosh Ganu , Alexey Romanov , Patrice Chotard , Fabrice Gasnier , Hector Palacios , Marek Vasut , Rasmus Villemoes , AKASHI Takahiro , Linus Walleij , Rui Miguel Silva , Andrew Scull Subject: Re: [RFC PATCH v7 23/23] DO NOT MERGE: only to make CI happy Date: Thu, 30 Mar 2023 23:14:34 +0100 Message-ID: <12179610.O9o76ZdvQC@pwmachine> In-Reply-To: References: <20230330194716.23623-1-francis.laniel@amarulasolutions.com> <20230330194716.23623-24-francis.laniel@amarulasolutions.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Hi. Le jeudi 30 mars 2023, 21:17:33 WEST Tony Dinh a =C3=A9crit : > Hi Francis, >=20 > On Thu, Mar 30, 2023 at 12:50=E2=80=AFPM Francis Laniel >=20 > wrote: > > This commit set CONFIG_HUSH_PARSER_2021 as the default to trigger the CI > > with this parser. > >=20 > > Nonetheless, the keymile (i.e. VENDOR_KM) board family is not compatible > > with new 2021 hush parser. > > Indeed, This boards used set_local_var() to store some variables as loc= al > > shell. They then used get_local_var() to retrieve the variables values. > > Sadly, this two functions do not exist with CONFIG_HUSH_PARSER_2021. > > A patch was proposed to use environment variables rather than local > > variables but it does not tackle the problem, so complementary work is > > needed to make this boards use CONFIG_HUSH_PARSER_2021 [1]. > >=20 > > We also remove a #undef of CONFIG_FEATURE_SH_STANDALONE as it does not > > exist in U-Boot and causes troubles in the CI. > >=20 > > We also set CONFIG_LTO for kirkwoord sheevaplug and phytec bk4r1, > > otherwise it hits its board size limit. > > By enabling this option, we also had to add assembly for > > __gnu_thumb1_case_si. It was taken from upstream gcc and adapted as wid= th > > suffix was removed for the add [2]. >=20 > Thanks for adding __gnu_thumb1_case_si ! It will help not just the > Sheevaplug board, but also a few other boards too. I'll give this a > try. You are welcome! I nonetheless cannot ensure the modifications I brought to the code are cor= rect=20 as I do not have the board to test them. So, if you can test it on a board it will be really welcomed and in case yo= u=20 find any problem I will add your suggested changes to the commit! >=20 > All the best, > Tony >=20 > > Signed-off-by: Francis Laniel > > [1] https://marc.info/?l=3Du-boot&m=3D165541917618725&w=3D2 > > [2] > > https://github.com/gcc-mirror/gcc/blob/4f181f9c7ee3efc509d185fdfda33be9= 01 > > 8f1611/libgcc/config/arm/lib1funcs.S#L2156 --- > >=20 > > arch/arm/lib/lib1funcs.S | 17 +++++++++++++++++ > > cmd/Kconfig | 3 ++- > > common/cli_hush_upstream.c | 1 - > > configs/bk4r1_defconfig | 1 + > > configs/sheevaplug_defconfig | 1 + > > 5 files changed, 21 insertions(+), 2 deletions(-) > >=20 > > diff --git a/arch/arm/lib/lib1funcs.S b/arch/arm/lib/lib1funcs.S > > index de15d09e36..a1f44d9454 100644 > > --- a/arch/arm/lib/lib1funcs.S > > +++ b/arch/arm/lib/lib1funcs.S > > @@ -419,4 +419,21 @@ ENTRY(__gnu_thumb1_case_uhi) > >=20 > > ret lr > > =20 > > ENDPROC(__gnu_thumb1_case_uhi) > > .popsection > >=20 > > + > > +/* Taken and adapted from: > > https://github.com/gcc-mirror/gcc/blob/4f181f9c7ee3efc509d185fdfda33be9= 01 > > 8f1611/libgcc/config/arm/lib1funcs.S#L2156 */ +.pushsection > > .text.__gnu_thumb1_case_si, "ax" > > +ENTRY(__gnu_thumb1_case_si) > > + push {r0, r1} > > + mov r1, lr > > + adds r1, r1, #2 /* Align to word. */ > > + lsrs r1, r1, #2 > > + lsls r0, r0, #2 > > + lsls r1, r1, #2 > > + ldr r0, [r1, r0] > > + adds r0, r0, r1 > > + mov lr, r0 > > + pop {r0, r1} > > + mov pc, lr /* We know we were called from thumb co= de. > > */ +ENDPROC(__gnu_thumb1_case_si) > > +.popsection > >=20 > > #endif > >=20 > > diff --git a/cmd/Kconfig b/cmd/Kconfig > > index 1b9d04680d..d4809fcfa4 100644 > > --- a/cmd/Kconfig > > +++ b/cmd/Kconfig > > @@ -28,7 +28,7 @@ menu "Hush flavor to use" > >=20 > > config HUSH_OLD_PARSER > > =20 > > bool "Use hush old parser" > >=20 > > - default y > > + default y if VENDOR_KM > >=20 > > help > > =20 > > This option enables the old flavor of hush based on h= ush > > Busybox from > > 2005. > >=20 > > @@ -37,6 +37,7 @@ menu "Hush flavor to use" > >=20 > > config HUSH_2021_PARSER > > =20 > > bool "Use hush 2021 parser" > >=20 > > + default y if !VENDOR_KM > >=20 > > help > > =20 > > This option enables the new flavor of hush based on h= ush > > Busybox from > > 2021. > >=20 > > diff --git a/common/cli_hush_upstream.c b/common/cli_hush_upstream.c > > index 93796e87c5..78a13eeb62 100644 > > --- a/common/cli_hush_upstream.c > > +++ b/common/cli_hush_upstream.c > > @@ -427,7 +427,6 @@ > >=20 > > #include "NUM_APPLETS.h" > > #if NUM_APPLETS =3D=3D 1 > > /* STANDALONE does not make sense, and won't compile */ > >=20 > > -# undef CONFIG_FEATURE_SH_STANDALONE > >=20 > > # undef ENABLE_FEATURE_SH_STANDALONE > > # undef IF_FEATURE_SH_STANDALONE > > # undef IF_NOT_FEATURE_SH_STANDALONE > >=20 > > diff --git a/configs/bk4r1_defconfig b/configs/bk4r1_defconfig > > index 66adeac725..95f0c30cde 100644 > > --- a/configs/bk4r1_defconfig > > +++ b/configs/bk4r1_defconfig > > @@ -18,6 +18,7 @@ CONFIG_TARGET_BK4R1=3Dy > >=20 > > CONFIG_SYS_LOAD_ADDR=3D0x82000000 > > CONFIG_SYS_MEMTEST_START=3D0x80010000 > > CONFIG_SYS_MEMTEST_END=3D0x87c00000 > >=20 > > +CONFIG_LTO=3Dy > >=20 > > CONFIG_HAS_BOARD_SIZE_LIMIT=3Dy > > CONFIG_BOARD_SIZE_LIMIT=3D520192 > > CONFIG_FIT=3Dy > >=20 > > diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig > > index 2e4901b840..365f779cc8 100644 > > --- a/configs/sheevaplug_defconfig > > +++ b/configs/sheevaplug_defconfig > > @@ -16,6 +16,7 @@ CONFIG_ENV_OFFSET=3D0x80000 > >=20 > > CONFIG_DEFAULT_DEVICE_TREE=3D"kirkwood-sheevaplug" > > CONFIG_IDENT_STRING=3D"\nMarvell-Sheevaplug" > > CONFIG_SYS_LOAD_ADDR=3D0x800000 > >=20 > > +CONFIG_LTO=3Dy > >=20 > > CONFIG_HAS_BOARD_SIZE_LIMIT=3Dy > > CONFIG_BOARD_SIZE_LIMIT=3D524288 > > CONFIG_BOOTDELAY=3D3 > >=20 > > -- > > 2.34.1 Best regards.