From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mx.groups.io with SMTP id smtpd.web10.2041.1583232342013497693 for ; Tue, 03 Mar 2020 02:45:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=KUnuukVb; spf=pass (domain: linaro.org, ip: 209.85.221.66, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wr1-f66.google.com with SMTP id x7so3744306wrr.0 for ; Tue, 03 Mar 2020 02:45:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=5PF31cQHA0epkEA6d7moedLcLG2IJTgKokO6sk7yAkI=; b=KUnuukVbyyXBDh2HyqoayfNFvxHb0IzRP2/hmwjfDpqGPsIt3SOPxNLj7EottfJd5p 3LRso7gsiYCie7FQNkKUWSeOnwWwcbIo08NfDMFuanBuMz8hBmY3s4ELB3N4Dm/TTMP5 XZEiAjDC6ps08uYcaHkZ01BhQSQW5qNgBfUg12Hqlq1wMUE2sVd11eO/IPAYLWz4G4Rg QnWne/kZKyMpQCpW0qBgNoneR/GJ2ZmhS0H3iLRxywRy3SORxhApDM5hEeMnBoWCH9Tw 0PYz0/uzdedq0w7xQOh3u/a6sscCJq3uy4APkVogVVyCC1MvtPEiuAuicBXiQZGSDoHA AlyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=5PF31cQHA0epkEA6d7moedLcLG2IJTgKokO6sk7yAkI=; b=HcmEcPluh8rDJjP43DxRs5LO+Bt2wEEXwH2ajZ8EIoHp+7MmIBz54yf6ZddgWkYTHU tT4VPVDoVSRnZ87bcJNraUnT8ZliTTHnElgla4kykkZYMpgFvCMXIOyEZkAj0F885L+s DWyhK6MluefoNTtXwPv0HfdhWQPdIr98g6ocOTIpqjnXDazloek9Bbl8PeHTiiu5XRfa zB4ENaabUifH+LH7a2zvO+8Xhg3N/TzFeY2YhZmlgwnOJEkccYW22OS62kdiwCnWVLdd IBTZI0ifVWPkzDTk+SKzO3LaUyZ9YHkbAsxHg/rwrkhrBZJ0dolbKpgBb0qBRNpmyp6V hb/Q== X-Gm-Message-State: ANhLgQ14A8uUVAg9EmfHi76L58G7v8Ico8uwSXjm1qIe3hVczqfhctHt 9fbUT6P1sqoveShgQr4fKxnYGQXljNv+6cQl4LQ2LQ== X-Google-Smtp-Source: ADFU+vtMTSdUZgsQsNodws1CLk+h3gFqAo2C2LJ63P32NThuuR61FaNzLbF3LT74+kjdgPXx7RKDKwK5NaQIP2TFOA0= X-Received: by 2002:adf:f84a:: with SMTP id d10mr5006467wrq.208.1583232340417; Tue, 03 Mar 2020 02:45:40 -0800 (PST) MIME-Version: 1.0 References: <20200303103339.7468-1-pete@akeo.ie> <20200303103339.7468-6-pete@akeo.ie> In-Reply-To: <20200303103339.7468-6-pete@akeo.ie> From: "Ard Biesheuvel" Date: Tue, 3 Mar 2020 11:45:29 +0100 Message-ID: Subject: Re: [edk2-devel][PATCH 5/5] Platform/RPi/ConfigDxe: Improve RPi configuration forms To: Pete Batard Cc: edk2-devel-groups-io , Leif Lindholm , =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= , Andrei Warkentin Content-Type: text/plain; charset="UTF-8" On Tue, 3 Mar 2020 at 11:34, Pete Batard wrote: > > 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: Ard Biesheuvel > --- > 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/Platform/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 configure system settings." > > /* > - * Chipset config. > + * Chipset configuration. > */ > > -#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." > > #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 Rate (MHz)" > #string STR_CHIPSET_CUSTOM_CPU_CLOCK_HELP #language en-US "Adjust the CPU speed.\nMin value: 100 MHz\nMax value: 1600 MHz\n\nWarning: Overclocking can make the system unbootable!" > > -#string STR_CHIPSET_SD_PROMPT #language en-US "uSD Routing" > -#string STR_CHIPSET_SD_HELP #language en-US "Choose host controller 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. > */ > > -#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 to drive uSD slot" > +#string STR_MMC_SD_SDHOST #language en-US "Broadcom SDHOST" > +#string STR_MMC_SD_ARASAN #language en-US "Arasan SDHCI" > > #string STR_MMC_DISMULTI_PROMPT #language en-US "Multi-Block Support" > #string STR_MMC_DISMULTI_HELP #language en-US "Use CMD18/CMD25 for transfers when possible" > @@ -84,7 +84,7 @@ > * Display settings. > */ > > -#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 settings" > > #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 Configuration" > #string STR_DEBUG_FORM_SUBTITLE #language en-US "For UEFI/OS Developers" > > #string STR_DEBUG_JTAG_PROMPT #language en-US "JTAG Routing" > diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr b/Platform/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; > > -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; > > +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 = CustomCpuClock, > guid = CONFIGDXE_FORM_SET_GUID; > > - efivarstore CHIPSET_SD_VARSTORE_DATA, > - attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE, > - name = SdIsArasan, > - guid = CONFIGDXE_FORM_SET_GUID; > - > efivarstore ADVANCED_RAM_MORE_THAN_3GB_VARSTORE_DATA, > attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE, > name = RamMoreThan3GB, > @@ -175,6 +170,11 @@ formset > name = OptDeviceTree, > guid = CONFIGDXE_FORM_SET_GUID; > > + efivarstore MMC_SD_VARSTORE_DATA, > + attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE, > + name = SdIsArasan, > + guid = CONFIGDXE_FORM_SET_GUID; > + > efivarstore MMC_DISMULTI_VARSTORE_DATA, > attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE, > name = MmcDisableMulti, > @@ -228,6 +228,10 @@ formset > prompt = STRING_TOKEN(STR_CHIPSET_FORM_TITLE), > help = STRING_TOKEN(STR_NULL_STRING); > > + goto 0x1004, > + prompt = STRING_TOKEN(STR_DISPLAY_FORM_TITLE), > + help = STRING_TOKEN(STR_NULL_STRING); > + > goto 0x1006, > prompt = STRING_TOKEN(STR_ADVANCED_FORM_TITLE), > help = STRING_TOKEN(STR_NULL_STRING); > @@ -236,10 +240,6 @@ formset > prompt = STRING_TOKEN(STR_MMC_FORM_TITLE), > help = STRING_TOKEN(STR_NULL_STRING); > > - goto 0x1004, > - prompt = STRING_TOKEN(STR_DISPLAY_FORM_TITLE), > - help = STRING_TOKEN(STR_NULL_STRING); > - > goto 0x1005, > prompt = STRING_TOKEN(STR_DEBUG_FORM_TITLE), > help = STRING_TOKEN(STR_NULL_STRING); > @@ -269,14 +269,6 @@ formset > default = 600, > endnumeric; > endif; > - > - oneof varid = SdIsArasan.Routing, > - prompt = STRING_TOKEN(STR_CHIPSET_SD_PROMPT), > - help = STRING_TOKEN(STR_CHIPSET_SD_HELP), > - flags = NUMERIC_SIZE_4 | INTERACTIVE | RESET_REQUIRED, > - option text = STRING_TOKEN(STR_CHIPSET_SD_ARASAN), value = 1, flags = 0; > - option text = STRING_TOKEN(STR_CHIPSET_SD_SDHOST), value = 0, flags = DEFAULT; > - endoneof; > endform; > > form formid = 0x1006, > @@ -306,6 +298,14 @@ formset > title = STRING_TOKEN(STR_MMC_FORM_TITLE); > subtitle text = STRING_TOKEN(STR_MMC_FORM_SUBTITLE); > > + oneof varid = SdIsArasan.Routing, > + prompt = STRING_TOKEN(STR_MMC_SD_PROMPT), > + help = STRING_TOKEN(STR_MMC_SD_HELP), > + flags = NUMERIC_SIZE_4 | INTERACTIVE | RESET_REQUIRED, > + option text = STRING_TOKEN(STR_MMC_SD_ARASAN), value = 1, flags = 0; > + option text = STRING_TOKEN(STR_MMC_SD_SDHOST), value = 0, flags = DEFAULT; > + endoneof; > + > oneof varid = MmcDisableMulti.DisableMulti, > prompt = STRING_TOKEN(STR_MMC_DISMULTI_PROMPT), > help = STRING_TOKEN(STR_MMC_DISMULTI_HELP), > -- > 2.21.0.windows.1 >