[U-Boot] [PATCH 1/2] cosmetic: Fix spelling and whitespace errors
Signed-off-by: Thomas Hebb tommyhebb@gmail.com --- Makefile | 2 +- README | 4 ++-- arch/arm/cpu/armv8/sec_firmware.c | 2 +- arch/arm/mach-rockchip/Kconfig | 2 +- arch/arm/mach-rockchip/bootrom.c | 4 ++-- arch/arm/mach-rockchip/rk3399/Kconfig | 6 +++--- arch/arm/mach-rockchip/spl-boot-order.c | 2 +- board/rockchip/evb_rk3399/README | 2 +- common/spl/Kconfig | 4 ++-- doc/README.SPL | 2 +- doc/README.TPL | 2 +- doc/uImage.FIT/source_file_format.txt | 2 +- tools/binman/README | 2 +- tools/binman/README.entries | 4 ++-- 14 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/Makefile b/Makefile index 5c8c4c971f..3c4082a3db 100644 --- a/Makefile +++ b/Makefile @@ -1663,7 +1663,7 @@ u-boot.sym: u-boot FORCE # make sure no implicit rule kicks in $(sort $(u-boot-init) $(u-boot-main)): $(u-boot-dirs) ;
-# Handle descending into subdirectories listed in $(vmlinux-dirs) +# Handle descending into ubdirectories listed in $(u-boot-dirs) # Preset locale variables to speed up the build process. Limit locale # tweaks to this spot to avoid wrong language settings when running # make menuconfig etc. diff --git a/README b/README index 1389e8ff12..f0e9c030de 100644 --- a/README +++ b/README @@ -3087,7 +3087,7 @@ Low Level (hardware related) configuration options: compiling a NAND SPL.
- CONFIG_TPL_BUILD - Modifies the behaviour of start.S when compiling a loader + Modifies the behaviour of start.S when compiling a loader that is executed after the SPL and before the actual U-Boot. It is loaded by the SPL.
@@ -3306,7 +3306,7 @@ Testing of U-Boot Modifications, Ports to New Hardware, etc.: If you have modified U-Boot sources (for instance added a new board or support for new devices, a new CPU, etc.) you are expected to provide feedback to the other developers. The feedback normally takes -the form of a "patch", i. e. a context diff against a certain (latest +the form of a "patch", i.e. a context diff against a certain (latest official or latest in the git repository) version of U-Boot sources.
But before you submit such a patch, please verify that your modifi- diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c index 8dc0ac9266..4b3eb71cef 100644 --- a/arch/arm/cpu/armv8/sec_firmware.c +++ b/arch/arm/cpu/armv8/sec_firmware.c @@ -353,7 +353,7 @@ bool sec_firmware_support_hwrng(void) return true; #endif if (sec_firmware_addr & SEC_FIRMWARE_RUNNING) { - return true; + return true; }
return false; diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index f5a80b4f0c..1b7f82f596 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -265,7 +265,7 @@ config TPL_ROCKCHIP_COMMON_BOARD Rockchip SoCs have similar boot process, prefer to use TPL for DRAM init and back to bootrom, and SPL as Trust ATF/U-Boot loader. TPL common board is a basic TPL board init which can be shared for most - of SoCs to avoid copy-pase for different SoCs. + of SoCs to avoid copy-paste for different SoCs.
config ROCKCHIP_BOOT_MODE_REG hex "Rockchip boot mode flag register address" diff --git a/arch/arm/mach-rockchip/bootrom.c b/arch/arm/mach-rockchip/bootrom.c index 9ccb45e6ac..10614c99d9 100644 --- a/arch/arm/mach-rockchip/bootrom.c +++ b/arch/arm/mach-rockchip/bootrom.c @@ -39,8 +39,8 @@ void back_to_bootrom(enum rockchip_bootrom_cmd brom_cmd) * to check it and back to bootrom at very early bootstage(before * some basic configurations(such as interrupts) been * changed by TPL/SPL, as the bootrom download operation - * relys on many default settings(such as interrupts) by - * it's self. + * relies on many default settings(such as interrupts) by + * itself. */ static bool check_back_to_brom_dnl_flag(void) { diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig index 6660d05349..8e43e52e3c 100644 --- a/arch/arm/mach-rockchip/rk3399/Kconfig +++ b/arch/arm/mach-rockchip/rk3399/Kconfig @@ -6,9 +6,9 @@ choice config TARGET_EVB_RK3399 bool "RK3399 evaluation board" help - RK3399evb is a evaluation board for Rockchp rk3399, - with full function and phisical connectors support like type-C ports, - usb2.0 host ports, LVDS, JTAG, MAC, SDcard, HDMI, USB-2-serial... + RK3399evb is a evaluation board for Rockchip RK3399, + with full function and physical connectors support like Type-C ports, + USB.0 host ports, LVDS, JTAG, MAC, SD card, HDMI, USB-to-serial...
config TARGET_PUMA_RK3399 bool "Theobroma Systems RK3399-Q7 (Puma)" diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c index fa8e096426..c147d5821e 100644 --- a/arch/arm/mach-rockchip/spl-boot-order.c +++ b/arch/arm/mach-rockchip/spl-boot-order.c @@ -35,7 +35,7 @@ static int spl_node_to_boot_device(int node) /* * This should eventually move into the SPL code, once SPL becomes * aware of the block-device layer. Until then (and to avoid unneeded - * delays in getting this feature out, it lives at the board-level). + * delays in getting this feature out), it lives at the board-level. */ if (!uclass_get_device_by_of_offset(UCLASS_MMC, node, &parent)) { struct udevice *dev; diff --git a/board/rockchip/evb_rk3399/README b/board/rockchip/evb_rk3399/README index ea3258cf37..da7ae89ab1 100644 --- a/board/rockchip/evb_rk3399/README +++ b/board/rockchip/evb_rk3399/README @@ -9,7 +9,7 @@ RK3399 key features we might use in U-Boot: * DRAM: 4GB-128MB dual-channel * eMMC: support eMMC 5.0/5.1, suport HS400, HS200, DDR50 * SD/MMC: support SD 3.0, MMC 4.51 -* USB: USB3.0 typc-C port *2 with dwc3 controller +* USB: USB3.0 type-C port *2 with dwc3 controller * USB2.0 EHCI host port *2 * Display: RGB/HDMI/DP/MIPI/EDP
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 8f0ba8ef83..19da82725a 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -268,7 +268,7 @@ config SPL_BANNER_PRINT default y help If this option is enabled, SPL will print the banner with version - info. Disabling this option could be useful to reduce TPL boot time + info. Disabling this option could be useful to reduce SPL boot time (e.g. approx. 6 ms faster, when output on i.MX6 with 115200 baud).
config TPL_BANNER_PRINT @@ -277,7 +277,7 @@ config TPL_BANNER_PRINT default y help If this option is enabled, SPL will not print the banner with version - info. Disabling this option could be useful to reduce SPL boot time + info. Disabling this option could be useful to reduce TPL boot time (e.g. approx. 6 ms faster, when output on i.MX6 with 115200 baud).
config SPL_EARLY_BSS diff --git a/doc/README.SPL b/doc/README.SPL index 6eed83f8c5..3c931ec720 100644 --- a/doc/README.SPL +++ b/doc/README.SPL @@ -75,7 +75,7 @@ with: - the nodes with one pre-relocation property: 'u-boot,dm-pre-reloc' or 'u-boot,dm-spl'
-ftgrep is also used to remove: +fdtgrep is also used to remove: - the properties defined in CONFIG_OF_SPL_REMOVE_PROPS - all the pre-relocation properties ('u-boot,dm-pre-reloc', 'u-boot,dm-spl' and 'u-boot,dm-tpl') diff --git a/doc/README.TPL b/doc/README.TPL index c94129fdc9..72027fd692 100644 --- a/doc/README.TPL +++ b/doc/README.TPL @@ -31,7 +31,7 @@ make environment and also appended to CPPFLAGS with -DCONFIG_TPL_BUILD.
The SPL options are shared by SPL and TPL, the board config file should determine which SPL options to choose based on whether CONFIG_TPL_BUILD -is set. Source files can be compiled for TPL with options choosed in the +is set. Source files can be compiled for TPL with options chosen in the board config file.
TPL use a small device tree (u-boot-tpl.dtb), containing only the nodes with diff --git a/doc/uImage.FIT/source_file_format.txt b/doc/uImage.FIT/source_file_format.txt index f8e27ed34e..18d2aedcb7 100644 --- a/doc/uImage.FIT/source_file_format.txt +++ b/doc/uImage.FIT/source_file_format.txt @@ -262,7 +262,7 @@ o config-1 - loadables : Unit name containing a list of additional binaries to be loaded at their given locations. "loadables" is a comma-separated list of strings. U-Boot will load each binary at its given start-address and - may optionaly invoke additional post-processing steps on this binary based + may optionally invoke additional post-processing steps on this binary based on its component image node type. - compatible : The root compatible string of the U-Boot device tree that this configuration shall automatically match when CONFIG_FIT_BEST_MATCH is diff --git a/tools/binman/README b/tools/binman/README index c96a564226..47254bd1e6 100644 --- a/tools/binman/README +++ b/tools/binman/README @@ -73,7 +73,7 @@ any dependencies between them and brought in as needed - Provides for a standard image description available in the build and at run-time -- SoC-specific image-signing tools can be accomodated +- SoC-specific image-signing tools can be accommodated - Avoids cluttering the U-Boot build system with image-building code - The image description is automatically available at run-time in U-Boot, SPL. It can be made available to other software also diff --git a/tools/binman/README.entries b/tools/binman/README.entries index 1099433521..0576e63a86 100644 --- a/tools/binman/README.entries +++ b/tools/binman/README.entries @@ -519,7 +519,7 @@ Properties / Entry arguments:
This file contains code used by the SoC that is required to make it work. The Management Engine is like a background task that runs things that are -not clearly documented, but may include keyboard, deplay and network +not clearly documented, but may include keyboard, display and network access. For platform that use ME it is not possible to disable it. U-Boot does not directly execute code in the ME binary.
@@ -593,7 +593,7 @@ Entry: powerpc-mpc85xx-bootpg-resetvec: PowerPC mpc85xx bootpg + resetvec code f Properties / Entry arguments: - filename: Filename of u-boot-br.bin (default 'u-boot-br.bin')
-This enrty is valid for PowerPC mpc85xx cpus. This entry holds +This entry is valid for PowerPC mpc85xx cpus. This entry holds 'bootpg + resetvec' code for PowerPC mpc85xx CPUs which needs to be placed at offset 'RESET_VECTOR_ADDRESS - 0xffc'.
Signed-off-by: Thomas Hebb tommyhebb@gmail.com --- arch/arm/cpu/armv8/Kconfig | 2 +- arch/arm/cpu/armv8/sec_firmware.c | 8 ++++---- drivers/net/pfe_eth/pfe_firmware.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig index 92a2b58ed4..16c83e8614 100644 --- a/arch/arm/cpu/armv8/Kconfig +++ b/arch/arm/cpu/armv8/Kconfig @@ -65,7 +65,7 @@ config ARMV8_SEC_FIRMWARE_SUPPORT - Address of secure firmware. - Address to hold the return address from secure firmware. - Secure firmware FIT image related information. - Such as: SEC_FIRMWARE_FIT_IMAGE and SEC_FIRMEWARE_FIT_CNF_NAME + Such as: SEC_FIRMWARE_FIT_IMAGE and SEC_FIRMWARE_FIT_CNF_NAME - The target exception level that secure monitor firmware will return to.
diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c index 4b3eb71cef..e64452d8f8 100644 --- a/arch/arm/cpu/armv8/sec_firmware.c +++ b/arch/arm/cpu/armv8/sec_firmware.c @@ -28,8 +28,8 @@ phys_addr_t sec_firmware_addr; #ifndef SEC_FIRMWARE_FIT_IMAGE #define SEC_FIRMWARE_FIT_IMAGE "firmware" #endif -#ifndef SEC_FIRMEWARE_FIT_CNF_NAME -#define SEC_FIRMEWARE_FIT_CNF_NAME "config-1" +#ifndef SEC_FIRMWARE_FIT_CNF_NAME +#define SEC_FIRMWARE_FIT_CNF_NAME "config-1" #endif #ifndef SEC_FIRMWARE_TARGET_EL #define SEC_FIRMWARE_TARGET_EL 2 @@ -43,7 +43,7 @@ static int sec_firmware_get_data(const void *sec_firmware_img, char *desc; int ret;
- conf_node_name = SEC_FIRMEWARE_FIT_CNF_NAME; + conf_node_name = SEC_FIRMWARE_FIT_CNF_NAME;
conf_node_off = fit_conf_get_node(sec_firmware_img, conf_node_name); if (conf_node_off < 0) { @@ -123,7 +123,7 @@ static int sec_firmware_check_copy_loadable(const void *sec_firmware_img, const char *name, *str, *type; int len;
- conf_node_name = SEC_FIRMEWARE_FIT_CNF_NAME; + conf_node_name = SEC_FIRMWARE_FIT_CNF_NAME;
conf_node_off = fit_conf_get_node(sec_firmware_img, conf_node_name); if (conf_node_off < 0) { diff --git a/drivers/net/pfe_eth/pfe_firmware.c b/drivers/net/pfe_eth/pfe_firmware.c index adb2d06010..e4563f192b 100644 --- a/drivers/net/pfe_eth/pfe_firmware.c +++ b/drivers/net/pfe_eth/pfe_firmware.c @@ -16,7 +16,7 @@ #include <fsl_validate.h> #endif
-#define PFE_FIRMEWARE_FIT_CNF_NAME "config@1" +#define PFE_FIRMWARE_FIT_CNF_NAME "config@1"
static const void *pfe_fit_addr = (void *)CONFIG_SYS_LS_PFE_FW_ADDR;
@@ -99,7 +99,7 @@ static int pfe_get_fw(const void **data, char *desc; int ret = 0;
- conf_node_name = PFE_FIRMEWARE_FIT_CNF_NAME; + conf_node_name = PFE_FIRMWARE_FIT_CNF_NAME;
conf_node_off = fit_conf_get_node(pfe_fit_addr, conf_node_name); if (conf_node_off < 0) {
On Sun, Nov 10, 2019 at 08:23:15AM -0800, Thomas Hebb wrote:
Signed-off-by: Thomas Hebb tommyhebb@gmail.com
Applied to u-boot/master, thanks!
On Mon, Nov 11, 2019 at 5:23 AM Thomas Hebb tommyhebb@gmail.com wrote:
Signed-off-by: Thomas Hebb tommyhebb@gmail.com
Makefile | 2 +- README | 4 ++-- arch/arm/cpu/armv8/sec_firmware.c | 2 +- arch/arm/mach-rockchip/Kconfig | 2 +- arch/arm/mach-rockchip/bootrom.c | 4 ++-- arch/arm/mach-rockchip/rk3399/Kconfig | 6 +++--- arch/arm/mach-rockchip/spl-boot-order.c | 2 +- board/rockchip/evb_rk3399/README | 2 +- common/spl/Kconfig | 4 ++-- doc/README.SPL | 2 +- doc/README.TPL | 2 +- doc/uImage.FIT/source_file_format.txt | 2 +- tools/binman/README | 2 +- tools/binman/README.entries | 4 ++-- 14 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/Makefile b/Makefile index 5c8c4c971f..3c4082a3db 100644 --- a/Makefile +++ b/Makefile @@ -1663,7 +1663,7 @@ u-boot.sym: u-boot FORCE # make sure no implicit rule kicks in $(sort $(u-boot-init) $(u-boot-main)): $(u-boot-dirs) ;
-# Handle descending into subdirectories listed in $(vmlinux-dirs) +# Handle descending into ubdirectories listed in $(u-boot-dirs)
"ubdirectories" should stay as "subdirectories" (or "sub-directories" which seems to placate Firefox's spell checker)
# Preset locale variables to speed up the build process. Limit locale # tweaks to this spot to avoid wrong language settings when running # make menuconfig etc. diff --git a/README b/README index 1389e8ff12..f0e9c030de 100644 --- a/README +++ b/README @@ -3087,7 +3087,7 @@ Low Level (hardware related) configuration options: compiling a NAND SPL.
- CONFIG_TPL_BUILD
Modifies the behaviour of start.S when compiling a loader
Modifies the behaviour of start.S when compiling a loader that is executed after the SPL and before the actual U-Boot. It is loaded by the SPL.
The correct thing would be to replace "SPL" with "TPL" in the paragraph that follows. But I actually wonder if the content should be updated as one does not usually set SPL_BUILD or TPL_BUILD directly. The are both automatically defined by the build system.
@@ -3306,7 +3306,7 @@ Testing of U-Boot Modifications, Ports to New Hardware, etc.: If you have modified U-Boot sources (for instance added a new board or support for new devices, a new CPU, etc.) you are expected to provide feedback to the other developers. The feedback normally takes -the form of a "patch", i. e. a context diff against a certain (latest +the form of a "patch", i.e. a context diff against a certain (latest official or latest in the git repository) version of U-Boot sources.
But before you submit such a patch, please verify that your modifi- diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c index 8dc0ac9266..4b3eb71cef 100644 --- a/arch/arm/cpu/armv8/sec_firmware.c +++ b/arch/arm/cpu/armv8/sec_firmware.c @@ -353,7 +353,7 @@ bool sec_firmware_support_hwrng(void) return true; #endif if (sec_firmware_addr & SEC_FIRMWARE_RUNNING) {
return true;
return true; } return false;diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index f5a80b4f0c..1b7f82f596 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -265,7 +265,7 @@ config TPL_ROCKCHIP_COMMON_BOARD Rockchip SoCs have similar boot process, prefer to use TPL for DRAM init and back to bootrom, and SPL as Trust ATF/U-Boot loader. TPL common board is a basic TPL board init which can be shared for most
of SoCs to avoid copy-pase for different SoCs.
of SoCs to avoid copy-paste for different SoCs.config ROCKCHIP_BOOT_MODE_REG hex "Rockchip boot mode flag register address" diff --git a/arch/arm/mach-rockchip/bootrom.c b/arch/arm/mach-rockchip/bootrom.c index 9ccb45e6ac..10614c99d9 100644 --- a/arch/arm/mach-rockchip/bootrom.c +++ b/arch/arm/mach-rockchip/bootrom.c @@ -39,8 +39,8 @@ void back_to_bootrom(enum rockchip_bootrom_cmd brom_cmd)
- to check it and back to bootrom at very early bootstage(before
- some basic configurations(such as interrupts) been
- changed by TPL/SPL, as the bootrom download operation
- relys on many default settings(such as interrupts) by
- it's self.
- relies on many default settings(such as interrupts) by
*/
- itself.
static bool check_back_to_brom_dnl_flag(void) { diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig index 6660d05349..8e43e52e3c 100644 --- a/arch/arm/mach-rockchip/rk3399/Kconfig +++ b/arch/arm/mach-rockchip/rk3399/Kconfig @@ -6,9 +6,9 @@ choice config TARGET_EVB_RK3399 bool "RK3399 evaluation board" help
RK3399evb is a evaluation board for Rockchp rk3399,with full function and phisical connectors support like type-C ports,usb2.0 host ports, LVDS, JTAG, MAC, SDcard, HDMI, USB-2-serial...
RK3399evb is a evaluation board for Rockchip RK3399,with full function and physical connectors support like Type-C ports,USB.0 host ports, LVDS, JTAG, MAC, SD card, HDMI, USB-to-serial...config TARGET_PUMA_RK3399 bool "Theobroma Systems RK3399-Q7 (Puma)" diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c index fa8e096426..c147d5821e 100644 --- a/arch/arm/mach-rockchip/spl-boot-order.c +++ b/arch/arm/mach-rockchip/spl-boot-order.c @@ -35,7 +35,7 @@ static int spl_node_to_boot_device(int node) /* * This should eventually move into the SPL code, once SPL becomes * aware of the block-device layer. Until then (and to avoid unneeded
* delays in getting this feature out, it lives at the board-level).
* delays in getting this feature out), it lives at the board-level. */ if (!uclass_get_device_by_of_offset(UCLASS_MMC, node, &parent)) { struct udevice *dev;diff --git a/board/rockchip/evb_rk3399/README b/board/rockchip/evb_rk3399/README index ea3258cf37..da7ae89ab1 100644 --- a/board/rockchip/evb_rk3399/README +++ b/board/rockchip/evb_rk3399/README @@ -9,7 +9,7 @@ RK3399 key features we might use in U-Boot:
- DRAM: 4GB-128MB dual-channel
- eMMC: support eMMC 5.0/5.1, suport HS400, HS200, DDR50
- SD/MMC: support SD 3.0, MMC 4.51
-* USB: USB3.0 typc-C port *2 with dwc3 controller +* USB: USB3.0 type-C port *2 with dwc3 controller
USB2.0 EHCI host port *2- Display: RGB/HDMI/DP/MIPI/EDP
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 8f0ba8ef83..19da82725a 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -268,7 +268,7 @@ config SPL_BANNER_PRINT default y help If this option is enabled, SPL will print the banner with version
info. Disabling this option could be useful to reduce TPL boot time
info. Disabling this option could be useful to reduce SPL boot time (e.g. approx. 6 ms faster, when output on i.MX6 with 115200 baud).config TPL_BANNER_PRINT @@ -277,7 +277,7 @@ config TPL_BANNER_PRINT default y help If this option is enabled, SPL will not print the banner with version
There's another one just here ~~^
info. Disabling this option could be useful to reduce SPL boot time
info. Disabling this option could be useful to reduce TPL boot time (e.g. approx. 6 ms faster, when output on i.MX6 with 115200 baud).config SPL_EARLY_BSS diff --git a/doc/README.SPL b/doc/README.SPL index 6eed83f8c5..3c931ec720 100644 --- a/doc/README.SPL +++ b/doc/README.SPL @@ -75,7 +75,7 @@ with:
- the nodes with one pre-relocation property: 'u-boot,dm-pre-reloc' or 'u-boot,dm-spl'
-ftgrep is also used to remove: +fdtgrep is also used to remove:
- the properties defined in CONFIG_OF_SPL_REMOVE_PROPS
- all the pre-relocation properties ('u-boot,dm-pre-reloc', 'u-boot,dm-spl' and 'u-boot,dm-tpl')
diff --git a/doc/README.TPL b/doc/README.TPL index c94129fdc9..72027fd692 100644 --- a/doc/README.TPL +++ b/doc/README.TPL @@ -31,7 +31,7 @@ make environment and also appended to CPPFLAGS with -DCONFIG_TPL_BUILD.
The SPL options are shared by SPL and TPL, the board config file should determine which SPL options to choose based on whether CONFIG_TPL_BUILD -is set. Source files can be compiled for TPL with options choosed in the +is set. Source files can be compiled for TPL with options chosen in the board config file.
TPL use a small device tree (u-boot-tpl.dtb), containing only the nodes with diff --git a/doc/uImage.FIT/source_file_format.txt b/doc/uImage.FIT/source_file_format.txt index f8e27ed34e..18d2aedcb7 100644 --- a/doc/uImage.FIT/source_file_format.txt +++ b/doc/uImage.FIT/source_file_format.txt @@ -262,7 +262,7 @@ o config-1
- loadables : Unit name containing a list of additional binaries to be loaded at their given locations. "loadables" is a comma-separated list of strings. U-Boot will load each binary at its given start-address and
- may optionaly invoke additional post-processing steps on this binary based
- may optionally invoke additional post-processing steps on this binary based on its component image node type.
this configuration shall automatically match when CONFIG_FIT_BEST_MATCH is
- compatible : The root compatible string of the U-Boot device tree that
diff --git a/tools/binman/README b/tools/binman/README index c96a564226..47254bd1e6 100644 --- a/tools/binman/README +++ b/tools/binman/README @@ -73,7 +73,7 @@ any dependencies between them and brought in as needed
- Provides for a standard image description available in the build and at
run-time -- SoC-specific image-signing tools can be accomodated +- SoC-specific image-signing tools can be accommodated
- Avoids cluttering the U-Boot build system with image-building code
- The image description is automatically available at run-time in U-Boot,
SPL. It can be made available to other software also diff --git a/tools/binman/README.entries b/tools/binman/README.entries index 1099433521..0576e63a86 100644 --- a/tools/binman/README.entries +++ b/tools/binman/README.entries @@ -519,7 +519,7 @@ Properties / Entry arguments:
This file contains code used by the SoC that is required to make it work. The Management Engine is like a background task that runs things that are -not clearly documented, but may include keyboard, deplay and network +not clearly documented, but may include keyboard, display and network access. For platform that use ME it is not possible to disable it. U-Boot does not directly execute code in the ME binary.
@@ -593,7 +593,7 @@ Entry: powerpc-mpc85xx-bootpg-resetvec: PowerPC mpc85xx bootpg + resetvec code f Properties / Entry arguments: - filename: Filename of u-boot-br.bin (default 'u-boot-br.bin')
-This enrty is valid for PowerPC mpc85xx cpus. This entry holds +This entry is valid for PowerPC mpc85xx cpus. This entry holds 'bootpg + resetvec' code for PowerPC mpc85xx CPUs which needs to be placed at offset 'RESET_VECTOR_ADDRESS - 0xffc'.
Other than the things I've pointed out
Reviewed-by: Chris Packham judge.packham@gmail.com
Signed-off-by: Thomas Hebb tommyhebb@gmail.com --- Makefile | 2 +- README | 16 +++++++++------- arch/arm/cpu/armv8/sec_firmware.c | 2 +- arch/arm/mach-rockchip/Kconfig | 2 +- arch/arm/mach-rockchip/bootrom.c | 4 ++-- arch/arm/mach-rockchip/rk3399/Kconfig | 6 +++--- arch/arm/mach-rockchip/spl-boot-order.c | 2 +- board/rockchip/evb_rk3399/README | 2 +- common/spl/Kconfig | 6 +++--- doc/README.SPL | 2 +- doc/README.TPL | 2 +- doc/uImage.FIT/source_file_format.txt | 2 +- tools/binman/README | 2 +- tools/binman/README.entries | 4 ++-- 14 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/Makefile b/Makefile index 5c8c4c971f..c5d4bd533b 100644 --- a/Makefile +++ b/Makefile @@ -1663,7 +1663,7 @@ u-boot.sym: u-boot FORCE # make sure no implicit rule kicks in $(sort $(u-boot-init) $(u-boot-main)): $(u-boot-dirs) ;
-# Handle descending into subdirectories listed in $(vmlinux-dirs) +# Handle descending into subdirectories listed in $(u-boot-dirs) # Preset locale variables to speed up the build process. Limit locale # tweaks to this spot to avoid wrong language settings when running # make menuconfig etc. diff --git a/README b/README index 1389e8ff12..d047b3b3dd 100644 --- a/README +++ b/README @@ -3082,14 +3082,16 @@ Low Level (hardware related) configuration options: instruction cache) is still performed.
- CONFIG_SPL_BUILD - Modifies the behaviour of start.S when compiling a loader - that is executed before the actual U-Boot. E.g. when - compiling a NAND SPL. + Set when the currently-running compilation is for an artifact + that will end up in the SPL (as opposed to the TPL or U-Boot + proper). Code that needs stage-specific behavior should check + this.
- CONFIG_TPL_BUILD - Modifies the behaviour of start.S when compiling a loader - that is executed after the SPL and before the actual U-Boot. - It is loaded by the SPL. + Set when the currently-running compilation is for an artifact + that will end up in the TPL (as opposed to the SPL or U-Boot + proper). Code that needs stage-specific behavior should check + this.
- CONFIG_SYS_MPC85XX_NO_RESETVEC Only for 85xx systems. If this variable is specified, the section @@ -3306,7 +3308,7 @@ Testing of U-Boot Modifications, Ports to New Hardware, etc.: If you have modified U-Boot sources (for instance added a new board or support for new devices, a new CPU, etc.) you are expected to provide feedback to the other developers. The feedback normally takes -the form of a "patch", i. e. a context diff against a certain (latest +the form of a "patch", i.e. a context diff against a certain (latest official or latest in the git repository) version of U-Boot sources.
But before you submit such a patch, please verify that your modifi- diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c index 8dc0ac9266..4b3eb71cef 100644 --- a/arch/arm/cpu/armv8/sec_firmware.c +++ b/arch/arm/cpu/armv8/sec_firmware.c @@ -353,7 +353,7 @@ bool sec_firmware_support_hwrng(void) return true; #endif if (sec_firmware_addr & SEC_FIRMWARE_RUNNING) { - return true; + return true; }
return false; diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index f5a80b4f0c..1b7f82f596 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -265,7 +265,7 @@ config TPL_ROCKCHIP_COMMON_BOARD Rockchip SoCs have similar boot process, prefer to use TPL for DRAM init and back to bootrom, and SPL as Trust ATF/U-Boot loader. TPL common board is a basic TPL board init which can be shared for most - of SoCs to avoid copy-pase for different SoCs. + of SoCs to avoid copy-paste for different SoCs.
config ROCKCHIP_BOOT_MODE_REG hex "Rockchip boot mode flag register address" diff --git a/arch/arm/mach-rockchip/bootrom.c b/arch/arm/mach-rockchip/bootrom.c index 9ccb45e6ac..10614c99d9 100644 --- a/arch/arm/mach-rockchip/bootrom.c +++ b/arch/arm/mach-rockchip/bootrom.c @@ -39,8 +39,8 @@ void back_to_bootrom(enum rockchip_bootrom_cmd brom_cmd) * to check it and back to bootrom at very early bootstage(before * some basic configurations(such as interrupts) been * changed by TPL/SPL, as the bootrom download operation - * relys on many default settings(such as interrupts) by - * it's self. + * relies on many default settings(such as interrupts) by + * itself. */ static bool check_back_to_brom_dnl_flag(void) { diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig index 6660d05349..8e43e52e3c 100644 --- a/arch/arm/mach-rockchip/rk3399/Kconfig +++ b/arch/arm/mach-rockchip/rk3399/Kconfig @@ -6,9 +6,9 @@ choice config TARGET_EVB_RK3399 bool "RK3399 evaluation board" help - RK3399evb is a evaluation board for Rockchp rk3399, - with full function and phisical connectors support like type-C ports, - usb2.0 host ports, LVDS, JTAG, MAC, SDcard, HDMI, USB-2-serial... + RK3399evb is a evaluation board for Rockchip RK3399, + with full function and physical connectors support like Type-C ports, + USB.0 host ports, LVDS, JTAG, MAC, SD card, HDMI, USB-to-serial...
config TARGET_PUMA_RK3399 bool "Theobroma Systems RK3399-Q7 (Puma)" diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c index fa8e096426..c147d5821e 100644 --- a/arch/arm/mach-rockchip/spl-boot-order.c +++ b/arch/arm/mach-rockchip/spl-boot-order.c @@ -35,7 +35,7 @@ static int spl_node_to_boot_device(int node) /* * This should eventually move into the SPL code, once SPL becomes * aware of the block-device layer. Until then (and to avoid unneeded - * delays in getting this feature out, it lives at the board-level). + * delays in getting this feature out), it lives at the board-level. */ if (!uclass_get_device_by_of_offset(UCLASS_MMC, node, &parent)) { struct udevice *dev; diff --git a/board/rockchip/evb_rk3399/README b/board/rockchip/evb_rk3399/README index ea3258cf37..da7ae89ab1 100644 --- a/board/rockchip/evb_rk3399/README +++ b/board/rockchip/evb_rk3399/README @@ -9,7 +9,7 @@ RK3399 key features we might use in U-Boot: * DRAM: 4GB-128MB dual-channel * eMMC: support eMMC 5.0/5.1, suport HS400, HS200, DDR50 * SD/MMC: support SD 3.0, MMC 4.51 -* USB: USB3.0 typc-C port *2 with dwc3 controller +* USB: USB3.0 type-C port *2 with dwc3 controller * USB2.0 EHCI host port *2 * Display: RGB/HDMI/DP/MIPI/EDP
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 8f0ba8ef83..f0d89afa0b 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -268,7 +268,7 @@ config SPL_BANNER_PRINT default y help If this option is enabled, SPL will print the banner with version - info. Disabling this option could be useful to reduce TPL boot time + info. Disabling this option could be useful to reduce SPL boot time (e.g. approx. 6 ms faster, when output on i.MX6 with 115200 baud).
config TPL_BANNER_PRINT @@ -276,8 +276,8 @@ config TPL_BANNER_PRINT depends on TPL default y help - If this option is enabled, SPL will not print the banner with version - info. Disabling this option could be useful to reduce SPL boot time + If this option is enabled, TPL will print the banner with version + info. Disabling this option could be useful to reduce TPL boot time (e.g. approx. 6 ms faster, when output on i.MX6 with 115200 baud).
config SPL_EARLY_BSS diff --git a/doc/README.SPL b/doc/README.SPL index 6eed83f8c5..3c931ec720 100644 --- a/doc/README.SPL +++ b/doc/README.SPL @@ -75,7 +75,7 @@ with: - the nodes with one pre-relocation property: 'u-boot,dm-pre-reloc' or 'u-boot,dm-spl'
-ftgrep is also used to remove: +fdtgrep is also used to remove: - the properties defined in CONFIG_OF_SPL_REMOVE_PROPS - all the pre-relocation properties ('u-boot,dm-pre-reloc', 'u-boot,dm-spl' and 'u-boot,dm-tpl') diff --git a/doc/README.TPL b/doc/README.TPL index c94129fdc9..72027fd692 100644 --- a/doc/README.TPL +++ b/doc/README.TPL @@ -31,7 +31,7 @@ make environment and also appended to CPPFLAGS with -DCONFIG_TPL_BUILD.
The SPL options are shared by SPL and TPL, the board config file should determine which SPL options to choose based on whether CONFIG_TPL_BUILD -is set. Source files can be compiled for TPL with options choosed in the +is set. Source files can be compiled for TPL with options chosen in the board config file.
TPL use a small device tree (u-boot-tpl.dtb), containing only the nodes with diff --git a/doc/uImage.FIT/source_file_format.txt b/doc/uImage.FIT/source_file_format.txt index f8e27ed34e..18d2aedcb7 100644 --- a/doc/uImage.FIT/source_file_format.txt +++ b/doc/uImage.FIT/source_file_format.txt @@ -262,7 +262,7 @@ o config-1 - loadables : Unit name containing a list of additional binaries to be loaded at their given locations. "loadables" is a comma-separated list of strings. U-Boot will load each binary at its given start-address and - may optionaly invoke additional post-processing steps on this binary based + may optionally invoke additional post-processing steps on this binary based on its component image node type. - compatible : The root compatible string of the U-Boot device tree that this configuration shall automatically match when CONFIG_FIT_BEST_MATCH is diff --git a/tools/binman/README b/tools/binman/README index c96a564226..47254bd1e6 100644 --- a/tools/binman/README +++ b/tools/binman/README @@ -73,7 +73,7 @@ any dependencies between them and brought in as needed - Provides for a standard image description available in the build and at run-time -- SoC-specific image-signing tools can be accomodated +- SoC-specific image-signing tools can be accommodated - Avoids cluttering the U-Boot build system with image-building code - The image description is automatically available at run-time in U-Boot, SPL. It can be made available to other software also diff --git a/tools/binman/README.entries b/tools/binman/README.entries index 1099433521..0576e63a86 100644 --- a/tools/binman/README.entries +++ b/tools/binman/README.entries @@ -519,7 +519,7 @@ Properties / Entry arguments:
This file contains code used by the SoC that is required to make it work. The Management Engine is like a background task that runs things that are -not clearly documented, but may include keyboard, deplay and network +not clearly documented, but may include keyboard, display and network access. For platform that use ME it is not possible to disable it. U-Boot does not directly execute code in the ME binary.
@@ -593,7 +593,7 @@ Entry: powerpc-mpc85xx-bootpg-resetvec: PowerPC mpc85xx bootpg + resetvec code f Properties / Entry arguments: - filename: Filename of u-boot-br.bin (default 'u-boot-br.bin')
-This enrty is valid for PowerPC mpc85xx cpus. This entry holds +This entry is valid for PowerPC mpc85xx cpus. This entry holds 'bootpg + resetvec' code for PowerPC mpc85xx CPUs which needs to be placed at offset 'RESET_VECTOR_ADDRESS - 0xffc'.
On Wed, Nov 13, 2019 at 06:18:03PM -0800, Thomas Hebb wrote:
Signed-off-by: Thomas Hebb tommyhebb@gmail.com
Applied to u-boot/master, thanks!
Hi Thomas,
Could you add commit message for patch and split the patch into multi patches
base on the module?
Thanks,
- Kever
On 2019/11/14 上午10:18, Thomas Hebb wrote:
Signed-off-by: Thomas Hebb tommyhebb@gmail.com
Makefile | 2 +- README | 16 +++++++++------- arch/arm/cpu/armv8/sec_firmware.c | 2 +- arch/arm/mach-rockchip/Kconfig | 2 +- arch/arm/mach-rockchip/bootrom.c | 4 ++-- arch/arm/mach-rockchip/rk3399/Kconfig | 6 +++--- arch/arm/mach-rockchip/spl-boot-order.c | 2 +- board/rockchip/evb_rk3399/README | 2 +- common/spl/Kconfig | 6 +++--- doc/README.SPL | 2 +- doc/README.TPL | 2 +- doc/uImage.FIT/source_file_format.txt | 2 +- tools/binman/README | 2 +- tools/binman/README.entries | 4 ++-- 14 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/Makefile b/Makefile index 5c8c4c971f..c5d4bd533b 100644 --- a/Makefile +++ b/Makefile @@ -1663,7 +1663,7 @@ u-boot.sym: u-boot FORCE # make sure no implicit rule kicks in $(sort $(u-boot-init) $(u-boot-main)): $(u-boot-dirs) ;
-# Handle descending into subdirectories listed in $(vmlinux-dirs) +# Handle descending into subdirectories listed in $(u-boot-dirs) # Preset locale variables to speed up the build process. Limit locale # tweaks to this spot to avoid wrong language settings when running # make menuconfig etc. diff --git a/README b/README index 1389e8ff12..d047b3b3dd 100644 --- a/README +++ b/README @@ -3082,14 +3082,16 @@ Low Level (hardware related) configuration options: instruction cache) is still performed.
- CONFIG_SPL_BUILD
Modifies the behaviour of start.S when compiling a loaderthat is executed before the actual U-Boot. E.g. whencompiling a NAND SPL.
Set when the currently-running compilation is for an artifactthat will end up in the SPL (as opposed to the TPL or U-Bootproper). Code that needs stage-specific behavior should checkthis.
- CONFIG_TPL_BUILD
Modifies the behaviour of start.S when compiling a loaderthat is executed after the SPL and before the actual U-Boot.It is loaded by the SPL.
Set when the currently-running compilation is for an artifactthat will end up in the TPL (as opposed to the SPL or U-Bootproper). Code that needs stage-specific behavior should checkthis.
- CONFIG_SYS_MPC85XX_NO_RESETVEC
Only for 85xx systems. If this variable is specified, the section
@@ -3306,7 +3308,7 @@ Testing of U-Boot Modifications, Ports to New Hardware, etc.: If you have modified U-Boot sources (for instance added a new board or support for new devices, a new CPU, etc.) you are expected to provide feedback to the other developers. The feedback normally takes -the form of a "patch", i. e. a context diff against a certain (latest +the form of a "patch", i.e. a context diff against a certain (latest official or latest in the git repository) version of U-Boot sources.
But before you submit such a patch, please verify that your modifi- diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c index 8dc0ac9266..4b3eb71cef 100644 --- a/arch/arm/cpu/armv8/sec_firmware.c +++ b/arch/arm/cpu/armv8/sec_firmware.c @@ -353,7 +353,7 @@ bool sec_firmware_support_hwrng(void) return true; #endif if (sec_firmware_addr & SEC_FIRMWARE_RUNNING) {
return true;
return true;}
return false;
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index f5a80b4f0c..1b7f82f596 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -265,7 +265,7 @@ config TPL_ROCKCHIP_COMMON_BOARD Rockchip SoCs have similar boot process, prefer to use TPL for DRAM init and back to bootrom, and SPL as Trust ATF/U-Boot loader. TPL common board is a basic TPL board init which can be shared for most
of SoCs to avoid copy-pase for different SoCs.
of SoCs to avoid copy-paste for different SoCs.config ROCKCHIP_BOOT_MODE_REG hex "Rockchip boot mode flag register address"
diff --git a/arch/arm/mach-rockchip/bootrom.c b/arch/arm/mach-rockchip/bootrom.c index 9ccb45e6ac..10614c99d9 100644 --- a/arch/arm/mach-rockchip/bootrom.c +++ b/arch/arm/mach-rockchip/bootrom.c @@ -39,8 +39,8 @@ void back_to_bootrom(enum rockchip_bootrom_cmd brom_cmd)
- to check it and back to bootrom at very early bootstage(before
- some basic configurations(such as interrupts) been
- changed by TPL/SPL, as the bootrom download operation
- relys on many default settings(such as interrupts) by
- it's self.
- relies on many default settings(such as interrupts) by
*/ static bool check_back_to_brom_dnl_flag(void) {
- itself.
diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig index 6660d05349..8e43e52e3c 100644 --- a/arch/arm/mach-rockchip/rk3399/Kconfig +++ b/arch/arm/mach-rockchip/rk3399/Kconfig @@ -6,9 +6,9 @@ choice config TARGET_EVB_RK3399 bool "RK3399 evaluation board" help
RK3399evb is a evaluation board for Rockchp rk3399,with full function and phisical connectors support like type-C ports,usb2.0 host ports, LVDS, JTAG, MAC, SDcard, HDMI, USB-2-serial...
RK3399evb is a evaluation board for Rockchip RK3399,with full function and physical connectors support like Type-C ports,USB.0 host ports, LVDS, JTAG, MAC, SD card, HDMI, USB-to-serial...config TARGET_PUMA_RK3399 bool "Theobroma Systems RK3399-Q7 (Puma)"
diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c index fa8e096426..c147d5821e 100644 --- a/arch/arm/mach-rockchip/spl-boot-order.c +++ b/arch/arm/mach-rockchip/spl-boot-order.c @@ -35,7 +35,7 @@ static int spl_node_to_boot_device(int node) /* * This should eventually move into the SPL code, once SPL becomes * aware of the block-device layer. Until then (and to avoid unneeded
* delays in getting this feature out, it lives at the board-level).
* delays in getting this feature out), it lives at the board-level.diff --git a/board/rockchip/evb_rk3399/README b/board/rockchip/evb_rk3399/README index ea3258cf37..da7ae89ab1 100644 --- a/board/rockchip/evb_rk3399/README +++ b/board/rockchip/evb_rk3399/README @@ -9,7 +9,7 @@ RK3399 key features we might use in U-Boot:
- DRAM: 4GB-128MB dual-channel
- eMMC: support eMMC 5.0/5.1, suport HS400, HS200, DDR50
- SD/MMC: support SD 3.0, MMC 4.51
-* USB: USB3.0 typc-C port *2 with dwc3 controller +* USB: USB3.0 type-C port *2 with dwc3 controller
USB2.0 EHCI host port *2- Display: RGB/HDMI/DP/MIPI/EDP
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 8f0ba8ef83..f0d89afa0b 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -268,7 +268,7 @@ config SPL_BANNER_PRINT default y help If this option is enabled, SPL will print the banner with version
info. Disabling this option could be useful to reduce TPL boot time
info. Disabling this option could be useful to reduce SPL boot time(e.g. approx. 6 ms faster, when output on i.MX6 with 115200 baud).
config TPL_BANNER_PRINT
@@ -276,8 +276,8 @@ config TPL_BANNER_PRINT depends on TPL default y help
If this option is enabled, SPL will not print the banner with versioninfo. Disabling this option could be useful to reduce SPL boot time
If this option is enabled, TPL will print the banner with versioninfo. Disabling this option could be useful to reduce TPL boot time(e.g. approx. 6 ms faster, when output on i.MX6 with 115200 baud).
config SPL_EARLY_BSS
diff --git a/doc/README.SPL b/doc/README.SPL index 6eed83f8c5..3c931ec720 100644 --- a/doc/README.SPL +++ b/doc/README.SPL @@ -75,7 +75,7 @@ with:
- the nodes with one pre-relocation property: 'u-boot,dm-pre-reloc' or 'u-boot,dm-spl'
-ftgrep is also used to remove: +fdtgrep is also used to remove:
- the properties defined in CONFIG_OF_SPL_REMOVE_PROPS
- all the pre-relocation properties ('u-boot,dm-pre-reloc', 'u-boot,dm-spl' and 'u-boot,dm-tpl')
diff --git a/doc/README.TPL b/doc/README.TPL index c94129fdc9..72027fd692 100644 --- a/doc/README.TPL +++ b/doc/README.TPL @@ -31,7 +31,7 @@ make environment and also appended to CPPFLAGS with -DCONFIG_TPL_BUILD.
The SPL options are shared by SPL and TPL, the board config file should determine which SPL options to choose based on whether CONFIG_TPL_BUILD -is set. Source files can be compiled for TPL with options choosed in the +is set. Source files can be compiled for TPL with options chosen in the board config file.
TPL use a small device tree (u-boot-tpl.dtb), containing only the nodes with diff --git a/doc/uImage.FIT/source_file_format.txt b/doc/uImage.FIT/source_file_format.txt index f8e27ed34e..18d2aedcb7 100644 --- a/doc/uImage.FIT/source_file_format.txt +++ b/doc/uImage.FIT/source_file_format.txt @@ -262,7 +262,7 @@ o config-1 - loadables : Unit name containing a list of additional binaries to be loaded at their given locations. "loadables" is a comma-separated list of strings. U-Boot will load each binary at its given start-address and
- may optionaly invoke additional post-processing steps on this binary based
- may optionally invoke additional post-processing steps on this binary based on its component image node type.
this configuration shall automatically match when CONFIG_FIT_BEST_MATCH is
- compatible : The root compatible string of the U-Boot device tree that
diff --git a/tools/binman/README b/tools/binman/README index c96a564226..47254bd1e6 100644 --- a/tools/binman/README +++ b/tools/binman/README @@ -73,7 +73,7 @@ any dependencies between them and brought in as needed
- Provides for a standard image description available in the build and at
run-time -- SoC-specific image-signing tools can be accomodated +- SoC-specific image-signing tools can be accommodated
- Avoids cluttering the U-Boot build system with image-building code
- The image description is automatically available at run-time in U-Boot,
SPL. It can be made available to other software also diff --git a/tools/binman/README.entries b/tools/binman/README.entries index 1099433521..0576e63a86 100644 --- a/tools/binman/README.entries +++ b/tools/binman/README.entries @@ -519,7 +519,7 @@ Properties / Entry arguments:
This file contains code used by the SoC that is required to make it work. The Management Engine is like a background task that runs things that are -not clearly documented, but may include keyboard, deplay and network +not clearly documented, but may include keyboard, display and network access. For platform that use ME it is not possible to disable it. U-Boot does not directly execute code in the ME binary.
@@ -593,7 +593,7 @@ Entry: powerpc-mpc85xx-bootpg-resetvec: PowerPC mpc85xx bootpg + resetvec code f Properties / Entry arguments: - filename: Filename of u-boot-br.bin (default 'u-boot-br.bin')
-This enrty is valid for PowerPC mpc85xx cpus. This entry holds +This entry is valid for PowerPC mpc85xx cpus. This entry holds 'bootpg + resetvec' code for PowerPC mpc85xx CPUs which needs to be placed at offset 'RESET_VECTOR_ADDRESS - 0xffc'.
On Thu, Dec 12, 2019 at 7:26 PM Kever Yang kever.yang@rock-chips.com wrote:
Hi Thomas,
Could you add commit message for patch and split the patch intomulti patches
base on the module?
Hi Kever,
I think this already got merged, didn't it?
-Tom
Thanks,
- Kever
On 2019/11/14 上午10:18, Thomas Hebb wrote:
Signed-off-by: Thomas Hebb tommyhebb@gmail.com
Makefile | 2 +- README | 16 +++++++++------- arch/arm/cpu/armv8/sec_firmware.c | 2 +- arch/arm/mach-rockchip/Kconfig | 2 +- arch/arm/mach-rockchip/bootrom.c | 4 ++-- arch/arm/mach-rockchip/rk3399/Kconfig | 6 +++--- arch/arm/mach-rockchip/spl-boot-order.c | 2 +- board/rockchip/evb_rk3399/README | 2 +- common/spl/Kconfig | 6 +++--- doc/README.SPL | 2 +- doc/README.TPL | 2 +- doc/uImage.FIT/source_file_format.txt | 2 +- tools/binman/README | 2 +- tools/binman/README.entries | 4 ++-- 14 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/Makefile b/Makefile index 5c8c4c971f..c5d4bd533b 100644 --- a/Makefile +++ b/Makefile @@ -1663,7 +1663,7 @@ u-boot.sym: u-boot FORCE # make sure no implicit rule kicks in $(sort $(u-boot-init) $(u-boot-main)): $(u-boot-dirs) ;
-# Handle descending into subdirectories listed in $(vmlinux-dirs) +# Handle descending into subdirectories listed in $(u-boot-dirs) # Preset locale variables to speed up the build process. Limit locale # tweaks to this spot to avoid wrong language settings when running # make menuconfig etc. diff --git a/README b/README index 1389e8ff12..d047b3b3dd 100644 --- a/README +++ b/README @@ -3082,14 +3082,16 @@ Low Level (hardware related) configuration options: instruction cache) is still performed.
- CONFIG_SPL_BUILD
Modifies the behaviour of start.S when compiling a loaderthat is executed before the actual U-Boot. E.g. whencompiling a NAND SPL.
Set when the currently-running compilation is for an artifactthat will end up in the SPL (as opposed to the TPL or U-Bootproper). Code that needs stage-specific behavior should checkthis.
- CONFIG_TPL_BUILD
Modifies the behaviour of start.S when compiling a loaderthat is executed after the SPL and before the actual U-Boot.It is loaded by the SPL.
Set when the currently-running compilation is for an artifactthat will end up in the TPL (as opposed to the SPL or U-Bootproper). Code that needs stage-specific behavior should checkthis.
- CONFIG_SYS_MPC85XX_NO_RESETVEC Only for 85xx systems. If this variable is specified, the section
@@ -3306,7 +3308,7 @@ Testing of U-Boot Modifications, Ports to New Hardware, etc.: If you have modified U-Boot sources (for instance added a new board or support for new devices, a new CPU, etc.) you are expected to provide feedback to the other developers. The feedback normally takes -the form of a "patch", i. e. a context diff against a certain (latest +the form of a "patch", i.e. a context diff against a certain (latest official or latest in the git repository) version of U-Boot sources.
But before you submit such a patch, please verify that your modifi- diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c index 8dc0ac9266..4b3eb71cef 100644 --- a/arch/arm/cpu/armv8/sec_firmware.c +++ b/arch/arm/cpu/armv8/sec_firmware.c @@ -353,7 +353,7 @@ bool sec_firmware_support_hwrng(void) return true; #endif if (sec_firmware_addr & SEC_FIRMWARE_RUNNING) {
return true;
return true; } return false;diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index f5a80b4f0c..1b7f82f596 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -265,7 +265,7 @@ config TPL_ROCKCHIP_COMMON_BOARD Rockchip SoCs have similar boot process, prefer to use TPL for DRAM init and back to bootrom, and SPL as Trust ATF/U-Boot loader. TPL common board is a basic TPL board init which can be shared for most
of SoCs to avoid copy-pase for different SoCs.
of SoCs to avoid copy-paste for different SoCs.config ROCKCHIP_BOOT_MODE_REG hex "Rockchip boot mode flag register address"
diff --git a/arch/arm/mach-rockchip/bootrom.c b/arch/arm/mach-rockchip/bootrom.c index 9ccb45e6ac..10614c99d9 100644 --- a/arch/arm/mach-rockchip/bootrom.c +++ b/arch/arm/mach-rockchip/bootrom.c @@ -39,8 +39,8 @@ void back_to_bootrom(enum rockchip_bootrom_cmd brom_cmd)
- to check it and back to bootrom at very early bootstage(before
- some basic configurations(such as interrupts) been
- changed by TPL/SPL, as the bootrom download operation
- relys on many default settings(such as interrupts) by
- it's self.
- relies on many default settings(such as interrupts) by
*/ static bool check_back_to_brom_dnl_flag(void) {
- itself.
diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig index 6660d05349..8e43e52e3c 100644 --- a/arch/arm/mach-rockchip/rk3399/Kconfig +++ b/arch/arm/mach-rockchip/rk3399/Kconfig @@ -6,9 +6,9 @@ choice config TARGET_EVB_RK3399 bool "RK3399 evaluation board" help
RK3399evb is a evaluation board for Rockchp rk3399,with full function and phisical connectors support like type-C ports,usb2.0 host ports, LVDS, JTAG, MAC, SDcard, HDMI, USB-2-serial...
RK3399evb is a evaluation board for Rockchip RK3399,with full function and physical connectors support like Type-C ports,USB.0 host ports, LVDS, JTAG, MAC, SD card, HDMI, USB-to-serial...config TARGET_PUMA_RK3399 bool "Theobroma Systems RK3399-Q7 (Puma)"
diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c index fa8e096426..c147d5821e 100644 --- a/arch/arm/mach-rockchip/spl-boot-order.c +++ b/arch/arm/mach-rockchip/spl-boot-order.c @@ -35,7 +35,7 @@ static int spl_node_to_boot_device(int node) /* * This should eventually move into the SPL code, once SPL becomes * aware of the block-device layer. Until then (and to avoid unneeded
* delays in getting this feature out, it lives at the board-level).
* delays in getting this feature out), it lives at the board-level. */ if (!uclass_get_device_by_of_offset(UCLASS_MMC, node, &parent)) { struct udevice *dev;diff --git a/board/rockchip/evb_rk3399/README b/board/rockchip/evb_rk3399/README index ea3258cf37..da7ae89ab1 100644 --- a/board/rockchip/evb_rk3399/README +++ b/board/rockchip/evb_rk3399/README @@ -9,7 +9,7 @@ RK3399 key features we might use in U-Boot:
- DRAM: 4GB-128MB dual-channel
- eMMC: support eMMC 5.0/5.1, suport HS400, HS200, DDR50
- SD/MMC: support SD 3.0, MMC 4.51
-* USB: USB3.0 typc-C port *2 with dwc3 controller +* USB: USB3.0 type-C port *2 with dwc3 controller
USB2.0 EHCI host port *2- Display: RGB/HDMI/DP/MIPI/EDP
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 8f0ba8ef83..f0d89afa0b 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -268,7 +268,7 @@ config SPL_BANNER_PRINT default y help If this option is enabled, SPL will print the banner with version
info. Disabling this option could be useful to reduce TPL boot time
info. Disabling this option could be useful to reduce SPL boot time (e.g. approx. 6 ms faster, when output on i.MX6 with 115200 baud).config TPL_BANNER_PRINT
@@ -276,8 +276,8 @@ config TPL_BANNER_PRINT depends on TPL default y help
If this option is enabled, SPL will not print the banner with versioninfo. Disabling this option could be useful to reduce SPL boot time
If this option is enabled, TPL will print the banner with versioninfo. Disabling this option could be useful to reduce TPL boot time (e.g. approx. 6 ms faster, when output on i.MX6 with 115200 baud).config SPL_EARLY_BSS
diff --git a/doc/README.SPL b/doc/README.SPL index 6eed83f8c5..3c931ec720 100644 --- a/doc/README.SPL +++ b/doc/README.SPL @@ -75,7 +75,7 @@ with:
- the nodes with one pre-relocation property: 'u-boot,dm-pre-reloc' or 'u-boot,dm-spl'
-ftgrep is also used to remove: +fdtgrep is also used to remove:
- the properties defined in CONFIG_OF_SPL_REMOVE_PROPS
- all the pre-relocation properties ('u-boot,dm-pre-reloc', 'u-boot,dm-spl' and 'u-boot,dm-tpl')
diff --git a/doc/README.TPL b/doc/README.TPL index c94129fdc9..72027fd692 100644 --- a/doc/README.TPL +++ b/doc/README.TPL @@ -31,7 +31,7 @@ make environment and also appended to CPPFLAGS with -DCONFIG_TPL_BUILD.
The SPL options are shared by SPL and TPL, the board config file should determine which SPL options to choose based on whether CONFIG_TPL_BUILD -is set. Source files can be compiled for TPL with options choosed in the +is set. Source files can be compiled for TPL with options chosen in the board config file.
TPL use a small device tree (u-boot-tpl.dtb), containing only the nodes with diff --git a/doc/uImage.FIT/source_file_format.txt b/doc/uImage.FIT/source_file_format.txt index f8e27ed34e..18d2aedcb7 100644 --- a/doc/uImage.FIT/source_file_format.txt +++ b/doc/uImage.FIT/source_file_format.txt @@ -262,7 +262,7 @@ o config-1 - loadables : Unit name containing a list of additional binaries to be loaded at their given locations. "loadables" is a comma-separated list of strings. U-Boot will load each binary at its given start-address and
- may optionaly invoke additional post-processing steps on this binary based
- may optionally invoke additional post-processing steps on this binary based on its component image node type.
this configuration shall automatically match when CONFIG_FIT_BEST_MATCH is
- compatible : The root compatible string of the U-Boot device tree that
diff --git a/tools/binman/README b/tools/binman/README index c96a564226..47254bd1e6 100644 --- a/tools/binman/README +++ b/tools/binman/README @@ -73,7 +73,7 @@ any dependencies between them and brought in as needed
- Provides for a standard image description available in the build and at
run-time -- SoC-specific image-signing tools can be accomodated +- SoC-specific image-signing tools can be accommodated
- Avoids cluttering the U-Boot build system with image-building code
- The image description is automatically available at run-time in U-Boot,
SPL. It can be made available to other software also diff --git a/tools/binman/README.entries b/tools/binman/README.entries index 1099433521..0576e63a86 100644 --- a/tools/binman/README.entries +++ b/tools/binman/README.entries @@ -519,7 +519,7 @@ Properties / Entry arguments:
This file contains code used by the SoC that is required to make it work. The Management Engine is like a background task that runs things that are -not clearly documented, but may include keyboard, deplay and network +not clearly documented, but may include keyboard, display and network access. For platform that use ME it is not possible to disable it. U-Boot does not directly execute code in the ME binary.
@@ -593,7 +593,7 @@ Entry: powerpc-mpc85xx-bootpg-resetvec: PowerPC mpc85xx bootpg + resetvec code f Properties / Entry arguments: - filename: Filename of u-boot-br.bin (default 'u-boot-br.bin')
-This enrty is valid for PowerPC mpc85xx cpus. This entry holds +This entry is valid for PowerPC mpc85xx cpus. This entry holds 'bootpg + resetvec' code for PowerPC mpc85xx CPUs which needs to be placed at offset 'RESET_VECTOR_ADDRESS - 0xffc'.
participants (5)
-
Chris Packham -
Kever Yang -
Thomas Hebb -
Tom Hebb
-
Tom Rini