June 2022 - U-Boot

[PATCH] rockchip: rockpro64: enable leds
by Peter Robinson 29 Jun '22

29 Jun '22

The Rockpro64 has some GPIO leds so let's enable them so the user gets some output in early boot. Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com> --- configs/rockpro64-rk3399_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig index e6f7a8469a3..b0c3527fab0 100644 --- a/configs/rockpro64-rk3399_defconfig +++ b/configs/rockpro64-rk3399_defconfig @@ -42,6 +42,8 @@ CONFIG_AHCI_PCI=y CONFIG_SATA_SIL=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_LED=y +CONFIG_LED_GPIO=y CONFIG_MISC=y CONFIG_ROCKCHIP_EFUSE=y CONFIG_MMC_DW=y -- 2.36.1

2 1

[PATCH] rockchip: pinebook-pro: minor SPI flash fixes
by Peter Robinson 29 Jun '22

29 Jun '22

Set a default offset for environment so it doesn't write it to unexpected locations, drop unneeded mtd config option. Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com> --- configs/pinebook-pro-rk3399_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pinebook-pro-rk3399_defconfig b/configs/pinebook-pro-rk3399_defconfig index 8ca1d0708f9..aaa52c6ea70 100644 --- a/configs/pinebook-pro-rk3399_defconfig +++ b/configs/pinebook-pro-rk3399_defconfig @@ -5,6 +5,7 @@ CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x8000 +CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro" CONFIG_ROCKCHIP_RK3399=y CONFIG_TARGET_PINEBOOK_PRO_RK3399=y @@ -22,7 +23,6 @@ CONFIG_MISC_INIT_R=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 -CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_SPI_LOAD=y CONFIG_TPL=y CONFIG_CMD_BOOTZ=y -- 2.36.1

2 1

[PATCH] configs: ast2600: Move SPL bss section to DRAM space
by Chia-Wei Wang 29 Jun '22

29 Jun '22

The commit b583348ca8c8 ("image: fit: Align hash output buffers") places the hash output buffer at the .bss section. However, AST2600 by default executes SPL in the NOR flash XIP way. This results in the hash output cannot be written to the buffer as it is located at the R/X only region. We need to move the .bss section out of the SPL body to the DRAM space, where hash output can be written to. This patch includes: - Define the .bss section base and size - A new SPL linker script is added with a separate .bss region specified - Enable CONFIG_SPL_SEPARATE_BSS kconfig option Signed-off-by: Chia-Wei Wang <chiawei_wang(a)aspeedtech.com> --- arch/arm/mach-aspeed/ast2600/u-boot-spl.lds | 94 +++++++++++++++++++++ configs/evb-ast2600_defconfig | 3 + include/configs/evb_ast2600.h | 3 + 3 files changed, 100 insertions(+) create mode 100644 arch/arm/mach-aspeed/ast2600/u-boot-spl.lds diff --git a/arch/arm/mach-aspeed/ast2600/u-boot-spl.lds b/arch/arm/mach-aspeed/ast2600/u-boot-spl.lds new file mode 100644 index 0000000000..22b4e16d35 --- /dev/null +++ b/arch/arm/mach-aspeed/ast2600/u-boot-spl.lds @@ -0,0 +1,94 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (c) 2004-2008 Texas Instruments + * + * (C) Copyright 2002 + * Gary Jennejohn, DENX Software Engineering, <garyj(a)denx.de> + * + * (C) Copyright 2022 + * Chia-Wei Wang <chiawei_wang(a)aspeedtech.com> + */ + +MEMORY { .nor : ORIGIN = CONFIG_SPL_TEXT_BASE, + LENGTH = CONFIG_SPL_SIZE_LIMIT } +MEMORY { .bss : ORIGIN = CONFIG_SPL_BSS_START_ADDR, + LENGTH = CONFIG_SPL_BSS_MAX_SIZE } + +OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + . = 0x00000000; + + . = ALIGN(4); + .text : + { + __image_copy_start = .; + *(.vectors) + CPUDIR/start.o (.text*) + *(.text*) + *(.glue*) + } > .nor + + . = ALIGN(4); + .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } > .nor + + . = ALIGN(4); + .data : { + *(.data*) + } > .nor + + . = ALIGN(4); + .u_boot_list : { + KEEP(*(SORT(.u_boot_list*))); + } > .nor + + . = ALIGN(4); + .binman_sym_table : { + __binman_sym_start = .; + KEEP(*(SORT(.binman_sym*))); + __binman_sym_end = .; + } > .nor + + . = ALIGN(4); + + __image_copy_end = .; + + .rel.dyn : { + __rel_dyn_start = .; + *(.rel*) + __rel_dyn_end = .; + } > .nor + + .end : + { + *(.__end) + } > .nor + + _image_binary_end = .; + + .bss : { + __bss_start = .; + *(.bss*) + . = ALIGN(4); + __bss_end = .; + } > .bss + + __bss_size = __bss_end - __bss_start; +} + +#if defined(IMAGE_MAX_SIZE) +ASSERT(__image_copy_end - __image_copy_start <= (IMAGE_MAX_SIZE), \ + "SPL image too big"); +#endif + +#if defined(CONFIG_SPL_BSS_MAX_SIZE) +ASSERT(__bss_end - __bss_start <= (CONFIG_SPL_BSS_MAX_SIZE), \ + "SPL image BSS too big"); +#endif + +#if defined(CONFIG_SPL_MAX_FOOTPRINT) +ASSERT(__bss_end - _start <= (CONFIG_SPL_MAX_FOOTPRINT), \ + "SPL image plus BSS too big"); +#endif diff --git a/configs/evb-ast2600_defconfig b/configs/evb-ast2600_defconfig index f84b723bbb..d19e1d79ec 100644 --- a/configs/evb-ast2600_defconfig +++ b/configs/evb-ast2600_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_DCACHE_OFF=y CONFIG_SPL_SYS_THUMB_BUILD=y +CONFIG_SPL_LDSCRIPT="arch/arm/mach-aspeed/ast2600/u-boot-spl.lds" CONFIG_ARCH_ASPEED=y CONFIG_SYS_TEXT_BASE=0x80000000 CONFIG_SYS_MALLOC_LEN=0x2000000 @@ -35,6 +36,8 @@ CONFIG_SPL_SIZE_LIMIT_SUBTRACT_MALLOC=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000000 +CONFIG_SPL_SEPARATE_BSS=y +# CONFIG_TPL_SEPARATE_BSS is not set CONFIG_SPL_FIT_IMAGE_TINY=y CONFIG_SPL_DM_RESET=y CONFIG_SPL_RAM_SUPPORT=y diff --git a/include/configs/evb_ast2600.h b/include/configs/evb_ast2600.h index 3c2155da46..54abb29df9 100644 --- a/include/configs/evb_ast2600.h +++ b/include/configs/evb_ast2600.h @@ -10,6 +10,9 @@ #define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SPL_BSS_START_ADDR 0x83000000 +#define CONFIG_SPL_BSS_MAX_SIZE 0x01000000 + /* Misc */ #define STR_HELPER(s) #s #define STR(s) STR_HELPER(s) -- 2.25.1

6 6

[PATCH v2] fs/squashfs: Use kcalloc when relevant
by Miquel Raynal 29 Jun '22

29 Jun '22

A crafted squashfs image could embed a huge number of empty metadata blocks in order to make the amount of malloc()'d memory overflow and be much smaller than expected. Because of this flaw, any random code positioned at the right location in the squashfs image could be memcpy'd from the squashfs structures into U-Boot code location while trying to access the rearmost blocks, before being executed. In order to prevent this vulnerability from being exploited in eg. a secure boot environment, let's add a check over the amount of data that is going to be allocated. Such a check could look like: if (!elem_size || n > SIZE_MAX / elem_size) return NULL; The right way to do it would be to enhance the calloc() implementation but this is quite an impacting change for such a small fix. Another solution would be to add the check before the malloc call in the squashfs implementation, but this does not look right. So for now, let's use the kcalloc() compatibility function from Linux, which has this check. Fixes: c5100613037 ("fs/squashfs: new filesystem") Reported-by: Tatsuhiko Yasumatsu <Tatsuhiko.Yasumatsu(a)sony.com> Signed-off-by: Miquel Raynal <miquel.raynal(a)bootlin.com> Tested-by: Tatsuhiko Yasumatsu <Tatsuhiko.Yasumatsu(a)sony.com> --- Changes in v2: * Fixed the title prefix: s/sqashfs/squashfs * Rebased on master to avoid a conflit with a headers change * Added a Fixes tag * Added the Tested-by from Tatsuhiko sent privately fs/squashfs/sqfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/squashfs/sqfs.c b/fs/squashfs/sqfs.c index 40361ffa6d6..9f98d086070 100644 --- a/fs/squashfs/sqfs.c +++ b/fs/squashfs/sqfs.c @@ -13,6 +13,7 @@ #include <fs.h> #include <linux/types.h> #include <asm/byteorder.h> +#include <linux/compat.h> #include <memalign.h> #include <stdlib.h> #include <string.h> @@ -726,7 +727,8 @@ static int sqfs_read_inode_table(unsigned char **inode_table) goto free_itb; } - *inode_table = malloc(metablks_count * SQFS_METADATA_BLOCK_SIZE); + *inode_table = kcalloc(metablks_count, SQFS_METADATA_BLOCK_SIZE, + GFP_KERNEL); if (!*inode_table) { ret = -ENOMEM; printf("Error: failed to allocate squashfs inode_table of size %i, increasing CONFIG_SYS_MALLOC_LEN could help\n", -- 2.34.1

2 1

[RESEND PATCH 0/4] imx8mn_bsh_smm_s2: fix NAND booting
by Dario Binacchi 29 Jun '22

29 Jun '22

The series contains all the patches required by the BSH smm s2 board for booting from NAND and properly mounting the UBI rootfs. Dario Binacchi (4): configs: imx8mn_bsh_smm_s2: add NAND driver configs: imx8mn_bsh_smm_s2: add UBI commands configs: imx8mn_bsh_smm_s2: remove console from bootargs configs: imx8mn_bsh_smm_s2: add mtdparts to bootargs configs/imx8mn_bsh_smm_s2_defconfig | 6 ++++++ include/configs/imx8mn_bsh_smm_s2.h | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) -- 2.32.0

2 8

[PATCH] i2c: fix stack buffer overflow vulnerability in i2c md command
by nicolas.iooss.ledger＠proton.me 29 Jun '22

29 Jun '22

From: Nicolas Iooss <nicolas.iooss+uboot(a)ledger.fr> When running "i2c md 0 0 80000100", the function do_i2c_md parses the length into an unsigned int variable named length. The value is then moved to a signed variable: int nbytes = length; #define DISP_LINE_LEN 16 int linebytes = (nbytes > DISP_LINE_LEN) ? DISP_LINE_LEN : nbytes; ret = dm_i2c_read(dev, addr, linebuf, linebytes); On systems where integers are 32 bits wide, 0x80000100 is a negative value to "nbytes > DISP_LINE_LEN" is false and linebytes gets assigned 0x80000100 instead of 16. The consequence is that the function which reads from the i2c device (dm_i2c_read or i2c_read) is called with a 16-byte stack buffer to fill but with a size parameter which is too large. In some cases, this could trigger a crash. But with some i2c drivers, such as drivers/i2c/nx_i2c.c (used with "nexell,s5pxx18-i2c" bus), the size is actually truncated to a 16-bit integer. This is because function i2c_transfer expects an unsigned short length. In such a case, an attacker who can control the response of an i2c device can overwrite the return address of a function and execute arbitrary code through Return-Oriented Programming. Fix this issue by using unsigned integers types in do_i2c_md. While at it, make also alen unsigned, as signed sizes can cause vulnerabilities when people forgot to check that they can be negative. Signed-off-by: Nicolas Iooss <nicolas.iooss+uboot(a)ledger.fr> --- cmd/i2c.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cmd/i2c.c b/cmd/i2c.c index 9050b2b8d27a..bd04b14024be 100644 --- a/cmd/i2c.c +++ b/cmd/i2c.c @@ -200,10 +200,10 @@ void i2c_init_board(void) * * Returns the address length. */ -static uint get_alen(char *arg, int default_len) +static uint get_alen(char *arg, uint default_len) { - int j; - int alen; + uint j; + uint alen; alen = default_len; for (j = 0; j < 8; j++) { @@ -247,7 +247,7 @@ static int do_i2c_read(struct cmd_tbl *cmdtp, int flag, int argc, { uint chip; uint devaddr, length; - int alen; + uint alen; u_char *memaddr; int ret; #if CONFIG_IS_ENABLED(DM_I2C) @@ -301,7 +301,7 @@ static int do_i2c_write(struct cmd_tbl *cmdtp, int flag, int argc, { uint chip; uint devaddr, length; - int alen; + uint alen; u_char *memaddr; int ret; #if CONFIG_IS_ENABLED(DM_I2C) @@ -469,8 +469,8 @@ static int do_i2c_md(struct cmd_tbl *cmdtp, int flag, int argc, { uint chip; uint addr, length; - int alen; - int j, nbytes, linebytes; + uint alen; + uint j, nbytes, linebytes; int ret; #if CONFIG_IS_ENABLED(DM_I2C) struct udevice *dev; @@ -589,9 +589,9 @@ static int do_i2c_mw(struct cmd_tbl *cmdtp, int flag, int argc, { uint chip; ulong addr; - int alen; + uint alen; uchar byte; - int count; + uint count; int ret; #if CONFIG_IS_ENABLED(DM_I2C) struct udevice *dev; @@ -676,8 +676,8 @@ static int do_i2c_crc(struct cmd_tbl *cmdtp, int flag, int argc, { uint chip; ulong addr; - int alen; - int count; + uint alen; + uint count; uchar byte; ulong crc; ulong err; @@ -985,7 +985,7 @@ static int do_i2c_loop(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { uint chip; - int alen; + uint alen; uint addr; uint length; u_char bytes[16]; -- 2.32.0

4 4

Pull request: u-boot-imx u-boot-imx-20220628
by Stefano Babic 28 Jun '22

28 Jun '22

Hi Tom, last i.MX's fixes for the release. The following changes since commit bfa9306e140c136e43d0efc9574991db46ad8c9e: Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi (2022-06-26 21:06:08 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-20220628 for you to fetch changes up to b5023254b88a67fcbca913e212e3401dea521fc9: kontron-sl-mx8mm: Add CAAM support (2022-06-28 15:24:31 +0200) ---------------------------------------------------------------- Fixes for 2022.07 CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/12541 ---------------------------------------------------------------- Andrejs Cainikovs (1): imx8m: fixup thermal trips Fabio Estevam (1): kontron-sl-mx8mm: Add CAAM support Francesco Dolcini (3): toradex: apalis/colibri_imx6: Fix CLKO1/CLKO2 output mx6: ddr: Fix disabling on-die termination board: apalis_imx6: DDR init using mx6_dram_cfg() Frieder Schrempf (2): pmic: pca9450: Add optional SD_VSEL GPIO for LDO5 imx: kontron-sl-mx8mm: Enable PCA9450 regulator driver and fix SD card access Marek Vasut (1): ARM: imx: Switch Data Modul i.MX8M Mini eDM SBC to USB251x Hub driver arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 17 +++++ arch/arm/mach-imx/imx8m/Kconfig | 3 + arch/arm/mach-imx/imx8m/soc.c | 49 ++++++++++++++ arch/arm/mach-imx/mx6/ddr.c | 13 +++- board/data_modul/imx8mm_edm_sbc/imx8mm_data_modul_edm_sbc.c | 9 +++ board/kontron/sl-mx8mm/spl.c | 9 +++ board/toradex/apalis_imx6/apalis_imx6.c | 456 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------- board/toradex/colibri_imx6/colibri_imx6.c | 14 ++-- configs/imx8mm_data_modul_edm_sbc_defconfig | 1 + configs/kontron-sl-mx8mm_defconfig | 2 + drivers/power/pmic/pca9450.c | 27 ++++++++ include/configs/imx8mm_data_modul_edm_sbc.h | 20 ------ 12 files changed, 333 insertions(+), 287 deletions(-) Best regards, Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

2 1

[PATCH 0/8] powerpc: mpc85xx: Fix and cleanup mpc85xx code
by Pali Rohár 28 Jun '22

28 Jun '22

This patch series fixes support for CONFIG_OF_SEPARATE option, cleanup linker scripts and change code so TEXT_BASE address is set o expected value. Tested on P2020 based board. Pali Rohár (8): powerpc: mpc85xx: Fix CONFIG_OF_SEPARATE support powerpc: mpc85xx: Remove duplicate u-boot-nand.lds powerpc: mpc85xx: Remove u-boot-nand_spl.lds powerpc: mpc85xx: Remove useless SIZEOF_HEADERS and .interp from ld script powerpc: mpc85xx: Put bss after image when not including reset vector powerpc: mpc85xx: Define linker sections in ascending order powerpc: mpc85xx: Set TEXT_BASE addresses to real base values board: freescale: p1_p2_rdb_pc: Simplify SPL offset macros arch/powerpc/cpu/mpc85xx/start.S | 4 +- arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 97 -------------------- arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 68 -------------- arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 25 ++--- arch/powerpc/cpu/mpc85xx/u-boot.lds | 37 +++----- configs/P1010RDB-PA_36BIT_NAND_defconfig | 6 +- configs/P1010RDB-PA_36BIT_SDCARD_defconfig | 4 +- configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig | 4 +- configs/P1010RDB-PA_NAND_defconfig | 6 +- configs/P1010RDB-PA_SDCARD_defconfig | 4 +- configs/P1010RDB-PA_SPIFLASH_defconfig | 4 +- configs/P1010RDB-PB_36BIT_NAND_defconfig | 6 +- configs/P1010RDB-PB_36BIT_SDCARD_defconfig | 4 +- configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig | 4 +- configs/P1010RDB-PB_NAND_defconfig | 6 +- configs/P1010RDB-PB_SDCARD_defconfig | 4 +- configs/P1010RDB-PB_SPIFLASH_defconfig | 4 +- configs/P1020RDB-PC_36BIT_NAND_defconfig | 6 +- configs/P1020RDB-PC_36BIT_SDCARD_defconfig | 4 +- configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 4 +- configs/P1020RDB-PC_NAND_defconfig | 6 +- configs/P1020RDB-PC_SDCARD_defconfig | 4 +- configs/P1020RDB-PC_SPIFLASH_defconfig | 4 +- configs/P1020RDB-PD_NAND_defconfig | 6 +- configs/P1020RDB-PD_SDCARD_defconfig | 4 +- configs/P1020RDB-PD_SPIFLASH_defconfig | 4 +- configs/P2020RDB-PC_36BIT_NAND_defconfig | 6 +- configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 4 +- configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 4 +- configs/P2020RDB-PC_NAND_defconfig | 6 +- configs/P2020RDB-PC_SDCARD_defconfig | 4 +- configs/P2020RDB-PC_SPIFLASH_defconfig | 4 +- configs/T1024RDB_NAND_defconfig | 4 +- configs/T1024RDB_SDCARD_defconfig | 2 +- configs/T1024RDB_SPIFLASH_defconfig | 2 +- configs/T1042D4RDB_NAND_defconfig | 4 +- configs/T1042D4RDB_SDCARD_defconfig | 2 +- configs/T1042D4RDB_SPIFLASH_defconfig | 2 +- configs/T2080QDS_NAND_defconfig | 4 +- configs/T2080QDS_SDCARD_defconfig | 2 +- configs/T2080QDS_SPIFLASH_defconfig | 2 +- configs/T2080RDB_NAND_defconfig | 4 +- configs/T2080RDB_SDCARD_defconfig | 2 +- configs/T2080RDB_SPIFLASH_defconfig | 2 +- configs/T2080RDB_revD_NAND_defconfig | 4 +- configs/T2080RDB_revD_SDCARD_defconfig | 2 +- configs/T2080RDB_revD_SPIFLASH_defconfig | 2 +- configs/T4240RDB_SDCARD_defconfig | 2 +- configs/qemu-ppce500_defconfig | 2 +- include/configs/P1010RDB.h | 10 +- include/configs/T102xRDB.h | 3 + include/configs/T104xRDB.h | 3 + include/configs/T208xQDS.h | 3 + include/configs/T208xRDB.h | 3 + include/configs/p1_p2_rdb_pc.h | 26 +++--- 55 files changed, 127 insertions(+), 322 deletions(-) delete mode 100644 arch/powerpc/cpu/mpc85xx/u-boot-nand.lds delete mode 100644 arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds -- 2.20.1

5 38

[PATCH] board: freescale: p1_p2_rdb_pc: Remove mapping for TDM-PMC card
by Pali Rohár 28 Jun '22

28 Jun '22

>From whole P1/P2 family of RDB boards is TDM-PMC card (PCI Mezzanine Card, Freescale PQ-MDS-T1) available only on P1021RDB and P1025RDB boards. So address mapping for TDM-PMC card on LBC should not be enabled on any other P1/P2 RDB board as there is no device at that TDM-PMC address. Support for P1021RDB and P1025RDB boards was already removed from mainline U-Boot in commits 6d1dd76afe85 ("board/freescale: Remove P1021RDB board support") and d521cece5adb ("board/freescale: Remove P1025RDB board support"). So do not enable TDM-PMC address mapping on remaining P1/P2 RDB boards and remove all macros related to TDM-PMC address mappings. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- board/freescale/p1_p2_rdb_pc/law.c | 1 - board/freescale/p1_p2_rdb_pc/tlb.c | 3 --- include/configs/p1_p2_rdb_pc.h | 9 --------- scripts/config_whitelist.txt | 4 ---- 4 files changed, 17 deletions(-) diff --git a/board/freescale/p1_p2_rdb_pc/law.c b/board/freescale/p1_p2_rdb_pc/law.c index 5f4d713ca569..6bdfb356eede 100644 --- a/board/freescale/p1_p2_rdb_pc/law.c +++ b/board/freescale/p1_p2_rdb_pc/law.c @@ -9,7 +9,6 @@ struct law_entry law_table[] = { SET_LAW(CONFIG_SYS_CPLD_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_LBC), - SET_LAW(CONFIG_SYS_PMC_BASE_PHYS, LAW_SIZE_64K, LAW_TRGT_IF_LBC), #ifdef CONFIG_VSC7385_ENET SET_LAW(CONFIG_SYS_VSC7385_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_LBC), #endif diff --git a/board/freescale/p1_p2_rdb_pc/tlb.c b/board/freescale/p1_p2_rdb_pc/tlb.c index 5931ec650bd8..13f3a1edf68d 100644 --- a/board/freescale/p1_p2_rdb_pc/tlb.c +++ b/board/freescale/p1_p2_rdb_pc/tlb.c @@ -65,9 +65,6 @@ struct fsl_e_tlb_entry tlb_table[] = { SET_TLB_ENTRY(1, CONFIG_SYS_CPLD_BASE, CONFIG_SYS_CPLD_BASE_PHYS, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 6, BOOKE_PAGESZ_1M, 1), - SET_TLB_ENTRY(1, CONFIG_SYS_PMC_BASE, CONFIG_SYS_PMC_BASE_PHYS, - MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, - 0, 10, BOOKE_PAGESZ_64K, 1), #endif /* not SPL */ #ifdef CONFIG_SYS_NAND_BASE diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 50ce2d9aaed4..9102dd819731 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -247,7 +247,6 @@ * 0xf8f8_0000 0xf8ff_ffff L2 SRAM Up to 512K cacheable * (early boot only) * 0xff80_0000 0xff80_7fff NAND flash 32K non-cacheable CS1/0 - * 0xff98_0000 0xff98_ffff PMC 64K non-cacheable CS2 * 0xffa0_0000 0xffaf_ffff CPLD 1M non-cacheable CS3 * 0xffb0_0000 0xffbf_ffff VSC7385 switch 1M non-cacheable CS2 * 0xffc0_0000 0xffc3_ffff PCI IO range 256k non-cacheable @@ -359,14 +358,6 @@ BR_PS_8 | BR_V) #define CONFIG_CPLD_OR_PRELIM (0xfff009f7) -#define CONFIG_SYS_PMC_BASE 0xff980000 -#define CONFIG_SYS_PMC_BASE_PHYS CONFIG_SYS_PMC_BASE -#define CONFIG_PMC_BR_PRELIM (BR_PHYS_ADDR(CONFIG_SYS_PMC_BASE_PHYS) | \ - BR_PS_8 | BR_V) -#define CONFIG_PMC_OR_PRELIM (OR_AM_64KB | OR_GPCM_CSNT | OR_GPCM_XACS | \ - OR_GPCM_SCY | OR_GPCM_TRLX | OR_GPCM_EHTR | \ - OR_GPCM_EAD) - /* Vsc7385 switch */ #ifdef CONFIG_VSC7385_ENET #define __VSCFW_ADDR "vscfw_addr=ef000000\0" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index a6bc234f51ed..33f6d73d3c58 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -637,8 +637,6 @@ CONFIG_PHY_RESET_DELAY CONFIG_PL011_CLOCK CONFIG_PL01x_PORTS CONFIG_PM -CONFIG_PMC_BR_PRELIM -CONFIG_PMC_OR_PRELIM CONFIG_PME_PLAT_CLK_DIV CONFIG_PMU CONFIG_PMW_BASE @@ -1796,8 +1794,6 @@ CONFIG_SYS_PLL_FDR CONFIG_SYS_PLL_ODR CONFIG_SYS_PLL_SETTLING_TIME CONFIG_SYS_PMAN -CONFIG_SYS_PMC_BASE -CONFIG_SYS_PMC_BASE_PHYS CONFIG_SYS_PME_CLK CONFIG_SYS_POST_MEMORY CONFIG_SYS_POST_MEM_REGIONS -- 2.20.1

1 2

[PATCH v3 0/3] usb: add isp1760 hcd support
by Rui Miguel Silva 28 Jun '22

28 Jun '22

Add support for the usb isp1760 host controller family, which for example is present in MPS3 FPGA board from Arm (isp1763). First we move some helper functions and defines to a more common place to be shared by several urb users. (patch 1/3) Then add the driver itself, is a ported version of the kernel actual driver, which I am also the maintainer. (patch 2/3) And last, enable it for the corstone1000 platform that uses that MPS3 board for its implementation (patch 3/3). Cheers, Rui v2[3] -> v3: - when you think you have amend commit and fix stay uncommitted. s/[HC_FIELD_MAX] = {};/[HC_FIELD_MAX] = {},/ v1[0] -> v2: - gentle ping - merge fix from kernel upstream [1] PS: This should go on top of the corstone1000 platform enable series [2] 0: https://lore.kernel.org/u-boot/20220512142016.2025129-1-rui.silva@linaro.or… 1: https://lore.kernel.org/linux-usb/20220516091424.391209-1-linus.walleij@lin… 2: https://lore.kernel.org/u-boot/20220511095541.1461937-1-rui.silva@linaro.or… 3: https://lore.kernel.org/u-boot/20220523090119.1212016-1-rui.silva@linaro.or… Rui Miguel Silva (3): usb: common: move urb code to common usb: add isp1760 family driver corstone1000: enable isp1763 usb controller and mmc Makefile | 1 + configs/corstone1000_defconfig | 3 + drivers/usb/Kconfig | 2 + drivers/usb/common/Makefile | 3 + drivers/usb/common/usb_urb.c | 160 ++ drivers/usb/host/r8a66597-hcd.c | 30 +- drivers/usb/isp1760/Kconfig | 12 + drivers/usb/isp1760/Makefile | 6 + drivers/usb/isp1760/isp1760-core.c | 380 +++ drivers/usb/isp1760/isp1760-core.h | 96 + drivers/usb/isp1760/isp1760-hcd.c | 2477 +++++++++++++++++ drivers/usb/isp1760/isp1760-hcd.h | 81 + drivers/usb/isp1760/isp1760-if.c | 125 + drivers/usb/isp1760/isp1760-regs.h | 292 ++ drivers/usb/isp1760/isp1760-uboot.c | 75 + drivers/usb/isp1760/isp1760-uboot.h | 27 + drivers/usb/musb-new/musb_core.c | 2 +- drivers/usb/musb-new/musb_host.c | 2 +- drivers/usb/musb-new/musb_host.h | 2 +- drivers/usb/musb-new/musb_uboot.c | 38 +- drivers/usb/musb-new/musb_uboot.h | 2 +- include/configs/corstone1000.h | 6 + .../linux/usb/usb_urb_compat.h | 47 +- include/usb_defs.h | 32 + 24 files changed, 3825 insertions(+), 76 deletions(-) create mode 100644 drivers/usb/common/usb_urb.c create mode 100644 drivers/usb/isp1760/Kconfig create mode 100644 drivers/usb/isp1760/Makefile create mode 100644 drivers/usb/isp1760/isp1760-core.c create mode 100644 drivers/usb/isp1760/isp1760-core.h create mode 100644 drivers/usb/isp1760/isp1760-hcd.c create mode 100644 drivers/usb/isp1760/isp1760-hcd.h create mode 100644 drivers/usb/isp1760/isp1760-if.c create mode 100644 drivers/usb/isp1760/isp1760-regs.h create mode 100644 drivers/usb/isp1760/isp1760-uboot.c create mode 100644 drivers/usb/isp1760/isp1760-uboot.h rename drivers/usb/musb-new/usb-compat.h => include/linux/usb/usb_urb_compat.h (59%) -- 2.36.1

3 10