Skip to content

Fix logical OR tautology in Zynq/ZynqMP architecture check #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fcgorter wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix logical OR tautology in Zynq/ZynqMP architecture check #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bisonflex/bif.tab.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@ namespace BIF {
case 83:
/* Line 670 of lalr1.cc */
#line 384 "parser/bif.y"
{ if(options.GetArchType() != Arch::ZYNQ || options.GetArchType() != Arch::ZYNQMP)
{ if(options.GetArchType() != Arch::ZYNQ && options.GetArchType() != Arch::ZYNQMP)
LOG_WARNING("BIF attribute error !!! [keysrc_encryption] not supported for the specified architecture.\n\t Refer 'bootgen -bif_help' for more details");
currentBifOptions->SetEncryptionKeySource((yysemantic_stack_[(4) - (4)].encrkeysrc_t)); options.SetEncryptedKeySource((yysemantic_stack_[(4) - (4)].encrkeysrc_t)); }
break;
Expand Down
2 changes: 1 addition & 1 deletion parser/bif.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ partition_content : /* empty */
| partition_content new_file_spec
;

other_spec : OBRACKET KEYSRC_ENCRYPTION EBRACKET key_src { if(options.GetArchType() != Arch::ZYNQ || options.GetArchType() != Arch::ZYNQMP)
other_spec : OBRACKET KEYSRC_ENCRYPTION EBRACKET key_src { if(options.GetArchType() != Arch::ZYNQ && options.GetArchType() != Arch::ZYNQMP)
LOG_WARNING("BIF attribute error !!! [keysrc_encryption] not supported for the specified architecture.\n\t Refer 'bootgen -bif_help' for more details");
currentBifOptions->SetEncryptionKeySource($4); options.SetEncryptedKeySource($4); }
| OBRACKET FSBL_CONFIG { if(options.GetArchType() == Arch::ZYNQ)
Expand Down