Change in flashrom[master]: meson: Sort options alphabetically

[Angel Pons (Code Review)]

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/38668 )


Change subject: meson: Sort options alphabetically
......................................................................

meson: Sort options alphabetically

Treat them as C-strings, so that `nicintel` goes before `nicintel-spi`.

Change-Id: I77f97dc8ba0cfb2bec38342a80ace7b98ed00d37
Signed-off-by: Angel Pons <[e-mail]>
---
M meson.build
M meson_options.txt
2 files changed, 4 insertions(+), 4 deletions(-)



  git pull ssh://review.coreboot.org:29418/flashrom refs/changes/68/38668/1

diff --git a/meson.build b/meson.build
index 07b89fc..2ff49d2 100644
--- a/meson.build
+++ b/meson.build
@@ -48,8 +48,8 @@
 config_linux_spi	= get_option('config_linux_spi')
 config_mstarddc_spi	= get_option('config_mstarddc_spi')
 config_nic3com		= get_option('config_nic3com')
-config_nicintel_eeprom	= get_option('config_nicintel_eeprom')
 config_nicintel		= get_option('config_nicintel')
+config_nicintel_eeprom	= get_option('config_nicintel_eeprom')
 config_nicintel_spi	= get_option('config_nicintel_spi')
 config_nicnatsemi	= get_option('config_nicnatsemi')
 config_nicrealtek	= get_option('config_nicrealtek')
@@ -60,8 +60,8 @@
 config_satamv		= get_option('config_satamv')
 config_satasii		= get_option('config_satasii')
 config_serprog		= get_option('config_serprog')
-config_usbblaster_spi	= get_option('config_usbblaster_spi')
 config_stlinkv3_spi	= get_option('config_stlinkv3_spi')
+config_usbblaster_spi	= get_option('config_usbblaster_spi')
 
 cargs = []
 deps = []
diff --git a/meson_options.txt b/meson_options.txt
index f81e605..8cef6e9 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -20,9 +20,9 @@
 option('config_linux_spi',		type : 'boolean',	value : true,	description : 'Linux spidev interfaces')
 option('config_mstarddc_spi',		type : 'boolean',	value : false,	description : 'MSTAR DDC support')
 option('config_nic3com',		type : 'boolean',	value : true,	description : '3Com NICs')
+option('config_nicintel',		type : 'boolean',	value : true,	description : 'Intel NICs')
 option('config_nicintel_eeprom',	type : 'boolean',	value : true,	description : 'EEPROM on Intel NICs')
 option('config_nicintel_spi',		type : 'boolean',	value : true,	description : 'SPI on Intel NICs')
-option('config_nicintel',		type : 'boolean',	value : true,	description : 'Intel NICs')
 option('config_nicnatsemi',		type : 'boolean',	value : false,	description : 'National Semiconductor NICs')
 option('config_nicrealtek',		type : 'boolean',	value : true,	description : 'Realtek NICs')
 option('config_ogp_spi',		type : 'boolean',	value : true,	description : 'SPI on OGP cards')
@@ -32,5 +32,5 @@
 option('config_satamv',			type : 'boolean',	value : true,	description : 'Marvell SATA controllers')
 option('config_satasii',		type : 'boolean',	value : true,	description : 'SiI SATA controllers')
 option('config_serprog',		type : 'boolean',	value : true,	description : 'serprog')
-option('config_usbblaster_spi',		type : 'boolean',	value : true,	description : 'Altera USB-Blaster dongles')
 option('config_stlinkv3_spi',		type : 'boolean',	value : true,	description : 'STMicroelectronics STLINK-V3')
+option('config_usbblaster_spi',		type : 'boolean',	value : true,	description : 'Altera USB-Blaster dongles')

-- 
To view, visit https://review.coreboot.org/c/flashrom/+/38668
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I77f97dc8ba0cfb2bec38342a80ace7b98ed00d37
Gerrit-Change-Number: 38668
Gerrit-PatchSet: 1
Gerrit-Owner: Angel Pons <[e-mail]>
Gerrit-MessageType: newchange

[David Hendricks (Code Review)]

David Hendricks has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/38668 )

Change subject: meson: Sort options alphabetically
......................................................................


Patch Set 1: Code-Review+2


-- 
To view, visit https://review.coreboot.org/c/flashrom/+/38668
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I77f97dc8ba0cfb2bec38342a80ace7b98ed00d37
Gerrit-Change-Number: 38668
Gerrit-PatchSet: 1
Gerrit-Owner: Angel Pons <[e-mail]>
Gerrit-Reviewer: Angel Pons <[e-mail]>
Gerrit-Reviewer: Carl-Daniel Hailfinger <[e-mail]>
Gerrit-Reviewer: David Hendricks <[e-mail]>
Gerrit-Reviewer: Edward O'Callaghan <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-Comment-Date: Sat, 01 Feb 2020 16:12:38 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[Edward O'Callaghan (Code Review)]

Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/38668 )

Change subject: meson: Sort options alphabetically
......................................................................


Patch Set 1: Code-Review+2


-- 
To view, visit https://review.coreboot.org/c/flashrom/+/38668
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I77f97dc8ba0cfb2bec38342a80ace7b98ed00d37
Gerrit-Change-Number: 38668
Gerrit-PatchSet: 1
Gerrit-Owner: Angel Pons <[e-mail]>
Gerrit-Reviewer: Angel Pons <[e-mail]>
Gerrit-Reviewer: Carl-Daniel Hailfinger <[e-mail]>
Gerrit-Reviewer: David Hendricks <[e-mail]>
Gerrit-Reviewer: Edward O'Callaghan <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-CC: Paul Menzel <[e-mail]>
Gerrit-Comment-Date: Sun, 02 Feb 2020 02:48:02 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[Carl-Daniel Hailfinger (Code Review)]

Carl-Daniel Hailfinger has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/38668 )

Change subject: meson: Sort options alphabetically
......................................................................


Patch Set 1: Code-Review-1

This patch misses half of the necessary changes. Please fix the other occurrences in meson.build as well.


-- 
To view, visit https://review.coreboot.org/c/flashrom/+/38668
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I77f97dc8ba0cfb2bec38342a80ace7b98ed00d37
Gerrit-Change-Number: 38668
Gerrit-PatchSet: 1
Gerrit-Owner: Angel Pons <[e-mail]>
Gerrit-Reviewer: Angel Pons <[e-mail]>
Gerrit-Reviewer: Carl-Daniel Hailfinger <[e-mail]>
Gerrit-Reviewer: David Hendricks <[e-mail]>
Gerrit-Reviewer: Edward O'Callaghan <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-CC: Paul Menzel <[e-mail]>
Gerrit-Comment-Date: Sun, 02 Feb 2020 07:08:56 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/38668 )

Change subject: meson: Sort options alphabetically
......................................................................


Patch Set 1:
> Patch Set 1: Code-Review-1
>
> This patch misses half of the necessary changes.

Necessary?
> Please fix the other occurrences in meson.build as well.

Which lines are you referring to? The ones in the conditional code?


-- 
To view, visit https://review.coreboot.org/c/flashrom/+/38668
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I77f97dc8ba0cfb2bec38342a80ace7b98ed00d37
Gerrit-Change-Number: 38668
Gerrit-PatchSet: 1
Gerrit-Owner: Angel Pons <[e-mail]>
Gerrit-Reviewer: Angel Pons <[e-mail]>
Gerrit-Reviewer: Carl-Daniel Hailfinger <[e-mail]>
Gerrit-Reviewer: David Hendricks <[e-mail]>
Gerrit-Reviewer: Edward O'Callaghan <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-CC: Paul Menzel <[e-mail]>
Gerrit-Comment-Date: Sun, 02 Feb 2020 12:43:29 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

[Angel Pons (Code Review)]

Angel Pons has abandoned this change. ( https://review.coreboot.org/c/flashrom/+/38668 )

Change subject: meson: Sort options alphabetically
......................................................................


Abandoned
-- 
To view, visit https://review.coreboot.org/c/flashrom/+/38668
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I77f97dc8ba0cfb2bec38342a80ace7b98ed00d37
Gerrit-Change-Number: 38668
Gerrit-PatchSet: 1
Gerrit-Owner: Angel Pons <[e-mail]>
Gerrit-Reviewer: Angel Pons <[e-mail]>
Gerrit-Reviewer: Carl-Daniel Hailfinger <[e-mail]>
Gerrit-Reviewer: David Hendricks <[e-mail]>
Gerrit-Reviewer: Edward O'Callaghan <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-CC: Paul Menzel <[e-mail]>
Gerrit-MessageType: abandon

[Carl-Daniel Hailfinger (Code Review)]

Carl-Daniel Hailfinger has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/38668 )

Change subject: meson: Sort options alphabetically
......................................................................


Patch Set 1:
> Patch Set 1:
> > Patch Set 1: Code-Review-1
> >
> > This patch misses half of the necessary changes.
>
> Necessary?
> > Please fix the other occurrences in meson.build as well.
>
> Which lines are you referring to? The ones in the conditional code?

Yes, those. Could you please resubmit with those changes as well? Thanks.


-- 
To view, visit https://review.coreboot.org/c/flashrom/+/38668
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I77f97dc8ba0cfb2bec38342a80ace7b98ed00d37
Gerrit-Change-Number: 38668
Gerrit-PatchSet: 1
Gerrit-Owner: Angel Pons <[e-mail]>
Gerrit-Reviewer: Angel Pons <[e-mail]>
Gerrit-Reviewer: Carl-Daniel Hailfinger <[e-mail]>
Gerrit-Reviewer: David Hendricks <[e-mail]>
Gerrit-Reviewer: Edward O'Callaghan <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-CC: Paul Menzel <[e-mail]>
Gerrit-Comment-Date: Mon, 03 Feb 2020 10:01:15 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment