July 2020 - U-Boot

RE: [PATCH 4/4] reset: add reset controller driver for SCMI agents
by Peng Fan 20 Jul '20

20 Jul '20

> Subject: [PATCH 4/4] reset: add reset controller driver for SCMI agents > > This change introduces a reset controller driver for SCMI agent devices. > When SCMI agent and SCMI reset domain drivers are enabled, SCMI agent > binds a reset controller device for each SCMI reset domain protocol devices > enabled in the FDT. > > SCMI reset driver is embedded upon CONFIG_RESET_SCMI=y. If enabled, > CONFIG_SCMI_AGENT is also enabled. > > SCMI Reset Domain protocol is defined in the SCMI specification [1]. > > Links: [1] > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fdevelo > per.arm.com%2Farchitectures%2Fsystem-architectures%2Fsoftware-standar > ds%2Fscmi&data=02%7C01%7Cpeng.fan%40nxp.com%7C68ec2a92529 > e49d46be608d82a6778a9%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0% > 7C0%7C637305971181000613&sdata=NWnJw%2BYBsbC1zBkBdq9Jxh9 > Crepk5JdxJlCxNl0diqA%3D&reserved=0 > Signed-off-by: Etienne Carriere <etienne.carriere(a)linaro.org> > --- > > drivers/firmware/scmi.c | 3 ++ > drivers/reset/Kconfig | 8 ++++ > drivers/reset/Makefile | 1 + > drivers/reset/reset-scmi.c | 86 > ++++++++++++++++++++++++++++++++++++++ > 4 files changed, 98 insertions(+) > create mode 100644 drivers/reset/reset-scmi.c > > diff --git a/drivers/firmware/scmi.c b/drivers/firmware/scmi.c index > 9f06718df51..9be53a9cf11 100644 > --- a/drivers/firmware/scmi.c > +++ b/drivers/firmware/scmi.c > @@ -402,6 +402,9 @@ static int scmi_bind(struct udevice *dev) > case SCMI_PROTOCOL_ID_CLOCK: > drv = DM_GET_DRIVER(scmi_clock); > break; > + case SCMI_PROTOCOL_ID_RESET_DOMAIN: > + drv = DM_GET_DRIVER(scmi_reset_domain); > + break; > default: > dev_info(dev, "Ignore unsupported SCMI protocol %u\n", > protocol_id); > diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index > 6d535612234..31bd4cd5b45 100644 > --- a/drivers/reset/Kconfig > +++ b/drivers/reset/Kconfig > @@ -164,4 +164,12 @@ config RESET_RASPBERRYPI > relevant. This driver provides a reset controller capable of > interfacing with RPi4's co-processor and model these firmware > initialization routines as reset lines. > + > +config RESET_SCMI > + bool "Enable SCMI reset domain driver" > + select SCMI_FIRMWARE > + help > + Enable this option if you want to support reset controller > + devices exposed by a SCMI agent based on SCMI reset domain > + protocol communication with a SCMI server. > endmenu > diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile index > 8e0124b8dee..f3c0fbfd8f3 100644 > --- a/drivers/reset/Makefile > +++ b/drivers/reset/Makefile > @@ -25,3 +25,4 @@ obj-$(CONFIG_RESET_HISILICON) += reset-hisilicon.o > obj-$(CONFIG_RESET_IMX7) += reset-imx7.o > obj-$(CONFIG_RESET_SYSCON) += reset-syscon.o > obj-$(CONFIG_RESET_RASPBERRYPI) += reset-raspberrypi.o > +obj-$(CONFIG_RESET_SCMI) += reset-scmi.o > diff --git a/drivers/reset/reset-scmi.c b/drivers/reset/reset-scmi.c new file > mode 100644 index 00000000000..e664d91d865 > --- /dev/null > +++ b/drivers/reset/reset-scmi.c > @@ -0,0 +1,86 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (C) 2019-2020 Linaro Limited */ #include <common.h> > +#include <dm.h> #include <errno.h> #include <reset-uclass.h> #include > +<scmi.h> #include <asm/types.h> > + > +enum scmi_reset_domain_message_id { > + SCMI_RESET_DOMAIN_RESET = 0x4, > +}; > + > +#define SCMI_RD_RESET_FLAG_ASSERT BIT(1) > +#define SCMI_RD_RESET_FLAG_DEASSERT 0 > + > +struct scmi_rd_reset_in { > + u32 domain_id; > + u32 flags; > + u32 reset_state; > +}; > + > +struct scmi_rd_reset_out { > + s32 status; > +}; > + > +static int scmi_reset_set_state(struct reset_ctl *rst, int > +assert_not_deassert) { > + struct scmi_rd_reset_in in = { > + .domain_id = rst->id, > + .flags = assert_not_deassert ? SCMI_RD_RESET_FLAG_ASSERT : > + SCMI_RD_RESET_FLAG_DEASSERT, > + .reset_state = 0, > + }; > + struct scmi_rd_reset_out out; > + struct scmi_msg scmi_msg = { > + .protocol_id = SCMI_PROTOCOL_ID_RESET_DOMAIN, > + .message_id = SCMI_RESET_DOMAIN_RESET, > + .in_msg = (u8 *)&in, > + .in_msg_sz = sizeof(in), > + .out_msg = (u8 *)&out, > + .out_msg_sz = sizeof(out), > + }; > + int rc; > + > + rc = scmi_send_and_process_msg(rst->dev->parent, &scmi_msg); > + if (rc) > + return rc; > + > + return scmi_to_linux_errno(out.status); } > + > +static int scmi_reset_assert(struct reset_ctl *rst) { > + return scmi_reset_set_state(rst, SCMI_RD_RESET_FLAG_ASSERT); } > + > +static int scmi_reset_deassert(struct reset_ctl *rst) { > + return scmi_reset_set_state(rst, SCMI_RD_RESET_FLAG_DEASSERT); } > + > +static int scmi_reset_request(struct reset_ctl *reset_ctl) { > + return 0; > +} > + > +static int scmi_reset_rfree(struct reset_ctl *reset_ctl) { > + return 0; > +} > + > +static const struct reset_ops scmi_reset_domain_ops = { > + .request = scmi_reset_request, > + .rfree = scmi_reset_rfree, > + .rst_assert = scmi_reset_assert, > + .rst_deassert = scmi_reset_deassert, > +}; > + > +U_BOOT_DRIVER(scmi_reset_domain) = { > + .name = "scmi_reset_domain", > + .id = UCLASS_RESET, > + .ops = &scmi_reset_domain_ops, > +}; > -- Regards, Peng. > 2.17.1

1 0

[PATCH v6 00/25] x86: Enhance MTRR functionality to support multiple CPUs
by Simon Glass 20 Jul '20

20 Jul '20

At present MTRRs are mirrored to the secondary CPUs only once, as those CPUs are started up. But U-Boot may add more MTRRs later, e.g. if it decides that a video console must be set up. This series enhances the x86 multi-processor support to allow MTRRs to be updated at any time. It also updates the 'mtrr' command to support setting the MTRRs on CPUs other than the boot CPU. Changes in v6: - Rebase to x86/master Changes in v5: - Drop timing in mp_park_aps() Changes in v4: - Update get_bsp() to return zero when SMP is not inited - Add a Kconfig to control this feature, enabled only on APL - Only enable this feature of CONFIG_SMP_AP_WORK is enabled - Allow running on the BSP if SMP is not enabled - Update mp_next_cpu() to stop if CONFIG_SMP_AP_WORK is not enabled Changes in v3: - Update bsp_do_flight_plan() to say 'on the BSP' - s/slow/slot/ - Use C code instead of assembler to read/write callback pointers - Update commit message to mention dropping of cpu_map - Rename flag to GD_FLG_SMP_READY - Rename flag to GD_FLG_SMP_READY - Add a comment to run_ap_work() - Rename flag to GD_FLG_SMP_READY - Update the comment for run_ap_work() to explain logical_cpu_number - Clarify meaning of @cpu_select in mp_run_on_cpus() comment - Update the comment for mp_park_aps() - Add more comments on how the iterators work - Mention that the CPU number is in hex - Remove stray asterisk from comments - Drop mention of cpu_map which was handled in a previous patch Changes in v2: - Add comments to explain what start_aps() does - Drop change to include/dm/uclass.h - Mention error return in get_bsp() - Add more comments - Rename mtrr_save_all() to mtrr_read_all() - Add a new patch to avoid enabling SMP in SPL - Add new patch to add AP_DEFAULT_BASE to coral's memory map - Rename function to mtrr_write_all() - Keep things building by temporarily renaming the function in cmd/ - Drop the renamed mtrr_set_valid_() instead of mtrr_set_valid() - Add a new patch with more comments Simon Glass (25): x86: mp_init: Switch to livetree x86: Move MP code into mp_init x86: mp_init: Avoid declarations in header files x86: mp_init: Switch parameter names in start_aps() x86: mp_init: Drop the num_cpus static variable x86: mtrr: Fix 'ensable' typo x86: mp_init: Set up the CPU numbers at the start x86: mp_init: Adjust bsp_init() to return more information x86: cpu: Remove unnecessary #ifdefs x86: mp: Support APs waiting for instructions global_data: Add a generic global_data flag for SMP state x86: Set the SMP flag when MP init is complete x86: mp: Allow running functions on multiple CPUs x86: mp: Park CPUs before running the OS x86: mp: Add iterators for CPUs x86: mtrr: Use MP calls to list the MTRRs x86: Don't enable SMP in SPL x86: coral: Update the memory map x86: mtrr: Update MTRRs on all CPUs x86: mtrr: Add support for writing to MTRRs on any CPU x86: mtrr: Update the command to use the new mtrr calls x86: mtrr: Restructure so command execution is in one place x86: mtrr: Update 'mtrr' to allow setting MTRRs on any CPU x86: mp: Add more comments to the module x86: mtrr: Enhance 'mtrr' command to list MTRRs on any CPU arch/x86/Kconfig | 7 + arch/x86/cpu/Makefile | 2 +- arch/x86/cpu/apollolake/Kconfig | 1 + arch/x86/cpu/cpu.c | 58 +-- arch/x86/cpu/i386/cpu.c | 26 +- arch/x86/cpu/mp_init.c | 528 ++++++++++++++++++++++---- arch/x86/cpu/mtrr.c | 149 ++++++++ arch/x86/include/asm/mp.h | 137 ++++++- arch/x86/include/asm/mtrr.h | 51 +++ cmd/x86/mtrr.c | 148 +++++--- doc/board/google/chromebook_coral.rst | 1 + include/asm-generic/global_data.h | 1 + 12 files changed, 924 insertions(+), 185 deletions(-) -- 2.28.0.rc0.105.gf9edc3c819-goog

2 33

[PATCH] dm: core: Don't show an ACPI warning if there is no ordering
by Simon Glass 20 Jul '20

20 Jul '20

Some boards don't care about the ordering of ACPI code fragments. Change the warning to a debug message. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- drivers/core/acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/core/acpi.c b/drivers/core/acpi.c index cdbc2c5cf5..7fe93992b5 100644 --- a/drivers/core/acpi.c +++ b/drivers/core/acpi.c @@ -195,7 +195,7 @@ static int sort_acpi_item_type(struct acpi_ctx *ctx, void *start, "u-boot,acpi-dsdt-order" : "u-boot,acpi-ssdt-order", &size); if (!order) { - log_warning("Failed to find ordering, leaving as is\n"); + log_debug("Failed to find ordering, leaving as is\n"); return 0; } -- 2.28.0.rc0.105.gf9edc3c819-goog

2 2

[RFC PATCH 00/16] RFC: patman: Collect review tags and comments from Patchwork
by Simon Glass 19 Jul '20

19 Jul '20

Patman is a useful tool for creating, checking sending out patches. It automates the creation of patches, simplifies checking them and handles cover letters and change logs. However once patches are sent and reviewers add Reviewed-by tags, etc., these must be manually added into the commits using git before the next version of the series is sent. Also, the only way to look at patches is in the web interface. It would be nice if patman could talk to Patchwork and collect the review tags itself. Even better if it could show the review comments in a command-line view patch-by-patch to speed up addressing comments. This series adds these features to patman, talking directly to the web URLs. While pwclient seems like it could handle some of this, or at least provide a library to patman, the documentation[1] doesn't really explain what the commands do and it doesn't seem to work with the current Patchwork (e.g. pwclient git-am requires a patch number but Patchwork seems to use an ID now). With these changes, which currently lack tests, it is possible to type 'patman status' and see a list of new review tags. It is also possible to create a new branch with those tags and list out the review comments as small snippets on the command line. I have been using these features for a short while and they seem useful, so herewith a series. This series depends on u-boot-dm/next so you might find it easier to get it from u-boot-dm/patman-working[2] [1] https://patchwork.readthedocs.io/projects/pwclient/en/latest/usage/ [2] https://gitlab.denx.de/u-boot/custodians/u-boot-dm/-/tree/patman-working Simon Glass (16): patman: Use test_util to show test results patman: Move main code out to a control module patman: Add a test that uses gitpython patman: Allow creating patches for another branch patman: Allow skipping patches at the end patman: Convert to ArgumentParser patman: Allow different commands patman: Add a 'test' subcommand patman: Allow disabling 'bright' mode with Print output patman: Support collecting response tags in Patchstream patman: Allow linking a series with patchwork patman: Add a -D option to enable debugging patchstream: Support parsing of review snippets patman: Support checking for review tags in patchwork patman: Support updating a branch with review tags patman: Support listing comments from patchwork .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- .travis.yml | 2 +- test/run | 2 +- tools/patman/README | 93 ++++++- tools/patman/checkpatch.py | 6 + tools/patman/commit.py | 14 ++ tools/patman/control.py | 214 ++++++++++++++++ tools/patman/func_test.py | 170 ++++++++++++- tools/patman/gitutil.py | 23 +- tools/patman/main.py | 219 ++++++++--------- tools/patman/patchstream.py | 82 ++++++- tools/patman/series.py | 4 +- tools/patman/settings.py | 10 +- tools/patman/status.py | 476 ++++++++++++++++++++++++++++++++++++ tools/patman/terminal.py | 4 +- tools/patman/test_util.py | 8 +- tools/patman/tools.py | 4 +- 18 files changed, 1178 insertions(+), 157 deletions(-) create mode 100644 tools/patman/control.py create mode 100644 tools/patman/status.py -- 2.27.0.212.ge8ba1cc988-goog

4 32

[PATCH v3 00/49] rockchip: x86: Support building ROM files automatically with binman
by Simon Glass 19 Jul '20

19 Jul '20

Rockchip-based Chromebooks support booting from SPI flash. It is annoying to have to manually build the SPI image when the SD image is built automatically. This feature is already available for x86 devices, so the existing mechanism is reused. Briefly, this allows a BUILD_ROM environment variable to be provided to indicate that any required binary blobs are present and it is safe to build the ROM. A new 'mkimage' type is added to binman to support building binaries containing mkimagem using a binman definition to configure it. This avoids Makefile/shell/Python code to do the same thing. This series also migrates some rockchip boards to use binman to produce their FIT as well, resulting in removing the fit_spl_optee.sh script. Other archs and the rest of rockchip could be migrated too. This series uses binman to produce a ROM image on two selected Chromebooks, Bob (RK3399) and Jerry (RK3388). Changes in v3: - Set a default toolpath for ease of use - Fix the code rather than breaking the README - Update commit message to explain cros_ec_rw and mention dropping Entry - Move the SetAllowMissing() function into this patch - Keep the _allow_missing property to sections only - Move the SetAllowMissing() function into an earlier patch - Add a comment about CONFIG_SPL_FRAMEWORK - Drop rockchip changes which should not be in this patch - Move in the rockchip changes mistakenly in the earlier x86 patch - Drop use of rk322x.dtsi - Add changes to rk3288-u-boot.dtsi instead - Drop leftover debugging Changes in v2: - Add new binman patch to output errors to stderr - Leave the old (object-directory) path in place - Drop 'rockchip' tag since this commit no-longer affects rockchip yet - Drop ROM_NEEDS_BLOBS for baytrail since HAVE_FSP already selects it - Add patches to partially migrate rockchip to use binman Simon Glass (49): dm: core Fix long line in device_bind_common() .gitignore: Ignore Python 3 cache directories binman: Output errors to stderr binman: cbfs: Fix IFWI typo binman: Correct the search patch for pylibfdt binman: Specify the toolpath when running test coverage binman: Set a default toolpath binman: Add support for calling mkimage binman: Fix a few typos in the entry docs binman: Adjust pylibfdt for incremental build binman: Re-enable concurrent tests binman: Use super() instead of specifying parent type binman: Add an etype for external binary blobs binman: Convert existing binary blobs to blob_ext binman: Allow external binaries to be missing patman: Update errors and warnings to use stderr binman: Detect when valid images are not produced binman: Allow missing Intel blobs binman: Allow zero-length entries to overlap mkimage: Allow updating the FIT timestamp dtoc: Allow adding variable-sized data to a dtb binman: Add support for generating a FIT x86: Change how selection of ROMs works rockchip: Allow Bob to use SPI boot Makefile: Allow building .rom files for non-x86 boards rockchip: jerry: Add serial support rockchip: bob: Support SPI-flash booting rockchip: Enable building a SPI ROM image on jerry rockchip: Enable building a SPI ROM image on bob tegra: Drop the unused non-binman code tegra: Don't enable binman on ARMv8 SoCs Makefile: Rename ALL-y to INPUTS-y powerpc: mpc85xx: Only enable binman when it is needed x86: Makefile: Drop explicit targets built by binman x86: Drop CONFIG_BUILD_ROM and repurpose BUILD_ROM sunxi: Makefile: Drop explicit targets built by binman tegra: Makefile: Drop explicit targets built by binman mediatek: Makefile: Drop explicit targets built by binman Makefile: Move CONFIG_TOOLS_DEBUG check to later Makefile: Fix a long line in cmd_mkfitimage Makefile: Allow CONFIG_SPL_FIT_GENERATOR to be empty Makefile: Warn against using CONFIG_SPL_FIT_GENERATOR rockchip: Convert evb-rk3288 over to use binman rockchip: Convert evb-rk3229 over to use binman rockchip: Drop the fit_spl_optee.sh script x86: Move the fdtmap away from the binary blobs x86: chromebook_link64: Correct the image layout x86: chromebook_panther: Correct the image layout x86: chromebook_samus_tpl: Correct the image layout .gitignore | 3 + Kconfig | 29 ++- Makefile | 169 ++++++++---------- arch/Kconfig | 1 + arch/arm/config.mk | 10 +- arch/arm/dts/rk3288-u-boot.dtsi | 78 ++++++++ arch/arm/dts/rk3399-gru-u-boot.dtsi | 4 + arch/arm/dts/rk3399-gru.dtsi | 2 +- arch/arm/dts/rk3399-u-boot.dtsi | 27 +++ arch/arm/dts/rockchip-u-boot.dtsi | 10 +- arch/arm/mach-at91/config.mk | 2 +- arch/arm/mach-davinci/config.mk | 2 +- arch/arm/mach-k3/config.mk | 10 +- arch/arm/mach-keystone/config.mk | 4 +- arch/arm/mach-omap2/config.mk | 28 +-- arch/arm/mach-rmobile/Makefile | 2 +- arch/arm/mach-rockchip/fit_spl_optee.sh | 84 --------- arch/arm/mach-rockchip/rk3288/Kconfig | 1 + arch/arm/mach-rockchip/rk3399/Kconfig | 1 + arch/arm/mach-rockchip/spl.c | 3 +- arch/arm/mach-stm32mp/config.mk | 4 +- arch/arm/mach-tegra/Kconfig | 2 +- arch/powerpc/Kconfig | 2 +- arch/x86/Kconfig | 11 +- arch/x86/cpu/quark/Kconfig | 1 + arch/x86/dts/u-boot.dtsi | 10 +- board/BuR/brppt1/config.mk | 4 +- board/BuR/brppt2/config.mk | 4 +- board/BuR/brsmarc1/config.mk | 6 +- board/imgtec/boston/config.mk | 2 +- board/intel/edison/config.mk | 2 +- configs/am335x_evm_defconfig | 1 + configs/am335x_hs_evm_defconfig | 1 + configs/am335x_hs_evm_uart_defconfig | 1 + configs/am43xx_evm_defconfig | 1 + configs/am43xx_evm_rtconly_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/am43xx_hs_evm_defconfig | 1 + configs/am57xx_evm_defconfig | 1 + configs/am57xx_hs_evm_defconfig | 1 + configs/am57xx_hs_evm_usb_defconfig | 1 + configs/am65x_evm_a53_defconfig | 1 + configs/am65x_evm_r5_defconfig | 1 + configs/am65x_hs_evm_a53_defconfig | 1 + configs/am65x_hs_evm_r5_defconfig | 1 + configs/chromebook_bob_defconfig | 4 +- configs/chromebook_jerry_defconfig | 1 + configs/chromebook_link64_defconfig | 2 + configs/chromebook_samus_tpl_defconfig | 2 +- configs/chromebox_panther_defconfig | 2 + configs/dh_imx6_defconfig | 1 + configs/display5_defconfig | 1 + configs/display5_factory_defconfig | 1 + configs/dra7xx_evm_defconfig | 1 + configs/dra7xx_hs_evm_defconfig | 1 + configs/dra7xx_hs_evm_usb_defconfig | 1 + configs/evb-rk3229_defconfig | 2 +- configs/evb-rk3288_defconfig | 2 +- configs/imx6qdl_icore_mipi_defconfig | 1 + configs/imx6qdl_icore_mmc_defconfig | 1 + configs/imx6qdl_icore_rqs_defconfig | 1 + configs/j721e_evm_a72_defconfig | 1 + configs/j721e_evm_r5_defconfig | 1 + configs/j721e_hs_evm_a72_defconfig | 1 + configs/j721e_hs_evm_r5_defconfig | 1 + configs/ls1046ardb_qspi_spl_defconfig | 1 + configs/mccmon6_nor_defconfig | 1 + configs/mccmon6_sd_defconfig | 1 + configs/mx6sabreauto_defconfig | 1 + configs/mx6sabresd_defconfig | 1 + configs/pico-imx6_defconfig | 1 + configs/qemu-x86_64_defconfig | 2 +- configs/qemu-x86_defconfig | 1 - configs/sandbox_spl_defconfig | 1 + configs/socfpga_arria10_defconfig | 1 + configs/stm32mp15_dhcom_basic_defconfig | 1 + configs/stm32mp15_dhcor_basic_defconfig | 1 + configs/wandboard_defconfig | 1 + configs/xilinx_zynq_virt_defconfig | 1 + doc/mkimage.1 | 9 + drivers/core/device.c | 3 +- scripts/Makefile.spl | 24 +-- scripts/dtc/pylibfdt/Makefile | 3 + tools/binman/README | 2 +- tools/binman/README.entries | 76 ++++++++ tools/binman/cmdline.py | 2 + tools/binman/control.py | 19 +- tools/binman/entry.py | 21 +++ tools/binman/etype/_testing.py | 9 +- tools/binman/etype/blob.py | 2 +- tools/binman/etype/blob_dtb.py | 6 +- tools/binman/etype/blob_ext.py | 39 ++++ tools/binman/etype/blob_named_by_arg.py | 2 +- tools/binman/etype/cbfs.py | 16 +- tools/binman/etype/cros_ec_rw.py | 4 +- tools/binman/etype/fdtmap.py | 2 +- tools/binman/etype/files.py | 2 +- tools/binman/etype/fill.py | 4 +- tools/binman/etype/fit.py | 164 +++++++++++++++++ tools/binman/etype/fmap.py | 2 +- tools/binman/etype/gbb.py | 2 +- tools/binman/etype/image_header.py | 4 +- tools/binman/etype/intel_cmc.py | 7 +- tools/binman/etype/intel_descriptor.py | 15 +- tools/binman/etype/intel_fit.py | 8 +- tools/binman/etype/intel_fit_ptr.py | 8 +- tools/binman/etype/intel_fsp.py | 7 +- tools/binman/etype/intel_fsp_m.py | 7 +- tools/binman/etype/intel_fsp_s.py | 7 +- tools/binman/etype/intel_fsp_t.py | 7 +- tools/binman/etype/intel_ifwi.py | 25 ++- tools/binman/etype/intel_me.py | 9 +- tools/binman/etype/intel_mrc.py | 7 +- tools/binman/etype/intel_refcode.py | 7 +- tools/binman/etype/intel_vbt.py | 7 +- tools/binman/etype/intel_vga.py | 7 +- tools/binman/etype/mkimage.py | 62 +++++++ .../etype/powerpc_mpc85xx_bootpg_resetvec.py | 5 +- tools/binman/etype/section.py | 58 ++++-- tools/binman/etype/text.py | 2 +- tools/binman/etype/u_boot.py | 2 +- tools/binman/etype/u_boot_dtb.py | 2 +- tools/binman/etype/u_boot_dtb_with_ucode.py | 4 +- tools/binman/etype/u_boot_elf.py | 4 +- tools/binman/etype/u_boot_img.py | 2 +- tools/binman/etype/u_boot_nodtb.py | 2 +- tools/binman/etype/u_boot_spl.py | 2 +- tools/binman/etype/u_boot_spl_bss_pad.py | 2 +- tools/binman/etype/u_boot_spl_dtb.py | 2 +- tools/binman/etype/u_boot_spl_elf.py | 2 +- tools/binman/etype/u_boot_spl_nodtb.py | 2 +- .../binman/etype/u_boot_spl_with_ucode_ptr.py | 2 +- tools/binman/etype/u_boot_tpl.py | 2 +- tools/binman/etype/u_boot_tpl_dtb.py | 2 +- .../binman/etype/u_boot_tpl_dtb_with_ucode.py | 2 +- tools/binman/etype/u_boot_tpl_elf.py | 2 +- .../binman/etype/u_boot_tpl_with_ucode_ptr.py | 2 +- tools/binman/etype/u_boot_ucode.py | 2 +- tools/binman/etype/u_boot_with_ucode_ptr.py | 2 +- tools/binman/etype/vblock.py | 2 +- tools/binman/etype/x86_reset16.py | 2 +- tools/binman/etype/x86_reset16_spl.py | 2 +- tools/binman/etype/x86_reset16_tpl.py | 2 +- tools/binman/etype/x86_start16.py | 2 +- tools/binman/etype/x86_start16_spl.py | 2 +- tools/binman/etype/x86_start16_tpl.py | 2 +- tools/binman/ftest.py | 140 ++++++++++++++- tools/binman/image.py | 12 +- tools/binman/main.py | 18 +- tools/binman/test/156_mkimage.dts | 23 +++ tools/binman/test/157_blob_ext.dts | 14 ++ tools/binman/test/158_blob_ext_missing.dts | 16 ++ .../binman/test/159_blob_ext_missing_sect.dts | 23 +++ tools/binman/test/160_pack_overlap_zero.dts | 18 ++ tools/binman/test/161_fit.dts | 62 +++++++ tools/binman/test/162_fit_external.dts | 64 +++++++ tools/dtoc/fdt.py | 17 +- tools/dtoc/test_fdt.py | 4 + tools/fit_image.c | 2 +- tools/imagetool.h | 1 + tools/mkimage.c | 5 +- tools/patman/test_util.py | 13 +- tools/patman/tools.py | 8 +- tools/patman/tout.py | 6 +- 164 files changed, 1338 insertions(+), 411 deletions(-) delete mode 100755 arch/arm/mach-rockchip/fit_spl_optee.sh create mode 100644 tools/binman/etype/blob_ext.py create mode 100644 tools/binman/etype/fit.py create mode 100644 tools/binman/etype/mkimage.py create mode 100644 tools/binman/test/156_mkimage.dts create mode 100644 tools/binman/test/157_blob_ext.dts create mode 100644 tools/binman/test/158_blob_ext_missing.dts create mode 100644 tools/binman/test/159_blob_ext_missing_sect.dts create mode 100644 tools/binman/test/160_pack_overlap_zero.dts create mode 100644 tools/binman/test/161_fit.dts create mode 100644 tools/binman/test/162_fit_external.dts -- 2.27.0.389.gc38d7665816-goog

2 75

[PULL] u-boot-mips
by Daniel Schwierzeck 19 Jul '20

19 Jul '20

Hi Tom, please pull MIPS updates for 2020.10. This contains initial but very basic support for Marvell Octeon MIPS64 SoC's along with some small refactorings in start.S to prepare for Octeon. Gitlab CI: https://gitlab.denx.de/u-boot/custodians/u-boot-mips/pipelines/4105 The following changes since commit 1c4b5038afcc7cdb1064713f65571da05aa0de0e: Merge branch '2020-07-17-misc-fixes' (2020-07-17 16:08:54 -0400) are available in the Git repository at: git@gitlab.denx.de:u-boot/custodians/u-boot-mips.git tags/mips-pull-2020-07-18 for you to fetch changes up to 5fef24c912a44a08ab644aa16ceb5a435491f9d9: mips: octeon: Add minimal Octeon 3 EBB7304 EVK support (2020-07-18 15:47:50 +0200) ---------------------------------------------------------------- - MIPS: refactor cache init and setup in start.S - MIPS: sync asm header files with Linux 5.7 - MIPS: add initial support for Marvell Octeon MIPS64 ---------------------------------------------------------------- Aaron Williams (1): mips: octeon: Initial minimal support for the Marvell Octeon SoC Daniel Schwierzeck (8): mips: start.S: remove dead code mips: add KSEG1 wrapper for change_k0_cca mips: refactor disabling of caches mips: add config options for generic cache setup code mips: remove deprecated UNCACHED_SDRAM() macro mips: sync asm/asm.h with Linux 5.7 mips: sync asm/addrspace.h with Linux 5.7 mips: sync asm/mipsregs.h with Linux 5.7 Stefan Roese (11): mips: time: Only compile the weak get_tbclk() when needed mips: traps: Set WG bit in EBase register on Octeon mips: reloc: Change R_MIPS_NONE to catch pre-reloc BSS usage mips: cache: Allow using CONFIG_MIPS_L2_CACHE without CONFIG_MIPS_CM mips: cache: Make flush_cache() weak to enable overwrite mips: cache: Make invalidate_dcache_range() weak to enable overwrite mips: Add CONFIG_MIPS_MACH_EARLY_INIT for very early mach init code sysreset: Add Octeon sysreset driver mips: octeon: dts: Add Octeon 3 cn73xx base dtsi file mips: octeon: use mips_mach_early_init() to copy to L2 cache mips: octeon: Add minimal Octeon 3 EBB7304 EVK support MAINTAINERS | 7 + arch/mips/Kconfig | 77 ++ arch/mips/Makefile | 3 + arch/mips/cpu/start.S | 31 +- arch/mips/cpu/time.c | 2 + arch/mips/dts/Makefile | 1 + arch/mips/dts/mrvl,cn73xx.dtsi | 64 ++ arch/mips/dts/mrvl,octeon-ebb7304.dts | 96 ++ arch/mips/include/asm/addrspace.h | 27 +- arch/mips/include/asm/asm.h | 130 +-- arch/mips/include/asm/cm.h | 12 + arch/mips/include/asm/compiler.h | 69 ++ arch/mips/include/asm/isa-rev.h | 24 + arch/mips/include/asm/mipsregs.h | 1201 +++++++++++++++++++++---- arch/mips/include/asm/relocs.h | 2 +- arch/mips/lib/bootm.c | 4 +- arch/mips/lib/cache.c | 6 +- arch/mips/lib/cache_init.S | 38 +- arch/mips/lib/reloc.c | 7 +- arch/mips/lib/traps.c | 4 + arch/mips/mach-octeon/Kconfig | 60 ++ arch/mips/mach-octeon/Makefile | 10 + arch/mips/mach-octeon/cache.c | 24 + arch/mips/mach-octeon/clock.c | 14 + arch/mips/mach-octeon/cpu.c | 66 ++ arch/mips/mach-octeon/dram.c | 28 + arch/mips/mach-octeon/include/ioremap.h | 30 + arch/mips/mach-octeon/include/mach/cavm-reg.h | 17 + arch/mips/mach-octeon/include/mach/clock.h | 12 + arch/mips/mach-octeon/lowlevel_init.S | 69 ++ board/Marvell/octeon_ebb7304/Kconfig | 19 + board/Marvell/octeon_ebb7304/MAINTAINERS | 7 + board/Marvell/octeon_ebb7304/Makefile | 8 + board/Marvell/octeon_ebb7304/board.c | 9 + configs/octeon_ebb7304_defconfig | 38 + drivers/sysreset/Kconfig | 7 + drivers/sysreset/Makefile | 1 + drivers/sysreset/sysreset_octeon.c | 52 ++ include/configs/octeon_common.h | 19 + include/configs/octeon_ebb7304.h | 20 + scripts/config_whitelist.txt | 1 - 41 files changed, 1937 insertions(+), 379 deletions(-) create mode 100644 arch/mips/dts/mrvl,cn73xx.dtsi create mode 100644 arch/mips/dts/mrvl,octeon-ebb7304.dts create mode 100644 arch/mips/include/asm/compiler.h create mode 100644 arch/mips/include/asm/isa-rev.h create mode 100644 arch/mips/mach-octeon/Kconfig create mode 100644 arch/mips/mach-octeon/Makefile create mode 100644 arch/mips/mach-octeon/cache.c create mode 100644 arch/mips/mach-octeon/clock.c create mode 100644 arch/mips/mach-octeon/cpu.c create mode 100644 arch/mips/mach-octeon/dram.c create mode 100644 arch/mips/mach-octeon/include/ioremap.h create mode 100644 arch/mips/mach-octeon/include/mach/cavm-reg.h create mode 100644 arch/mips/mach-octeon/include/mach/clock.h create mode 100644 arch/mips/mach-octeon/lowlevel_init.S create mode 100644 board/Marvell/octeon_ebb7304/Kconfig create mode 100644 board/Marvell/octeon_ebb7304/MAINTAINERS create mode 100644 board/Marvell/octeon_ebb7304/Makefile create mode 100644 board/Marvell/octeon_ebb7304/board.c create mode 100644 configs/octeon_ebb7304_defconfig create mode 100644 drivers/sysreset/sysreset_octeon.c create mode 100644 include/configs/octeon_common.h create mode 100644 include/configs/octeon_ebb7304.h

2 1

[PATCH v2 1/1] efi_loader: use logging for bootefi command
by Heinrich Schuchardt 19 Jul '20

19 Jul '20

Log messages of the bootefi command instead of simply printing them to the console. Do not show "## Application terminated" message when the UEFI binary completed successfully. Adjust the python tests testing for '## Application terminated'. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- v2: adjust Python tests to reflect changed command line output --- cmd/bootefi.c | 42 ++++++++++++++++++-------------- test/py/tests/test_efi_fit.py | 9 +++---- test/py/tests/test_efi_loader.py | 9 +++---- 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 57552f99fc..8154efde52 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -5,6 +5,8 @@ * Copyright (c) 2016 Alexander Graf */ +#define LOG_CATEGORY LOGC_EFI + #include <common.h> #include <charset.h> #include <command.h> @@ -14,6 +16,7 @@ #include <env.h> #include <errno.h> #include <image.h> +#include <log.h> #include <malloc.h> #include <linux/libfdt.h> #include <linux/libfdt_env.h> @@ -62,7 +65,7 @@ static efi_status_t set_load_options(efi_handle_t handle, const char *env_var, size = utf8_utf16_strlen(env) + 1; loaded_image_info->load_options = calloc(size, sizeof(u16)); if (!loaded_image_info->load_options) { - printf("ERROR: Out of memory\n"); + log_err("ERROR: Out of memory\n"); EFI_CALL(systab.boottime->close_protocol(handle, &efi_guid_loaded_image, efi_root, NULL)); @@ -137,7 +140,7 @@ static efi_status_t copy_fdt(void **fdtp) EFI_ACPI_RECLAIM_MEMORY, fdt_pages, &new_fdt_addr); if (ret != EFI_SUCCESS) { - printf("ERROR: Failed to reserve space for FDT\n"); + log_err("ERROR: Failed to reserve space for FDT\n"); goto done; } } @@ -156,8 +159,8 @@ static void efi_reserve_memory(u64 addr, u64 size) addr = (uintptr_t)map_sysmem(addr, 0); if (efi_add_memory_map(addr, size, EFI_RESERVED_MEMORY_TYPE) != EFI_SUCCESS) - printf("Reserved memory mapping failed addr %llx size %llx\n", - addr, size); + log_err("Reserved memory mapping failed addr %llx size %llx\n", + addr, size); } /** @@ -252,7 +255,7 @@ efi_status_t efi_install_fdt(void *fdt) */ #if CONFIG_IS_ENABLED(GENERATE_ACPI_TABLE) if (fdt) { - printf("ERROR: can't have ACPI table and device tree.\n"); + log_err("ERROR: can't have ACPI table and device tree.\n"); return EFI_LOAD_ERROR; } #else @@ -272,13 +275,13 @@ efi_status_t efi_install_fdt(void *fdt) if (!fdt_opt) { fdt_opt = env_get("fdtcontroladdr"); if (!fdt_opt) { - printf("ERROR: need device tree\n"); + log_err("ERROR: need device tree\n"); return EFI_NOT_FOUND; } } fdt_addr = simple_strtoul(fdt_opt, NULL, 16); if (!fdt_addr) { - printf("ERROR: invalid $fdt_addr or $fdtcontroladdr\n"); + log_err("ERROR: invalid $fdt_addr or $fdtcontroladdr\n"); return EFI_LOAD_ERROR; } fdt = map_sysmem(fdt_addr, 0); @@ -286,19 +289,19 @@ efi_status_t efi_install_fdt(void *fdt) /* Install device tree */ if (fdt_check_header(fdt)) { - printf("ERROR: invalid device tree\n"); + log_err("ERROR: invalid device tree\n"); return EFI_LOAD_ERROR; } /* Prepare device tree for payload */ ret = copy_fdt(&fdt); if (ret) { - printf("ERROR: out of memory\n"); + log_err("ERROR: out of memory\n"); return EFI_OUT_OF_RESOURCES; } if (image_setup_libfdt(&img, fdt, 0, NULL)) { - printf("ERROR: failed to process device tree\n"); + log_err("ERROR: failed to process device tree\n"); return EFI_LOAD_ERROR; } @@ -308,7 +311,7 @@ efi_status_t efi_install_fdt(void *fdt) /* Install device tree as UEFI table */ ret = efi_install_configuration_table(&efi_guid_fdt, fdt); if (ret != EFI_SUCCESS) { - printf("ERROR: failed to install device tree\n"); + log_err("ERROR: failed to install device tree\n"); return ret; } #endif /* GENERATE_ACPI_TABLE */ @@ -339,10 +342,13 @@ static efi_status_t do_bootefi_exec(efi_handle_t handle) /* Call our payload! */ ret = EFI_CALL(efi_start_image(handle, &exit_data_size, &exit_data)); - printf("## Application terminated, r = %lu\n", ret & ~EFI_ERROR_MASK); - if (ret && exit_data) { - printf("## %ls\n", exit_data); - efi_free_pool(exit_data); + if (ret != EFI_SUCCESS) { + log_err("## Application failed, r = %lu\n", + ret & ~EFI_ERROR_MASK); + if (exit_data) { + log_err("## %ls\n", exit_data); + efi_free_pool(exit_data); + } } efi_restore_gd(); @@ -364,7 +370,7 @@ static int do_efibootmgr(void) ret = efi_bootmgr_load(&handle); if (ret != EFI_SUCCESS) { - printf("EFI boot manager: Cannot load any image\n"); + log_notice("EFI boot manager: Cannot load any image\n"); return CMD_RET_FAILURE; } @@ -611,8 +617,8 @@ static int do_bootefi(struct cmd_tbl *cmdtp, int flag, int argc, /* Initialize EFI drivers */ ret = efi_init_obj_list(); if (ret != EFI_SUCCESS) { - printf("Error: Cannot initialize UEFI sub-system, r = %lu\n", - ret & ~EFI_ERROR_MASK); + log_err("Error: Cannot initialize UEFI sub-system, r = %lu\n", + ret & ~EFI_ERROR_MASK); return CMD_RET_FAILURE; } diff --git a/test/py/tests/test_efi_fit.py b/test/py/tests/test_efi_fit.py index 06fb151c13..068a35a559 100644 --- a/test/py/tests/test_efi_fit.py +++ b/test/py/tests/test_efi_fit.py @@ -420,12 +420,11 @@ def test_efi_fit_launch(u_boot_console): fit_config = 'config-efi-fdt' if enable_fdt else 'config-efi-nofdt' # Try booting. - cons.run_command( - 'bootm %x#%s' % (addr, fit_config), wait_for_prompt=False) + output = cons.run_command('bootm %x#%s' % (addr, fit_config)) if enable_fdt: - cons.wait_for('Booting using the fdt blob') - cons.wait_for('Hello, world') - cons.wait_for('## Application terminated, r = 0') + assert 'Booting using the fdt blob' in output + assert 'Hello, world' in output + assert '## Application failed' not in output cons.restart_uboot() cons = u_boot_console diff --git a/test/py/tests/test_efi_loader.py b/test/py/tests/test_efi_loader.py index 7aa422e764..ca68626cec 100644 --- a/test/py/tests/test_efi_loader.py +++ b/test/py/tests/test_efi_loader.py @@ -161,8 +161,8 @@ def test_efi_helloworld_net(u_boot_console): output = u_boot_console.run_command('bootefi %x' % addr) expected_text = 'Hello, world' assert expected_text in output - expected_text = '## Application terminated, r = 0' - assert expected_text in output + expected_text = '## Application failed' + assert expected_text not in output @pytest.mark.buildconfigspec('cmd_bootefi_hello') def test_efi_helloworld_builtin(u_boot_console): @@ -198,8 +198,7 @@ def test_efi_grub_net(u_boot_console): # Then exit cleanly u_boot_console.wait_for('grub>') - output = u_boot_console.run_command('exit', wait_for_prompt=False, wait_for_echo=False) - u_boot_console.wait_for('r = 0') - + u_boot_console.run_command('exit', wait_for_prompt=False, wait_for_echo=False) + u_boot_console.wait_for('=>') # And give us our U-Boot prompt back u_boot_console.run_command('') -- 2.27.0

1 0

rk3399: boot from compressed Image
by Tian Yuanhao 19 Jul '20

19 Jul '20

Hello, booti now supports booting from compressed Image. See 414c34ed555b8ce5c260cf641261ecf45beca251. Would you please add kernel_comp_addr_r and kernel_comp_size to rk3399_common.h, so that people can use compressed Image (e.g. Image.gz) in extlinux.conf. Thanks, Yuanhao

2 2

[PATCH] ARM: omap3: evm: Complete DM_ETH and DM_USB migrations
by Derald D. Woods 19 Jul '20

19 Jul '20

This commit completes the migrations for DM_ETH and DM_USB. The board is now consistent with omap3_beagle and other remaining OMAP3 boards. Cc: Tom Rini <trini(a)konsulko.com> Cc: Adam Ford <aford173(a)gmail.com> Signed-off-by: Derald D. Woods <woods.technical(a)gmail.com> --- arch/arm/mach-omap2/omap3/Kconfig | 3 ++ board/ti/evm/evm.c | 82 +++++-------------------------- configs/omap3_evm_defconfig | 14 ++++-- 3 files changed, 23 insertions(+), 76 deletions(-) diff --git a/arch/arm/mach-omap2/omap3/Kconfig b/arch/arm/mach-omap2/omap3/Kconfig index cf11e5707f..0a6eb4cb26 100644 --- a/arch/arm/mach-omap2/omap3/Kconfig +++ b/arch/arm/mach-omap2/omap3/Kconfig @@ -61,7 +61,10 @@ config TARGET_OMAP3_EVM select DM select DM_GPIO select DM_SERIAL + select OMAP3_GPIO_2 select OMAP3_GPIO_3 + select OMAP3_GPIO_5 + select OMAP3_GPIO_6 imply CMD_DM config TARGET_OMAP3_IGEP00X0 diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c index 193b3eb576..ecbd843676 100644 --- a/board/ti/evm/evm.c +++ b/board/ti/evm/evm.c @@ -16,7 +16,6 @@ #include <init.h> #include <net.h> #include <ns16550.h> -#include <netdev.h> #include <serial.h> #include <asm/io.h> #include <asm/arch/mem.h> @@ -24,20 +23,17 @@ #include <asm/arch/sys_proto.h> #include <asm/arch/mmc_host_def.h> #include <asm/gpio.h> -#include <i2c.h> #include <twl4030.h> #include <asm/mach-types.h> -#include <asm/omap_musb.h> #include <linux/delay.h> #include <linux/mtd/rawnand.h> -#include <linux/usb/ch9.h> -#include <linux/usb/gadget.h> -#include <linux/usb/musb.h> #include "evm.h" #define OMAP3EVM_GPIO_ETH_RST_GEN1 64 #define OMAP3EVM_GPIO_ETH_RST_GEN2 7 +#define CONFIG_SMC911X_BASE 0x2C000000 + DECLARE_GLOBAL_DATA_PTR; static u32 omap3_evm_version; @@ -49,7 +45,7 @@ u32 get_omap3_evm_rev(void) static void omap3_evm_get_revision(void) { -#if defined(CONFIG_CMD_NET) +#if defined(CONFIG_SMC911X) /* * Board revision can be ascertained only by identifying * the Ethernet chipset. @@ -70,7 +66,7 @@ static void omap3_evm_get_revision(void) default: omap3_evm_version = OMAP3EVM_BOARD_GEN_2; } -#else /* !CONFIG_CMD_NET */ +#else /* !CONFIG_SMC911X */ #if defined(CONFIG_STATIC_BOARD_REV) /* Look for static defintion of the board revision */ omap3_evm_version = CONFIG_STATIC_BOARD_REV; @@ -78,7 +74,7 @@ static void omap3_evm_get_revision(void) /* Fallback to the default above */ omap3_evm_version = OMAP3EVM_BOARD_GEN_2; #endif /* CONFIG_STATIC_BOARD_REV */ -#endif /* CONFIG_CMD_NET */ +#endif /* CONFIG_SMC911X */ } #if defined(CONFIG_USB_MUSB_GADGET) || defined(CONFIG_USB_MUSB_HOST) @@ -155,33 +151,6 @@ void get_board_mem_timings(struct board_sdrc_timings *timings) } #endif /* CONFIG_SPL_BUILD */ -#if defined(CONFIG_USB_MUSB_OMAP2PLUS) -static struct musb_hdrc_config musb_config = { - .multipoint = 1, - .dyn_fifo = 1, - .num_eps = 16, - .ram_bits = 12, -}; - -static struct omap_musb_board_data musb_board_data = { - .interface_type = MUSB_INTERFACE_ULPI, -}; - -static struct musb_hdrc_platform_data musb_plat = { -#if defined(CONFIG_USB_MUSB_HOST) - .mode = MUSB_HOST, -#elif defined(CONFIG_USB_MUSB_GADGET) - .mode = MUSB_PERIPHERAL, -#else -#error "Please define either CONFIG_USB_MUSB_HOST or CONFIG_USB_MUSB_GADGET" -#endif /* CONFIG_USB_MUSB_{GADGET,HOST} */ - .config = &musb_config, - .power = 100, - .platform_ops = &omap2430_ops, - .board_data = &musb_board_data, -}; -#endif /* CONFIG_USB_MUSB_OMAP2PLUS */ - /* * Routine: misc_init_r * Description: Init ethernet (done here so udelay works) @@ -190,25 +159,18 @@ int misc_init_r(void) { twl4030_power_init(); -#ifdef CONFIG_SYS_I2C_OMAP24XX - i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE); -#endif - -#if defined(CONFIG_CMD_NET) +#if defined(CONFIG_SMC911X) setup_net_chip(); #endif omap3_evm_get_revision(); -#if defined(CONFIG_CMD_NET) +#if defined(CONFIG_SMC911X) reset_net_chip(); #endif omap_die_id_display(); -#if defined(CONFIG_USB_MUSB_OMAP2PLUS) - musb_register(&musb_plat, &musb_board_data, (void *)MUSB_BASE); -#endif - -#if defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET) +#if defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET) && \ + !defined(CONFIG_SMC911X) omap_die_id_usbethaddr(); #endif return 0; @@ -225,7 +187,7 @@ void set_muxconf_regs(void) MUX_EVM(); } -#if defined(CONFIG_CMD_NET) +#if defined(CONFIG_SMC911X) /* * Routine: setup_net_chip * Description: Setting up the configuration GPMC registers specific to the @@ -283,33 +245,11 @@ static void reset_net_chip(void) udelay(1); gpio_set_value(rst_gpio, 1); } - -int board_eth_init(struct bd_info *bis) -{ -#if defined(CONFIG_SMC911X) - env_set("ethaddr", NULL); - return smc911x_initialize(0, CONFIG_SMC911X_BASE); -#else - return 0; -#endif -} -#endif /* CONFIG_CMD_NET */ +#endif /* CONFIG_SMC911X */ #if defined(CONFIG_MMC) -int board_mmc_init(struct bd_info *bis) -{ - return omap_mmc_init(0, 0, 0, -1, -1); -} - void board_mmc_power_init(void) { twl4030_power_mmc_init(0); } #endif /* CONFIG_MMC */ - -#if defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET) && !defined(CONFIG_CMD_NET) -int board_eth_init(struct bd_info *bis) -{ - return usb_eth_initialize(bis); -} -#endif /* CONFIG_USB_ETHER */ diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 1322707968..cf62c73cc3 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -10,6 +10,7 @@ CONFIG_NR_DRAM_BANKS=2 CONFIG_SPL=y CONFIG_DISTRO_DEFAULTS=y CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="usb start" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_DEFAULT_FDT_FILE="omap3-evm.dtb" CONFIG_VERSION_VARIABLE=y @@ -38,7 +39,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(spl),1920k(u-boot),128k(u-boot-env),128k(dtb),6m(kernel),-(rootfs)" CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set -# CONFIG_EFI_PARTITION is not set +# CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_PARTITION_UUIDS=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y @@ -48,11 +49,10 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SPL_DM=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_OF_TRANSLATE=y -# CONFIG_SPL_BLK is not set CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x82000000 +CONFIG_GPIO_HOG=y CONFIG_DM_MMC=y -# CONFIG_SPL_DM_MMC is not set CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y @@ -60,8 +60,8 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 CONFIG_SPL_NAND_SIMPLE=y +CONFIG_DM_ETH=y CONFIG_SMC911X=y -CONFIG_SMC911X_BASE=0x2C000000 CONFIG_SMC911X_32_BIT=y CONFIG_SPI=y CONFIG_DM_SPI=y @@ -78,6 +78,10 @@ CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" CONFIG_USB_GADGET_VENDOR_NUM=0x0451 CONFIG_USB_GADGET_PRODUCT_NUM=0x5678 CONFIG_USB_ETHER=y +CONFIG_USB_HOST_ETHER=y +CONFIG_USB_ETHER_ASIX=y +CONFIG_USB_ETHER_MCS7830=y +CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_VIDEO_OMAP3=y CONFIG_FAT_WRITE=y CONFIG_BCH=y -# CONFIG_EFI_LOADER is not set -- 2.27.0

1 2

PINE64 Rock64 - How to get SPI driver working
by Johannes Krottmayer 18 Jul '20

18 Jul '20

Hello, I just compiled U-Boot v2020.04 for a PINE64 Rock media board. It compiles fine without errors, but when I try to probe the on board flash I get an error: => sf probe Invalid bus 0 (err=-19) Failed to initialize SPI flash at 0:0 (error -19) => SPI is activated in the Device-Tree blob. I also added support to the Rockchip SPI driver (added IDS strings for this SoC). In the device config I added the following: CONFIG_SPI=y CONFIG_ROCKCHIP_SPI=y CONFIG_SPI_FLASH=y But the driver still doesn't work. Output of DM (shortened): => dm tree [...] spi 0 [ ] rockchip_spi |-- spi@ff190000 spi_flash 0 [ ] spi_flash_std | `-- spiflash@0 [...] What is missing? Is there a way to load driver? Any kind of help is highly appreciated. -- Kind regards, Johannes K.

4 11