April 2022 - U-Boot

Please pull u-boot-net/next
by Ramon Fried 15 Apr '22

15 Apr '22

Hi Tom, Please pull the latest changes from u-boot-net/next branch which include: * DM9000 DM support * tftp server bug fix * mdio ofnode support functions * Various phy fixes and improvements. The following changes since commit 8221c52d88fbe84ca9692dc23827e21403c952e8: Merge tag 'u-boot-at91-2022.07-a' of https://source.denx.de/u-boot/custodians/u-boot-at91 into next (2022-04-04 08:26:55 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-net.git/next for you to fetch changes up to 0154e6de37e8bbaac837939391f6d4a8f0b3fd18: configs: net: dm9000: Move new Kconfig option to board configs (2022-04-13 15:14:31 +0300) ---------------------------------------------------------------- Arjan Minzinga Zijlstra (1): net: tftp: fix tftp server initialization Haolin Li (1): net: phy: dp83867: Fix a never true comparison Marek Behún (17): net: mdio-uclass: fix type for phy_mode_str and phy_handle_str net: mdio-uclass: use ARRAY_SIZE() net: introduce helpers to get PHY ofnode from MAC net: mdio-uclass: add wrappers for read/write/reset operations treewide: use dm_mdio_read/write/reset() wrappers net: phy: fix parsing wrong property net: introduce helpers to get PHY interface mode from a device/ofnode treewide: Rename PHY_INTERFACE_MODE_COUNT to PHY_INTERFACE_MODE_MAX treewide: Rename PHY_INTERFACE_MODE_NONE to PHY_INTERFACE_MODE_NA phy: Move PHY_INTERFACE_MODE_NA to the beginning of the enum definition net: phy: xilinx: Check interface type in ->config(), not ->probe() net: phy: use ->is_c45 instead of is_10g_interface() bcmgenet, sun8i_emac: Don't connect PHY two times net: phy: don't require PHY interface mode during PHY creation driver: net: ti: keystone_net: Deduplicate code driver: net: ti: keystone_net: Convert to ofnode functions driver: net: ti: keystone_net: Change priv member type Marek Vasut (17): net: dm9000: Make accessor names lowercase net: dm9000: Replace DM9000_DBG() with debug() net: dm9000: Make RxLen and RxStatus lowercase net: dm9000: Drop unused dump_regs() net: dm9000: Turn DM9000_DMP_PACKET() into a function net: dm9000: Drop volatiles net: dm9000: Checkpatch cleanup net: dm9000: Reorder and staticize net: dm9000: Rename board_info to dm9000_priv net: dm9000: Drop static device private data net: dm9000: Drop dm9000.h and staticize SROM access net: dm9000: Pass private data around for IO net: dm9000: Split non-DM specific bits from common code net: dm9000: Receive one packet per recv call net: dm9000: Add DM support net: dm9000: Add Kconfig entry configs: net: dm9000: Move new Kconfig option to board configs Nate Drude (1): phy: adin: add driver for Analog Devices ADIN1300 PHY Tim Harvey (2): net: fec: prevent undesired de-assertion of phy-reset on request net: eth-phy: prevent undesired de-assertion of phy-reset on request Vladimir Oltean (2): net: phy: dp83867: avoid error in dp83867_of_init() when PHY has no OF node net: phy: atheros: avoid error in ar803x_of_init() when PHY has no OF node arch/sandbox/dts/test.dts | 14 ++++ board/CZ.NIC/turris_mox/turris_mox.c | 2 +- board/boundary/nitrogen6x/nitrogen6x.c | 2 +- board/freescale/corenet_ds/eth_hydra.c | 2 +- board/freescale/corenet_ds/eth_superhydra.c | 4 +- board/freescale/t104xrdb/eth.c | 4 +- board/gdsys/a38x/controlcenterdc.c | 7 +- board/gdsys/a38x/ihs_phys.c | 6 +- board/st/stm32f746-disco/stm32f746-disco.c | 13 ++- configs/M5253DEMO_defconfig | 1 + configs/at91sam9261ek_dataflash_cs0_defconfig | 1 + configs/at91sam9261ek_dataflash_cs3_defconfig | 1 + configs/at91sam9261ek_nandflash_defconfig | 1 + configs/ci20_mmc_defconfig | 1 + configs/colibri_pxa270_defconfig | 1 + configs/devkit8000_defconfig | 1 + doc/device-tree-bindings/net/phy/adin.txt | 26 ++++++ drivers/core/ofnode.c | 44 ++++++++++ drivers/core/read.c | 10 +++ drivers/net/Kconfig | 5 ++ drivers/net/ag7xxx.c | 9 +- drivers/net/altera_tse.c | 17 ++-- drivers/net/bcm6348-eth.c | 8 +- drivers/net/bcmgenet.c | 12 +-- drivers/net/designware.c | 10 +-- drivers/net/dm9000x.c | 827 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------ drivers/net/dwc_eth_qos.c | 40 ++------- drivers/net/eth-phy-uclass.c | 2 +- drivers/net/ethoc.c | 4 +- drivers/net/fec_mxc.c | 13 +-- drivers/net/fm/b4860.c | 8 +- drivers/net/fm/eth.c | 13 +-- drivers/net/fm/init.c | 8 +- drivers/net/fm/ls1043.c | 6 +- drivers/net/fm/ls1046.c | 8 +- drivers/net/fm/p1023.c | 4 +- drivers/net/fm/p4080.c | 6 +- drivers/net/fm/p5020.c | 6 +- drivers/net/fm/p5040.c | 6 +- drivers/net/fm/t1024.c | 4 +- drivers/net/fm/t1040.c | 4 +- drivers/net/fm/t2080.c | 6 +- drivers/net/fm/t4240.c | 6 +- drivers/net/fsl_enetc.c | 13 +-- drivers/net/ftgmac100.c | 11 +-- drivers/net/higmacv300.c | 9 +- drivers/net/ldpaa_eth/ldpaa_eth.c | 28 ++----- drivers/net/ldpaa_eth/ldpaa_wriop.c | 10 +-- drivers/net/ldpaa_eth/ls1088a.c | 4 +- drivers/net/ldpaa_eth/ls2080a.c | 4 +- drivers/net/ldpaa_eth/lx2160a.c | 4 +- drivers/net/macb.c | 10 +-- drivers/net/mdio_mux_sandbox.c | 6 +- drivers/net/mscc_eswitch/jr2_switch.c | 2 +- drivers/net/mscc_eswitch/luton_switch.c | 2 +- drivers/net/mscc_eswitch/ocelot_switch.c | 2 +- drivers/net/mscc_eswitch/serval_switch.c | 2 +- drivers/net/mscc_eswitch/servalt_switch.c | 2 +- drivers/net/mt7620-eth.c | 45 ++++------ drivers/net/mtk_eth.c | 8 +- drivers/net/mvgbe.c | 7 +- drivers/net/mvneta.c | 11 +-- drivers/net/mvpp2.c | 9 +- drivers/net/pch_gbe.c | 4 +- drivers/net/phy/Kconfig | 5 ++ drivers/net/phy/Makefile | 1 + drivers/net/phy/adin.c | 228 ++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/net/phy/aquantia.c | 2 +- drivers/net/phy/atheros.c | 2 +- drivers/net/phy/dp83867.c | 9 +- drivers/net/phy/ethernet_id.c | 5 +- drivers/net/phy/phy.c | 120 ++++++++++---------------- drivers/net/phy/xilinx_gmii2rgmii.c | 14 ++-- drivers/net/pic32_eth.c | 11 +-- drivers/net/qe/dm_qe_uec.c | 11 +-- drivers/net/ravb.c | 19 ++--- drivers/net/sh_eth.c | 19 ++--- drivers/net/sni_ave.c | 16 ++-- drivers/net/sni_netsec.c | 10 +-- drivers/net/sun8i_emac.c | 13 +-- drivers/net/sunxi_emac.c | 5 +- drivers/net/ti/am65-cpsw-nuss.c | 15 +--- drivers/net/ti/cpsw.c | 10 +-- drivers/net/ti/keystone_net.c | 194 +++++++++++++++++++----------------------- drivers/net/tsec.c | 9 +- drivers/net/xilinx_axi_emac.c | 10 +-- drivers/net/zynq_gem.c | 9 +- include/_exports.h | 3 +- include/configs/M5253DEMO.h | 1 - include/configs/at91sam9261ek.h | 1 - include/configs/ci20.h | 1 - include/configs/colibri_pxa270.h | 1 - include/configs/devkit8000.h | 1 - include/dm/ofnode.h | 27 ++++++ include/dm/read.h | 36 ++++++++ include/dm9000.h | 16 ---- include/exports.h | 3 +- include/fm_eth.h | 2 +- include/miiphy.h | 31 +++++++ include/phy.h | 41 +++------ include/phy_interface.h | 11 ++- include/vsc9953.h | 2 +- net/mdio-mux-uclass.c | 16 +--- net/mdio-uclass.c | 96 ++++++++++----------- net/tftp.c | 2 + test/dm/mdio.c | 18 ++-- test/dm/mdio_mux.c | 16 ++-- test/dm/ofnode.c | 22 +++++ 108 files changed, 1337 insertions(+), 1113 deletions(-) create mode 100644 doc/device-tree-bindings/net/phy/adin.txt create mode 100644 drivers/net/phy/adin.c delete mode 100644 include/dm9000.h Thanks, Ramon

2 2

[PATCH] CI: Print out unmigrated symbols when failing
by Tom Rini 15 Apr '22

15 Apr '22

To make addressing the problem of migrated symbols being present in board config header files, update the CI test to them print what symbols are causing it to fail. Also report all failures in the tree, rather than stopping at the first failing file. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- .azure-pipelines.yml | 7 +++++-- .gitlab-ci.yml | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 314d27718926..ec77c7ab5fcf 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -63,6 +63,7 @@ stages: - script: | KSYMLST=`mktemp` KUSEDLST=`mktemp` + RET=0 cat `find . -name "Kconfig*"` | \ sed -n -e 's/^\s*config *$[A-Za-z0-9_]*$.*$/CONFIG_\1/p' \ -e 's/^\s*menuconfig *$[A-Za-z0-9_]*$.*$/CONFIG_\1/p' \ @@ -76,10 +77,12 @@ stages: NUM=`comm -123 --total --output-delimiter=, ${KSYMLST} ${KUSEDLST} | \ cut -d , -f 3` if [[ $NUM -ne 0 ]]; then - echo "Unmigrated symbols found in $CFG" - exit 1 + echo "Unmigrated symbols found in $CFG:" + comm -12 ${KSYMLST} ${KUSEDLST} + RET=1 fi done + exit $RET - job: cppcheck displayName: 'Static code analysis with cppcheck' diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 43fe8c64991c..f193ffd3cbc4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -124,6 +124,7 @@ check for migrated symbols in board header: script: - KSYMLST=`mktemp`; KUSEDLST=`mktemp`; + RET=0; cat `find . -name "Kconfig*"` | sed -n -e 's/^\s*config *$[A-Za-z0-9_]*$.*$/CONFIG_\1/p' -e 's/^\s*menuconfig *$[A-Za-z0-9_]*$.*$/CONFIG_\1/p' @@ -137,10 +138,12 @@ check for migrated symbols in board header: NUM=`comm -123 --total --output-delimiter=, ${KSYMLST} ${KUSEDLST} | cut -d , -f 3`; if [[ $NUM -ne 0 ]]; then - echo "Unmigrated symbols found in $CFG"; - exit 1; + echo "Unmigrated symbols found in $CFG:"; + comm -12 ${KSYMLST} ${KUSEDLST}; + RET=1; fi; - done + done; + exit $RET # QA jobs for code analytics # static code analysis with cppcheck (we can add --enable=all later) -- 2.25.1

1 1

[PATCH 1/1] arm: apple: Add M1 Ultra support
by Janne Grunau 15 Apr '22

15 Apr '22

The M1 Ultra consists of two M1 Max dies. The second die's I/O is at a consistent offset of 0x2000000000. Signed-off-by: Janne Grunau <j(a)jannau.net> --- arch/arm/mach-apple/board.c | 167 ++++++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) diff --git a/arch/arm/mach-apple/board.c b/arch/arm/mach-apple/board.c index 722dff1f64c5..ffc1301cf57f 100644 --- a/arch/arm/mach-apple/board.c +++ b/arch/arm/mach-apple/board.c @@ -177,6 +177,171 @@ static struct mm_region t6000_mem_map[] = { } }; +/* Apple M1 Ultra */ + +static struct mm_region t6002_mem_map[] = { + { + /* I/O */ + .virt = 0x280000000, + .phys = 0x280000000, + .size = SZ_1G, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* I/O */ + .virt = 0x380000000, + .phys = 0x380000000, + .size = SZ_1G, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* I/O */ + .virt = 0x580000000, + .phys = 0x580000000, + .size = SZ_512M, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* PCIE */ + .virt = 0x5a0000000, + .phys = 0x5a0000000, + .size = SZ_512M, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRE) | + PTE_BLOCK_INNER_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* PCIE */ + .virt = 0x5c0000000, + .phys = 0x5c0000000, + .size = SZ_1G, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRE) | + PTE_BLOCK_INNER_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* I/O */ + .virt = 0x700000000, + .phys = 0x700000000, + .size = SZ_1G, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* I/O */ + .virt = 0xb00000000, + .phys = 0xb00000000, + .size = SZ_1G, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* I/O */ + .virt = 0xf00000000, + .phys = 0xf00000000, + .size = SZ_1G, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* I/O */ + .virt = 0x1300000000, + .phys = 0x1300000000, + .size = SZ_1G, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* I/O */ + .virt = 0x2280000000, + .phys = 0x2280000000, + .size = SZ_1G, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* I/O */ + .virt = 0x2380000000, + .phys = 0x2380000000, + .size = SZ_1G, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* I/O */ + .virt = 0x2580000000, + .phys = 0x2580000000, + .size = SZ_512M, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* PCIE */ + .virt = 0x25a0000000, + .phys = 0x25a0000000, + .size = SZ_512M, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRE) | + PTE_BLOCK_INNER_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* PCIE */ + .virt = 0x25c0000000, + .phys = 0x25c0000000, + .size = SZ_1G, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRE) | + PTE_BLOCK_INNER_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* I/O */ + .virt = 0x2700000000, + .phys = 0x2700000000, + .size = SZ_1G, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* I/O */ + .virt = 0x2b00000000, + .phys = 0x2b00000000, + .size = SZ_1G, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* I/O */ + .virt = 0x2f00000000, + .phys = 0x2f00000000, + .size = SZ_1G, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* I/O */ + .virt = 0x3300000000, + .phys = 0x3300000000, + .size = SZ_1G, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* RAM */ + .virt = 0x10000000000, + .phys = 0x10000000000, + .size = 16UL * SZ_1G, + .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | + PTE_BLOCK_INNER_SHARE + }, { + /* Framebuffer */ + .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL_NC) | + PTE_BLOCK_INNER_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* List terminator */ + 0, + } +}; + struct mm_region *mem_map; int board_init(void) @@ -216,6 +381,8 @@ void build_mem_map(void) mem_map = t6000_mem_map; else if (of_machine_is_compatible("apple,t6001")) mem_map = t6000_mem_map; + else if (of_machine_is_compatible("apple,t6002")) + mem_map = t6002_mem_map; else panic("Unsupported SoC\n"); -- 2.35.1

3 3

[PATCH] doc: board: apple: Mention M1 Ultra support
by Mark Kettenis 15 Apr '22

15 Apr '22

U-Boot now supports the M1 Ultra SoC as found in the new Mac Studio. Signed-off-by: Mark Kettenis <kettenis(a)openbsd.org> --- doc/board/apple/m1.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/board/apple/m1.rst b/doc/board/apple/m1.rst index 083bfb0a1a..8fa7637629 100644 --- a/doc/board/apple/m1.rst +++ b/doc/board/apple/m1.rst @@ -10,6 +10,7 @@ the following SoCs work: - Apple M1 SoC (t8103) - Apple M1 Pro SoC (t6000) - Apple M1 Max SoC (t6001) + - Apple M1 Ultra SoC (t6002) On these SoCs the following hardware is supported: @@ -78,5 +79,5 @@ supported SoCs. - Base Address * - M1 (t8103) - 0x235200000 - * - M1 Pro/Max (t6000/t6001) + * - M1 Pro/Max/Ultra (t6000/t6001/t6002) - 0x39b200000 -- 2.35.1

1 0

[PATCH] fs: Allow to compile CMD_UBIFS when SPL is enabled
by Pali Rohár 15 Apr '22

15 Apr '22

Currently there is no UBIFS support in SPL. But macro CONFIG_CMD_UBIFS is defined also when building SPL. when both CMD_UBIFS and SPL are enabled then build process throw compile error. Fix check for ubifs code in fstypes[] to allow compiling CMD_UBIFS only in proper U-Boot. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- fs/fs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/fs.c b/fs/fs.c index 5c3b1ac09e53..7bf8c440886a 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -246,6 +246,7 @@ static struct fstype_info fstypes[] = { .ln = fs_ln_unsupported, }, #endif +#ifndef CONFIG_SPL_BUILD #ifdef CONFIG_CMD_UBIFS { .fstype = FS_TYPE_UBIFS, @@ -265,6 +266,7 @@ static struct fstype_info fstypes[] = { .ln = fs_ln_unsupported, }, #endif +#endif #ifdef CONFIG_FS_BTRFS { .fstype = FS_TYPE_BTRFS, -- 2.20.1

2 1

[PATCH] fs: Allow to compile FS_FAT only for proper U-Boot
by Pali Rohár 15 Apr '22

15 Apr '22

CONFIG_SPL_FS_FAT cannot be disabled when CONFIG_FS_FAT is enabled. Fix it. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- fs/fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/fs.c b/fs/fs.c index 023f89cafec2..5c3b1ac09e53 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -175,7 +175,7 @@ struct fstype_info { }; static struct fstype_info fstypes[] = { -#ifdef CONFIG_FS_FAT +#if CONFIG_IS_ENABLED(FS_FAT) { .fstype = FS_TYPE_FAT, .name = "fat", -- 2.20.1

2 1

[PATCH] Remove duplication of table_compute_checksum function
by Tom Rini 15 Apr '22

15 Apr '22

It seems like there was some merge error when first cleaning up and sharing this function. We have both an inline version of the function in include/tables_csum.h and a non-inline version in lib/tables_csum.c. Rework things so that we only have the non-inline version (due to number of calls, we should not inline this). Fixes: 1befb38b8682 ("x86: Move table csum into separate file") Fixes: 2b445e4d3194 ("x86: Move table csum into separate header") Cc: Alexander Graf <agraf(a)csgraf.de> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- arch/sandbox/include/asm/tables.h | 0 arch/x86/include/asm/tables.h | 13 ------------- drivers/misc/qfw.c | 3 --- include/tables_csum.h | 23 ++++++++++++----------- 4 files changed, 12 insertions(+), 27 deletions(-) delete mode 100644 arch/sandbox/include/asm/tables.h diff --git a/arch/sandbox/include/asm/tables.h b/arch/sandbox/include/asm/tables.h deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/arch/x86/include/asm/tables.h b/arch/x86/include/asm/tables.h index aa938837b65a..37be01240db5 100644 --- a/arch/x86/include/asm/tables.h +++ b/arch/x86/include/asm/tables.h @@ -16,19 +16,6 @@ /* SeaBIOS expects coreboot tables at address range 0x0000-0x1000 */ #define CB_TABLE_ADDR 0x800 -/** - * table_compute_checksum() - Compute a table checksum - * - * This computes an 8-bit checksum for the configuration table. - * All bytes in the configuration table, including checksum itself and - * reserved bytes must add up to zero. - * - * @v: configuration table base address - * @len: configuration table size - * @return: the 8-bit checksum - */ -u8 table_compute_checksum(void *v, int len); - /** * table_fill_string() - Fill a string with pad in the configuration table * diff --git a/drivers/misc/qfw.c b/drivers/misc/qfw.c index 677841aac5ef..1d54b7542b8a 100644 --- a/drivers/misc/qfw.c +++ b/drivers/misc/qfw.c @@ -15,9 +15,6 @@ #include <dm.h> #include <misc.h> #include <tables_csum.h> -#ifdef CONFIG_GENERATE_ACPI_TABLE -#include <asm/tables.h> -#endif #if defined(CONFIG_GENERATE_ACPI_TABLE) && !defined(CONFIG_SANDBOX) /* diff --git a/include/tables_csum.h b/include/tables_csum.h index 5f7edc419ba2..4812333093a1 100644 --- a/include/tables_csum.h +++ b/include/tables_csum.h @@ -6,16 +6,17 @@ #ifndef _TABLES_CSUM_H_ #define _TABLES_CSUM_H_ -static inline u8 table_compute_checksum(void *v, int len) -{ - u8 *bytes = v; - u8 checksum = 0; - int i; - - for (i = 0; i < len; i++) - checksum -= bytes[i]; - - return checksum; -} +/** + * table_compute_checksum() - Compute a table checksum + * + * This computes an 8-bit checksum for the configuration table. + * All bytes in the configuration table, including checksum itself and + * reserved bytes must add up to zero. + * + * @v: configuration table base address + * @len: configuration table size + * @return: the 8-bit checksum + */ +u8 table_compute_checksum(void *v, int len); #endif -- 2.25.1

1 1

[PATCH 0/4] serial: Finish adding puts support
by Sean Anderson 15 Apr '22

15 Apr '22

This series has the remaining patches to [1] which were not applied due to a build error. That error is addressed in patch 1. The remaining patches are unmodified, except for 3 which incorperates Simon's feedback. [1] https://lore.kernel.org/u-boot/20220322205938.1721846-1-sean.anderson@seco.… Sean Anderson (4): serial: Fix _serial_puts using \n\r instead of \r\n serial: sandbox: Implement puts test: serial: Add test for putc/puts serial: smh: Implement puts for DM arch/sandbox/include/asm/serial.h | 22 +++++++++++++ drivers/serial/Kconfig | 2 ++ drivers/serial/sandbox.c | 48 +++++++++++++++++++++++++++-- drivers/serial/serial-uclass.c | 32 +++++++++++++------ drivers/serial/serial_semihosting.c | 31 +++++++++++++++++++ test/dm/serial.c | 19 ++++++++++++ 6 files changed, 142 insertions(+), 12 deletions(-) -- 2.35.1.1320.gc452695387.dirty

2 8

[PATCH] cmd: ubi.c: skip part command if right partition is already attached
by Alexandre Besnard 15 Apr '22

15 Apr '22

Attaching a UBI partition may take a while, since scanning the memory is required. It thus makes sense to avoid a detach/scan/attach cycle when the right partition is already attached, and let the calling process call 'detach' beforehand if it needs it. This commit checks for the currently attached UBI partition, and skips reattaching if not needed, showing an information. Signed-off-by: Alexandre Besnard <alexandre.besnard(a)softathome.com> --- cmd/ubi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmd/ubi.c b/cmd/ubi.c index fe8ac58bac..fccbfdf48d 100644 --- a/cmd/ubi.c +++ b/cmd/ubi.c @@ -511,6 +511,11 @@ int ubi_part(char *part_name, const char *vid_header_offset) struct mtd_info *mtd; int err = 0; + if (ubi && ubi->mtd && !strcmp(ubi->mtd->name, part_name)) { + printf("UBI partition '%s' already selected\n", part_name); + return 0; + } + ubi_detach(); mtd_probe_devices(); -- 2.35.1

2 1

[PATCH] sandbox: Increase default SYS_MALLOC_LEN
by Tom Rini 15 Apr '22

15 Apr '22

Increase the malloc pool on sandbox in order to avoid spurious errors such as: ___________________ test_ut[ut_dm_dm_test_video_comp_bmp32] ____________________ test/py/tests/test_ut.py:43: in test_ut assert output.endswith('Failures: 0') E AssertionError: assert False E + where False = <built-in method endswith of str object at 0x7f5de85efb20>('Failures: 0') E + where <built-in method endswith of str object at 0x7f5de85efb20> = 'Test: dm_test_video_comp_bmp32: video.c\r\r\nSDL renderer does not exist\r\r\ntest/dm/video.c:86, compress_frame_buff..._test_video_comp_bmp32(): 2024 == compress_frame_buffer(uts, dev): Expected 0x7e8 (2024), got 0x1 (1)\r\r\nFailures: 2'.endswith Cc: Simon Glass <sjg(a)chromium.org> Cc: Ramon Fried <rfried.dev(a)gmail.com> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- Kconfig | 1 + configs/sandbox64_defconfig | 1 - configs/sandbox_defconfig | 1 - configs/sandbox_flattree_defconfig | 1 - configs/sandbox_noinst_defconfig | 1 - configs/sandbox_spl_defconfig | 1 - 6 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Kconfig b/Kconfig index 0ee3068b9a66..b45e60a75b93 100644 --- a/Kconfig +++ b/Kconfig @@ -263,6 +263,7 @@ config SYS_MALLOC_F_LEN config SYS_MALLOC_LEN hex "Define memory for Dynamic allocation" + default 0x4000000 if SANDBOX default 0x2000000 if ARCH_ROCKCHIP || ARCH_OMAP2PLUS || ARCH_MESON default 0x200000 if ARCH_BMIPS || X86 default 0x120000 if MACH_SUNIV diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig index 88f9ecbb7fce..a13fa2e2c517 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig @@ -1,5 +1,4 @@ CONFIG_SYS_TEXT_BASE=0 -CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="sandbox64" diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index cb8d590eb642..4d3e4f317fca 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -1,5 +1,4 @@ CONFIG_SYS_TEXT_BASE=0 -CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="sandbox" diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig index 24b272068a19..d799f7ddcad3 100644 --- a/configs/sandbox_flattree_defconfig +++ b/configs/sandbox_flattree_defconfig @@ -1,5 +1,4 @@ CONFIG_SYS_TEXT_BASE=0 -CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="sandbox" diff --git a/configs/sandbox_noinst_defconfig b/configs/sandbox_noinst_defconfig index 9eefe4f1051c..c9430da0f09e 100644 --- a/configs/sandbox_noinst_defconfig +++ b/configs/sandbox_noinst_defconfig @@ -1,5 +1,4 @@ CONFIG_SYS_TEXT_BASE=0x200000 -CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index 0092fea76ba7..13a76e89ea52 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -1,5 +1,4 @@ CONFIG_SYS_TEXT_BASE=0x200000 -CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y -- 2.25.1

2 2