From nobody Tue Feb 10 01:31:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+55326+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+55326+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1583240920; cv=none; d=zohomail.com; s=zohoarc; b=BCzLow/DB683IXebiCFf8pFrbx3wJYBBatLHZV5FtS5KwMBui+WaXKtvicdjdzPKP0JhrDdSxbrT7EP8t7SB9A/x07O/Z3VtlOZFVorma7mFX02dDr0MNZ2anzMnDFy+TK08rwcGqj4uCreznBKJoJWB6qEqb4IrZacsuH6chZk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583240920; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=mT+2z+hyEjG9tXS9Au5ReX2O0D53Tcd8yobDVLNbJPI=; b=QK8Pc+1Hs3NprOi2mowc7EBm5bsAo9dnscmXOvsinYr0VomsW7t3JxCc92yQK9CLBeO/zaep1a7cGbLp0kJL58Jd5SvBCLj+Wuki20aqvYaOH38KtGyXhszHe7O5POBkss9Bbn1kKJyI8YDAZdPpEU0eUtXIw3tYFCdTtdYw40k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+55326+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1583240920587794.093779971075; Tue, 3 Mar 2020 05:08:40 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id QeYcYY1788612x6a01FEzb8I; Tue, 03 Mar 2020 05:08:38 -0800 X-Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.groups.io with SMTP id smtpd.web09.3316.1583240917408042694 for ; Tue, 03 Mar 2020 05:08:37 -0800 X-Received: by mail-wr1-f43.google.com with SMTP id z15so4297322wrl.1 for ; Tue, 03 Mar 2020 05:08:37 -0800 (PST) X-Gm-Message-State: Jk8eaS9TglbqkcM7SR13Xgenx1787277AA= X-Google-Smtp-Source: ADFU+vtFP5naI7ONSYo8GeJ5gt8Sl0YiRKj8w64i7mrJsbnS7lgJEj42it4L64yoMJluxNe4rXOg/w== X-Received: by 2002:a05:6000:104f:: with SMTP id c15mr5209167wrx.376.1583240915491; Tue, 03 Mar 2020 05:08:35 -0800 (PST) X-Received: from localhost.localdomain ([84.203.56.244]) by smtp.gmail.com with ESMTPSA id j5sm3907620wmi.33.2020.03.03.05.08.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Mar 2020 05:08:34 -0800 (PST) From: "Pete Batard" To: devel@edk2.groups.io Cc: ard.biesheuvel@linaro.org, leif@nuviainc.com, philmd@redhat.com, awarkentin@vmware.com Subject: [edk2-devel][PATCH v2 6/6] Platform/RPi/ConfigDxe: Improve RPi configuration form Date: Tue, 3 Mar 2020 13:08:14 +0000 Message-Id: <20200303130814.3092-7-pete@akeo.ie> In-Reply-To: <20200303130814.3092-1-pete@akeo.ie> References: <20200303130814.3092-1-pete@akeo.ie> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,pete@akeo.ie Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1583240918; bh=EGFzMFYfosC/HKZwdUdL3Wgfzyzu6A8Fm8Ehhx6N/Js=; h=Cc:Date:From:Reply-To:Subject:To; b=iZ1FxL5k3ZZZ/the2cgEW0rvhRVMhiu+r1+L+/+wHmmouaoq6dVO4/aocuRWOcWGCcq jOybNUhQajVQIqK9fnFhN/8bzLuNfexwiWU/HmTG899Xg7627kGyKRIj8gTK2K08+A08t B6nUgQk60T6MqzJpl6V0QkpjsLyfTVpI6Ic= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Group all SD/MMC settings under the SD/MMC form. Make CPU settings more prominent. Harmonise form titles and text content. Reorder forms in the order they are most likely to be queried. Signed-off-by: Pete Batard Reviewed-by: Andrei Warkentin --- Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni | 24 +++++----- Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr | 50 ++++++++++---= ------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni b/Plat= form/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni index 2e79e322e558..77eda96d8136 100644 --- a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni +++ b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni @@ -14,11 +14,11 @@ #string STR_FORM_SET_TITLE_HELP #language en-US "Press to configu= re system settings." =20 /* - * Chipset config. + * Chipset configuration. */ =20 -#string STR_CHIPSET_FORM_TITLE #language en-US "Chipset Configuration" -#string STR_CHIPSET_FORM_SUBTITLE #language en-US "Note: OS may override= settings when booted." +#string STR_CHIPSET_FORM_TITLE #language en-US "CPU Configuration" +#string STR_CHIPSET_FORM_SUBTITLE #language en-US "Note: OS may override= settings." =20 #string STR_CHIPSET_CLOCK_CPU_PROMPT #language en-US "CPU Clock" #string STR_CHIPSET_CLOCK_CPU_HELP #language en-US "CPU Speed" @@ -30,11 +30,6 @@ #string STR_CHIPSET_CUSTOM_CPU_CLOCK_PROMPT #language en-US "CPU Clock Rat= e (MHz)" #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!" =20 -#string STR_CHIPSET_SD_PROMPT #language en-US "uSD Routing" -#string STR_CHIPSET_SD_HELP #language en-US "Choose host controll= er to drive uSD slot" -#string STR_CHIPSET_SD_SDHOST #language en-US "Broadcom SDHOST" -#string STR_CHIPSET_SD_ARASAN #language en-US "Arasan SDHCI" - /* * Advanced configuration. */ @@ -55,8 +50,13 @@ * MMC/SD configuration. */ =20 -#string STR_MMC_FORM_TITLE #language en-US "SD/MMC Tweaks" -#string STR_MMC_FORM_SUBTITLE #language en-US "Note: UEFI only, OS will= override settings when booted." +#string STR_MMC_FORM_TITLE #language en-US "SD/MMC Configuration" +#string STR_MMC_FORM_SUBTITLE #language en-US "Note: UEFI only, OS may = override settings." + +#string STR_MMC_SD_PROMPT #language en-US "uSD Routing" +#string STR_MMC_SD_HELP #language en-US "Choose host controller t= o drive uSD slot" +#string STR_MMC_SD_SDHOST #language en-US "Broadcom SDHOST" +#string STR_MMC_SD_ARASAN #language en-US "Arasan SDHCI" =20 #string STR_MMC_DISMULTI_PROMPT #language en-US "Multi-Block Support" #string STR_MMC_DISMULTI_HELP #language en-US "Use CMD18/CMD25 for tran= sfers when possible" @@ -84,7 +84,7 @@ * Display settings. */ =20 -#string STR_DISPLAY_FORM_TITLE #language en-US "Display" +#string STR_DISPLAY_FORM_TITLE #language en-US "Display Configuration" #string STR_DISPLAY_FORM_SUBTITLE #language en-US "UEFI video driver set= tings" =20 #string STR_DISPLAY_VMODES_640_PROMPT #language en-US "Virtual 640x480" @@ -109,7 +109,7 @@ /* * Debugging settings go here. */ -#string STR_DEBUG_FORM_TITLE #language en-US "Debugging" +#string STR_DEBUG_FORM_TITLE #language en-US "Debugging Configurati= on" #string STR_DEBUG_FORM_SUBTITLE #language en-US "For UEFI/OS Developer= s" =20 #string STR_DEBUG_JTAG_PROMPT #language en-US "JTAG Routing" diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr b/Plat= form/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr index d16058da4926..9c2fd64a8e27 100644 --- a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr +++ b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr @@ -65,14 +65,6 @@ typedef struct { UINT32 Clock; } CHIPSET_CUSTOM_CPU_CLOCK_VARSTORE_DATA; =20 -typedef struct { - /* - * 0 - uSD slot routed to Broadcom SDHOST. - * 1 - uSD slot routed to Arasan SDHCI. - */ - UINT32 Routing; -} CHIPSET_SD_VARSTORE_DATA; - typedef struct { /* * Always set by ConfigDxe prior to HII init to reflect @@ -93,6 +85,14 @@ typedef struct { UINT32 Enabled; } ADVANCED_DEVICE_TREE_VARSTORE_DATA; =20 +typedef struct { + /* + * 0 - uSD slot routed to Broadcom SDHOST. + * 1 - uSD slot routed to Arasan SDHCI. + */ + UINT32 Routing; +} MMC_SD_VARSTORE_DATA; + typedef struct { /* * 0 - Don't disable multi-block. @@ -155,11 +155,6 @@ formset name =3D CustomCpuClock, guid =3D CONFIGDXE_FORM_SET_GUID; =20 - efivarstore CHIPSET_SD_VARSTORE_DATA, - attribute =3D EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME= _ACCESS | EFI_VARIABLE_NON_VOLATILE, - name =3D SdIsArasan, - guid =3D CONFIGDXE_FORM_SET_GUID; - efivarstore ADVANCED_RAM_MORE_THAN_3GB_VARSTORE_DATA, attribute =3D EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME= _ACCESS | EFI_VARIABLE_NON_VOLATILE, name =3D RamMoreThan3GB, @@ -175,6 +170,11 @@ formset name =3D OptDeviceTree, guid =3D CONFIGDXE_FORM_SET_GUID; =20 + efivarstore MMC_SD_VARSTORE_DATA, + attribute =3D EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME= _ACCESS | EFI_VARIABLE_NON_VOLATILE, + name =3D SdIsArasan, + guid =3D CONFIGDXE_FORM_SET_GUID; + efivarstore MMC_DISMULTI_VARSTORE_DATA, attribute =3D EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME= _ACCESS | EFI_VARIABLE_NON_VOLATILE, name =3D MmcDisableMulti, @@ -228,6 +228,10 @@ formset prompt =3D STRING_TOKEN(STR_CHIPSET_FORM_TITLE), help =3D STRING_TOKEN(STR_NULL_STRING); =20 + goto 0x1004, + prompt =3D STRING_TOKEN(STR_DISPLAY_FORM_TITLE), + help =3D STRING_TOKEN(STR_NULL_STRING); + goto 0x1006, prompt =3D STRING_TOKEN(STR_ADVANCED_FORM_TITLE), help =3D STRING_TOKEN(STR_NULL_STRING); @@ -236,10 +240,6 @@ formset prompt =3D STRING_TOKEN(STR_MMC_FORM_TITLE), help =3D STRING_TOKEN(STR_NULL_STRING); =20 - goto 0x1004, - prompt =3D STRING_TOKEN(STR_DISPLAY_FORM_TITLE), - help =3D STRING_TOKEN(STR_NULL_STRING); - goto 0x1005, prompt =3D STRING_TOKEN(STR_DEBUG_FORM_TITLE), help =3D STRING_TOKEN(STR_NULL_STRING); @@ -269,14 +269,6 @@ formset default =3D 600, endnumeric; endif; - - oneof varid =3D SdIsArasan.Routing, - prompt =3D STRING_TOKEN(STR_CHIPSET_SD_PROMPT), - help =3D STRING_TOKEN(STR_CHIPSET_SD_HELP), - flags =3D NUMERIC_SIZE_4 | INTERACTIVE | RESET_REQUIRED, - option text =3D STRING_TOKEN(STR_CHIPSET_SD_ARASAN), value =3D= 1, flags =3D 0; - option text =3D STRING_TOKEN(STR_CHIPSET_SD_SDHOST), value =3D= 0, flags =3D DEFAULT; - endoneof; endform; =20 form formid =3D 0x1006, @@ -306,6 +298,14 @@ formset title =3D STRING_TOKEN(STR_MMC_FORM_TITLE); subtitle text =3D STRING_TOKEN(STR_MMC_FORM_SUBTITLE); =20 + oneof varid =3D SdIsArasan.Routing, + prompt =3D STRING_TOKEN(STR_MMC_SD_PROMPT), + help =3D STRING_TOKEN(STR_MMC_SD_HELP), + flags =3D NUMERIC_SIZE_4 | INTERACTIVE | RESET_REQUIRED, + option text =3D STRING_TOKEN(STR_MMC_SD_ARASAN), value =3D 1, = flags =3D 0; + option text =3D STRING_TOKEN(STR_MMC_SD_SDHOST), value =3D 0, = flags =3D DEFAULT; + endoneof; + oneof varid =3D MmcDisableMulti.DisableMulti, prompt =3D STRING_TOKEN(STR_MMC_DISMULTI_PROMPT), help =3D STRING_TOKEN(STR_MMC_DISMULTI_HELP), --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#55326): https://edk2.groups.io/g/devel/message/55326 Mute This Topic: https://groups.io/mt/71699478/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-