From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (NAM11-BN8-obe.outbound.protection.outlook.com [40.107.236.59]) by mx.groups.io with SMTP id smtpd.web11.6293.1583252274399545888 for ; Tue, 03 Mar 2020 08:17:54 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@vmware.com header.s=selector2 header.b=WANHRQcM; spf=pass (domain: vmware.com, ip: 40.107.236.59, mailfrom: awarkentin@vmware.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Cd6MceUw0BTytmdBu58z6eOsyZ2kKH+BNxNz6pMugNLIBl/mhRGfVSuna8wtUWOyGPe0MitpOcbjdD5iquJbBrVcJn3A6GkLplNs910lQhe3h+Mdd/Dp0DqgDCKX112Q2ZX3bTvTKhE1lPNl6ZoF+fhirGy/Uk6MHtBZDkPi9SMFDFqeS+rC+LUsviai7LTg9NrDMmFT0SGdGNmiTNyvOUN1wVkc4Hwaur55KAgHX9ufsyxREykCbcdUufuzBwVaKTheYcf1M4QWvhlLwG9BXMpbFN3KoZhoGap6pXPdGLb47W2CmpHjJhHnlP/xJfFYV3Kk/fvc7pR9pfn8m9Zkfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=m1zWvXUczEFomfeu28Il+L8SUsTk8PDXLU9rwVpStuM=; b=beo005/2AVKY1jKHICmCup/rUkj3O4k5dytE0M91tmYkgh/pmzzzx2PeX+RrXycf0um+DObaD3h5z4NSxTMpJhXZt6BuHdQenRXRXTcVgNDIWDeML9BmnLd3Gf58EoQdEe4MaF/+qAxXDzrOrSZTuJsYdeA7MGeOVnGjtsS0lJ6RaACfX2Ik7nYe6dM68YXYRscWnEVp4m9T1l070boTppMXPsOFXA+1Sb/G8hUs45pWJOtSK0Nufswc9+DLvE8NBqUZ1cEKOu5XB81u0NDFZDZpa0HWYMQtMbHPpZwfouOKJL+6ow4dngnl/m2XnRrgxh+/AOwkNQSlngEPvvIyfw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vmware.com; dmarc=pass action=none header.from=vmware.com; dkim=pass header.d=vmware.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vmware.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=m1zWvXUczEFomfeu28Il+L8SUsTk8PDXLU9rwVpStuM=; b=WANHRQcMK8a/oSXSMyZc6C0ygB3LZ2LHPRSDs37VcVelIH3yXZ1W98jIKgkWr0uoqlbVPK265heiIHVFwxeBfqR6CsFyY1RrmY36k81G7UIaoLpmJ6QjZDTlC5g8Q87nsFwpFk2Nn7AOvdxkSukIUWuKWvm/6SiDXzcmDOJoGY0= Received: from BN6PR05MB3411.namprd05.prod.outlook.com (2603:10b6:405:43::23) by BN6PR05MB3267.namprd05.prod.outlook.com (2603:10b6:404:bb::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2793.5; Tue, 3 Mar 2020 16:17:53 +0000 Received: from BN6PR05MB3411.namprd05.prod.outlook.com ([fe80::5df3:40e3:521a:7f84]) by BN6PR05MB3411.namprd05.prod.outlook.com ([fe80::5df3:40e3:521a:7f84%5]) with mapi id 15.20.2793.011; Tue, 3 Mar 2020 16:17:53 +0000 From: "Andrei Warkentin" To: Pete Batard , "devel@edk2.groups.io" CC: "ard.biesheuvel@linaro.org" , "leif@nuviainc.com" , "philmd@redhat.com" Subject: Re: [edk2-devel][PATCH v2 6/6] Platform/RPi/ConfigDxe: Improve RPi configuration form Thread-Topic: [edk2-devel][PATCH v2 6/6] Platform/RPi/ConfigDxe: Improve RPi configuration form Thread-Index: AQHV8Vzb9zB/QXs/qEiLlP1O+nYp6ag3C2Sz Date: Tue, 3 Mar 2020 16:17:52 +0000 Message-ID: References: <20200303130814.3092-1-pete@akeo.ie>,<20200303130814.3092-7-pete@akeo.ie> In-Reply-To: <20200303130814.3092-7-pete@akeo.ie> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=awarkentin@vmware.com; x-originating-ip: [24.147.160.127] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d62a70e2-c1bd-40d3-04e9-08d7bf8e6cf4 x-ms-traffictypediagnostic: BN6PR05MB3267: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:826; x-forefront-prvs: 03319F6FEF x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(376002)(366004)(136003)(39860400002)(346002)(396003)(189003)(199004)(52536014)(55016002)(9686003)(26005)(186003)(76116006)(66476007)(71200400001)(64756008)(66446008)(66556008)(66946007)(8676002)(4326008)(86362001)(478600001)(8936002)(33656002)(81156014)(2906002)(81166006)(110136005)(54906003)(316002)(7696005)(5660300002)(6506007)(53546011);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR05MB3267;H:BN6PR05MB3411.namprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: vmware.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: OEAVOw5xUZwh2BgHj5k2EqBE/LLjX2fQmJbvelmQfnKU/oxNWA8R3awpVKGzWXCbtlGtTJYt3X6EJkeelOnbkM5OA8eWTadkjixu+k/0OQngNckJc4gYh8qegTl+BbCInpYr+zJt+1parsSjUQdiDQ9LxeLmLCIZIFboAxiyTtlFSVgdfh2iHCV3nUV4kCbswXM2Gnappmgs0OqfunD0ZgM3WZUBqR3mCIvY9gEU8CHXtM0tVpI7Y3nrxA2gbUCiwfG/Xd9BC/HuhTttWPTjhrGV18znJ8Y65r3zhg7mbk+zDIMmOs+BeGlE1gpZIgjhv+v8hKOZbCSKsWNxZ5WU+CWLA3/hzDd4Dv9eKT+auoaW5JKq2oVlxlpHk6hk+ypv7nnIC0z4JVYTIobj2mBq0tZOxVkqBmCGzRLN+RZIRFR0rdYSdu0QN9ETA+FDH6WG x-ms-exchange-antispam-messagedata: 9EzD9+Y5HiS3QZDeE+nM0E241cYliAkh9la4u0E6nd8Y9ILQRUN3SJ0LLdRVM85FQMYnrudjJv4S5qlfCOE/YlDobXcmrdDCHDa25p4U5WdMnG1lY67RzZuxyI6uVNwAC89hCmyy7ja0wYLqHJDvUw== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: d62a70e2-c1bd-40d3-04e9-08d7bf8e6cf4 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Mar 2020 16:17:52.8408 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: jq+tEvoa4Q8cN5OyI63u41gCVq9GvRNkwRxI53pHm/lf6qZ0p51L5PKMLXeIoLHr5XOgddsvTL1sLX73aFQmZg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR05MB3267 Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Reviewed-by: Andrei Warkentin =0A= =0A= ________________________________________=0A= From: Pete Batard =0A= Sent: Tuesday, March 3, 2020 8:08 AM=0A= To: devel@edk2.groups.io=0A= Cc: ard.biesheuvel@linaro.org; leif@nuviainc.com; philmd@redhat.com; Andrei= Warkentin=0A= Subject: [edk2-devel][PATCH v2 6/6] Platform/RPi/ConfigDxe: Improve RPi con= figuration form=0A= =0A= Group all SD/MMC settings under the SD/MMC form.=0A= Make CPU settings more prominent.=0A= Harmonise form titles and text content.=0A= Reorder forms in the order they are most likely to be queried.=0A= =0A= Signed-off-by: Pete Batard =0A= ---=0A= Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni | 24 +++++-----=0A= Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr | 50 ++++++++++---= -------=0A= 2 files changed, 37 insertions(+), 37 deletions(-)=0A= =0A= diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni b/Plat= form/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni=0A= index 2e79e322e558..77eda96d8136 100644=0A= --- a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni=0A= +++ b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni=0A= @@ -14,11 +14,11 @@=0A= #string STR_FORM_SET_TITLE_HELP #language en-US "Press to configu= re system settings."=0A= =0A= /*=0A= - * Chipset config.=0A= + * Chipset configuration.=0A= */=0A= =0A= -#string STR_CHIPSET_FORM_TITLE #language en-US "Chipset Configuration= "=0A= -#string STR_CHIPSET_FORM_SUBTITLE #language en-US "Note: OS may override= settings when booted."=0A= +#string STR_CHIPSET_FORM_TITLE #language en-US "CPU Configuration"=0A= +#string STR_CHIPSET_FORM_SUBTITLE #language en-US "Note: OS may override= settings."=0A= =0A= #string STR_CHIPSET_CLOCK_CPU_PROMPT #language en-US "CPU Clock"=0A= #string STR_CHIPSET_CLOCK_CPU_HELP #language en-US "CPU Speed"=0A= @@ -30,11 +30,6 @@=0A= #string STR_CHIPSET_CUSTOM_CPU_CLOCK_PROMPT #language en-US "CPU Clock Rat= e (MHz)"=0A= #string STR_CHIPSET_CUSTOM_CPU_CLOCK_HELP #language en-US "Adjust the CP= U speed.\nMin value: 100 MHz\nMax value: 1600 MHz\n\nWarning: Overclocking = can make the system unbootable!"=0A= =0A= -#string STR_CHIPSET_SD_PROMPT #language en-US "uSD Routing"=0A= -#string STR_CHIPSET_SD_HELP #language en-US "Choose host controll= er to drive uSD slot"=0A= -#string STR_CHIPSET_SD_SDHOST #language en-US "Broadcom SDHOST"=0A= -#string STR_CHIPSET_SD_ARASAN #language en-US "Arasan SDHCI"=0A= -=0A= /*=0A= * Advanced configuration.=0A= */=0A= @@ -55,8 +50,13 @@=0A= * MMC/SD configuration.=0A= */=0A= =0A= -#string STR_MMC_FORM_TITLE #language en-US "SD/MMC Tweaks"=0A= -#string STR_MMC_FORM_SUBTITLE #language en-US "Note: UEFI only, OS will= override settings when booted."=0A= +#string STR_MMC_FORM_TITLE #language en-US "SD/MMC Configuration"=0A= +#string STR_MMC_FORM_SUBTITLE #language en-US "Note: UEFI only, OS may = override settings."=0A= +=0A= +#string STR_MMC_SD_PROMPT #language en-US "uSD Routing"=0A= +#string STR_MMC_SD_HELP #language en-US "Choose host controller t= o drive uSD slot"=0A= +#string STR_MMC_SD_SDHOST #language en-US "Broadcom SDHOST"=0A= +#string STR_MMC_SD_ARASAN #language en-US "Arasan SDHCI"=0A= =0A= #string STR_MMC_DISMULTI_PROMPT #language en-US "Multi-Block Support"=0A= #string STR_MMC_DISMULTI_HELP #language en-US "Use CMD18/CMD25 for tran= sfers when possible"=0A= @@ -84,7 +84,7 @@=0A= * Display settings.=0A= */=0A= =0A= -#string STR_DISPLAY_FORM_TITLE #language en-US "Display"=0A= +#string STR_DISPLAY_FORM_TITLE #language en-US "Display Configuration= "=0A= #string STR_DISPLAY_FORM_SUBTITLE #language en-US "UEFI video driver set= tings"=0A= =0A= #string STR_DISPLAY_VMODES_640_PROMPT #language en-US "Virtual 640x480"= =0A= @@ -109,7 +109,7 @@=0A= /*=0A= * Debugging settings go here.=0A= */=0A= -#string STR_DEBUG_FORM_TITLE #language en-US "Debugging"=0A= +#string STR_DEBUG_FORM_TITLE #language en-US "Debugging Configurati= on"=0A= #string STR_DEBUG_FORM_SUBTITLE #language en-US "For UEFI/OS Developer= s"=0A= =0A= #string STR_DEBUG_JTAG_PROMPT #language en-US "JTAG Routing"=0A= diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr b/Plat= form/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr=0A= index d16058da4926..9c2fd64a8e27 100644=0A= --- a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr=0A= +++ b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr=0A= @@ -65,14 +65,6 @@ typedef struct {=0A= UINT32 Clock;=0A= } CHIPSET_CUSTOM_CPU_CLOCK_VARSTORE_DATA;=0A= =0A= -typedef struct {=0A= - /*=0A= - * 0 - uSD slot routed to Broadcom SDHOST.=0A= - * 1 - uSD slot routed to Arasan SDHCI.=0A= - */=0A= - UINT32 Routing;=0A= -} CHIPSET_SD_VARSTORE_DATA;=0A= -=0A= typedef struct {=0A= /*=0A= * Always set by ConfigDxe prior to HII init to reflect=0A= @@ -93,6 +85,14 @@ typedef struct {=0A= UINT32 Enabled;=0A= } ADVANCED_DEVICE_TREE_VARSTORE_DATA;=0A= =0A= +typedef struct {=0A= + /*=0A= + * 0 - uSD slot routed to Broadcom SDHOST.=0A= + * 1 - uSD slot routed to Arasan SDHCI.=0A= + */=0A= + UINT32 Routing;=0A= +} MMC_SD_VARSTORE_DATA;=0A= +=0A= typedef struct {=0A= /*=0A= * 0 - Don't disable multi-block.=0A= @@ -155,11 +155,6 @@ formset=0A= name =3D CustomCpuClock,=0A= guid =3D CONFIGDXE_FORM_SET_GUID;=0A= =0A= - efivarstore CHIPSET_SD_VARSTORE_DATA,=0A= - attribute =3D EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME= _ACCESS | EFI_VARIABLE_NON_VOLATILE,=0A= - name =3D SdIsArasan,=0A= - guid =3D CONFIGDXE_FORM_SET_GUID;=0A= -=0A= efivarstore ADVANCED_RAM_MORE_THAN_3GB_VARSTORE_DATA,=0A= attribute =3D EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME= _ACCESS | EFI_VARIABLE_NON_VOLATILE,=0A= name =3D RamMoreThan3GB,=0A= @@ -175,6 +170,11 @@ formset=0A= name =3D OptDeviceTree,=0A= guid =3D CONFIGDXE_FORM_SET_GUID;=0A= =0A= + efivarstore MMC_SD_VARSTORE_DATA,=0A= + attribute =3D EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME= _ACCESS | EFI_VARIABLE_NON_VOLATILE,=0A= + name =3D SdIsArasan,=0A= + guid =3D CONFIGDXE_FORM_SET_GUID;=0A= +=0A= efivarstore MMC_DISMULTI_VARSTORE_DATA,=0A= attribute =3D EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME= _ACCESS | EFI_VARIABLE_NON_VOLATILE,=0A= name =3D MmcDisableMulti,=0A= @@ -228,6 +228,10 @@ formset=0A= prompt =3D STRING_TOKEN(STR_CHIPSET_FORM_TITLE),=0A= help =3D STRING_TOKEN(STR_NULL_STRING);=0A= =0A= + goto 0x1004,=0A= + prompt =3D STRING_TOKEN(STR_DISPLAY_FORM_TITLE),=0A= + help =3D STRING_TOKEN(STR_NULL_STRING);=0A= +=0A= goto 0x1006,=0A= prompt =3D STRING_TOKEN(STR_ADVANCED_FORM_TITLE),=0A= help =3D STRING_TOKEN(STR_NULL_STRING);=0A= @@ -236,10 +240,6 @@ formset=0A= prompt =3D STRING_TOKEN(STR_MMC_FORM_TITLE),=0A= help =3D STRING_TOKEN(STR_NULL_STRING);=0A= =0A= - goto 0x1004,=0A= - prompt =3D STRING_TOKEN(STR_DISPLAY_FORM_TITLE),=0A= - help =3D STRING_TOKEN(STR_NULL_STRING);=0A= -=0A= goto 0x1005,=0A= prompt =3D STRING_TOKEN(STR_DEBUG_FORM_TITLE),=0A= help =3D STRING_TOKEN(STR_NULL_STRING);=0A= @@ -269,14 +269,6 @@ formset=0A= default =3D 600,=0A= endnumeric;=0A= endif;=0A= -=0A= - oneof varid =3D SdIsArasan.Routing,=0A= - prompt =3D STRING_TOKEN(STR_CHIPSET_SD_PROMPT),=0A= - help =3D STRING_TOKEN(STR_CHIPSET_SD_HELP),=0A= - flags =3D NUMERIC_SIZE_4 | INTERACTIVE | RESET_REQUIRED,= =0A= - option text =3D STRING_TOKEN(STR_CHIPSET_SD_ARASAN), value =3D= 1, flags =3D 0;=0A= - option text =3D STRING_TOKEN(STR_CHIPSET_SD_SDHOST), value =3D= 0, flags =3D DEFAULT;=0A= - endoneof;=0A= endform;=0A= =0A= form formid =3D 0x1006,=0A= @@ -306,6 +298,14 @@ formset=0A= title =3D STRING_TOKEN(STR_MMC_FORM_TITLE);=0A= subtitle text =3D STRING_TOKEN(STR_MMC_FORM_SUBTITLE);=0A= =0A= + oneof varid =3D SdIsArasan.Routing,=0A= + prompt =3D STRING_TOKEN(STR_MMC_SD_PROMPT),=0A= + help =3D STRING_TOKEN(STR_MMC_SD_HELP),=0A= + flags =3D NUMERIC_SIZE_4 | INTERACTIVE | RESET_REQUIRED,= =0A= + option text =3D STRING_TOKEN(STR_MMC_SD_ARASAN), value =3D 1, = flags =3D 0;=0A= + option text =3D STRING_TOKEN(STR_MMC_SD_SDHOST), value =3D 0, = flags =3D DEFAULT;=0A= + endoneof;=0A= +=0A= oneof varid =3D MmcDisableMulti.DisableMulti,=0A= prompt =3D STRING_TOKEN(STR_MMC_DISMULTI_PROMPT),=0A= help =3D STRING_TOKEN(STR_MMC_DISMULTI_HELP),=0A= --=0A= 2.21.0.windows.1=0A= =0A=