September 2019 - U-Boot

[U-Boot] [PATCH 1/2] am335x, guardian: update guardian board
by BollavarapuMoses.Christopher＠in.bosch.com 12 Oct '19

12 Oct '19

From: Moses Christopher <BollavarapuMoses.Christopher(a)in.bosch.com> - add BOARD_LATE_INIT function calls in board.c - add swi_status detection in board.c - mux: add guardian interfaces to single pinmux structure - am33xx, kconfig: add BOARD_LATE_INIT for GUARDIAN board Signed-off-by: Moses Christopher <BollavarapuMoses.Christopher(a)in.bosch.com> --- arch/arm/mach-omap2/am33xx/Kconfig | 1 + board/bosch/guardian/board.c | 53 ++++++++++++++++++++++++++++++++++++++ board/bosch/guardian/mux.c | 32 ++++++++--------------- 3 files changed, 65 insertions(+), 21 deletions(-) diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig index 7f6b344..39d9c28 100644 --- a/arch/arm/mach-omap2/am33xx/Kconfig +++ b/arch/arm/mach-omap2/am33xx/Kconfig @@ -89,6 +89,7 @@ config TARGET_AM335X_SHC config TARGET_AM335X_GUARDIAN bool "Support am335x based guardian board from bosch" + select BOARD_LATE_INIT select DM select DM_SERIAL select DM_GPIO diff --git a/board/bosch/guardian/board.c b/board/bosch/guardian/board.c index ec0c4a17..072aa4e 100644 --- a/board/bosch/guardian/board.c +++ b/board/bosch/guardian/board.c @@ -172,6 +172,8 @@ void sdram_init(void) int board_init(void) { + save_omap_boot_params(); + #if defined(CONFIG_HW_WATCHDOG) hw_watchdog_init(); #endif @@ -183,3 +185,54 @@ int board_init(void) #endif return 0; } + +#ifdef CONFIG_BOARD_LATE_INIT +static void set_bootmode_env(void) +{ + char *boot_device_name = NULL; + char *boot_mode_gpio = "gpio@44e07000_14"; + int ret; + int value; + + struct gpio_desc boot_mode_desc; + + switch (gd->arch.omap_boot_device) { + case BOOT_DEVICE_NAND: + boot_device_name = "nand"; + break; + case BOOT_DEVICE_USBETH: + boot_device_name = "usbeth"; + break; + default: + break; + } + + if (boot_device_name) + env_set("boot_device", boot_device_name); + + ret = dm_gpio_lookup_name(boot_mode_gpio, &boot_mode_desc); + if (ret) { + printf("%s is not found\n", boot_mode_gpio); + goto err; + } + + ret = dm_gpio_request(&boot_mode_desc, "setup_bootmode_env"); + if (ret && ret != -EBUSY) { + printf("requesting gpio: %s failed\n", boot_mode_gpio); + goto err; + } + + value = dm_gpio_get_value(&boot_mode_desc); + value ? env_set("swi_status", "0") : env_set("swi_status", "1"); + return; + +err: + env_set("swi_status", "err"); +} + +int board_late_init(void) +{ + set_bootmode_env(); + return 0; +} +#endif /* CONFIG_BOARD_LATE_INIT */ diff --git a/board/bosch/guardian/mux.c b/board/bosch/guardian/mux.c index 708c3e7..20a1f25 100644 --- a/board/bosch/guardian/mux.c +++ b/board/bosch/guardian/mux.c @@ -26,24 +26,16 @@ static struct module_pin_mux i2c0_pin_mux[] = { {-1}, }; -static struct module_pin_mux adc_voltages_en[] = { - {OFFSET(mcasp0_ahclkx), (MODE(7) | PULLUP_EN)}, - {-1}, -}; - -static struct module_pin_mux asp_power_en[] = { - {OFFSET(mcasp0_aclkx), (MODE(7) | PULLUP_EN)}, - {-1}, -}; - -static struct module_pin_mux switch_off_3v6_pin_mux[] = { - {OFFSET(mii1_txd0), (MODE(7) | PULLUP_EN)}, - /* - * The uart1 lines are made floating inputs, based on the Guardian - * A2 Sample Power Supply Schematics - */ - {OFFSET(uart1_rxd), (MODE(7) | PULLUDDIS)}, - {OFFSET(uart1_txd), (MODE(7) | PULLUDDIS)}, +static struct module_pin_mux guardian_interfaces_pin_mux[] = { + {OFFSET(mcasp0_ahclkx), (MODE(7) | PULLDOWN_EN)}, + {OFFSET(mcasp0_aclkx), (MODE(7) | PULLUP_EN)}, + {OFFSET(mii1_txd0), (MODE(7) | PULLUP_EN)}, + {OFFSET(uart1_rxd), (MODE(7) | RXACTIVE | PULLUDDIS)}, + {OFFSET(uart1_txd), (MODE(7) | PULLUDDIS)}, + {OFFSET(mii1_crs), (MODE(7) | PULLDOWN_EN)}, + {OFFSET(rmii1_refclk), (MODE(7) | PULLDOWN_EN)}, + {OFFSET(mii1_txd3), (MODE(7) | PULLUDDIS)}, + {OFFSET(mii1_rxdv), (MODE(7) | PULLDOWN_EN)}, {-1}, }; @@ -93,7 +85,5 @@ void enable_board_pin_mux(void) #ifdef CONFIG_NAND configure_module_pin_mux(nand_pin_mux); #endif - configure_module_pin_mux(adc_voltages_en); - configure_module_pin_mux(asp_power_en); - configure_module_pin_mux(switch_off_3v6_pin_mux); + configure_module_pin_mux(guardian_interfaces_pin_mux); } -- 2.8.1

2 5

[U-Boot] [PATCH 0/5] arm: omap: dra7: Fix ECC test and memory priming
by Lokesh Vutla 12 Oct '19

12 Oct '19

This series fixes ecc address calculation and updates the ddr ecc enabling sequence . Krunal Bhargav (3): arm: omap: emif-common: Disable interleaving arm: omap: emif-common: Fix memory priming for ECC cmd: ti: ddr3: Move the print statement after test Lokesh Vutla (2): arm: omap: emif-common: Fix ecc address calculation cmd: ti: ddr3: Fix ecc address calculation arch/arm/mach-omap2/emif-common.c | 53 +++++++++++++++++++------------ cmd/ti/ddr3.c | 17 +++++----- 2 files changed, 41 insertions(+), 29 deletions(-) -- 2.22.0

2 10

[U-Boot] [PATCH v2 00/26] remoteproc: Add support for R5F and DSP processors
by Lokesh Vutla 12 Oct '19

12 Oct '19

This series addds support loading and starting for the following remote processors: - ARM Cortex-R5F in lockstep and split mode - C66x DSP - C7x DSP Enable these remoteprocessor in AM654-evm and J721E evm. Changes since v1: - Reword the comments section for device_to_virt() api. - Update the stm32_coproc driver to add size checks in device_to_virt() callback. - Retain the export of rproc_elf32_sanity_check(). - Exported rproc_elf64_sanity_check() - Added rproc_elf_sanity_check() api - Added README for J721E. Kedar Chitnis (1): armv8: K3: j721e: Updated ddr address regions in MMU table Lokesh Vutla (15): dm: core: Add a function to count the children of a device remoteproc: ops: Add elf section size as input parameter to device_to_virt api remoteproc: elf_loader: Always check the validity of the image before loading remoteproc: elf-loader: Add 64 bit elf loading support remoteproc: elf_loader: Introduce a common elf loader and checker functions remoteproc: elf_loader: Introduce rproc_elf_get_boot_addr() api remoteproc: tisci_proc: Add helper api for controlling core power domain remoteproc: Introduce K3 remoteproc driver for R5F subsystem remoteproc: Introduce K3 C66 and C71 remoteproc driver arm: dts: k3-j721e-mcu: Add MCU domain R5F cluster node arm: dts: k3-j721e-main: Add MAIN domain R5F cluster nodes arm: dts: k3-j721e-main: Add C66x DSP nodes arm: dts: k3-j721e-main: Add C71x DSP node configs: j721e_evm_a72: Enable R5F and DSP remoteproc driver board: j721e: Add README Suman Anna (10): dt-bindings: remoteproc: Add bindings for R5F subsystem on TI K3 SoCs dt-bindings: remoteproc: Add bindings for DSP C66x clusters on TI K3 SoCs arm: dts: k3-am65-mcu: Add MCU domain R5F DT nodes env: ti: k3_rproc: Add common rproc environment variables env: ti: j721e-evm: Add support to boot rprocs including R5Fs and DSPs env: ti: am65x_evm: Add env support to boot the MCU R5F rprocs configs: j721e_evm_a72: Enhance bootcmd to start remoteprocs configs: am65x_evm_a53: Enable R5F remoteproc driver configs: am65x_evm_a53: Enhance bootcmd to start remoteprocs armv8: K3: am65x: Update DDR address regions in MMU table arch/arm/dts/k3-am65-mcu.dtsi | 40 +- arch/arm/dts/k3-am654-base-board.dts | 5 + arch/arm/dts/k3-j721e-common-proc-board.dts | 12 + arch/arm/dts/k3-j721e-main.dtsi | 111 +++ arch/arm/dts/k3-j721e-mcu-wakeup.dtsi | 38 + arch/arm/mach-k3/arm64-mmu.c | 24 +- board/ti/j721e/README | 227 +++++ configs/am65x_evm_a53_defconfig | 4 +- configs/j721e_evm_a72_defconfig | 5 +- .../remoteproc/ti,k3-dsp-rproc.txt | 101 +++ .../remoteproc/ti,k3-r5f-rproc.txt | 164 ++++ drivers/core/device.c | 11 + drivers/remoteproc/Kconfig | 20 + drivers/remoteproc/Makefile | 2 + drivers/remoteproc/rproc-elf-loader.c | 179 +++- drivers/remoteproc/sandbox_testproc.c | 4 +- drivers/remoteproc/stm32_copro.c | 21 +- drivers/remoteproc/ti_k3_dsp_rproc.c | 354 ++++++++ drivers/remoteproc/ti_k3_r5f_rproc.c | 816 ++++++++++++++++++ drivers/remoteproc/ti_sci_proc.h | 27 + include/configs/am65x_evm.h | 11 +- include/configs/j721e_evm.h | 14 +- include/dm/device.h | 9 + include/environment/ti/k3_rproc.h | 52 ++ include/remoteproc.h | 76 +- test/dm/bus.c | 41 +- test/dm/remoteproc.c | 7 +- 27 files changed, 2316 insertions(+), 59 deletions(-) create mode 100644 board/ti/j721e/README create mode 100644 doc/device-tree-bindings/remoteproc/ti,k3-dsp-rproc.txt create mode 100644 doc/device-tree-bindings/remoteproc/ti,k3-r5f-rproc.txt create mode 100644 drivers/remoteproc/ti_k3_dsp_rproc.c create mode 100644 drivers/remoteproc/ti_k3_r5f_rproc.c create mode 100644 include/environment/ti/k3_rproc.h -- 2.22.0

3 56

[U-Boot] [PATCH 0/7] Implement UART-based boot of TI K3 AM65x SoCs
by Andreas Dannenberg 12 Oct '19

12 Oct '19

This series enables UART-based boot of TI K3 AM65x SoCs by extending the TI K3 System Firmware (SYSFW) loader with support for UART-based loading of SYSFW. This is done by tapping into the existing SPL Y-Modem serial loader framework to accomplish the actual loading functionality. The series also implements a feature called "early console" which allows setting up an alternate full console (as required by Y-Modem) provided through an alternate serial port (a serial port different from what will be used by U-Boot proper/Linux in a system) which can be configured and used prior to SYSFW being available Specifically, the MAIN_UART0 in case of AM654x SoCs can't be used in the early boot process (on R5 SPL) to load SYSFW as it is not clocked. However since the MCU_UART0 is readily available prior to loading SYSFW we use it during the early boot process via said "early console" functionality, and then later switch over to using MAIN_UART0 both for the continued boot process as well as for the actual U-Boot console itself (and Linux, etc.) This series depends on [1] to be able to boot to prompt on the TI AM654x EVM. Sample instructions on how to boot are provided in the updates to the board-specific README. [1] https://patchwork.ozlabs.org/patch/1142068/ Andreas Dannenberg (7): spl: ymodem: Fix FIT loading termination handling spl: ymodem: Make SPL Y-Modem loader framework accessible arm: K3: common: Allow for early console functionality arm: K3: sysfw-loader: Allow loading SYSFW via Y-Modem armv7R: dts: k3: am654: Add MCU_UART0 related definitions configs: am65x_evm_r5: Activate early console functionality board: ti: am65x: Add UART boot procedure in README arch/arm/dts/k3-am654-r5-base-board.dts | 19 +++++++++++++++ arch/arm/mach-k3/Kconfig | 21 ++++++++++++++++ arch/arm/mach-k3/common.c | 26 ++++++++++++++++++++ arch/arm/mach-k3/common.h | 1 + arch/arm/mach-k3/sysfw-loader.c | 21 ++++++++++++++++ board/ti/am65x/README | 32 +++++++++++++++++++++++++ common/spl/spl_ymodem.c | 9 +++---- configs/am65x_evm_r5_defconfig | 1 + include/spl.h | 3 +++ 9 files changed, 129 insertions(+), 4 deletions(-) -- 2.17.1

2 14

[U-Boot] [PATCH V2] spl: add a generic function board_init_f
by Philippe Reynes 12 Oct '19

12 Oct '19

This commit add a generic function board_init_f that only initialize some device (for example serial). It avoid to define a board function only to launch the serial configuration. Signed-off-by: Philippe Reynes <philippe.reynes(a)softathome.com> --- Changelog: v2: - fix the commit message (use board_init_f instead of board_init_r) (thanks Simon) - remove the useless "default n" in Kconfig (thanks Simon) - enhance the help in Kconfig (thanks Simon) - replace #if by if (thanks Simon) common/spl/Kconfig | 9 +++++++++ common/spl/spl.c | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index f467eca..33752a3 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -25,6 +25,15 @@ config SPL_FRAMEWORK supports MMC, NAND and YMODEM and other methods loading of U-Boot and the Linux Kernel. If unsure, say Y. +config SPL_FRAMEWORK_BOARD_INIT_F + bool "Define a generic function board_init_f" + depends on SPL_FRAMEWORK + help + Define a generic function board_init_f that: + - initialize the spl (spl_early_init) + - initialize the serial (preloader_console_init) + Unless you want to provide your own board_init_f, you should say Y. + config SPL_SIZE_LIMIT int "Maximum size of SPL image" depends on SPL diff --git a/common/spl/spl.c b/common/spl/spl.c index 082fa2b..c823062 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -566,6 +566,24 @@ static int boot_from_devices(struct spl_image_info *spl_image, return -ENODEV; } +#if defined(CONFIG_SPL_FRAMEWORK_BOARD_INIT_F) +void board_init_f(ulong dummy) +{ + if (CONFIG_IS_ENABLED(OF_CONTROL)) { + int ret; + + ret = spl_early_init(); + if (ret) { + debug("spl_early_init() failed: %d\n", ret); + hang(); + } + } + + if (CONFIG_IS_ENABLED(SERIAL_SUPPORT)) + preloader_console_init(); +} +#endif + void board_init_r(gd_t *dummy1, ulong dummy2) { u32 spl_boot_list[] = { -- 2.7.4

2 1

[U-Boot] [PATCH 1/1] arm64: print instructions leading to exception
by Heinrich Schuchardt 12 Oct '19

12 Oct '19

If an exception occurs in a loaded image and the relocation offset is unknown, it is helpful to know the instructions pointed to by the program counter. This patch adds the missing output. A possible output is: Code: 910c4021 aa1303e0 f9400662 d63f0040 (e7f7defb) The parentheses indicate the instruction causing the exception. The output can be disassembled using scripts/decodecode: echo 'Code: 90000360 9100b800 94002782 17ffff8f (e7f7defb)' | \ ARCH=arm64 scripts/decodecode Code: 90000360 9100b800 94002782 17ffff8f (e7f7defb) All code ======== 0: 90000360 adrp x0, 0x6c000 4: 9100b800 add x0, x0, #0x2e 8: 94002782 bl 0x9e10 c: 17ffff8f b 0xfffffffffffffe48 10:* e7f7defb .inst 0xe7f7defb ; undefined <-- trapping instruction Code starting with the faulting instruction =========================================== 0: e7f7defb .inst 0xe7f7defb ; undefined We already have implemented the same for armv7. For testing command 'exception undefined' can be used. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- arch/arm/lib/interrupts_64.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm/lib/interrupts_64.c b/arch/arm/lib/interrupts_64.c index 0bfdb8d93d..a32a4b6868 100644 --- a/arch/arm/lib/interrupts_64.c +++ b/arch/arm/lib/interrupts_64.c @@ -30,6 +30,17 @@ static void show_efi_loaded_images(struct pt_regs *regs) efi_print_image_infos((void *)regs->elr); } +static void dump_instr(struct pt_regs *regs) +{ + u32 *addr = (u32 *)(regs->elr & ~3UL); + int i; + + printf("Code: "); + for (i = -4; i < 1; i++) + printf(i == 0 ? "(%08x) " : "%08x ", addr[i]); + printf("\n"); +} + void show_regs(struct pt_regs *regs) { int i; @@ -44,6 +55,7 @@ void show_regs(struct pt_regs *regs) printf("x%-2d: %016lx x%-2d: %016lx\n", i, regs->regs[i], i+1, regs->regs[i+1]); printf("\n"); + dump_instr(regs); } /* -- 2.23.0

2 1

[U-Boot] [PATCH] cmd: avoid decimal conversion
by Michal Simek 12 Oct '19

12 Oct '19

From: T Karthik Reddy <t.karthik.reddy(a)xilinx.com> This patch uses auto instead of decimal in simple_strtoul(). Signed-off-by: T Karthik Reddy <t.karthik.reddy(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- cmd/test.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cmd/test.c b/cmd/test.c index fa0c349f0827..258bfd880653 100644 --- a/cmd/test.c +++ b/cmd/test.c @@ -113,28 +113,28 @@ static int do_test(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) expr = strcmp(ap[0], ap[2]) > 0; break; case OP_INT_EQ: - expr = simple_strtol(ap[0], NULL, 10) == - simple_strtol(ap[2], NULL, 10); + expr = simple_strtol(ap[0], NULL, 0) == + simple_strtol(ap[2], NULL, 0); break; case OP_INT_NEQ: - expr = simple_strtol(ap[0], NULL, 10) != - simple_strtol(ap[2], NULL, 10); + expr = simple_strtol(ap[0], NULL, 0) != + simple_strtol(ap[2], NULL, 0); break; case OP_INT_LT: - expr = simple_strtol(ap[0], NULL, 10) < - simple_strtol(ap[2], NULL, 10); + expr = simple_strtol(ap[0], NULL, 0) < + simple_strtol(ap[2], NULL, 0); break; case OP_INT_LE: - expr = simple_strtol(ap[0], NULL, 10) <= - simple_strtol(ap[2], NULL, 10); + expr = simple_strtol(ap[0], NULL, 0) <= + simple_strtol(ap[2], NULL, 0); break; case OP_INT_GT: - expr = simple_strtol(ap[0], NULL, 10) > - simple_strtol(ap[2], NULL, 10); + expr = simple_strtol(ap[0], NULL, 0) > + simple_strtol(ap[2], NULL, 0); break; case OP_INT_GE: - expr = simple_strtol(ap[0], NULL, 10) >= - simple_strtol(ap[2], NULL, 10); + expr = simple_strtol(ap[0], NULL, 0) >= + simple_strtol(ap[2], NULL, 0); break; case OP_FILE_EXISTS: expr = file_exists(ap[1], ap[2], ap[3], FS_TYPE_ANY); -- 2.17.1

4 9

[U-Boot] [PATCH 1/2] ARM: asm/io.h: kill off confusing #ifdef __mem_pci block
by Rasmus Villemoes 12 Oct '19

12 Oct '19

No ARM board seems to define __mem_pci - and if it did, one would get tons of ./arch/arm/include/asm/io.h:307:0: warning: "readl" redefined warnings, because readl and friends are unconditionally defined earlier in io.h. Moreover, the redefinitions lack the memory barriers that the first definitions have. So I'm guessing this is practically dead code. Signed-off-by: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> --- arch/arm/include/asm/io.h | 41 --------------------------------------- 1 file changed, 41 deletions(-) diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index e6d27b69f9..78b183d42f 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -315,46 +315,6 @@ extern void _memset_io(unsigned long, int, size_t); extern void __readwrite_bug(const char *fn); -/* - * If this architecture has PCI memory IO, then define the read/write - * macros. These should only be used with the cookie passed from - * ioremap. - */ -#ifdef __mem_pci - -#define readb(c) ({ unsigned int __v = __raw_readb(__mem_pci(c)); __v; }) -#define readw(c) ({ unsigned int __v = le16_to_cpu(__raw_readw(__mem_pci(c))); __v; }) -#define readl(c) ({ unsigned int __v = le32_to_cpu(__raw_readl(__mem_pci(c))); __v; }) - -#define writeb(v,c) __raw_writeb(v,__mem_pci(c)) -#define writew(v,c) __raw_writew(cpu_to_le16(v),__mem_pci(c)) -#define writel(v,c) __raw_writel(cpu_to_le32(v),__mem_pci(c)) - -#define memset_io(c,v,l) _memset_io(__mem_pci(c),(v),(l)) -#define memcpy_fromio(a,c,l) _memcpy_fromio((a),__mem_pci(c),(l)) -#define memcpy_toio(c,a,l) _memcpy_toio(__mem_pci(c),(a),(l)) - -#define eth_io_copy_and_sum(s,c,l,b) \ - eth_copy_and_sum((s),__mem_pci(c),(l),(b)) - -static inline int -check_signature(unsigned long io_addr, const unsigned char *signature, - int length) -{ - int retval = 0; - do { - if (readb(io_addr) != *signature) - goto out; - io_addr++; - signature++; - length--; - } while (length); - retval = 1; -out: - return retval; -} - -#else #define memset_io(a, b, c) memset((void *)(a), (b), (c)) #define memcpy_fromio(a, b, c) memcpy((a), (void *)(b), (c)) #define memcpy_toio(a, b, c) memcpy((void *)(a), (b), (c)) @@ -373,7 +333,6 @@ out: #define check_signature(io,sig,len) (0) #endif -#endif /* __mem_pci */ /* * If this architecture has ISA IO, then define the isa_read/isa_write -- 2.20.1

2 3

[U-Boot] [PATCH] spl: Introduce SPL_DM_SPI Kconfig define
by Lukasz Majewski 12 Oct '19

12 Oct '19

This define indicates if DM_SPI shall be supported in SPL. This allows proper operation of DM converted SPI drivers in SPL, which use #if !CONFIG_IS_ENABLED(DM_SPI) to also support not yet DM/DTS converted boards. Signed-off-by: Lukasz Majewski <lukma(a)denx.de> --- Applied on top of -master branch: SHA1: 448f11f7503995746a7b71e5e3b3a831c4651be9 This patch is a first step for converting SPI #defines to Kconfig. It was a part of "CONFIG_DM_SPI* to CONFIG_$(SPL_TPL_)DM_SPI*" patch: https://patchwork.ozlabs.org/patch/1158141/ which in spite of not introducing the apparent build breaks, was responsible for some deltas in SPL and U-Boot proper sizes (some parts of SPI code was not compiled in). To fix those board/SoC access to real HW is necessary as well as deep understanding of SPL SPI requirements. --- common/spl/Kconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 7c3391cabe..183ecf6264 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -683,6 +683,13 @@ config SPL_UBI Enable support for loading payloads from UBI. See README.ubispl for more info. +if SPL_DM +config SPL_DM_SPI + bool "Support SPI DM drivers in SPL" + help + Enable support for SPI DM drivers in SPL. + +endif if SPL_UBI config SPL_UBI_LOAD_BY_VOLNAME bool "Support loading volumes by name" -- 2.11.0

2 2

[U-Boot] [PATCH] spl: mmc: Fix indentation in spl_mmc.c file
by Lukasz Majewski 12 Oct '19

12 Oct '19

From: Mans Rullgard <mans(a)mansr.com> This fixes a wrongly indented block of code. Signed-off-by: Mans Rullgard <mans(a)mansr.com> [lukma: Make the commit message more verbose] Signed-off-by: Lukasz Majewski <lukma(a)denx.de> --- common/spl/spl_mmc.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index b3619889f7..2caceb5186 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -334,28 +334,28 @@ int spl_mmc_load(struct spl_image_info *spl_image, err = -EINVAL; switch (boot_mode) { case MMCSD_MODE_EMMCBOOT: - /* - * We need to check what the partition is configured to. - * 1 and 2 match up to boot0 / boot1 and 7 is user data - * which is the first physical partition (0). - */ - part = (mmc->part_config >> 3) & PART_ACCESS_MASK; - - if (part == 7) - part = 0; - - if (CONFIG_IS_ENABLED(MMC_TINY)) - err = mmc_switch_part(mmc, part); - else - err = blk_dselect_hwpart(mmc_get_blk_desc(mmc), part); - - if (err) { + /* + * We need to check what the partition is configured to. + * 1 and 2 match up to boot0 / boot1 and 7 is user data + * which is the first physical partition (0). + */ + part = (mmc->part_config >> 3) & PART_ACCESS_MASK; + + if (part == 7) + part = 0; + + if (CONFIG_IS_ENABLED(MMC_TINY)) + err = mmc_switch_part(mmc, part); + else + err = blk_dselect_hwpart(mmc_get_blk_desc(mmc), part); + + if (err) { #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT - puts("spl: mmc partition switch failed\n"); + puts("spl: mmc partition switch failed\n"); #endif - return err; - } - /* Fall through */ + return err; + } + /* Fall through */ case MMCSD_MODE_RAW: debug("spl: mmc boot mode: raw\n"); -- 2.11.0

2 2