From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.groups.io with SMTP id smtpd.web12.1929.1583231641862224080 for ; Tue, 03 Mar 2020 02:34:02 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@akeo-ie.20150623.gappssmtp.com header.s=20150623 header.b=INjpQMQz; spf=none, err=permanent DNS error (domain: akeo.ie, ip: 209.85.221.48, mailfrom: pete@akeo.ie) Received: by mail-wr1-f48.google.com with SMTP id q8so3668200wrm.4 for ; Tue, 03 Mar 2020 02:34:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akeo-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=snkKSBi+ovOMEa5M5h4nV8W3l0oHS/9v61y0jnBxgNs=; b=INjpQMQzHqoPwrA1df8tXwoK1fXeR+X//UVxa8juw7EIo0LbU8rE+n33a+F7qMwBS6 VUKphfvyov/aJzUsUZI5W6K1rLEfAUBYCYiAyma696gqBTcMuEJqTEoMhWjKE/EaCgrM pRT6hMQ2HPlnFPDU47ny3KR/Gfi+5E+UsFCvCijqTHHhmhhVaHaiAhYVbJrI5lcWjf8S WVSngIGw404ms96XGZidQSon3p0AI7FbAUocHGmtc7TCcDAkzNOs58S7UJ084UBJY1TY WU5H4zFY9zWcZEhGppqnlpKL+wcwJ7phVq/qAeDbYeWb6P8+a5w1f3/mhPwtbz01JD3K sW2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=snkKSBi+ovOMEa5M5h4nV8W3l0oHS/9v61y0jnBxgNs=; b=t+jmul6trbor7SLMVd/6i3ZJnl3XddI5SLfBwcnwcB1A1NRVzcoy7BnLpJb08TvMGa xrMLyDNm1PfMMZ41xr9dDgqEq8DC4fAfBUPMat2mPYBkqAG5YFKb0Bdub7yFl+w2Pu5g O47ztpnaN5R2Zq5DoE8hAKxqnHtvem1qCY/Y6ksLFf9foVjgMtl0tq4XvXLVor4GpcmG guJMBLoZtqcTLAlxD6ZPu5MaJYU3h8TPmyJ+2IIWqlRmHI1ph7C0uBObhswMnVU00geK CC39RfwUlHGeQ6fqj5szRjTI7o4v539c6fqpIiDnkr9hYPMKA53ApSXMBWhGnd++y8DA 154Q== X-Gm-Message-State: ANhLgQ1nCmDqMB0ifSEEsTWeTsX61nayo20f8whgxd4nWi34iKgJRSwn UG+YZWrbymyJ8hsX1EIJisOUDs86Zx8= X-Google-Smtp-Source: ADFU+vvW35Fa0jpVA/I84OOT/6USNAKTmGaEw7mvYZGjTveJMMt+lN1Eu/5yDdCAx+HXRwa3dbCKoA== X-Received: by 2002:adf:fc12:: with SMTP id i18mr4791518wrr.354.1583231639762; Tue, 03 Mar 2020 02:33:59 -0800 (PST) Return-Path: Received: from localhost.localdomain ([84.203.56.244]) by smtp.gmail.com with ESMTPSA id c4sm3255193wml.7.2020.03.03.02.33.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Mar 2020 02:33:58 -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 5/5] Platform/RPi/ConfigDxe: Improve RPi configuration forms Date: Tue, 3 Mar 2020 10:33:39 +0000 Message-Id: <20200303103339.7468-6-pete@akeo.ie> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20200303103339.7468-1-pete@akeo.ie> References: <20200303103339.7468-1-pete@akeo.ie> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- 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