diff mbox

[U-Boot,v2] test/py: Add option to skip SPL signature checking

Message ID 146cef530f9c3db9de5d0394fe8718da2bf62d78.1456220400.git.michal.simek@xilinx.com
State Superseded
Delegated to: Tom Rini
Headers show

Commit Message

Michal Simek Feb. 23, 2016, 9:40 a.m. UTC 
Provide user option to skip SPL signature verification for cases where
u-boot is build with SPL support but full U-Boot is also verified
without SPL.

If you want to support this feature please add env__spl_skipped = True
to your boardenv configuration file.

For example Xilinx Zynq is using this feature where the same U-Boot
binary is checked with SPL and without SPL(with FSBL).

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
---

Changes in v2:
- nits in commit message
- Rename to env_spl_skipped from env__spl_skipped

 test/py/u_boot_console_base.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Stephen Warren Feb. 23, 2016, 5:17 p.m. UTC | #1 
On 02/23/2016 02:40 AM, Michal Simek wrote:
> Provide user option to skip SPL signature verification for cases where
> u-boot is build with SPL support but full U-Boot is also verified
> without SPL.
>
> If you want to support this feature please add env__spl_skipped = True
> to your boardenv configuration file.
>
> For example Xilinx Zynq is using this feature where the same U-Boot
> binary is checked with SPL and without SPL(with FSBL).
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> Tested-by: Stephen Warren <swarren@nvidia.com>
> Acked-by: Stephen Warren <swarren@nvidia.com>

Actually, NAK now...

> diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py
> index d6502c6e64cb..b48d07261ff2 100644
> --- a/test/py/u_boot_console_base.py
> +++ b/test/py/u_boot_console_base.py
> @@ -307,7 +307,9 @@ class ConsoleBase(object):
>               config_spl = bcfg.get('config_spl', 'n') == 'y'
>               config_spl_serial_support = bcfg.get('config_spl_serial_support',
>                                                    'n') == 'y'
> -            if config_spl and config_spl_serial_support:
> +            config_spl_skip = self.config.env.get('env_spl_skipped',
> +                                                  False)

I was talking about renaming the Python variable config_spl_skip, not 
the boardenv_*.py variable env__spl_skipped.

The boardenv_*.py variable should be env__* to match existing variables 
in the Python file.

I was requesting that the Python variable be named env_... not 
config_... since it contains "board environment" not "config" data.

(BTW, you probably want to Cc Tom Rini on the next patch version since I 
assume he'd apply this)
Michal Simek Feb. 25, 2016, 1:59 p.m. UTC | #2 
On 23.2.2016 18:17, Stephen Warren wrote:
> On 02/23/2016 02:40 AM, Michal Simek wrote:
>> Provide user option to skip SPL signature verification for cases where
>> u-boot is build with SPL support but full U-Boot is also verified
>> without SPL.
>>
>> If you want to support this feature please add env__spl_skipped = True
>> to your boardenv configuration file.
>>
>> For example Xilinx Zynq is using this feature where the same U-Boot
>> binary is checked with SPL and without SPL(with FSBL).
>>
>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
>> Tested-by: Stephen Warren <swarren@nvidia.com>
>> Acked-by: Stephen Warren <swarren@nvidia.com>
> 
> Actually, NAK now...

I have removed your lines from v3.

> 
>> diff --git a/test/py/u_boot_console_base.py
>> b/test/py/u_boot_console_base.py
>> index d6502c6e64cb..b48d07261ff2 100644
>> --- a/test/py/u_boot_console_base.py
>> +++ b/test/py/u_boot_console_base.py
>> @@ -307,7 +307,9 @@ class ConsoleBase(object):
>>               config_spl = bcfg.get('config_spl', 'n') == 'y'
>>               config_spl_serial_support =
>> bcfg.get('config_spl_serial_support',
>>                                                    'n') == 'y'
>> -            if config_spl and config_spl_serial_support:
>> +            config_spl_skip = self.config.env.get('env_spl_skipped',
>> +                                                  False)
> 
> I was talking about renaming the Python variable config_spl_skip, not
> the boardenv_*.py variable env__spl_skipped.
> 
> The boardenv_*.py variable should be env__* to match existing variables
> in the Python file.
> 
> I was requesting that the Python variable be named env_... not
> config_... since it contains "board environment" not "config" data.

I misunderstood your description in v1.
Hopefully in v3 this will be correct.

> (BTW, you probably want to Cc Tom Rini on the next patch version since I
> assume he'd apply this)

Done.

Thanks,
Michal
diff mbox

Patch

diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py
index d6502c6e64cb..b48d07261ff2 100644
--- a/test/py/u_boot_console_base.py
+++ b/test/py/u_boot_console_base.py
@@ -307,7 +307,9 @@  class ConsoleBase(object):
             config_spl = bcfg.get('config_spl', 'n') == 'y'
             config_spl_serial_support = bcfg.get('config_spl_serial_support',
                                                  'n') == 'y'
-            if config_spl and config_spl_serial_support:
+            config_spl_skip = self.config.env.get('env_spl_skipped',
+                                                  False)
+            if config_spl and config_spl_serial_support and not config_spl_skip:
                 m = self.p.expect([pattern_u_boot_spl_signon] +
                                   self.bad_patterns)
                 if m != 0: