From dbedf4a56b49544b0f9174856a14bd6be2d9e641 Mon Sep 17 00:00:00 2001 From: Jim Liu Date: Mon, 7 Nov 2022 10:48:27 +0800 Subject: [PATCH 01/19] power: regulator: Add support for NPCM8xx Add support for setting nuvoton BMC NPCM845 voltage supply. Signed-off-by: Jim Liu --- drivers/power/regulator/Kconfig | 8 ++ drivers/power/regulator/Makefile | 1 + drivers/power/regulator/npcm8xx_regulator.c | 132 ++++++++++++++++++++ 3 files changed, 141 insertions(+) create mode 100644 drivers/power/regulator/npcm8xx_regulator.c diff --git a/drivers/power/regulator/Kconfig b/drivers/power/regulator/Kconfig index c519e066ef..c02e6377d8 100644 --- a/drivers/power/regulator/Kconfig +++ b/drivers/power/regulator/Kconfig @@ -128,6 +128,14 @@ config DM_REGULATOR_MAX77686 features for REGULATOR MAX77686. The driver implements get/set api for: value, enable and mode. +config DM_REGULATOR_NPCM8XX + bool "Enable Driver Model for NPCM8xx voltage supply" + depends on DM_REGULATOR && ARCH_NPCM8XX + help + Enable support for configuring voltage supply on NPCM8XX SoC. The + voltage supplies support two voltage levels and the driver implements + get/set api for setting the value. + config DM_REGULATOR_FAN53555 bool "Enable Driver Model for REGULATOR FAN53555" depends on DM_PMIC_FAN53555 diff --git a/drivers/power/regulator/Makefile b/drivers/power/regulator/Makefile index bc736068bc..68e4c0f9dd 100644 --- a/drivers/power/regulator/Makefile +++ b/drivers/power/regulator/Makefile @@ -9,6 +9,7 @@ obj-$(CONFIG_REGULATOR_ACT8846) += act8846.o obj-$(CONFIG_REGULATOR_AS3722) += as3722_regulator.o obj-$(CONFIG_$(SPL_)DM_REGULATOR_DA9063) += da9063.o obj-$(CONFIG_DM_REGULATOR_MAX77686) += max77686.o +obj-$(CONFIG_DM_REGULATOR_NPCM8XX) += npcm8xx_regulator.o obj-$(CONFIG_$(SPL_)DM_PMIC_PFUZE100) += pfuze100.o obj-$(CONFIG_$(SPL_)DM_REGULATOR_BD71837) += bd71837.o obj-$(CONFIG_$(SPL_)DM_REGULATOR_PCA9450) += pca9450.o diff --git a/drivers/power/regulator/npcm8xx_regulator.c b/drivers/power/regulator/npcm8xx_regulator.c new file mode 100644 index 0000000000..fcd1058cdf --- /dev/null +++ b/drivers/power/regulator/npcm8xx_regulator.c @@ -0,0 +1,132 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2022 Nuvoton Technology Corp. + */ + +#include +#include +#include +#include +#include + +#define REG_VSRCR 0xf08000e8 /* Voltage Supply Control Register */ + +/* Supported voltage levels (uV) */ +static const u32 volts_type1[] = { 3300000, 1800000 }; +static const u32 volts_type2[] = { 1000000, 1800000 }; +#define VOLT_LEV0 0 +#define VOLT_LEV1 1 + +struct volt_supply { + char *name; + const u32 *volts; + u32 reg_shift; /* Register bit offset for setting voltage */ +}; + +static const struct volt_supply npcm8xx_volt_supps[] = { + {"v1", volts_type1, 0}, + {"v2", volts_type1, 1}, + {"v3", volts_type1, 2}, + {"v4", volts_type1, 3}, + {"v5", volts_type1, 4}, + {"v6", volts_type1, 5}, + {"v7", volts_type1, 6}, + {"v8", volts_type1, 7}, + {"v9", volts_type1, 8}, + {"v10", volts_type1, 9}, + {"v11", volts_type2, 10}, + {"v12", volts_type1, 11}, + {"v13", volts_type1, 12}, + {"v14", volts_type2, 13}, + {"vsif", volts_type1, 14}, + {"vr2", volts_type1, 30}, +}; + +static const struct volt_supply *npcm8xx_volt_supply_get(const char *name) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(npcm8xx_volt_supps); i++) { + if (!strcmp(npcm8xx_volt_supps[i].name, name)) + return &npcm8xx_volt_supps[i]; + } + + return NULL; +} + +static int npcm8xx_regulator_set_value(struct udevice *dev, int uV) +{ + struct dm_regulator_uclass_plat *uc_pdata; + const struct volt_supply *supp; + u32 val, level; + + uc_pdata = dev_get_uclass_plat(dev); + if (!uc_pdata) + return -ENXIO; + + dev_dbg(dev, "%s set_value: %d\n", uc_pdata->name, uV); + supp = npcm8xx_volt_supply_get(uc_pdata->name); + if (!supp) + return -ENOENT; + + if (uV == supp->volts[VOLT_LEV0]) + level = VOLT_LEV0; + else if (uV == supp->volts[VOLT_LEV1]) + level = VOLT_LEV1; + else + return -EINVAL; + + /* Set voltage level */ + val = readl(REG_VSRCR); + val &= ~BIT(supp->reg_shift); + val |= level << supp->reg_shift; + writel(val, REG_VSRCR); + + return 0; +} + +static int npcm8xx_regulator_get_value(struct udevice *dev) +{ + struct dm_regulator_uclass_plat *uc_pdata; + const struct volt_supply *supp; + u32 val; + + uc_pdata = dev_get_uclass_plat(dev); + if (!uc_pdata) + return -ENXIO; + + supp = npcm8xx_volt_supply_get(uc_pdata->name); + if (!supp) + return -ENOENT; + + val = readl(REG_VSRCR) & BIT(supp->reg_shift); + + dev_dbg(dev, "%s get_value: %d\n", uc_pdata->name, + val ? supp->volts[VOLT_LEV1] : supp->volts[VOLT_LEV0]); + + return val ? supp->volts[VOLT_LEV1] : supp->volts[VOLT_LEV0]; +} + +static int npcm8xx_regulator_set_enable(struct udevice *dev, bool enable) +{ + /* Always on */ + return 0; +} + +static const struct dm_regulator_ops npcm8xx_regulator_ops = { + .set_value = npcm8xx_regulator_set_value, + .get_value = npcm8xx_regulator_get_value, + .set_enable = npcm8xx_regulator_set_enable, +}; + +static const struct udevice_id npcm8xx_regulator_ids[] = { + { .compatible = "regulator-npcm845" }, + { }, +}; + +U_BOOT_DRIVER(regulator_npcm8xx) = { + .name = "regulator_npcm845", + .id = UCLASS_REGULATOR, + .ops = &npcm8xx_regulator_ops, + .of_match = npcm8xx_regulator_ids, +}; From 0820e117c3a20afbf0ec611475e3719e8d8c83b1 Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Mon, 19 Dec 2022 14:29:49 -0600 Subject: [PATCH 02/19] doc: ti: reorganize existing ti docs Texas Instruments produces quite a lot of SoCs based upon a common architecture 'generation'. (eg: OMAP, K3) TI's existing documentation layout makes noticing this generation jump rather difficult. To make navigation easier, split the existing documentation into individual SoC families so we may begin grouping them according to their generational (eg: OMAP, K3) families. Signed-off-by: Bryan Brattlof Reviewed-by: Heinrich Schuchardt --- doc/board/ti/am335x_evm.rst | 5 ++++- doc/board/ti/am62x_sk.rst | 4 ++-- doc/board/ti/j721e_evm.rst | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/doc/board/ti/am335x_evm.rst b/doc/board/ti/am335x_evm.rst index a90f32da7a..7db9604ce0 100644 --- a/doc/board/ti/am335x_evm.rst +++ b/doc/board/ti/am335x_evm.rst @@ -1,8 +1,11 @@ .. SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause .. sectionauthor:: Tom Rini +AM335x Generation +================= + Summary -======= +------- This document covers various features of the `am335x_evm` default configuration, some of the related defconfigs, and how to enable hardware diff --git a/doc/board/ti/am62x_sk.rst b/doc/board/ti/am62x_sk.rst index 4e68c2018a..b1b7d99bef 100644 --- a/doc/board/ti/am62x_sk.rst +++ b/doc/board/ti/am62x_sk.rst @@ -1,8 +1,8 @@ .. SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause .. sectionauthor:: Vignesh Raghavendra -Texas Instruments AM62 Platforms -================================ +AM62 Platforms +=============== Introduction: ------------- diff --git a/doc/board/ti/j721e_evm.rst b/doc/board/ti/j721e_evm.rst index ad70f15b7a..e898601c41 100644 --- a/doc/board/ti/j721e_evm.rst +++ b/doc/board/ti/j721e_evm.rst @@ -1,8 +1,8 @@ .. SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause .. sectionauthor:: Lokesh Vutla -Texas Instruments K3 Platforms -============================== +J721E Platforms +=============== Introduction: ------------- From 16a30b3474a3813465b6b6d1b280fc7dc9a9f7ba Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Mon, 19 Dec 2022 14:29:50 -0600 Subject: [PATCH 03/19] doc: ti: add the K3 generation page Texas Instrument's entire K3 generation of SoCs use much of the same frameworks and boot flow, especially at the uboot level. Though there are small differences introduced as each new K3 based SoC is developed and as the K3 generation matures that will also need to be documented. Rather than copying the same documentation, with the small differences applicable to that specific SoC to a new page, introduce a new K3 page that can describe the general boot flow and design decisions for the entire K3 generation of chips, leaving the specifics for that particular SoC to a unique sub-page below this one. Signed-off-by: Bryan Brattlof Signed-off-by: Heinrich Schuchardt --- doc/board/ti/index.rst | 5 +- doc/board/ti/k3.rst | 274 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 276 insertions(+), 3 deletions(-) create mode 100644 doc/board/ti/k3.rst diff --git a/doc/board/ti/index.rst b/doc/board/ti/index.rst index 250d9242e8..89d537d195 100644 --- a/doc/board/ti/index.rst +++ b/doc/board/ti/index.rst @@ -1,11 +1,10 @@ .. SPDX-License-Identifier: GPL-2.0+ Texas Instruments -================= +################# .. toctree:: :maxdepth: 2 am335x_evm - j721e_evm - am62x_sk + k3 diff --git a/doc/board/ti/k3.rst b/doc/board/ti/k3.rst new file mode 100644 index 0000000000..b49a60caf1 --- /dev/null +++ b/doc/board/ti/k3.rst @@ -0,0 +1,274 @@ +.. SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +.. sectionauthor:: Bryan Brattlof + +K3 Generation +============= + +Summary +------- + +Texas Instrument's K3 family of SoCs utilize a heterogeneous multicore +and highly integrated device architecture targeted to maximize +performance and power efficiency for a wide range of industrial, +automotive and other broad market segments. + +Typically the processing cores and the peripherals for these devices are +partitioned into three functional domains to provide ultra-low power +modes as well as accommodating application and industrial safety systems +on the same SoC. These functional domains are typically called the: + +* Wakeup (WKUP) domain +* Micro-controller (MCU) domain +* Main domain + +For a more detailed view of what peripherals are attached to each +domain, consult the device specific documentation. + +K3 Based SoCs +------------- + +.. toctree:: + :maxdepth: 1 + + j721e_evm + am62x_sk + +Boot Flow Overview +------------------ + +For all K3 SoCs the first core started will be inside the Security +Management Subsystem (SMS) which will secure the device and start a core +in the wakeup domain to run the ROM code. ROM will then initialize the +boot media needed to load the binaries packaged inside `tiboot3.bin`, +including a 32bit U-Boot SPL, (called the wakup SPL) that ROM will jump +to after it has finished loading everything into internal SRAM. + +.. code-block:: text + + | WKUP Domain + ROM -> WKUP SPL -> + +The wakeup SPL, running on a wakeup domain core, will initialize DDR and +any peripherals needed load the larger binaries inside the `tispl.bin` +into DDR. Once loaded the wakeup SPL will start one of the 'big' +application cores inside the main domain to initialize the main domain, +starting with ARM Trusted Firmware (ATF), before moving on to start +OPTEE and the main domain's U-Boot SPL. + +.. code-block:: text + + | WKUP Domain | Main Domain -> + ROM -> WKUP SPL -> ATF -> OPTEE -> Main SPL + +The main domain's SPL, running on a 64bit application core, has +virtually unlimited space (billions of bytes now that DDR is working) to +initialize even more peripherals needed to load in the `u-boot.img` +which loads more firmware into the micro-controller & wakeup domains and +finally prepare the main domain to run Linux. + +.. code-block:: text + + | WKUP Domain | Main Domain -> + ROM -> WKUP SPL -> ATF -> OPTEE -> Main SPL -> UBoot -> Linux + +This is the typical boot flow for all K3 based SoCs, however this flow +offers quite a lot in the terms of flexibility, especially on High +Security (HS) SoCs. + +Boot Flow Variations +^^^^^^^^^^^^^^^^^^^^ + +All K3 SoCs will generally use the above boot flow with two main +differences depending on the capabilities of the boot ROM and the number +of cores inside the device. These differences split the bootflow into +essentially 4 unique but very similar flows: + +* Split binary with a combined firmware: (eg: AM65) +* Combined binary with a combined firmware: (eg: AM64) +* Split binary with a split firmware: (eg: J721E) +* Combined binary with a split firmware: (eg: AM62) + +For devices that utilize the split binary approach, ROM is not capable +of loading the firmware into the SoC requiring the wakeup domain's +U-Boot SPL to load the firmware. + +Devices with a split firmware will have two firmwares loaded into the +device at different times during the bootup process. TI's Foundational +Security (TIFS), needed to operate the Security Management Subsystem, +will either be loaded by ROM or the WKUP U-Boot SPL, then once the +wakeup U-Boot SPL has completed, the second Device Management (DM) +firmware can be loaded on the now free core in the wakeup domain. + +For more information on the bootup process of your SoC, consult the +device specific boot flow documentation. + +Software Sources +---------------- + +All scripts and code needed to build the `tiboot3.bin`, `tispl.bin` and +`u-boot.img` for all K3 SoCs can be located at the following places +online + +* **Das U-Boot** + + | **source:** https://source.denx.de/u-boot/u-boot.git + | **branch:** master + +* **K3 Image Gen** + + | **source:** https://git.ti.com/git/k3-image-gen/k3-image-gen.git + | **branch:** master + +* **ARM Trusted Firmware (ATF)** + + | **source:** https://github.com/ARM-software/arm-trusted-firmware.git + | **branch:** master + +* **Open Portable Trusted Execution Environment (OPTEE)** + + | **source:** https://github.com/OP-TEE/optee_os.git + | **branch:** master + +* **TI Firmware (TIFS, DM, DSMC)** + + | **source:** https://git.ti.com/git/processor-firmware/ti-linux-firmware.git + | **branch:** ti-linux-firmware + +* **TI's Security Development Tools** + + | **source:** https://git.ti.com/git/security-development-tools/core-secdev-k3.git + | **branch:** master + +Build Procedure +--------------- + +Depending on the specifics of your device, you will need three or more +binaries to boot your SoC. + +* `tiboot3.bin` (bootloader for the wakeup domain) +* `tispl.bin` (bootloader for the main domain) +* `u-boot.img` + +During the bootup process, both the 32bit wakeup domain and the 64bit +main domains will be involved. This means everything inside the +`tiboot3.bin` running in the wakeup domain will need to be compiled for +32bit cores and most binaries in the `tispl.bin` will need to be +compiled for 64bit main domain CPU cores. + +All of that to say you will need both a 32bit and 64bit cross compiler +(assuming you're using an x86 desktop) + +.. code-block:: bash + + export CC32=arm-linux-gnueabihf- + export CC64=aarch64-linux-gnu- + +Building tiboot3.bin +^^^^^^^^^^^^^^^^^^^^^ + +1. To generate the U-Boot SPL for the wakeup domain, use the following + commands, substituting :code:`{SOC}` for the name of your device (eg: + am62x) + +.. code-block:: bash + + # inside u-boot source + make ARCH=arm O=build/wkup CROSS_COMPILE=$CC32 {SOC}_evm_r5_defconfig + make ARCH=arm O=build/wkup CROSS_COMPILE=$CC32 + +2. Next we will use the K3 Image Gen scripts to package the various + firmware and the wakeup UBoot SPL into the final `tiboot3.bin` + binary. (or the `sysfw.itb` if your device uses the split binary + flow) + +.. code-block:: bash + + # inside k3-image-gen source + make CROSS_COMPILE=$CC32 SOC={SOC} SOC_TYPE={hs,gp} \ + TI_SECURE_DEV_PKG= \ + SYSFW_PATH= \ + SYSFW_HS_INNER_CERT_PATH= + +At this point you should have all the needed binaries to boot the wakeup +domain of your K3 SoC. + +**Combined Binary Boot Flow** (eg: am62x, am64x, ... ) + + `k3-image-gen/tiboot3-{SOC}-{hs,gp}-evm.bin` + +**Split Binary Boot Flow** (eg: j721e, am65x) + + | `u-boot/build/wkup/tiboot3.bin` + | `k3-image-gen/sysfw-{SOC}-evm.bin` + +.. note :: + + It's important to rename the generated `tiboot3.bin` and `sysfw.itb` + to match exactly `tiboot3.bin` and `sysfw.itb` as ROM and the wakeup + UBoot SPL will only look for and load the files with these names. + +Building tispl.bin +^^^^^^^^^^^^^^^^^^^ + +The `tispl.bin` is a standard fitImage combining the firmware need for +the main domain to function properly as well as Device Management (DM) +firmware if your device using a split firmware. + +3. We will first need ATF, as it's the first thing to run on the 'big' + application cores on the main domain. + +.. code-block:: bash + + # inside arm-trusted-firmware source + make CROSS_COMPILE=$CC64 ARCH=aarch64 PLAT=k3 \ + TARGET_BOARD={lite|generic} \ + SPD=opteed \ + +Typically all `j7*` devices will use `TARGET_BOARD=generic` while all +Sitara (`am6*`) devices use the `lite` option. + +4. The Open Portable Trusted Execution Environment (OPTEE) is designed + to run as a companion to a non-secure Linux kernel for Cortex-A cores + using the TrustZone technology built into the core. + +.. code-block:: bash + + # inside optee_os source + make CROSS_COMPILE=$CC32 CROSS_COMPILE64=$CC64 \ + PLATFORM=k3 CFG_ARM64_core=y + +5. Finally, after ATF has initialized the main domain and OPTEE has + finished, we can jump back into U-Boot again, this time running on a + 64bit core in the main domain. + +.. code-block:: bash + + # inside u-boot source + make ARCH=arm O=build/main CROSS_COMPILE=$CC64 {SOC}_evm_a{53,72}_defconfig + make ARCH=arm O=build/main CROSS_COMPILE=$CC64 \ + ATF= + +At this point you should have every binary needed initialize both the +wakeup and main domain and to boot to the U-Boot prompt + +**Main Domain Bootloader** + + | `u-boot/build/main/tispl.bin` + | `u-boot/build/main/u-boot.img` From a17be96b62476ccdb4838742f31e227963a69d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Tue, 20 Dec 2022 21:06:26 +0100 Subject: [PATCH 04/19] doc: board: qemu-ppce500: Update supported and unsupported MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qemu can emulate also e500v1 core but cannot emulate CPUs from Freescale PowerPC QorIQ T and P series. Signed-off-by: Pali Rohár Signed-off-by: Heinrich Schuchardt --- doc/board/emulation/qemu-ppce500.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/board/emulation/qemu-ppce500.rst b/doc/board/emulation/qemu-ppce500.rst index 5de0aaf55d..82b50a01de 100644 --- a/doc/board/emulation/qemu-ppce500.rst +++ b/doc/board/emulation/qemu-ppce500.rst @@ -7,7 +7,7 @@ QEMU PPC E500 QEMU for PPC supports a special 'ppce500' machine designed for emulation and virtualization purposes. This document describes how to run U-Boot under it. -The QEMU ppce500 machine models a generic PowerPC E500 virtual machine with +The QEMU ppce500 machine models a generic PowerPC e500 virtual machine with support for the VirtIO standard networking device connected to the built-in PCI host controller. Some common devices in the CCSBAR space are modeled, including MPIC, 16550A UART devices, GPIO, I2C and PCI host controller with @@ -39,6 +39,7 @@ embedded DTB created by QEMU reflects the new setting. Both qemu-system-ppc and qemu-system-ppc64 provide emulation for the following 32-bit PowerPC CPUs: +* e500v1 * e500v2 * e500mc @@ -61,8 +62,9 @@ When U-Boot boots, you will notice the following:: This is because we only specified a core name to QEMU and it does not have a meaningful SVR value which represents an actual SoC that integrates such core. You can specify a real world SoC device that QEMU has built-in support but all -these SoCs are e500v2 based MPC85xx series, hence you cannot test anything -built for P4080 (e500mc), P5020 (e5500) and T2080 (e6500). +these SoCs are e500v1/e500v2 based MPC85xx series, hence you cannot test anything +built for P10xx/P2010/P2020 (e500v2), P204x/P304x/P40xx (e500mc), P50xx/T10xx (e5500) +and T208x/T4080/T4160/T4240 (e6500). By default a VirtIO standard PCI networking device is connected as an ethernet interface at PCI address 0.1.0, but we can switch that to an e1000 NIC by:: From 7fa4c27a2e1131702ae7f665c3572cdd4ead27b3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 18 Dec 2022 21:48:08 -0500 Subject: [PATCH 05/19] doc: add texinfodocs and infodocs targets Sphinx supports generating Texinfo sources and Info documentation, which can be navigated easily and is convenient to search (via the indexed nodes or anchors, for example). This is basically the same as 1f050e904dd6f2955eecbd22031d912ccb2e7683, which was recently applied to the Linux kernel. Signed-off-by: Maxim Cournoyer Reviewed-by: Heinrich Schuchardt --- Makefile | 2 +- doc/Makefile | 10 ++++++++++ doc/conf.py | 6 +++--- doc/media/Makefile | 3 ++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index c977c906b0..66cfbb1dfe 100644 --- a/Makefile +++ b/Makefile @@ -2372,7 +2372,7 @@ tcheck: # Documentation targets # --------------------------------------------------------------------------- DOC_TARGETS := xmldocs latexdocs pdfdocs htmldocs epubdocs cleandocs \ - linkcheckdocs dochelp refcheckdocs + linkcheckdocs dochelp refcheckdocs texinfodocs infodocs PHONY += $(DOC_TARGETS) $(DOC_TARGETS): scripts_basic FORCE $(Q)$(MAKE) $(build)=doc $@ diff --git a/doc/Makefile b/doc/Makefile index f5de65e927..d0904a9f99 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -69,6 +69,14 @@ quiet_cmd_sphinx = SPHINX $@ --> file://$(abspath $(BUILDDIR)/$3/$4) htmldocs: @+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,html,$(var),,$(var))) +texinfodocs: + @+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,texinfo,$(var),texinfo,$(var))) + +# Note: the 'info' Make target is generated by sphinx itself when +# running the texinfodocs target defined above. +infodocs: texinfodocs + $(MAKE) -C $(BUILDDIR)/texinfo info + linkcheckdocs: @$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,linkcheck,$(var),,$(var))) @@ -109,6 +117,8 @@ cleandocs: dochelp: @echo ' U-Boot documentation in different formats from ReST:' @echo ' htmldocs - HTML' + @echo ' texinfodocs - Texinfo' + @echo ' infodocs - Info' @echo ' latexdocs - LaTeX' @echo ' pdfdocs - PDF' @echo ' epubdocs - EPUB' diff --git a/doc/conf.py b/doc/conf.py index 62c8d31270..3db70f80c1 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -449,7 +449,7 @@ for fn in os.listdir('.'): # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - (master_doc, 'dasuboot', 'The U-Boot Documentation', + (master_doc, 'u-boot', 'The U-Boot Documentation', [author], 1) ] @@ -463,8 +463,8 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - (master_doc, 'DasUBoot', 'The U-Boot Documentation', - author, 'DasUBoot', 'One line description of project.', + (master_doc, 'u-boot', 'The U-Boot Documentation', + author, 'U-Boot', 'Boot loader for embedded systems', 'Miscellaneous'), ] diff --git a/doc/media/Makefile b/doc/media/Makefile index b9b43a34c3..9b32258696 100644 --- a/doc/media/Makefile +++ b/doc/media/Makefile @@ -22,10 +22,11 @@ $(BUILDDIR)/linker_lists.h.rst: ${API}/linker_lists.h ${PARSER} $(SRC_DIR)/linke # Media build rules -.PHONY: all html epub xml latex +.PHONY: all html texinfo epub xml latex all: $(IMGDOT) $(BUILDDIR) ${TARGETS} html: all +texinfo: all epub: all xml: all latex: $(IMGPDF) all From f16086e3e2c1158bdb4f95c572567b13634a8669 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 21 Dec 2022 18:04:10 -0500 Subject: [PATCH 06/19] doc: Use "changesets" not "csets" in statistics pages To make things more human readable, say "changesets from" rather than "csets from" in all our historical pages here. Moving forward this has been changed in our gitdm with b034e399e31a ("gitdm: fix typo csets"). Signed-off-by: Tom Rini Reviewed-by: Heinrich Schuchardt --- doc/develop/statistics/u-boot-stats-v1.3.0.rst | 2 +- doc/develop/statistics/u-boot-stats-v1.3.1.rst | 2 +- doc/develop/statistics/u-boot-stats-v1.3.2.rst | 2 +- doc/develop/statistics/u-boot-stats-v1.3.3.rst | 2 +- doc/develop/statistics/u-boot-stats-v1.3.4.rst | 2 +- doc/develop/statistics/u-boot-stats-v2008.10.rst | 2 +- doc/develop/statistics/u-boot-stats-v2009.01.rst | 2 +- doc/develop/statistics/u-boot-stats-v2009.03.rst | 2 +- doc/develop/statistics/u-boot-stats-v2009.06.rst | 2 +- doc/develop/statistics/u-boot-stats-v2009.08.rst | 2 +- doc/develop/statistics/u-boot-stats-v2009.11.rst | 2 +- doc/develop/statistics/u-boot-stats-v2010.03.rst | 2 +- doc/develop/statistics/u-boot-stats-v2010.06.rst | 2 +- doc/develop/statistics/u-boot-stats-v2010.09.rst | 2 +- doc/develop/statistics/u-boot-stats-v2010.12.rst | 2 +- doc/develop/statistics/u-boot-stats-v2011.03.rst | 2 +- doc/develop/statistics/u-boot-stats-v2011.06.rst | 2 +- doc/develop/statistics/u-boot-stats-v2011.09.rst | 2 +- doc/develop/statistics/u-boot-stats-v2011.12.rst | 2 +- doc/develop/statistics/u-boot-stats-v2012.04.rst | 2 +- doc/develop/statistics/u-boot-stats-v2012.07.rst | 2 +- doc/develop/statistics/u-boot-stats-v2012.10.rst | 2 +- doc/develop/statistics/u-boot-stats-v2013.07.rst | 2 +- doc/develop/statistics/u-boot-stats-v2013.10.rst | 2 +- doc/develop/statistics/u-boot-stats-v2014.01.rst | 2 +- doc/develop/statistics/u-boot-stats-v2014.04.rst | 2 +- doc/develop/statistics/u-boot-stats-v2014.07.rst | 2 +- doc/develop/statistics/u-boot-stats-v2014.10.rst | 2 +- doc/develop/statistics/u-boot-stats-v2015.01.rst | 2 +- doc/develop/statistics/u-boot-stats-v2015.04.rst | 2 +- doc/develop/statistics/u-boot-stats-v2015.07.rst | 2 +- doc/develop/statistics/u-boot-stats-v2015.10.rst | 2 +- doc/develop/statistics/u-boot-stats-v2016.01.rst | 2 +- doc/develop/statistics/u-boot-stats-v2016.03.rst | 2 +- doc/develop/statistics/u-boot-stats-v2016.05.rst | 2 +- doc/develop/statistics/u-boot-stats-v2016.07.rst | 2 +- doc/develop/statistics/u-boot-stats-v2016.09.rst | 2 +- doc/develop/statistics/u-boot-stats-v2016.11.rst | 2 +- doc/develop/statistics/u-boot-stats-v2017.01.rst | 2 +- doc/develop/statistics/u-boot-stats-v2017.03.rst | 2 +- doc/develop/statistics/u-boot-stats-v2017.05.rst | 2 +- doc/develop/statistics/u-boot-stats-v2017.07.rst | 2 +- doc/develop/statistics/u-boot-stats-v2017.09.rst | 2 +- doc/develop/statistics/u-boot-stats-v2017.11.rst | 2 +- doc/develop/statistics/u-boot-stats-v2018.01.rst | 2 +- doc/develop/statistics/u-boot-stats-v2018.03.rst | 2 +- doc/develop/statistics/u-boot-stats-v2018.05.rst | 2 +- doc/develop/statistics/u-boot-stats-v2018.07.rst | 2 +- doc/develop/statistics/u-boot-stats-v2018.09.rst | 2 +- doc/develop/statistics/u-boot-stats-v2018.11.rst | 2 +- doc/develop/statistics/u-boot-stats-v2019.01.rst | 2 +- doc/develop/statistics/u-boot-stats-v2019.04.rst | 2 +- doc/develop/statistics/u-boot-stats-v2019.07.rst | 2 +- doc/develop/statistics/u-boot-stats-v2019.10.rst | 2 +- doc/develop/statistics/u-boot-stats-v2020.01.rst | 2 +- doc/develop/statistics/u-boot-stats-v2020.04.rst | 2 +- doc/develop/statistics/u-boot-stats-v2020.07.rst | 2 +- doc/develop/statistics/u-boot-stats-v2020.10.rst | 2 +- doc/develop/statistics/u-boot-stats-v2021.01.rst | 2 +- doc/develop/statistics/u-boot-stats-v2021.04.rst | 2 +- doc/develop/statistics/u-boot-stats-v2021.07.rst | 2 +- doc/develop/statistics/u-boot-stats-v2021.10.rst | 2 +- doc/develop/statistics/u-boot-stats-v2022.01.rst | 2 +- doc/develop/statistics/u-boot-stats-v2022.04.rst | 2 +- doc/develop/statistics/u-boot-stats-v2022.07.rst | 2 +- doc/develop/statistics/u-boot-stats-v2022.10.rst | 2 +- 66 files changed, 66 insertions(+), 66 deletions(-) diff --git a/doc/develop/statistics/u-boot-stats-v1.3.0.rst b/doc/develop/statistics/u-boot-stats-v1.3.0.rst index c891468f2a..cbf433f453 100644 --- a/doc/develop/statistics/u-boot-stats-v1.3.0.rst +++ b/doc/develop/statistics/u-boot-stats-v1.3.0.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v1.3.0 ==================================== -* Processed 1153 csets from 102 developers +* Processed 1153 changesets from 102 developers * 38 employers found diff --git a/doc/develop/statistics/u-boot-stats-v1.3.1.rst b/doc/develop/statistics/u-boot-stats-v1.3.1.rst index e6ddd5460c..6a5c592b00 100644 --- a/doc/develop/statistics/u-boot-stats-v1.3.1.rst +++ b/doc/develop/statistics/u-boot-stats-v1.3.1.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v1.3.1 ==================================== -* Processed 40 csets from 5 developers +* Processed 40 changesets from 5 developers * 5 employers found diff --git a/doc/develop/statistics/u-boot-stats-v1.3.2.rst b/doc/develop/statistics/u-boot-stats-v1.3.2.rst index f050558fb4..21fc2df09a 100644 --- a/doc/develop/statistics/u-boot-stats-v1.3.2.rst +++ b/doc/develop/statistics/u-boot-stats-v1.3.2.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v1.3.2 ==================================== -* Processed 744 csets from 79 developers +* Processed 744 changesets from 79 developers * 38 employers found diff --git a/doc/develop/statistics/u-boot-stats-v1.3.3.rst b/doc/develop/statistics/u-boot-stats-v1.3.3.rst index c381a73e96..0464275424 100644 --- a/doc/develop/statistics/u-boot-stats-v1.3.3.rst +++ b/doc/develop/statistics/u-boot-stats-v1.3.3.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v1.3.3 ==================================== -* Processed 646 csets from 75 developers +* Processed 646 changesets from 75 developers * 38 employers found diff --git a/doc/develop/statistics/u-boot-stats-v1.3.4.rst b/doc/develop/statistics/u-boot-stats-v1.3.4.rst index 125de241f7..33ef9895f0 100644 --- a/doc/develop/statistics/u-boot-stats-v1.3.4.rst +++ b/doc/develop/statistics/u-boot-stats-v1.3.4.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v1.3.4 ==================================== -* Processed 511 csets from 86 developers +* Processed 511 changesets from 86 developers * 46 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2008.10.rst b/doc/develop/statistics/u-boot-stats-v2008.10.rst index b163a5cb48..0370c70745 100644 --- a/doc/develop/statistics/u-boot-stats-v2008.10.rst +++ b/doc/develop/statistics/u-boot-stats-v2008.10.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2008.10 ====================================== -* Processed 2498 csets from 174 developers +* Processed 2498 changesets from 174 developers * 85 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2009.01.rst b/doc/develop/statistics/u-boot-stats-v2009.01.rst index 94c9bda436..3495b6dada 100644 --- a/doc/develop/statistics/u-boot-stats-v2009.01.rst +++ b/doc/develop/statistics/u-boot-stats-v2009.01.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2009.01 ====================================== -* Processed 464 csets from 69 developers +* Processed 464 changesets from 69 developers * 33 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2009.03.rst b/doc/develop/statistics/u-boot-stats-v2009.03.rst index 8c8a10ef91..bff94f0730 100644 --- a/doc/develop/statistics/u-boot-stats-v2009.03.rst +++ b/doc/develop/statistics/u-boot-stats-v2009.03.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2009.03 ====================================== -* Processed 489 csets from 90 developers +* Processed 489 changesets from 90 developers * 46 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2009.06.rst b/doc/develop/statistics/u-boot-stats-v2009.06.rst index 192d85f02d..9e2f3ba725 100644 --- a/doc/develop/statistics/u-boot-stats-v2009.06.rst +++ b/doc/develop/statistics/u-boot-stats-v2009.06.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2009.06 ====================================== -* Processed 433 csets from 74 developers +* Processed 433 changesets from 74 developers * 27 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2009.08.rst b/doc/develop/statistics/u-boot-stats-v2009.08.rst index 57c044ac0e..f9711b833e 100644 --- a/doc/develop/statistics/u-boot-stats-v2009.08.rst +++ b/doc/develop/statistics/u-boot-stats-v2009.08.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2009.08 ====================================== -* Processed 657 csets from 96 developers +* Processed 657 changesets from 96 developers * 35 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2009.11.rst b/doc/develop/statistics/u-boot-stats-v2009.11.rst index b9f64b1c94..2e1b2ea71e 100644 --- a/doc/develop/statistics/u-boot-stats-v2009.11.rst +++ b/doc/develop/statistics/u-boot-stats-v2009.11.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2009.11 ====================================== -* Processed 531 csets from 90 developers +* Processed 531 changesets from 90 developers * 39 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2010.03.rst b/doc/develop/statistics/u-boot-stats-v2010.03.rst index 15b5741ea3..5a8b0d6b8a 100644 --- a/doc/develop/statistics/u-boot-stats-v2010.03.rst +++ b/doc/develop/statistics/u-boot-stats-v2010.03.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2010.03 ====================================== -* Processed 468 csets from 92 developers +* Processed 468 changesets from 92 developers * 29 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2010.06.rst b/doc/develop/statistics/u-boot-stats-v2010.06.rst index 72348746fb..ddd59ee7c0 100644 --- a/doc/develop/statistics/u-boot-stats-v2010.06.rst +++ b/doc/develop/statistics/u-boot-stats-v2010.06.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2010.06 ====================================== -* Processed 402 csets from 100 developers +* Processed 402 changesets from 100 developers * 31 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2010.09.rst b/doc/develop/statistics/u-boot-stats-v2010.09.rst index acdab5bf15..6a0def0c6e 100644 --- a/doc/develop/statistics/u-boot-stats-v2010.09.rst +++ b/doc/develop/statistics/u-boot-stats-v2010.09.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2010.09 ====================================== -* Processed 402 csets from 100 developers +* Processed 402 changesets from 100 developers * 31 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2010.12.rst b/doc/develop/statistics/u-boot-stats-v2010.12.rst index 324752676c..2127adf1e9 100644 --- a/doc/develop/statistics/u-boot-stats-v2010.12.rst +++ b/doc/develop/statistics/u-boot-stats-v2010.12.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2010.12 ====================================== -* Processed 777 csets from 111 developers +* Processed 777 changesets from 111 developers * 31 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2011.03.rst b/doc/develop/statistics/u-boot-stats-v2011.03.rst index 404a83c673..5242471446 100644 --- a/doc/develop/statistics/u-boot-stats-v2011.03.rst +++ b/doc/develop/statistics/u-boot-stats-v2011.03.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2011.03 ====================================== -* Processed 451 csets from 80 developers +* Processed 451 changesets from 80 developers * 25 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2011.06.rst b/doc/develop/statistics/u-boot-stats-v2011.06.rst index 4edc09174d..e1b00e96a3 100644 --- a/doc/develop/statistics/u-boot-stats-v2011.06.rst +++ b/doc/develop/statistics/u-boot-stats-v2011.06.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2011.06 ====================================== -* Processed 636 csets from 134 developers +* Processed 636 changesets from 134 developers * 30 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2011.09.rst b/doc/develop/statistics/u-boot-stats-v2011.09.rst index c135a48225..9e2538e1e0 100644 --- a/doc/develop/statistics/u-boot-stats-v2011.09.rst +++ b/doc/develop/statistics/u-boot-stats-v2011.09.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2011.09 ====================================== -* Processed 645 csets from 120 developers +* Processed 645 changesets from 120 developers * 30 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2011.12.rst b/doc/develop/statistics/u-boot-stats-v2011.12.rst index cb9244f841..3d2fdcd06b 100644 --- a/doc/develop/statistics/u-boot-stats-v2011.12.rst +++ b/doc/develop/statistics/u-boot-stats-v2011.12.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2011.12 ====================================== -* Processed 1530 csets from 146 developers +* Processed 1530 changesets from 146 developers * 34 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2012.04.rst b/doc/develop/statistics/u-boot-stats-v2012.04.rst index f0324d991f..1fe67b31ce 100644 --- a/doc/develop/statistics/u-boot-stats-v2012.04.rst +++ b/doc/develop/statistics/u-boot-stats-v2012.04.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2012.04 ====================================== -* Processed 773 csets from 126 developers +* Processed 773 changesets from 126 developers * 36 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2012.07.rst b/doc/develop/statistics/u-boot-stats-v2012.07.rst index 040ddab69b..7bcf81a4f4 100644 --- a/doc/develop/statistics/u-boot-stats-v2012.07.rst +++ b/doc/develop/statistics/u-boot-stats-v2012.07.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2012.07 ====================================== -* Processed 775 csets from 114 developers +* Processed 775 changesets from 114 developers * 29 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2012.10.rst b/doc/develop/statistics/u-boot-stats-v2012.10.rst index ec06b574fb..715ec34255 100644 --- a/doc/develop/statistics/u-boot-stats-v2012.10.rst +++ b/doc/develop/statistics/u-boot-stats-v2012.10.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2012.12 ====================================== -* Processed 925 csets from 134 developers +* Processed 925 changesets from 134 developers * 31 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2013.07.rst b/doc/develop/statistics/u-boot-stats-v2013.07.rst index b0ee57c6fd..61b90a53ef 100644 --- a/doc/develop/statistics/u-boot-stats-v2013.07.rst +++ b/doc/develop/statistics/u-boot-stats-v2013.07.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2013.07 ====================================== -* Processed 948 csets from 162 developers +* Processed 948 changesets from 162 developers * 30 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2013.10.rst b/doc/develop/statistics/u-boot-stats-v2013.10.rst index 55a5856d19..4088020166 100644 --- a/doc/develop/statistics/u-boot-stats-v2013.10.rst +++ b/doc/develop/statistics/u-boot-stats-v2013.10.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2013.10 ====================================== -* Processed 710 csets from 135 developers +* Processed 710 changesets from 135 developers * 28 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2014.01.rst b/doc/develop/statistics/u-boot-stats-v2014.01.rst index 809f3ff013..584226904d 100644 --- a/doc/develop/statistics/u-boot-stats-v2014.01.rst +++ b/doc/develop/statistics/u-boot-stats-v2014.01.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2014.01 ====================================== -* Processed 980 csets from 154 developers +* Processed 980 changesets from 154 developers * 31 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2014.04.rst b/doc/develop/statistics/u-boot-stats-v2014.04.rst index 47d331464e..a794b113e9 100644 --- a/doc/develop/statistics/u-boot-stats-v2014.04.rst +++ b/doc/develop/statistics/u-boot-stats-v2014.04.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2014.04 ====================================== -* Processed 769 csets from 109 developers +* Processed 769 changesets from 109 developers * 26 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2014.07.rst b/doc/develop/statistics/u-boot-stats-v2014.07.rst index d931ca028d..d3b47f6a74 100644 --- a/doc/develop/statistics/u-boot-stats-v2014.07.rst +++ b/doc/develop/statistics/u-boot-stats-v2014.07.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2014.07 ====================================== -* Processed 1074 csets from 146 developers +* Processed 1074 changesets from 146 developers * 30 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2014.10.rst b/doc/develop/statistics/u-boot-stats-v2014.10.rst index ef33126845..b5c794ad05 100644 --- a/doc/develop/statistics/u-boot-stats-v2014.10.rst +++ b/doc/develop/statistics/u-boot-stats-v2014.10.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2014.10 ====================================== -* Processed 1111 csets from 145 developers +* Processed 1111 changesets from 145 developers * 24 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2015.01.rst b/doc/develop/statistics/u-boot-stats-v2015.01.rst index d81afd5b42..73b6d77847 100644 --- a/doc/develop/statistics/u-boot-stats-v2015.01.rst +++ b/doc/develop/statistics/u-boot-stats-v2015.01.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2015.01 ====================================== -* Processed 1588 csets from 162 developers +* Processed 1588 changesets from 162 developers * 35 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2015.04.rst b/doc/develop/statistics/u-boot-stats-v2015.04.rst index a16da2ee4d..75a0215af7 100644 --- a/doc/develop/statistics/u-boot-stats-v2015.04.rst +++ b/doc/develop/statistics/u-boot-stats-v2015.04.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2015.04 ====================================== -* Processed 1585 csets from 169 developers +* Processed 1585 changesets from 169 developers * 36 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2015.07.rst b/doc/develop/statistics/u-boot-stats-v2015.07.rst index 7999b27fe3..ed6baee6b3 100644 --- a/doc/develop/statistics/u-boot-stats-v2015.07.rst +++ b/doc/develop/statistics/u-boot-stats-v2015.07.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2015.07 ====================================== -* Processed 1563 csets from 156 developers +* Processed 1563 changesets from 156 developers * 28 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2015.10.rst b/doc/develop/statistics/u-boot-stats-v2015.10.rst index 1e9c98d5b8..6936b36f87 100644 --- a/doc/develop/statistics/u-boot-stats-v2015.10.rst +++ b/doc/develop/statistics/u-boot-stats-v2015.10.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2015.10 ====================================== -* Processed 2069 csets from 182 developers +* Processed 2069 changesets from 182 developers * 32 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2016.01.rst b/doc/develop/statistics/u-boot-stats-v2016.01.rst index 8a7bcb7d07..95ed8d11b6 100644 --- a/doc/develop/statistics/u-boot-stats-v2016.01.rst +++ b/doc/develop/statistics/u-boot-stats-v2016.01.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2016.01 ====================================== -* Processed 1513 csets from 149 developers +* Processed 1513 changesets from 149 developers * 33 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2016.03.rst b/doc/develop/statistics/u-boot-stats-v2016.03.rst index 6fe2219281..f66aa028e8 100644 --- a/doc/develop/statistics/u-boot-stats-v2016.03.rst +++ b/doc/develop/statistics/u-boot-stats-v2016.03.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2016.03 ====================================== -* Processed 1375 csets from 126 developers +* Processed 1375 changesets from 126 developers * 26 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2016.05.rst b/doc/develop/statistics/u-boot-stats-v2016.05.rst index a40c51fed4..792b3328a0 100644 --- a/doc/develop/statistics/u-boot-stats-v2016.05.rst +++ b/doc/develop/statistics/u-boot-stats-v2016.05.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2016.05 ====================================== -* Processed 1043 csets from 133 developers +* Processed 1043 changesets from 133 developers * 23 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2016.07.rst b/doc/develop/statistics/u-boot-stats-v2016.07.rst index d55e63e03b..d62729a678 100644 --- a/doc/develop/statistics/u-boot-stats-v2016.07.rst +++ b/doc/develop/statistics/u-boot-stats-v2016.07.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2016.07 ====================================== -* Processed 1078 csets from 133 developers +* Processed 1078 changesets from 133 developers * 27 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2016.09.rst b/doc/develop/statistics/u-boot-stats-v2016.09.rst index dabd187214..75c033264a 100644 --- a/doc/develop/statistics/u-boot-stats-v2016.09.rst +++ b/doc/develop/statistics/u-boot-stats-v2016.09.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2016.09 ====================================== -* Processed 987 csets from 129 developers +* Processed 987 changesets from 129 developers * 30 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2016.11.rst b/doc/develop/statistics/u-boot-stats-v2016.11.rst index 3bf61d5530..9fb6e3e526 100644 --- a/doc/develop/statistics/u-boot-stats-v2016.11.rst +++ b/doc/develop/statistics/u-boot-stats-v2016.11.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2016.11 ====================================== -* Processed 1031 csets from 114 developers +* Processed 1031 changesets from 114 developers * 26 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2017.01.rst b/doc/develop/statistics/u-boot-stats-v2017.01.rst index 4a996eab1c..6f14d7e1c3 100644 --- a/doc/develop/statistics/u-boot-stats-v2017.01.rst +++ b/doc/develop/statistics/u-boot-stats-v2017.01.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2017.01 ====================================== -* Processed 883 csets from 137 developers +* Processed 883 changesets from 137 developers * 29 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2017.03.rst b/doc/develop/statistics/u-boot-stats-v2017.03.rst index 733c9752de..bce2fe1709 100644 --- a/doc/develop/statistics/u-boot-stats-v2017.03.rst +++ b/doc/develop/statistics/u-boot-stats-v2017.03.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2017.03 ====================================== -* Processed 664 csets from 126 developers +* Processed 664 changesets from 126 developers * 29 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2017.05.rst b/doc/develop/statistics/u-boot-stats-v2017.05.rst index bae478837b..39e76846a7 100644 --- a/doc/develop/statistics/u-boot-stats-v2017.05.rst +++ b/doc/develop/statistics/u-boot-stats-v2017.05.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2017.05 ====================================== -* Processed 915 csets from 139 developers +* Processed 915 changesets from 139 developers * 29 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2017.07.rst b/doc/develop/statistics/u-boot-stats-v2017.07.rst index 9956378407..3999d625cf 100644 --- a/doc/develop/statistics/u-boot-stats-v2017.07.rst +++ b/doc/develop/statistics/u-boot-stats-v2017.07.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2017.07 ====================================== -* Processed 1371 csets from 129 developers +* Processed 1371 changesets from 129 developers * 31 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2017.09.rst b/doc/develop/statistics/u-boot-stats-v2017.09.rst index 09b4bf8903..a6768da6e3 100644 --- a/doc/develop/statistics/u-boot-stats-v2017.09.rst +++ b/doc/develop/statistics/u-boot-stats-v2017.09.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2017.09 ====================================== -* Processed 1308 csets from 130 developers +* Processed 1308 changesets from 130 developers * 27 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2017.11.rst b/doc/develop/statistics/u-boot-stats-v2017.11.rst index 700e09d70f..ba2f9e3ba6 100644 --- a/doc/develop/statistics/u-boot-stats-v2017.11.rst +++ b/doc/develop/statistics/u-boot-stats-v2017.11.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2017.11 ====================================== -* Processed 989 csets from 123 developers +* Processed 989 changesets from 123 developers * 28 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2018.01.rst b/doc/develop/statistics/u-boot-stats-v2018.01.rst index b2b3d0f05f..a5c68e7641 100644 --- a/doc/develop/statistics/u-boot-stats-v2018.01.rst +++ b/doc/develop/statistics/u-boot-stats-v2018.01.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2018.01 ====================================== -* Processed 785 csets from 132 developers +* Processed 785 changesets from 132 developers * 32 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2018.03.rst b/doc/develop/statistics/u-boot-stats-v2018.03.rst index f79c7b6888..7453aa177b 100644 --- a/doc/develop/statistics/u-boot-stats-v2018.03.rst +++ b/doc/develop/statistics/u-boot-stats-v2018.03.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2018.03 ====================================== -* Processed 1193 csets from 151 developers +* Processed 1193 changesets from 151 developers * 30 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2018.05.rst b/doc/develop/statistics/u-boot-stats-v2018.05.rst index 57a3d837e9..648832a47c 100644 --- a/doc/develop/statistics/u-boot-stats-v2018.05.rst +++ b/doc/develop/statistics/u-boot-stats-v2018.05.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2018.05 ====================================== -* Processed 977 csets from 128 developers +* Processed 977 changesets from 128 developers * 26 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2018.07.rst b/doc/develop/statistics/u-boot-stats-v2018.07.rst index c17b214190..da1b8aa1a4 100644 --- a/doc/develop/statistics/u-boot-stats-v2018.07.rst +++ b/doc/develop/statistics/u-boot-stats-v2018.07.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2018.07 ====================================== -* Processed 1055 csets from 141 developers +* Processed 1055 changesets from 141 developers * 30 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2018.09.rst b/doc/develop/statistics/u-boot-stats-v2018.09.rst index 2a5a979049..d360b9a891 100644 --- a/doc/develop/statistics/u-boot-stats-v2018.09.rst +++ b/doc/develop/statistics/u-boot-stats-v2018.09.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2018.09 ====================================== -* Processed 983 csets from 138 developers +* Processed 983 changesets from 138 developers * 32 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2018.11.rst b/doc/develop/statistics/u-boot-stats-v2018.11.rst index 8c84bb83b3..6ce39b9ae9 100644 --- a/doc/develop/statistics/u-boot-stats-v2018.11.rst +++ b/doc/develop/statistics/u-boot-stats-v2018.11.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2018.11 ====================================== -* Processed 1105 csets from 130 developers +* Processed 1105 changesets from 130 developers * 31 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2019.01.rst b/doc/develop/statistics/u-boot-stats-v2019.01.rst index bcec3e8086..32b7cca4c0 100644 --- a/doc/develop/statistics/u-boot-stats-v2019.01.rst +++ b/doc/develop/statistics/u-boot-stats-v2019.01.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2019.01 ====================================== -* Processed 1149 csets from 140 developers +* Processed 1149 changesets from 140 developers * 29 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2019.04.rst b/doc/develop/statistics/u-boot-stats-v2019.04.rst index 6d76e0e92d..24920b6f24 100644 --- a/doc/develop/statistics/u-boot-stats-v2019.04.rst +++ b/doc/develop/statistics/u-boot-stats-v2019.04.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2019.04 ====================================== -* Processed 1193 csets from 182 developers +* Processed 1193 changesets from 182 developers * 28 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2019.07.rst b/doc/develop/statistics/u-boot-stats-v2019.07.rst index 25af8ad909..eb2ff5ffc0 100644 --- a/doc/develop/statistics/u-boot-stats-v2019.07.rst +++ b/doc/develop/statistics/u-boot-stats-v2019.07.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2019.07 ====================================== -* Processed 2047 csets from 215 developers +* Processed 2047 changesets from 215 developers * 29 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2019.10.rst b/doc/develop/statistics/u-boot-stats-v2019.10.rst index 367b93236d..bd3eead6fa 100644 --- a/doc/develop/statistics/u-boot-stats-v2019.10.rst +++ b/doc/develop/statistics/u-boot-stats-v2019.10.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2019.10 ====================================== -* Processed 2007 csets from 190 developers +* Processed 2007 changesets from 190 developers * 32 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2020.01.rst b/doc/develop/statistics/u-boot-stats-v2020.01.rst index 35b1721588..8aa9dc4006 100644 --- a/doc/develop/statistics/u-boot-stats-v2020.01.rst +++ b/doc/develop/statistics/u-boot-stats-v2020.01.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2020.01 ====================================== -* Processed 1826 csets from 192 developers +* Processed 1826 changesets from 192 developers * 30 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2020.04.rst b/doc/develop/statistics/u-boot-stats-v2020.04.rst index 6650ad3bf0..c3f839f898 100644 --- a/doc/develop/statistics/u-boot-stats-v2020.04.rst +++ b/doc/develop/statistics/u-boot-stats-v2020.04.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2020.04 ====================================== -* Processed 1639 csets from 189 developers +* Processed 1639 changesets from 189 developers * 30 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2020.07.rst b/doc/develop/statistics/u-boot-stats-v2020.07.rst index ea99c59ed0..8218f976a6 100644 --- a/doc/develop/statistics/u-boot-stats-v2020.07.rst +++ b/doc/develop/statistics/u-boot-stats-v2020.07.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2020.07 ====================================== -* Processed 1918 csets from 203 developers +* Processed 1918 changesets from 203 developers * 32 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2020.10.rst b/doc/develop/statistics/u-boot-stats-v2020.10.rst index 0c0ccbebcd..fbd7e05ce2 100644 --- a/doc/develop/statistics/u-boot-stats-v2020.10.rst +++ b/doc/develop/statistics/u-boot-stats-v2020.10.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2020.10 ====================================== -* Processed 2048 csets from 227 developers +* Processed 2048 changesets from 227 developers * 31 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2021.01.rst b/doc/develop/statistics/u-boot-stats-v2021.01.rst index f8193bb6ff..41fb193202 100644 --- a/doc/develop/statistics/u-boot-stats-v2021.01.rst +++ b/doc/develop/statistics/u-boot-stats-v2021.01.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2021.01 ====================================== -* Processed 1694 csets from 163 developers +* Processed 1694 changesets from 163 developers * 27 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2021.04.rst b/doc/develop/statistics/u-boot-stats-v2021.04.rst index 2f5df964de..e47b6fc759 100644 --- a/doc/develop/statistics/u-boot-stats-v2021.04.rst +++ b/doc/develop/statistics/u-boot-stats-v2021.04.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2021.04 ====================================== -* Processed 1675 csets from 194 developers +* Processed 1675 changesets from 194 developers * 28 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2021.07.rst b/doc/develop/statistics/u-boot-stats-v2021.07.rst index e086220806..b41d2e3e51 100644 --- a/doc/develop/statistics/u-boot-stats-v2021.07.rst +++ b/doc/develop/statistics/u-boot-stats-v2021.07.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2021.07 ====================================== -* Processed 1730 csets from 187 developers +* Processed 1730 changesets from 187 developers * 30 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2021.10.rst b/doc/develop/statistics/u-boot-stats-v2021.10.rst index b2dcffe7d5..63c8f8b6dd 100644 --- a/doc/develop/statistics/u-boot-stats-v2021.10.rst +++ b/doc/develop/statistics/u-boot-stats-v2021.10.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2021.10 ====================================== -* Processed 1509 csets from 176 developers +* Processed 1509 changesets from 176 developers * 28 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2022.01.rst b/doc/develop/statistics/u-boot-stats-v2022.01.rst index a6d130c0e3..7b60c24a75 100644 --- a/doc/develop/statistics/u-boot-stats-v2022.01.rst +++ b/doc/develop/statistics/u-boot-stats-v2022.01.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2022.01 ====================================== -* Processed 1417 csets from 164 developers +* Processed 1417 changesets from 164 developers * 29 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2022.04.rst b/doc/develop/statistics/u-boot-stats-v2022.04.rst index 5d61832aa8..ef235114a4 100644 --- a/doc/develop/statistics/u-boot-stats-v2022.04.rst +++ b/doc/develop/statistics/u-boot-stats-v2022.04.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2022.04 ====================================== -* Processed 1555 csets from 193 developers +* Processed 1555 changesets from 193 developers * 27 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2022.07.rst b/doc/develop/statistics/u-boot-stats-v2022.07.rst index c1b627cd86..dc54e9a716 100644 --- a/doc/develop/statistics/u-boot-stats-v2022.07.rst +++ b/doc/develop/statistics/u-boot-stats-v2022.07.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2022.07 ====================================== -* Processed 1696 csets from 183 developers +* Processed 1696 changesets from 183 developers * 27 employers found diff --git a/doc/develop/statistics/u-boot-stats-v2022.10.rst b/doc/develop/statistics/u-boot-stats-v2022.10.rst index 0693d686df..6fb71d4753 100644 --- a/doc/develop/statistics/u-boot-stats-v2022.10.rst +++ b/doc/develop/statistics/u-boot-stats-v2022.10.rst @@ -3,7 +3,7 @@ Release Statistics for U-Boot v2022.10 ====================================== -* Processed 1521 csets from 151 developers +* Processed 1521 changesets from 151 developers * 25 employers found From 159dbe1fb12b20580f76f69173b176244d91b796 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Thu, 22 Dec 2022 11:32:03 +0100 Subject: [PATCH 07/19] doc: improve wget man-page * correct formatting of synopsis * improve description of TCP SACK configuration Signed-off-by: Heinrich Schuchardt --- doc/usage/cmd/wget.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/usage/cmd/wget.rst b/doc/usage/cmd/wget.rst index 4fcfa03954..e1e7f8d814 100644 --- a/doc/usage/cmd/wget.rst +++ b/doc/usage/cmd/wget.rst @@ -7,6 +7,7 @@ Synopsis -------- :: + wget address [[hostIPaddr:]path] Description @@ -52,8 +53,8 @@ Configuration The command is only available if CONFIG_CMD_WGET=y. -CONFIG_PROT_TCP_SACK can be turned on for the TCP SACK options. This will -help increasing the downloading speed. +TCP Selective Acknowledgments can be enabled via CONFIG_PROT_TCP_SACK=y. +This will improve the download speed. Return value ------------ From c33d389c7ab5924fc7892edaf11798d644a2d824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Tue, 13 Dec 2022 22:39:09 +0100 Subject: [PATCH 08/19] efi_loader: fix get_package_list_handle() status MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the HII protocol function get_package_list_handle() is called with an invalid package list handle, it returns EFI_NOT_FOUND but this is not in its list of possible status codes as per the EFI specification. Return EFI_INVALID_PARAMETER instead to fix conformance. Signed-off-by: Vincent Stehlé Cc: Heinrich Schuchardt Cc: Ilias Apalodimas Reviewed-by: Heinrich Schuchardt --- lib/efi_loader/efi_hii.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_hii.c b/lib/efi_loader/efi_hii.c index 75ff58aafa..27db3be6a1 100644 --- a/lib/efi_loader/efi_hii.c +++ b/lib/efi_loader/efi_hii.c @@ -780,7 +780,7 @@ get_package_list_handle(const struct efi_hii_database_protocol *this, } } - return EFI_EXIT(EFI_NOT_FOUND); + return EFI_EXIT(EFI_INVALID_PARAMETER); } const struct efi_hii_database_protocol efi_hii_database = { From 3ec07c99d8f2f711f801c31a1d7a20573d6f15bb Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Fri, 23 Dec 2022 02:16:03 +0100 Subject: [PATCH 09/19] efi_loader: set IMAGE_FILE_LARGE_ADDRESS_AWARE For the 64bit EFI binaries that we create set the IMAGE_FILE_LARGE_ADDRESS_AWARE characteristic in the PE-COFF header to indicate that they can handle addresses above 2 GiB. Signed-off-by: Heinrich Schuchardt --- arch/arm/lib/crt0_aarch64_efi.S | 1 + arch/riscv/lib/crt0_riscv_efi.S | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/arch/arm/lib/crt0_aarch64_efi.S b/arch/arm/lib/crt0_aarch64_efi.S index 7f38465359..b4fc263adf 100644 --- a/arch/arm/lib/crt0_aarch64_efi.S +++ b/arch/arm/lib/crt0_aarch64_efi.S @@ -34,6 +34,7 @@ coff_header: .short (IMAGE_FILE_EXECUTABLE_IMAGE | \ IMAGE_FILE_LINE_NUMS_STRIPPED | \ IMAGE_FILE_LOCAL_SYMS_STRIPPED | \ + IMAGE_FILE_LARGE_ADDRESS_AWARE | \ IMAGE_FILE_DEBUG_STRIPPED) optional_header: .short IMAGE_NT_OPTIONAL_HDR64_MAGIC /* PE32+ format */ diff --git a/arch/riscv/lib/crt0_riscv_efi.S b/arch/riscv/lib/crt0_riscv_efi.S index a01e08a3c6..793eefdd88 100644 --- a/arch/riscv/lib/crt0_riscv_efi.S +++ b/arch/riscv/lib/crt0_riscv_efi.S @@ -16,12 +16,23 @@ #define LOAD_LONG(reg, idx) ld reg, (idx*SIZE_LONG)(sp) #define PE_MACHINE IMAGE_FILE_MACHINE_RISCV64 #define PE_MAGIC IMAGE_NT_OPTIONAL_HDR64_MAGIC +#define IMG_CHARACTERISTICS \ + (IMAGE_FILE_EXECUTABLE_IMAGE | \ + IMAGE_FILE_LINE_NUMS_STRIPPED | \ + IMAGE_FILE_LOCAL_SYMS_STRIPPED | \ + IMAGE_FILE_LARGE_ADDRESS_AWARE | \ + IMAGE_FILE_DEBUG_STRIPPED) #else #define SIZE_LONG 4 #define SAVE_LONG(reg, idx) sw reg, (idx*SIZE_LONG)(sp) #define LOAD_LONG(reg, idx) lw reg, (idx*SIZE_LONG)(sp) #define PE_MACHINE IMAGE_FILE_MACHINE_RISCV32 #define PE_MAGIC IMAGE_NT_OPTIONAL_HDR32_MAGIC +#define IMG_CHARACTERISTICS \ + (IMAGE_FILE_EXECUTABLE_IMAGE | \ + IMAGE_FILE_LINE_NUMS_STRIPPED | \ + IMAGE_FILE_LOCAL_SYMS_STRIPPED | \ + IMAGE_FILE_DEBUG_STRIPPED) #endif @@ -47,11 +58,7 @@ coff_header: .long 0 /* PointerToSymbolTable */ .long 0 /* NumberOfSymbols */ .short section_table - optional_header /* SizeOfOptionalHeader */ - /* Characteristics */ - .short (IMAGE_FILE_EXECUTABLE_IMAGE | \ - IMAGE_FILE_LINE_NUMS_STRIPPED | \ - IMAGE_FILE_LOCAL_SYMS_STRIPPED | \ - IMAGE_FILE_DEBUG_STRIPPED) + .short IMG_CHARACTERISTICS /* Characteristics */ optional_header: .short PE_MAGIC /* PE32(+) format */ .byte 0x02 /* MajorLinkerVersion */ From eff6b7157c0094c02e790146c09a2f1b4bda410f Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Fri, 23 Dec 2022 02:26:52 +0100 Subject: [PATCH 10/19] efi_loader: set UEFI specification version to 2.10 Claim to implement UEFI 2.10 setting EFI_SPECIFICATION_VERSION accordingly. Signed-off-by: Heinrich Schuchardt Reviewed-by: Ilias Apalodimas --- include/efi_api.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/efi_api.h b/include/efi_api.h index 00c98e0984..9bd70b0f18 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -21,7 +21,7 @@ #include /* UEFI spec version 2.9 */ -#define EFI_SPECIFICATION_VERSION (2 << 16 | 90) +#define EFI_SPECIFICATION_VERSION (2 << 16 | 100) /* Types and defines for EFI CreateEvent */ enum efi_timer_delay { From fcf583b4a7f74de1475a953bd934efcdd4e34309 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Thu, 29 Dec 2022 09:23:03 +0100 Subject: [PATCH 11/19] efi_loader: typo non-volatile in efi_var_restore It is volatile variables that we do not allow to be restored from file. Signed-off-by: Heinrich Schuchardt Reviewed-by: Ilias Apalodimas --- lib/efi_loader/efi_var_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_var_file.c b/lib/efi_loader/efi_var_file.c index 3d58caa13d..de9ba8de99 100644 --- a/lib/efi_loader/efi_var_file.c +++ b/lib/efi_loader/efi_var_file.c @@ -176,7 +176,7 @@ efi_status_t efi_var_restore(struct efi_var_file *buf, bool safe) data = var->name + u16_strlen(var->name) + 1; /* - * Secure boot related and non-volatile variables shall only be + * Secure boot related and volatile variables shall only be * restored from U-Boot's preseed. */ if (!safe && From 77bb14758dcb1876c7bbfa4cead67c90f2d86a44 Mon Sep 17 00:00:00 2001 From: Ilias Apalodimas Date: Thu, 29 Dec 2022 10:13:22 +0200 Subject: [PATCH 12/19] efi_loader: avoid adding variables twice When the efi subsystem starts we restore variables that are both in a file or stored into the .efi_runtime section of U-Boot. However once a variable gets created or changed the preseeded entries will end up in the file. As a consequence on the next boot we will end up adding identical variable entries twice. Fix this by checking if the to be inserted variable already exists. Also swap the restoration order and start with the file instead of the builtin variables, so a user can replace the preseeded ones if needed. Tested-by: Leo Yan Signed-off-by: Ilias Apalodimas Reviewed-by: Heinrich Schuchardt --- lib/efi_loader/efi_var_file.c | 2 ++ lib/efi_loader/efi_variable.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/efi_loader/efi_var_file.c b/lib/efi_loader/efi_var_file.c index de9ba8de99..62e071bd83 100644 --- a/lib/efi_loader/efi_var_file.c +++ b/lib/efi_loader/efi_var_file.c @@ -187,6 +187,8 @@ efi_status_t efi_var_restore(struct efi_var_file *buf, bool safe) continue; if (!var->length) continue; + if (efi_var_mem_find(&var->guid, var->name, NULL)) + continue; ret = efi_var_mem_ins(var->name, &var->guid, var->attr, var->length, data, 0, NULL, var->time); diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index 8ca2d85694..503a33ed65 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -425,6 +425,9 @@ efi_status_t efi_init_variables(void) if (ret != EFI_SUCCESS) return ret; + ret = efi_var_from_file(); + if (ret != EFI_SUCCESS) + return ret; if (IS_ENABLED(CONFIG_EFI_VARIABLES_PRESEED)) { ret = efi_var_restore((struct efi_var_file *) __efi_var_file_begin, true); @@ -432,9 +435,6 @@ efi_status_t efi_init_variables(void) log_err("Invalid EFI variable seed\n"); } - ret = efi_var_from_file(); - if (ret != EFI_SUCCESS) - return ret; return efi_init_secure_state(); } From f557cf08b974c359ad3c53a87297d19fe13ff4f0 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Thu, 29 Dec 2022 10:50:54 +0100 Subject: [PATCH 13/19] efi_loader: use u16_strlen() in efi_var_mem_ins() Don't duplicate library functionality. Signed-off-by: Heinrich Schuchardt --- lib/efi_loader/efi_var_mem.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/efi_loader/efi_var_mem.c b/lib/efi_loader/efi_var_mem.c index 0bac594e00..e1058e3c6a 100644 --- a/lib/efi_loader/efi_var_mem.c +++ b/lib/efi_loader/efi_var_mem.c @@ -146,9 +146,7 @@ efi_status_t __efi_runtime efi_var_mem_ins( var = (struct efi_var_entry *) ((uintptr_t)efi_var_buf + efi_var_buf->length); - for (var_name_len = 0; variable_name[var_name_len]; ++var_name_len) - ; - ++var_name_len; + var_name_len = u16_strlen(variable_name) + 1; data = var->name + var_name_len; if ((uintptr_t)data - (uintptr_t)efi_var_buf + size1 + size2 > From 478ed23e11beb96a071fb5387bfe117d0f84e5aa Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 27 Dec 2022 11:48:08 -0500 Subject: [PATCH 14/19] CI: Rework rockchip jobs in Azure The rockchip job is getting close to the hard time limit in Azure for the free tier. Split this in to 32bit and 64bit board jobs. Signed-off-by: Tom Rini --- .azure-pipelines.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 21213369c6..ca29479745 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -535,8 +535,10 @@ stages: BUILDMAN: "uniphier" aarch64_catch_all: BUILDMAN: "aarch64 -x amlogic,bcm,imx8,imx9,k3,tegra,ls1,ls2,lx216,mvebu,uniphier,renesas,sunxi,samsung,socfpga,rk,versal,zynq" - rockchip: - BUILDMAN: "rk" + rockchip_32bit: + BUILDMAN: "rk -x aarch64" + rockchip_64bit: + BUILDMAN: "rk&aarch64" renesas: BUILDMAN: "renesas" zynq: From fe1489bc6d25de34baa50fe5798820b0dae537d4 Mon Sep 17 00:00:00 2001 From: Michael Walle Date: Wed, 28 Dec 2022 16:27:14 +0100 Subject: [PATCH 15/19] net: wget: fix implicit declaration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The compiler complains about the missing declaration of print_size(): net/wget.c:415:3: warning: implicit declaration of function ‘print_size’ [-Wimplicit-function-declaration] Fix it. Signed-off-by: Michael Walle --- net/wget.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/wget.c b/net/wget.c index 3826c4b364..eebdf80eb5 100644 --- a/net/wget.c +++ b/net/wget.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include From 20422d693004f7a18714c9f9818450821bd78f43 Mon Sep 17 00:00:00 2001 From: Michael Walle Date: Wed, 28 Dec 2022 16:27:15 +0100 Subject: [PATCH 16/19] cmd: net: wget: fix Kconfig dependency The wget command uses TCP, but fails to select PROT_TCP in Kconfig. Instead it selects the non-existing symbol TCP. Fix the typo. Signed-off-by: Michael Walle --- cmd/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index d93731f2af..b2d7598717 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1814,7 +1814,7 @@ config SYS_DISABLE_AUTOLOAD config CMD_WGET bool "wget" - select TCP + select PROT_TCP help wget is a simple command to download kernel, or other files, from a http server over TCP. From ec9efcf62a1d0123dfd4419c56aa61d4ff69f0f5 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 28 Dec 2022 10:52:51 -0500 Subject: [PATCH 17/19] PowerPC: Rework PBL location choice MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When converting CONFIG_SDCARD and CONFIG_SPIFLASH to Kconfig, one set of uses wasn't converted correctly. Allow for the case where platforms don't rely on "PBL" to boot but instead use other mechanisms. See the link below for more details. Link: https://lore.kernel.org/all/20220802091338.f4g45ldhc7qbg6hm@pali/ Fixes: d433c74eecdc ("Convert CONFIG_SDCARD et al to Kconfig") Tested-by: Pali Rohár Signed-off-by: Tom Rini --- boot/Kconfig | 9 ++++++--- configs/P1010RDB-PA_36BIT_NOR_defconfig | 2 +- configs/P1010RDB-PA_NOR_defconfig | 2 +- configs/P1010RDB-PB_36BIT_NOR_defconfig | 2 +- configs/P1010RDB-PB_NOR_defconfig | 2 +- configs/P1020RDB-PC_36BIT_defconfig | 2 +- configs/P1020RDB-PC_defconfig | 2 +- configs/P1020RDB-PD_defconfig | 2 +- configs/P2020RDB-PC_36BIT_defconfig | 2 +- configs/P2020RDB-PC_defconfig | 2 +- 10 files changed, 15 insertions(+), 12 deletions(-) diff --git a/boot/Kconfig b/boot/Kconfig index 4a001bcee8..424ad0e466 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -724,16 +724,19 @@ config RAMBOOT_PBL For more details refer to doc/README.pblimage choice - prompt "Freescale PBL load location" + prompt "Freescale PBL (or predecessor) load location" depends on RAMBOOT_PBL || ((TARGET_P1010RDB_PA || TARGET_P1010RDB_PB \ || TARGET_P1020RDB_PC || TARGET_P1020RDB_PD || TARGET_P2020RDB) \ && !CMD_NAND) config SDCARD - bool "Freescale PBL is found on SD card" + bool "Freescale PBL (or similar) is found on SD card" config SPIFLASH - bool "Freescale PBL is found on SPI flash" + bool "Freescale PBL (or similar) is found on SPI flash" + +config NO_PBL + bool "Freescale PBL (or similar) is not used in this case" endchoice diff --git a/configs/P1010RDB-PA_36BIT_NOR_defconfig b/configs/P1010RDB-PA_36BIT_NOR_defconfig index dcf74f5d6a..deff04bf88 100644 --- a/configs/P1010RDB-PA_36BIT_NOR_defconfig +++ b/configs/P1010RDB-PA_36BIT_NOR_defconfig @@ -19,7 +19,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_FSL_FIXED_MMC_LOCATION=y +CONFIG_NO_PBL=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs ramdisk_size=$ramdisk_size;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr" diff --git a/configs/P1010RDB-PA_NOR_defconfig b/configs/P1010RDB-PA_NOR_defconfig index 537d8bf576..98486a0ae2 100644 --- a/configs/P1010RDB-PA_NOR_defconfig +++ b/configs/P1010RDB-PA_NOR_defconfig @@ -18,7 +18,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_FSL_FIXED_MMC_LOCATION=y +CONFIG_NO_PBL=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs ramdisk_size=$ramdisk_size;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr" diff --git a/configs/P1010RDB-PB_36BIT_NOR_defconfig b/configs/P1010RDB-PB_36BIT_NOR_defconfig index 92a7e09669..41a1a852b9 100644 --- a/configs/P1010RDB-PB_36BIT_NOR_defconfig +++ b/configs/P1010RDB-PB_36BIT_NOR_defconfig @@ -19,7 +19,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_FSL_FIXED_MMC_LOCATION=y +CONFIG_NO_PBL=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs ramdisk_size=$ramdisk_size;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr" diff --git a/configs/P1010RDB-PB_NOR_defconfig b/configs/P1010RDB-PB_NOR_defconfig index 3e16470608..16c076bc9a 100644 --- a/configs/P1010RDB-PB_NOR_defconfig +++ b/configs/P1010RDB-PB_NOR_defconfig @@ -18,7 +18,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_FSL_FIXED_MMC_LOCATION=y +CONFIG_NO_PBL=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs ramdisk_size=$ramdisk_size;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr" diff --git a/configs/P1020RDB-PC_36BIT_defconfig b/configs/P1020RDB-PC_36BIT_defconfig index ce0ba0e375..e60c92ceda 100644 --- a/configs/P1020RDB-PC_36BIT_defconfig +++ b/configs/P1020RDB-PC_36BIT_defconfig @@ -21,7 +21,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_FSL_FIXED_MMC_LOCATION=y +CONFIG_NO_PBL=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr" diff --git a/configs/P1020RDB-PC_defconfig b/configs/P1020RDB-PC_defconfig index aae886b75c..f0f0eee65d 100644 --- a/configs/P1020RDB-PC_defconfig +++ b/configs/P1020RDB-PC_defconfig @@ -20,7 +20,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_FSL_FIXED_MMC_LOCATION=y +CONFIG_NO_PBL=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr" diff --git a/configs/P1020RDB-PD_defconfig b/configs/P1020RDB-PD_defconfig index 5fecb66847..8b7f9310b1 100644 --- a/configs/P1020RDB-PD_defconfig +++ b/configs/P1020RDB-PD_defconfig @@ -20,7 +20,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_FSL_FIXED_MMC_LOCATION=y +CONFIG_NO_PBL=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr" diff --git a/configs/P2020RDB-PC_36BIT_defconfig b/configs/P2020RDB-PC_36BIT_defconfig index b1dbca6e7e..1640f23798 100644 --- a/configs/P2020RDB-PC_36BIT_defconfig +++ b/configs/P2020RDB-PC_36BIT_defconfig @@ -21,7 +21,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_FSL_FIXED_MMC_LOCATION=y +CONFIG_NO_PBL=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr" diff --git a/configs/P2020RDB-PC_defconfig b/configs/P2020RDB-PC_defconfig index 1ee46f9fbe..ca9f447288 100644 --- a/configs/P2020RDB-PC_defconfig +++ b/configs/P2020RDB-PC_defconfig @@ -20,7 +20,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_FSL_FIXED_MMC_LOCATION=y +CONFIG_NO_PBL=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr" From 88c2e9157c3ed2f66c83bb029e95fae3624cc57d Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 29 Dec 2022 09:50:03 -0500 Subject: [PATCH 18/19] PowerPC: Update dependencies on *SYS_MPC85XX_NO_RESETVEC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In 96699f097a02 ("powerpc: mpc85xx: Use binman to embed dtb inside U-Boot") we introduce CONFIG_MPC85XX_HAVE_RESET_VECTOR and do so via Kconfig. However, much later in de47ff536363 ("Convert CONFIG_SYS_MPC85XX_NO_RESETVEC to Kconfig") I converted the symbol that is the inverse of this to Kconfig. This should have included a dependency on the first symbol as they are logically opposite. The dependency being missing lead to some platforms being broken at runtime due to discarding the require reset vector. Fixes: de47ff536363 ("Convert CONFIG_SYS_MPC85XX_NO_RESETVEC to Kconfig") Reported-by: Pali Rohár Signed-off-by: Tom Rini Tested-by: Pali Rohár --- arch/powerpc/cpu/mpc85xx/Kconfig | 6 +++--- configs/P1010RDB-PA_36BIT_NOR_defconfig | 1 - configs/P1010RDB-PA_NOR_defconfig | 1 - configs/P1010RDB-PB_36BIT_NOR_defconfig | 1 - configs/P1010RDB-PB_NOR_defconfig | 1 - configs/P1020RDB-PC_36BIT_defconfig | 1 - configs/P1020RDB-PC_defconfig | 1 - configs/P1020RDB-PD_defconfig | 1 - configs/P2020RDB-PC_36BIT_defconfig | 1 - configs/P2020RDB-PC_defconfig | 1 - 10 files changed, 3 insertions(+), 12 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 24d3f1f20c..9d12bf168d 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -1459,14 +1459,14 @@ config SYS_FSL_USB_DUAL_PHY_ENABLE config SYS_MPC85XX_NO_RESETVEC bool "Discard resetvec section and move bootpg section up" - depends on MPC85xx + depends on MPC85xx && !MPC85XX_HAVE_RESET_VECTOR help If this variable is specified, the section .resetvec is not kept and the section .bootpg is placed in the previous 4k of the .text section. config SPL_SYS_MPC85XX_NO_RESETVEC bool "Discard resetvec section and move bootpg section up, in SPL" - depends on MPC85xx && SPL + depends on MPC85xx && SPL && !MPC85XX_HAVE_RESET_VECTOR help If this variable is specified, the section .resetvec is not kept and the section .bootpg is placed in the previous 4k of the .text section, @@ -1474,7 +1474,7 @@ config SPL_SYS_MPC85XX_NO_RESETVEC config TPL_SYS_MPC85XX_NO_RESETVEC bool "Discard resetvec section and move bootpg section up, in TPL" - depends on MPC85xx && TPL + depends on MPC85xx && TPL && !MPC85XX_HAVE_RESET_VECTOR help If this variable is specified, the section .resetvec is not kept and the section .bootpg is placed in the previous 4k of the .text section, diff --git a/configs/P1010RDB-PA_36BIT_NOR_defconfig b/configs/P1010RDB-PA_36BIT_NOR_defconfig index deff04bf88..a14a53fbd0 100644 --- a/configs/P1010RDB-PA_36BIT_NOR_defconfig +++ b/configs/P1010RDB-PA_36BIT_NOR_defconfig @@ -10,7 +10,6 @@ CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PA=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_PHYS_64BIT=y diff --git a/configs/P1010RDB-PA_NOR_defconfig b/configs/P1010RDB-PA_NOR_defconfig index 98486a0ae2..f34a096b7d 100644 --- a/configs/P1010RDB-PA_NOR_defconfig +++ b/configs/P1010RDB-PA_NOR_defconfig @@ -10,7 +10,6 @@ CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PA=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_SYS_MONITOR_LEN=786432 diff --git a/configs/P1010RDB-PB_36BIT_NOR_defconfig b/configs/P1010RDB-PB_36BIT_NOR_defconfig index 41a1a852b9..4c1cdbb5fc 100644 --- a/configs/P1010RDB-PB_36BIT_NOR_defconfig +++ b/configs/P1010RDB-PB_36BIT_NOR_defconfig @@ -10,7 +10,6 @@ CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PB=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_PHYS_64BIT=y diff --git a/configs/P1010RDB-PB_NOR_defconfig b/configs/P1010RDB-PB_NOR_defconfig index 16c076bc9a..3eb61fbe07 100644 --- a/configs/P1010RDB-PB_NOR_defconfig +++ b/configs/P1010RDB-PB_NOR_defconfig @@ -10,7 +10,6 @@ CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PB=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_SYS_MONITOR_LEN=786432 diff --git a/configs/P1020RDB-PC_36BIT_defconfig b/configs/P1020RDB-PC_36BIT_defconfig index e60c92ceda..d04e5063ce 100644 --- a/configs/P1020RDB-PC_36BIT_defconfig +++ b/configs/P1020RDB-PC_36BIT_defconfig @@ -11,7 +11,6 @@ CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1020RDB_PC=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_PHYS_64BIT=y diff --git a/configs/P1020RDB-PC_defconfig b/configs/P1020RDB-PC_defconfig index f0f0eee65d..c7357e379d 100644 --- a/configs/P1020RDB-PC_defconfig +++ b/configs/P1020RDB-PC_defconfig @@ -11,7 +11,6 @@ CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1020RDB_PC=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_SYS_MONITOR_LEN=786432 diff --git a/configs/P1020RDB-PD_defconfig b/configs/P1020RDB-PD_defconfig index 8b7f9310b1..ffef3001d4 100644 --- a/configs/P1020RDB-PD_defconfig +++ b/configs/P1020RDB-PD_defconfig @@ -11,7 +11,6 @@ CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1020RDB_PD=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_SYS_MONITOR_LEN=786432 diff --git a/configs/P2020RDB-PC_36BIT_defconfig b/configs/P2020RDB-PC_36BIT_defconfig index 1640f23798..6d020d7d29 100644 --- a/configs/P2020RDB-PC_36BIT_defconfig +++ b/configs/P2020RDB-PC_36BIT_defconfig @@ -11,7 +11,6 @@ CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P2020RDB=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_PHYS_64BIT=y diff --git a/configs/P2020RDB-PC_defconfig b/configs/P2020RDB-PC_defconfig index ca9f447288..612ac053fd 100644 --- a/configs/P2020RDB-PC_defconfig +++ b/configs/P2020RDB-PC_defconfig @@ -11,7 +11,6 @@ CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P2020RDB=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_SYS_MONITOR_LEN=786432 From 3089d12a02efd1dc5dce01e0ec0fda9142693b11 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 29 Dec 2022 13:44:21 -0500 Subject: [PATCH 19/19] configs: Resync with savedefconfig Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini --- configs/ge_b1x5v2_defconfig | 1 - configs/ge_bx50v3_defconfig | 1 - configs/mx53ppd_defconfig | 1 - configs/roc-pc-rk3399_defconfig | 2 -- configs/rock-pi-4-rk3399_defconfig | 6 ++---- configs/rock-pi-4c-rk3399_defconfig | 6 ++---- configs/sandbox64_defconfig | 2 +- configs/sandbox_defconfig | 2 +- configs/sandbox_flattree_defconfig | 2 +- configs/stm32mp15_dhcom_basic_defconfig | 5 ----- configs/stm32mp15_dhcor_basic_defconfig | 5 ----- 11 files changed, 7 insertions(+), 26 deletions(-) diff --git a/configs/ge_b1x5v2_defconfig b/configs/ge_b1x5v2_defconfig index 180a6a8568..dc7b06858c 100644 --- a/configs/ge_b1x5v2_defconfig +++ b/configs/ge_b1x5v2_defconfig @@ -65,7 +65,6 @@ CONFIG_CMD_DNS=y CONFIG_CMD_BMP=y CONFIG_CMD_BOOTCOUNT=y CONFIG_CMD_CACHE=y -CONFIG_CMD_CLS=y CONFIG_CMD_TIME=y CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y diff --git a/configs/ge_bx50v3_defconfig b/configs/ge_bx50v3_defconfig index d9fbdbd640..44089ba24b 100644 --- a/configs/ge_bx50v3_defconfig +++ b/configs/ge_bx50v3_defconfig @@ -36,7 +36,6 @@ CONFIG_CMD_PCI=y CONFIG_CMD_BMP=y CONFIG_CMD_BOOTCOUNT=y CONFIG_CMD_CACHE=y -CONFIG_CMD_CLS=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig index 328f546c5b..dea3887823 100644 --- a/configs/mx53ppd_defconfig +++ b/configs/mx53ppd_defconfig @@ -34,7 +34,6 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_BOOTCOUNT=y -CONFIG_CMD_CLS=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig index cf354fd15f..1f29993a76 100644 --- a/configs/roc-pc-rk3399_defconfig +++ b/configs/roc-pc-rk3399_defconfig @@ -45,7 +45,6 @@ CONFIG_CMD_TIME=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_ENV_SPI_MAX_HZ=30000000 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_ROCKCHIP_GPIO=y @@ -82,7 +81,6 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_GENERIC=y -CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2 CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GENERIC=y CONFIG_USB_KEYBOARD=y diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig index 7dc5f5fa36..91ecb6d9f1 100644 --- a/configs/rock-pi-4-rk3399_defconfig +++ b/configs/rock-pi-4-rk3399_defconfig @@ -30,6 +30,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 CONFIG_TPL=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_NVEDIT_EFI=y CONFIG_CMD_DFU=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y @@ -38,6 +39,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_ROCKUSB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_EFIDEBUG=y CONFIG_CMD_TIME=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" @@ -90,9 +92,5 @@ CONFIG_DISPLAY_ROCKCHIP_HDMI=y CONFIG_SPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y CONFIG_OF_LIBFDT_OVERLAY=y -CONFIG_CMD_NVEDIT_EFI=y -CONFIG_CMD_EFIDEBUG=y -CONFIG_TOOLS_MKEFICAPSULE=y -CONFIG_HEXDUMP=y CONFIG_EFI_CAPSULE_ON_DISK=y CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y diff --git a/configs/rock-pi-4c-rk3399_defconfig b/configs/rock-pi-4c-rk3399_defconfig index 45f8958f90..bd21a4c8b6 100644 --- a/configs/rock-pi-4c-rk3399_defconfig +++ b/configs/rock-pi-4c-rk3399_defconfig @@ -30,6 +30,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 CONFIG_TPL=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_NVEDIT_EFI=y CONFIG_CMD_DFU=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y @@ -38,6 +39,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_ROCKUSB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_EFIDEBUG=y CONFIG_CMD_TIME=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" @@ -90,9 +92,5 @@ CONFIG_DISPLAY_ROCKCHIP_HDMI=y CONFIG_SPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y CONFIG_OF_LIBFDT_OVERLAY=y -CONFIG_CMD_NVEDIT_EFI=y -CONFIG_CMD_EFIDEBUG=y -CONFIG_TOOLS_MKEFICAPSULE=y -CONFIG_HEXDUMP=y CONFIG_EFI_CAPSULE_ON_DISK=y CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig index b69e053126..ba45ac0b71 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig @@ -101,6 +101,7 @@ CONFIG_BOOTP_SEND_HOSTNAME=y CONFIG_NETCONSOLE=y CONFIG_IP_DEFRAG=y CONFIG_BOOTP_SERVERIP=y +CONFIG_IPV6=y CONFIG_DM_DMA=y CONFIG_REGMAP=y CONFIG_SYSCON=y @@ -258,4 +259,3 @@ CONFIG_FWU_MULTI_BANK_UPDATE=y CONFIG_UNIT_TEST=y CONFIG_UT_TIME=y CONFIG_UT_DM=y -CONFIG_IPV6=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 404e4a3324..be46cae7aa 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -135,6 +135,7 @@ CONFIG_BOOTP_SEND_HOSTNAME=y CONFIG_NETCONSOLE=y CONFIG_IP_DEFRAG=y CONFIG_BOOTP_SERVERIP=y +CONFIG_IPV6=y CONFIG_DM_DMA=y CONFIG_DEVRES=y CONFIG_DEBUG_DEVRES=y @@ -333,4 +334,3 @@ CONFIG_TEST_FDTDEC=y CONFIG_UNIT_TEST=y CONFIG_UT_TIME=y CONFIG_UT_DM=y -CONFIG_IPV6=y diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig index 7237efe685..88aaddfa4a 100644 --- a/configs/sandbox_flattree_defconfig +++ b/configs/sandbox_flattree_defconfig @@ -78,6 +78,7 @@ CONFIG_BOOTP_SEND_HOSTNAME=y CONFIG_NETCONSOLE=y CONFIG_IP_DEFRAG=y CONFIG_BOOTP_SERVERIP=y +CONFIG_IPV6=y CONFIG_DM_DMA=y CONFIG_REGMAP=y CONFIG_SYSCON=y @@ -216,4 +217,3 @@ CONFIG_EFI_CAPSULE_FIRMWARE_FIT=y CONFIG_UNIT_TEST=y CONFIG_UT_TIME=y CONFIG_UT_DM=y -CONFIG_IPV6=y diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig index 26c2e73aa0..b1e7a7f11e 100644 --- a/configs/stm32mp15_dhcom_basic_defconfig +++ b/configs/stm32mp15_dhcom_basic_defconfig @@ -72,10 +72,8 @@ CONFIG_CMD_CLK=y CONFIG_CMD_DFU=y CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y -CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_MTD=y CONFIG_CMD_REMOTEPROC=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y @@ -110,9 +108,6 @@ CONFIG_STM32_ADC=y CONFIG_SPL_BLOCK_CACHE=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SYS_BOOTCOUNT_MAGIC=0xB0C40000 -CONFIG_DFU_MMC=y -CONFIG_DFU_MTD=y -CONFIG_DFU_RAM=y CONFIG_GPIO_HOG=y CONFIG_DM_HWSPINLOCK=y CONFIG_HWSPINLOCK_STM32=y diff --git a/configs/stm32mp15_dhcor_basic_defconfig b/configs/stm32mp15_dhcor_basic_defconfig index f76e13eafd..c4396b4367 100644 --- a/configs/stm32mp15_dhcor_basic_defconfig +++ b/configs/stm32mp15_dhcor_basic_defconfig @@ -70,10 +70,8 @@ CONFIG_CMD_CLK=y CONFIG_CMD_DFU=y CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y -CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_MTD=y CONFIG_CMD_REMOTEPROC=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y @@ -107,9 +105,6 @@ CONFIG_STM32_ADC=y CONFIG_SPL_BLOCK_CACHE=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SYS_BOOTCOUNT_MAGIC=0xB0C40000 -CONFIG_DFU_MMC=y -CONFIG_DFU_MTD=y -CONFIG_DFU_RAM=y CONFIG_GPIO_HOG=y CONFIG_DM_HWSPINLOCK=y CONFIG_HWSPINLOCK_STM32=y