diff options
| author | Michael Brown | 2013-12-05 13:38:51 +0100 |
|---|---|---|
| committer | Michael Brown | 2013-12-05 13:43:28 +0100 |
| commit | b0942534eb773915d3cb4e3d63354e5fddf5c0c7 (patch) | |
| tree | daded81f513f3ef5fbe061d509f4a923beb7a762 /src/arch/x86 | |
| parent | [dhcpv6] Use DUID-UUID form of client DUID (diff) | |
| download | ipxe-b0942534eb773915d3cb4e3d63354e5fddf5c0c7.tar.gz ipxe-b0942534eb773915d3cb4e3d63354e5fddf5c0c7.tar.xz ipxe-b0942534eb773915d3cb4e3d63354e5fddf5c0c7.zip | |
[settings] Force settings into alphabetical order within sections
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch/x86')
| -rw-r--r-- | src/arch/x86/core/cpuid_settings.c | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/src/arch/x86/core/cpuid_settings.c b/src/arch/x86/core/cpuid_settings.c index 2da859ee9..42dea9336 100644 --- a/src/arch/x86/core/cpuid_settings.c +++ b/src/arch/x86/core/cpuid_settings.c @@ -251,22 +251,24 @@ struct init_fn cpuid_settings_init_fn __init_fn ( INIT_NORMAL ) = { .initialise = cpuid_settings_init, }; -/** CPUID predefined settings */ -const struct setting cpuid_predefined_settings[] __setting ( SETTING_HOST_EXTRA ) = { - { - .name = "cpuvendor", - .description = "CPU vendor", - .tag = CPUID_TAG ( CPUID_VENDOR_ID, 1, 1, 3, - CPUID_EBX, CPUID_EDX, CPUID_ECX, 0 ), - .type = &setting_type_string, - .scope = &cpuid_settings_scope, - }, - { - .name = "cpumodel", - .description = "CPU model", - .tag = CPUID_TAG ( CPUID_MODEL, 3, 1, 4, - CPUID_EAX, CPUID_EBX, CPUID_ECX, CPUID_EDX ), - .type = &setting_type_string, - .scope = &cpuid_settings_scope, - }, +/** CPU vendor setting */ +const struct setting cpuvendor_setting __setting ( SETTING_HOST_EXTRA, + cpuvendor ) = { + .name = "cpuvendor", + .description = "CPU vendor", + .tag = CPUID_TAG ( CPUID_VENDOR_ID, 1, 1, 3, + CPUID_EBX, CPUID_EDX, CPUID_ECX, 0 ), + .type = &setting_type_string, + .scope = &cpuid_settings_scope, +}; + +/** CPU model setting */ +const struct setting cpumodel_setting __setting ( SETTING_HOST_EXTRA, + cpumodel ) = { + .name = "cpumodel", + .description = "CPU model", + .tag = CPUID_TAG ( CPUID_MODEL, 3, 1, 4, + CPUID_EAX, CPUID_EBX, CPUID_ECX, CPUID_EDX ), + .type = &setting_type_string, + .scope = &cpuid_settings_scope, }; |