August 2022 - U-Boot

[PATCH v3] common: Drop display_options.h from common header
by Simon Glass 10 Aug '22

10 Aug '22

Move this out of the common header and include it only where needed. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v3: - Rebase to master Changes in v2: - Rebase to master arch/arm/cpu/armv7/s5p-common/cpu_info.c | 1 + arch/arm/mach-at91/arm926ejs/eflash.c | 1 + arch/arm/mach-imx/hab.c | 1 + arch/powerpc/cpu/mpc85xx/cpu.c | 1 + arch/powerpc/cpu/mpc85xx/cpu_init.c | 1 + arch/powerpc/cpu/mpc85xx/tlb.c | 1 + arch/powerpc/cpu/mpc8xx/cpu.c | 1 + arch/powerpc/cpu/mpc8xxx/law.c | 1 + arch/x86/cpu/broadwell/refcode.c | 1 + board/freescale/ls1028a/ls1028a.c | 1 + board/freescale/ls1088a/ls1088a.c | 1 + board/freescale/ls2080aqds/ls2080aqds.c | 1 + board/freescale/ls2080ardb/ls2080ardb.c | 1 + board/freescale/lx2160a/lx2160a.c | 1 + board/freescale/mpc8548cds/mpc8548cds.c | 1 + board/kosagi/novena/novena.c | 1 + board/traverse/ten64/ten64.c | 1 + boot/image-board.c | 1 + boot/image.c | 1 + cmd/acpi.c | 1 + cmd/axi.c | 1 + cmd/bcb.c | 1 + cmd/cpu.c | 1 + cmd/fpgad.c | 1 + cmd/io.c | 1 + cmd/mem.c | 1 + cmd/mmc.c | 1 + cmd/rtc.c | 1 + cmd/sf.c | 1 + cmd/version.c | 1 + common/bloblist.c | 1 + common/board_f.c | 1 + common/board_r.c | 1 + common/console.c | 1 + common/log.c | 1 + common/splash.c | 1 + drivers/core/acpi.c | 1 + drivers/cpu/bmips_cpu.c | 1 + drivers/ddr/fsl/main.c | 1 + drivers/mmc/gen_atmel_mci.c | 1 + drivers/mtd/onenand/onenand_uboot.c | 1 + drivers/mtd/spi/sf_dataflash.c | 1 + drivers/mtd/spi/spi-nor-core.c | 1 + drivers/net/xilinx_axi_emac.c | 1 + drivers/tpm/tpm_atmel_twi.c | 1 + drivers/tpm/tpm_tis_sandbox.c | 1 + fs/fs.c | 1 + include/common.h | 1 - include/display_options.h | 1 + lib/aes.c | 1 + lib/display_options.c | 1 + lib/fdtdec.c | 1 + net/nfs.c | 1 + net/tftp.c | 1 + 54 files changed, 53 insertions(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c index d910282e2b2..fb2920950d4 100644 --- a/arch/arm/cpu/armv7/s5p-common/cpu_info.c +++ b/arch/arm/cpu/armv7/s5p-common/cpu_info.c @@ -4,6 +4,7 @@ * Minkyu Kang <mk7.kang(a)samsung.com> */ #include <common.h> +#include <display_options.h> #include <fdtdec.h> #include <init.h> #include <asm/global_data.h> diff --git a/arch/arm/mach-at91/arm926ejs/eflash.c b/arch/arm/mach-at91/arm926ejs/eflash.c index 043f06a8271..aade13cc014 100644 --- a/arch/arm/mach-at91/arm926ejs/eflash.c +++ b/arch/arm/mach-at91/arm926ejs/eflash.c @@ -43,6 +43,7 @@ * do a read-modify-write for partially programmed pages */ #include <common.h> +#include <display_options.h> #include <flash.h> #include <log.h> #include <asm/io.h> diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index 55317abba23..0d1a7766be8 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -6,6 +6,7 @@ #include <common.h> #include <command.h> #include <config.h> +#include <display_options.h> #include <fuse.h> #include <mapmem.h> #include <image.h> diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index ba9736ebef4..ffa8b602426 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -12,6 +12,7 @@ #include <common.h> #include <cpu_func.h> #include <clock_legacy.h> +#include <display_options.h> #include <init.h> #include <irq_func.h> #include <log.h> diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index 5fa4234fd09..92a7e608ceb 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -10,6 +10,7 @@ */ #include <common.h> +#include <display_options.h> #include <env.h> #include <init.h> #include <net.h> diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c index 4f6778c720d..ab616497fa0 100644 --- a/arch/powerpc/cpu/mpc85xx/tlb.c +++ b/arch/powerpc/cpu/mpc85xx/tlb.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <display_options.h> #include <init.h> #include <asm/bitops.h> #include <asm/global_data.h> diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c index 6d16ed084e6..892283436de 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu.c +++ b/arch/powerpc/cpu/mpc8xx/cpu.c @@ -18,6 +18,7 @@ #include <common.h> #include <cpu_func.h> +#include <display_options.h> #include <net.h> #include <time.h> #include <vsprintf.h> diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c index 713ff172bce..198b5b10a52 100644 --- a/arch/powerpc/cpu/mpc8xxx/law.c +++ b/arch/powerpc/cpu/mpc8xxx/law.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <display_options.h> #include <asm/bitops.h> #include <asm/global_data.h> #include <linux/compiler.h> diff --git a/arch/x86/cpu/broadwell/refcode.c b/arch/x86/cpu/broadwell/refcode.c index aced3e5e26a..94c2e05346a 100644 --- a/arch/x86/cpu/broadwell/refcode.c +++ b/arch/x86/cpu/broadwell/refcode.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <display_options.h> #include <errno.h> #include <init.h> #include <log.h> diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c index 1a7806fad77..faecb609924 100644 --- a/board/freescale/ls1028a/ls1028a.c +++ b/board/freescale/ls1028a/ls1028a.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <display_options.h> #include <init.h> #include <malloc.h> #include <errno.h> diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c index 5bf13dcdeb3..0157377354a 100644 --- a/board/freescale/ls1088a/ls1088a.c +++ b/board/freescale/ls1088a/ls1088a.c @@ -4,6 +4,7 @@ */ #include <common.h> #include <clock_legacy.h> +#include <display_options.h> #include <env.h> #include <i2c.h> #include <init.h> diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c index 5bdafebb6b1..5df85722d1d 100644 --- a/board/freescale/ls2080aqds/ls2080aqds.c +++ b/board/freescale/ls2080aqds/ls2080aqds.c @@ -5,6 +5,7 @@ */ #include <common.h> #include <clock_legacy.h> +#include <display_options.h> #include <env.h> #include <init.h> #include <malloc.h> diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c index f5ebb934eb9..fb0699cb94f 100644 --- a/board/freescale/ls2080ardb/ls2080ardb.c +++ b/board/freescale/ls2080ardb/ls2080ardb.c @@ -5,6 +5,7 @@ */ #include <common.h> #include <clock_legacy.h> +#include <display_options.h> #include <env.h> #include <init.h> #include <malloc.h> diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index a078643708f..5f0cc9eb7e9 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -5,6 +5,7 @@ #include <common.h> #include <clock_legacy.h> +#include <display_options.h> #include <dm.h> #include <init.h> #include <asm/global_data.h> diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index cfb5b0b38bb..dac821f1acc 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <display_options.h> #include <init.h> #include <net.h> #include <pci.h> diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c index 0e1b4a0a46c..815ecf55c4d 100644 --- a/board/kosagi/novena/novena.c +++ b/board/kosagi/novena/novena.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <display_options.h> #include <dm.h> #include <eeprom.h> #include <init.h> diff --git a/board/traverse/ten64/ten64.c b/board/traverse/ten64/ten64.c index bdabc214b26..a15b81b0cfd 100644 --- a/board/traverse/ten64/ten64.c +++ b/board/traverse/ten64/ten64.c @@ -5,6 +5,7 @@ * Copyright 2019-2021 Traverse Technologies */ #include <common.h> +#include <display_options.h> #include <dm/uclass.h> #include <env.h> #include <i2c.h> diff --git a/boot/image-board.c b/boot/image-board.c index b846bff2491..4e4d1c157d7 100644 --- a/boot/image-board.c +++ b/boot/image-board.c @@ -11,6 +11,7 @@ #include <common.h> #include <bootstage.h> #include <cpu_func.h> +#include <display_options.h> #include <env.h> #include <fpga.h> #include <image.h> diff --git a/boot/image.c b/boot/image.c index 5dcb55ba46a..a0d0cc2403d 100644 --- a/boot/image.c +++ b/boot/image.c @@ -9,6 +9,7 @@ #ifndef USE_HOSTCC #include <common.h> #include <env.h> +#include <display_options.h> #include <init.h> #include <lmb.h> #include <log.h> diff --git a/cmd/acpi.c b/cmd/acpi.c index 0e473b415dd..d0fc062ef8c 100644 --- a/cmd/acpi.c +++ b/cmd/acpi.c @@ -5,6 +5,7 @@ */ #include <common.h> #include <command.h> +#include <display_options.h> #include <mapmem.h> #include <acpi/acpi_table.h> #include <asm/acpi_table.h> diff --git a/cmd/axi.c b/cmd/axi.c index 0c80fef0533..b97b43eb7d0 100644 --- a/cmd/axi.c +++ b/cmd/axi.c @@ -13,6 +13,7 @@ #include <axi.h> #include <command.h> #include <console.h> +#include <display_options.h> #include <dm.h> #include <log.h> diff --git a/cmd/bcb.c b/cmd/bcb.c index 92f4d27990d..1bbd1fae998 100644 --- a/cmd/bcb.c +++ b/cmd/bcb.c @@ -9,6 +9,7 @@ #include <bcb.h> #include <command.h> #include <common.h> +#include <display_options.h> #include <log.h> #include <part.h> #include <malloc.h> diff --git a/cmd/cpu.c b/cmd/cpu.c index 2ca4d05ae8a..a09736e1bb9 100644 --- a/cmd/cpu.c +++ b/cmd/cpu.c @@ -8,6 +8,7 @@ #include <common.h> #include <command.h> #include <cpu.h> +#include <display_options.h> #include <dm.h> #include <errno.h> diff --git a/cmd/fpgad.c b/cmd/fpgad.c index e65441bb76a..dfc6220b5e0 100644 --- a/cmd/fpgad.c +++ b/cmd/fpgad.c @@ -11,6 +11,7 @@ #include <common.h> #include <command.h> #include <console.h> +#include <display_options.h> #include <gdsys_fpga.h> diff --git a/cmd/io.c b/cmd/io.c index e23ea627006..2de1111998f 100644 --- a/cmd/io.c +++ b/cmd/io.c @@ -9,6 +9,7 @@ #include <common.h> #include <command.h> +#include <display_options.h> #include <asm/io.h> /* Display values from last command */ diff --git a/cmd/mem.c b/cmd/mem.c index b7511382d3a..7e36927b711 100644 --- a/cmd/mem.c +++ b/cmd/mem.c @@ -16,6 +16,7 @@ #include <cli.h> #include <command.h> #include <console.h> +#include <display_options.h> #include <flash.h> #include <hash.h> #include <log.h> diff --git a/cmd/mmc.c b/cmd/mmc.c index f7b02b3149b..7bd4cd9e016 100644 --- a/cmd/mmc.c +++ b/cmd/mmc.c @@ -8,6 +8,7 @@ #include <blk.h> #include <command.h> #include <console.h> +#include <display_options.h> #include <memalign.h> #include <mmc.h> #include <part.h> diff --git a/cmd/rtc.c b/cmd/rtc.c index 75d4b64d688..a344cfa76b1 100644 --- a/cmd/rtc.c +++ b/cmd/rtc.c @@ -2,6 +2,7 @@ #include <common.h> #include <command.h> +#include <display_options.h> #include <dm.h> #include <hexdump.h> #include <i2c.h> diff --git a/cmd/sf.c b/cmd/sf.c index cd50b38081c..f9ac50e734c 100644 --- a/cmd/sf.c +++ b/cmd/sf.c @@ -7,6 +7,7 @@ #include <common.h> #include <command.h> +#include <display_options.h> #include <div64.h> #include <dm.h> #include <flash.h> diff --git a/cmd/version.c b/cmd/version.c index f83f6aff92c..190ef6a9061 100644 --- a/cmd/version.c +++ b/cmd/version.c @@ -6,6 +6,7 @@ #include <common.h> #include <command.h> +#include <display_options.h> #include <timestamp.h> #include <version.h> #include <version_string.h> diff --git a/common/bloblist.c b/common/bloblist.c index 406073c8105..8488663354b 100644 --- a/common/bloblist.c +++ b/common/bloblist.c @@ -9,6 +9,7 @@ #include <common.h> #include <bloblist.h> +#include <display_options.h> #include <log.h> #include <malloc.h> #include <mapmem.h> diff --git a/common/board_f.c b/common/board_f.c index 5c86faeb217..18e2246733b 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -16,6 +16,7 @@ #include <console.h> #include <cpu.h> #include <cpu_func.h> +#include <display_options.h> #include <dm.h> #include <env.h> #include <env_internal.h> diff --git a/common/board_r.c b/common/board_r.c index ed29069d2de..fcd333e1fbb 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -13,6 +13,7 @@ #include <api.h> #include <bootstage.h> #include <cpu_func.h> +#include <display_options.h> #include <exports.h> #include <flash.h> #include <hang.h> diff --git a/common/console.c b/common/console.c index dc071f1ed66..bde94122399 100644 --- a/common/console.c +++ b/common/console.c @@ -7,6 +7,7 @@ #include <common.h> #include <console.h> #include <debug_uart.h> +#include <display_options.h> #include <dm.h> #include <env.h> #include <stdarg.h> diff --git a/common/log.c b/common/log.c index 7254aa70bfd..57b71ed1b36 100644 --- a/common/log.c +++ b/common/log.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <display_options.h> #include <log.h> #include <malloc.h> #include <asm/global_data.h> diff --git a/common/splash.c b/common/splash.c index 98f0089266d..0e520cc1030 100644 --- a/common/splash.c +++ b/common/splash.c @@ -21,6 +21,7 @@ */ #include <common.h> +#include <display_options.h> #include <env.h> #include <splash.h> #include <lcd.h> diff --git a/drivers/core/acpi.c b/drivers/core/acpi.c index 8457733edb5..0ebd288ab42 100644 --- a/drivers/core/acpi.c +++ b/drivers/core/acpi.c @@ -9,6 +9,7 @@ #define LOG_CATEOGRY LOGC_ACPI #include <common.h> +#include <display_options.h> #include <dm.h> #include <log.h> #include <malloc.h> diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c index 172bc9980f6..3dd04fa8858 100644 --- a/drivers/cpu/bmips_cpu.c +++ b/drivers/cpu/bmips_cpu.c @@ -9,6 +9,7 @@ #include <common.h> #include <cpu.h> +#include <display_options.h> #include <dm.h> #include <errno.h> #include <init.h> diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c index f389e5ef952..1903562ac47 100644 --- a/drivers/ddr/fsl/main.c +++ b/drivers/ddr/fsl/main.c @@ -11,6 +11,7 @@ */ #include <common.h> +#include <display_options.h> #include <dm.h> #include <i2c.h> #include <fsl_ddr_sdram.h> diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c index da81425038d..607a22368cb 100644 --- a/drivers/mmc/gen_atmel_mci.c +++ b/drivers/mmc/gen_atmel_mci.c @@ -10,6 +10,7 @@ #include <common.h> #include <clk.h> +#include <display_options.h> #include <dm.h> #include <log.h> #include <mmc.h> diff --git a/drivers/mtd/onenand/onenand_uboot.c b/drivers/mtd/onenand/onenand_uboot.c index 6893394e089..3a8c7b867eb 100644 --- a/drivers/mtd/onenand/onenand_uboot.c +++ b/drivers/mtd/onenand/onenand_uboot.c @@ -14,6 +14,7 @@ */ #include <common.h> +#include <display_options.h> #include <linux/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/onenand.h> diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c index 85867817c78..34d0dd983d6 100644 --- a/drivers/mtd/spi/sf_dataflash.c +++ b/drivers/mtd/spi/sf_dataflash.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <display_options.h> #include <dm.h> #include <errno.h> #include <fdtdec.h> diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index 8a226a7af55..89ee8ac5552 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -10,6 +10,7 @@ */ #include <common.h> +#include <display_options.h> #include <flash.h> #include <log.h> #include <watchdog.h> diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c index 04277b1269f..d48e342ea08 100644 --- a/drivers/net/xilinx_axi_emac.c +++ b/drivers/net/xilinx_axi_emac.c @@ -9,6 +9,7 @@ #include <config.h> #include <common.h> #include <cpu_func.h> +#include <display_options.h> #include <dm.h> #include <log.h> #include <net.h> diff --git a/drivers/tpm/tpm_atmel_twi.c b/drivers/tpm/tpm_atmel_twi.c index c059ea4cfed..fd2a45d34b0 100644 --- a/drivers/tpm/tpm_atmel_twi.c +++ b/drivers/tpm/tpm_atmel_twi.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <display_options.h> #include <dm.h> #include <tpm-v1.h> #include <i2c.h> diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c index efbeb00ab63..7350e1c4d52 100644 --- a/drivers/tpm/tpm_tis_sandbox.c +++ b/drivers/tpm/tpm_tis_sandbox.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <display_options.h> #include <dm.h> #include <tpm-v1.h> #include <asm/state.h> diff --git a/fs/fs.c b/fs/fs.c index 6de1a3eb6d5..8324b4a22f2 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -7,6 +7,7 @@ #include <command.h> #include <config.h> +#include <display_options.h> #include <errno.h> #include <common.h> #include <env.h> diff --git a/include/common.h b/include/common.h index 71df59bca0e..25c317f4439 100644 --- a/include/common.h +++ b/include/common.h @@ -23,7 +23,6 @@ #include <stdio.h> #include <linux/kernel.h> #include <asm/u-boot.h> /* boot information for Linux kernel */ -#include <display_options.h> #include <vsprintf.h> #endif /* __ASSEMBLY__ */ diff --git a/include/display_options.h b/include/display_options.h index 33fcbb85335..85dacbc7590 100644 --- a/include/display_options.h +++ b/include/display_options.h @@ -19,6 +19,7 @@ * @size: Size to print * @suffix String to print after the size */ +#include <display_options.h> void print_size(uint64_t size, const char *suffix); /** diff --git a/lib/aes.c b/lib/aes.c index 05ec2357024..4fca85ebee2 100644 --- a/lib/aes.c +++ b/lib/aes.c @@ -23,6 +23,7 @@ #ifndef USE_HOSTCC #include <common.h> +#include <display_options.h> #include <log.h> #else #include <string.h> diff --git a/lib/display_options.c b/lib/display_options.c index 360b01bcf5f..7feb446a559 100644 --- a/lib/display_options.c +++ b/lib/display_options.c @@ -7,6 +7,7 @@ #include <common.h> #include <compiler.h> #include <console.h> +#include <display_options.h> #include <div64.h> #include <version_string.h> #include <linux/ctype.h> diff --git a/lib/fdtdec.c b/lib/fdtdec.c index ffa78f97ca0..96b6b71a606 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -6,6 +6,7 @@ #ifndef USE_HOSTCC #include <common.h> #include <boot_fit.h> +#include <display_options.h> #include <dm.h> #include <hang.h> #include <init.h> diff --git a/net/nfs.c b/net/nfs.c index 9152ab742ef..fcb3352dfa9 100644 --- a/net/nfs.c +++ b/net/nfs.c @@ -28,6 +28,7 @@ #include <common.h> #include <command.h> +#include <display_options.h> #include <flash.h> #include <image.h> #include <log.h> diff --git a/net/tftp.c b/net/tftp.c index bfc4c9bde9c..2e3620e059b 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -7,6 +7,7 @@ */ #include <common.h> #include <command.h> +#include <display_options.h> #include <efi_loader.h> #include <env.h> #include <image.h> -- 2.37.1.455.g008518b4e5-goog

2 1

[PATCH 1/1] Makefile: avoid false positive -Wmaybe-uninitialized
by Heinrich Schuchardt 10 Aug '22

10 Aug '22

When compiling with -Og gcc reports false positive -Wmaybe-uninitialized as reported in https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78394. Silence these warnings when building with CONFIG_CC_OPTIMIZE_FOR_DEBUG. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ff25f92974..e6c9ced399 100644 --- a/Makefile +++ b/Makefile @@ -676,6 +676,9 @@ endif # $(dot-config) ifdef CONFIG_CC_OPTIMIZE_FOR_DEBUG KBUILD_HOSTCFLAGS := -Wall -Wstrict-prototypes -Og -g -fomit-frame-pointer \ $(HOST_LFS_CFLAGS) $(HOSTCFLAGS) +# Avoid false positives -Wmaybe-uninitialized +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78394 +KBUILD_HOSTCFLAGS += -Wno-maybe-uninitialized KBUILD_HOSTCXXFLAGS := -Og -g $(HOST_LFS_CFLAGS) $(HOSTCXXFLAGS) endif @@ -696,7 +699,10 @@ KBUILD_CFLAGS += -O2 endif ifdef CONFIG_CC_OPTIMIZE_FOR_DEBUG -KBUILD_CFLAGS += -Og +KBUILD_CFLAGS += -Og -Wno-maybe-uninitialized +# Avoid false positives -Wmaybe-uninitialized +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78394 +KBUILD_CFLAGS += -Wno-maybe-uninitialized endif LTO_CFLAGS := -- 2.36.1

3 2

[PATCH] scripts/config: pick config script from kernel scripts
by Milan P. Stanić 10 Aug '22

10 Aug '22

pulled from kernel tag v5.18 --- scripts/config | 230 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 230 insertions(+) create mode 100755 scripts/config diff --git a/scripts/config b/scripts/config new file mode 100755 index 0000000000..ff88e2faef --- /dev/null +++ b/scripts/config @@ -0,0 +1,230 @@ +#!/usr/bin/env bash +# SPDX-License-Identifier: GPL-2.0 +# Manipulate options in a .config file from the command line + +myname=${0##*/} + +# If no prefix forced, use the default CONFIG_ +CONFIG_="${CONFIG_-CONFIG_}" + +# We use an uncommon delimiter for sed substitutions +SED_DELIM=$(echo -en "\001") + +usage() { + cat >&2 <<EOL +Manipulate options in a .config file from the command line. +Usage: +$myname options command ... +commands: + --enable|-e option Enable option + --disable|-d option Disable option + --module|-m option Turn option into a module + --set-str option string + Set option to "string" + --set-val option value + Set option to value + --undefine|-u option Undefine option + --state|-s option Print state of option (n,y,m,undef) + + --enable-after|-E beforeopt option + Enable option directly after other option + --disable-after|-D beforeopt option + Disable option directly after other option + --module-after|-M beforeopt option + Turn option into module directly after other option + + commands can be repeated multiple times + +options: + --file config-file .config file to change (default .config) + --keep-case|-k Keep next symbols' case (dont' upper-case it) + +$myname doesn't check the validity of the .config file. This is done at next +make time. + +By default, $myname will upper-case the given symbol. Use --keep-case to keep +the case of all following symbols unchanged. + +$myname uses 'CONFIG_' as the default symbol prefix. Set the environment +variable CONFIG_ to the prefix to use. Eg.: CONFIG_="FOO_" $myname ... +EOL + exit 1 +} + +checkarg() { + ARG="$1" + if [ "$ARG" = "" ] ; then + usage + fi + case "$ARG" in + ${CONFIG_}*) + ARG="${ARG/${CONFIG_}/}" + ;; + esac + if [ "$MUNGE_CASE" = "yes" ] ; then + ARG="`echo $ARG | tr a-z A-Z`" + fi +} + +txt_append() { + local anchor="$1" + local insert="$2" + local infile="$3" + local tmpfile="$infile.swp" + + # sed append cmd: 'a\' + newline + text + newline + cmd="$(printf "a\\%b$insert" "\n")" + + sed -e "/$anchor/$cmd" "$infile" >"$tmpfile" + # replace original file with the edited one + mv "$tmpfile" "$infile" +} + +txt_subst() { + local before="$1" + local after="$2" + local infile="$3" + local tmpfile="$infile.swp" + + sed -e "s$SED_DELIM$before$SED_DELIM$after$SED_DELIM" "$infile" >"$tmpfile" + # replace original file with the edited one + mv "$tmpfile" "$infile" +} + +txt_delete() { + local text="$1" + local infile="$2" + local tmpfile="$infile.swp" + + sed -e "/$text/d" "$infile" >"$tmpfile" + # replace original file with the edited one + mv "$tmpfile" "$infile" +} + +set_var() { + local name=$1 new=$2 before=$3 + + name_re="^($name=|# $name is not set)" + before_re="^($before=|# $before is not set)" + if test -n "$before" && grep -Eq "$before_re" "$FN"; then + txt_append "^$before=" "$new" "$FN" + txt_append "^# $before is not set" "$new" "$FN" + elif grep -Eq "$name_re" "$FN"; then + txt_subst "^$name=.*" "$new" "$FN" + txt_subst "^# $name is not set" "$new" "$FN" + else + echo "$new" >>"$FN" + fi +} + +undef_var() { + local name=$1 + + txt_delete "^$name=" "$FN" + txt_delete "^# $name is not set" "$FN" +} + +if [ "$1" = "--file" ]; then + FN="$2" + if [ "$FN" = "" ] ; then + usage + fi + shift 2 +else + FN=.config +fi + +if [ "$1" = "" ] ; then + usage +fi + +MUNGE_CASE=yes +while [ "$1" != "" ] ; do + CMD="$1" + shift + case "$CMD" in + --keep-case|-k) + MUNGE_CASE=no + continue + ;; + --refresh) + ;; + --*-after|-E|-D|-M) + checkarg "$1" + A=$ARG + checkarg "$2" + B=$ARG + shift 2 + ;; + -*) + checkarg "$1" + shift + ;; + esac + case "$CMD" in + --enable|-e) + set_var "${CONFIG_}$ARG" "${CONFIG_}$ARG=y" + ;; + + --disable|-d) + set_var "${CONFIG_}$ARG" "# ${CONFIG_}$ARG is not set" + ;; + + --module|-m) + set_var "${CONFIG_}$ARG" "${CONFIG_}$ARG=m" + ;; + + --set-str) + # sed swallows one level of escaping, so we need double-escaping + set_var "${CONFIG_}$ARG" "${CONFIG_}$ARG=\"${1//\"/\\\\\"}\"" + shift + ;; + + --set-val) + set_var "${CONFIG_}$ARG" "${CONFIG_}$ARG=$1" + shift + ;; + --undefine|-u) + undef_var "${CONFIG_}$ARG" + ;; + + --state|-s) + if grep -q "# ${CONFIG_}$ARG is not set" $FN ; then + echo n + else + V="$(grep "^${CONFIG_}$ARG=" $FN)" + if [ $? != 0 ] ; then + echo undef + else + V="${V/#${CONFIG_}$ARG=/}" + V="${V/#\"/}" + V="${V/%\"/}" + V="${V//\\\"/\"}" + echo "${V}" + fi + fi + ;; + + --enable-after|-E) + set_var "${CONFIG_}$B" "${CONFIG_}$B=y" "${CONFIG_}$A" + ;; + + --disable-after|-D) + set_var "${CONFIG_}$B" "# ${CONFIG_}$B is not set" "${CONFIG_}$A" + ;; + + --module-after|-M) + set_var "${CONFIG_}$B" "${CONFIG_}$B=m" "${CONFIG_}$A" + ;; + + # undocumented because it ignores --file (fixme) + --refresh) + yes "" | make oldconfig + ;; + + *) + echo "bad command: $CMD" >&2 + usage + ;; + esac +done -- 2.37.1

2 1

[PATCH] lz4: Fix compile warning comparison of distinct pointer types
by Pali Rohár 10 Aug '22

10 Aug '22

In file included from include/linux/bitops.h:22, from include/log.h:15, from include/linux/printk.h:4, from include/common.h:20, from lib/lz4_wrapper.c:6: lib/lz4_wrapper.c: In function ‘ulz4fn’: include/linux/kernel.h:184:17: warning: comparison of distinct pointer types lacks a cast (void) (&_min1 == &_min2); \ ^~ lib/lz4_wrapper.c:104:18: note: in expansion of macro ‘min’ size_t size = min((ptrdiff_t)block_size, end - out); ^~~ Signed-off-by: Pali Rohár <pali(a)kernel.org> --- lib/lz4_wrapper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/lz4_wrapper.c b/lib/lz4_wrapper.c index ebcb5c09a22c..5f8f5af012cf 100644 --- a/lib/lz4_wrapper.c +++ b/lib/lz4_wrapper.c @@ -101,7 +101,7 @@ int ulz4fn(const void *src, size_t srcn, void *dst, size_t *dstn) } if (block_header & LZ4F_BLOCKUNCOMPRESSED_FLAG) { - size_t size = min((ptrdiff_t)block_size, end - out); + size_t size = min((ptrdiff_t)block_size, (ptrdiff_t)(end - out)); memcpy(out, in, size); out += size; if (size < block_size) { -- 2.20.1

2 1

[PATCH] MAINTAINERS: Update e-mail address
by Joao Marcos Costa 10 Aug '22

10 Aug '22

Replace former professional address by my personal e-mail. Signed-off-by: Joao Marcos Costa <jmcosta944(a)gmail.com> --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 7f27ff4c20..1b859194d6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1267,7 +1267,7 @@ F: drivers/spmi/ F: include/spmi/ SQUASHFS -M: Joao Marcos Costa <joaomarcos.costa(a)bootlin.com> +M: Joao Marcos Costa <jmcosta944(a)gmail.com> R: Thomas Petazzoni <thomas.petazzoni(a)bootlin.com> R: Miquel Raynal <miquel.raynal(a)bootlin.com> S: Maintained -- 2.25.1

3 2

[PATCH] mmc: Do not send status of send_status is false
by Marek Vasut 10 Aug '22

10 Aug '22

Commit 44645f87de5 ("mmc: Fix mmc_switch excessive timeout") introduced a side effect where CMD13 SEND_STATUS is issued in case mmc_wait_dat0() does not return -ENOSYS and $send_status is not set. This happens on all hardware which does implement .mmc_wait_dat0 callback, e.g. i.MX8M . This leads to lengthy timeout before booting OS in case of eMMC in one of the HS200/HS400 modes, since the card cannot respond to CMD13 while downgrading from HS200/HS400 to regular HS mode. Fix this by adding the missing conditional. Fixes: 44645f87de5 ("mmc: Fix mmc_switch excessive timeout") Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Jaehoon Chung <jh80.chung(a)samsung.com> Cc: Kirill Kapranov <kirill.kapranov(a)compulab.co.il> Cc: Marek Behún <marek.behun(a)nic.cz> Cc: Pantelis Antoniou <panto(a)antoniou-consulting.com> Cc: Ye Li <ye.li(a)nxp.com> --- drivers/mmc/mmc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 12d29da528a..b62baca8457 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -831,6 +831,9 @@ static int __mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value, return 0; } + if (!send_status) + return 0; + /* Finally wait until the card is ready or indicates a failure * to switch. It doesn't hurt to use CMD13 here even if send_status * is false, because by now (after 'timeout_ms' ms) the bus should be -- 2.35.1

4 4

default environment append from kconfig
by Francesco Dolcini 10 Aug '22

10 Aug '22

Hello all, is there any kconfig mechanism in u-boot to append environment variable to the default one? I am aware of CONFIG_USE_DEFAULT_ENV_FILE, but this will completely replace it, looking into the code I was not able to find anything, but I wonder if something from this https://lore.kernel.org/all/20211022030852.1986718-1-sjg@chromium.org/ can be used. Francesco

4 7

Please pull u-boot-dm
by Simon Glass 10 Aug '22

10 Aug '22

Hi Tom, https://source.denx.de/u-boot/custodians/u-boot-dm/-/pipelines/13097 The following changes since commit 3dd4e916324efc825a7ee8e412f5cf1ded839021: Merge https://source.denx.de/u-boot/custodians/u-boot-marvell (2022-08-09 08:16:14 -0400) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-pull-9aug22 for you to fetch changes up to 6dbca84cc9420a327ccb67719afac976237a9490: boot: allow bootmeth-distro without CONFIG_NET (2022-08-09 11:55:41 -0600) ---------------------------------------------------------------- dtoc fixes with pylint, tests move to setuptools for fdt module ---------------------------------------------------------------- John Keeping (1): boot: allow bootmeth-distro without CONFIG_NET Simon Glass (7): dtoc: Tidy up fdt_tests RunTestCoverage() args dtoc: Tidy up fdt_tests RunTests() dtoc: Fix fdt test coverage dtoc: Move main program into its own function test_fdt: Convert to use argparse dtoc: Correct remaining pylint problems in test_fdt fdt: Move to setuptools boot/Kconfig | 8 +- boot/Makefile | 3 +- boot/pxe_utils.c | 3 +- cmd/Kconfig | 4 +- include/command.h | 2 +- scripts/dtc/README | 106 +++++++++++++++++ scripts/dtc/pylibfdt/Makefile | 5 +- scripts/dtc/pylibfdt/setup.py | 60 ++++++++-- scripts/pylint.base | 2 +- tools/dtoc/test_fdt.py | 326 +++++++++++++++++++++++++++++---------------------- 10 files changed, 358 insertions(+), 161 deletions(-) create mode 100644 scripts/dtc/README Regards, Simon

2 1

[PATCH] pci: Sort resources before assignment
by Leo Yan 10 Aug '22

10 Aug '22

A PCI device can request resource for multiple memory regions, e.g. a PCI device tries to allocate prefetchable memory for two regions, one region size is 0x1000_0000 and another is 0x1_0000_0000. And the PCIe controller provides prefetchable memory window size is 0x1_8000_0000, thus in theory the PCIe controller can meet the memory requirement for the PCI device: 0x1_8000_0000 > 0x1_1000_0000 (0x1000_0000 + 0x1_0000_0000) When allocate the memory region, pciauto_region_allocate() applies the alignment for the start address, we can see the memory regions are allocated as: => pci bar 1.0.0 ID Base Size Width Type ---------------------------------------------------------- 0 0x0000000088000000 0x0000000004000000 32 MEM 1 0x000000008c000000 0x0000000000100000 32 MEM 2 0x0000001000000000 0x0000000010000000 64 MEM Prefetchable 3 0x0000001100000000 0x0000000100000000 64 MEM Prefetchable The problem is for the last memory region, we can see its start address is 0x11_0000_0000 and the size is 0x1_0000_0000, therefore, these two memory regions occupy memory size is: 0x11_0000_0000 + 0x1_0000_0000 - 0x10_0000_0000 = 0x2_0000_0000 The allocated memory region (0x2_0000_0000) is out of the range, because the maximum space provided by PCI controller is only 0x1_8000_0000. To fix this issue, this patch sorts resources with descending, this can give the priority for big chunk memory region, the big memory region is allocated ahead before a small region, so that its start address does not necessarily introduce big hole caused by the alignment, which is finished by function pdev_sort_resources(). And we use another function pdev_assign_resources() to set BARs based on the sorted list. As result, we can see the updated memory regions are altered as below; the end address is: 0x11_0000_0000 + 0x1000_0000, which falls into the permitted memory window. => pci bar 1.0.0 ID Base Size Width Type ---------------------------------------------------------- 0 0x0000000088000000 0x0000000004000000 32 MEM 1 0x000000008c000000 0x0000000000100000 32 MEM 2 0x0000001100000000 0x0000000010000000 64 MEM Prefetchable 3 0x0000001000000000 0x0000000100000000 64 MEM Prefetchable Reported-by: Matsumoto Misako <matsumoto.misako(a)socionext.com> Signed-off-by: Leo Yan <leo.yan(a)linaro.org> --- drivers/pci/pci_auto.c | 104 +++++++++++++++++++++++++++++++---------- 1 file changed, 79 insertions(+), 25 deletions(-) diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c index c7968926a1..69c801fc62 100644 --- a/drivers/pci/pci_auto.c +++ b/drivers/pci/pci_auto.c @@ -14,6 +14,8 @@ #include <log.h> #include <pci.h> #include <time.h> +#include <linux/compiler.h> +#include <linux/list.h> #include "pci_internal.h" /* the user can define CONFIG_SYS_PCI_CACHE_LINE_SIZE to avoid problems */ @@ -21,6 +23,69 @@ #define CONFIG_SYS_PCI_CACHE_LINE_SIZE 8 #endif +struct pci_dev_resource { + struct list_head list; + int bar; + pci_size_t bar_size; + int found_mem64; + struct pci_region *bar_res; +}; + +/* Sort resources by bar size */ +static void pdev_sort_resources(struct pci_dev_resource *new, + struct list_head *head) +{ + struct pci_dev_resource *dev_res; + struct list_head *n; + + /* Fallback is smallest one or list is empty */ + n = head; + list_for_each_entry(dev_res, head, list) { + if (new->bar_size > dev_res->bar_size) { + n = &dev_res->list; + break; + } + } + + /* Insert it just before n */ + list_add_tail(&new->list, n); +} + +static void pdev_assign_resources(struct udevice *dev, struct list_head *head) +{ + struct pci_dev_resource *dev_res; + int bar; + pci_addr_t bar_value; + int ret = 0; + + list_for_each_entry(dev_res, head, list) { + ret = pciauto_region_allocate(dev_res->bar_res, dev_res->bar_size, + &bar_value, dev_res->found_mem64); + if (ret) + printf("PCI: Failed autoconfig bar %x\n", dev_res->bar); + + bar = dev_res->bar; + if (!ret) { + /* Write it out and update our limit */ + dm_pci_write_config32(dev, bar, (u32)bar_value); + + if (dev_res->found_mem64) { + bar += 4; + if (IS_ENABLED(CONFIG_SYS_PCI_64BIT)) + dm_pci_write_config32(dev, bar, + (u32)(bar_value >> 32)); + else + /* + * If we are a 64-bit decoder then increment to + * the upper 32 bits of the bar and force it to + * locate in the lower 4GB of memory. + */ + dm_pci_write_config32(dev, bar, 0x00000000); + } + } + } +} + static void dm_pciauto_setup_device(struct udevice *dev, struct pci_region *mem, struct pci_region *prefetch, @@ -37,6 +102,10 @@ static void dm_pciauto_setup_device(struct udevice *dev, struct pci_region *bar_res = NULL; int found_mem64 = 0; u16 class; + LIST_HEAD(head); + struct pci_dev_resource pdev_resource[6]; + + memset(pdev_resource, 0x0, sizeof(pdev_resource)); dm_pci_read_config16(dev, PCI_COMMAND, &cmdstat); cmdstat = (cmdstat & ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY)) | @@ -64,8 +133,6 @@ static void dm_pciauto_setup_device(struct udevice *dev, for (bar = PCI_BASE_ADDRESS_0; bar < PCI_BASE_ADDRESS_0 + (bars_num * 4); bar += 4) { - int ret = 0; - /* Tickle the BAR and get the response */ dm_pci_write_config32(dev, bar, 0xffffffff); dm_pci_read_config32(dev, bar, &bar_response); @@ -118,30 +185,15 @@ static void dm_pciauto_setup_device(struct udevice *dev, (unsigned long long)bar_size); } - ret = pciauto_region_allocate(bar_res, bar_size, - &bar_value, found_mem64); - if (ret) - printf("PCI: Failed autoconfig bar %x\n", bar); - - if (!ret) { - /* Write it out and update our limit */ - dm_pci_write_config32(dev, bar, (u32)bar_value); + INIT_LIST_HEAD(&pdev_resource[bar_nr].list); + pdev_resource[bar_nr].bar = bar; + pdev_resource[bar_nr].bar_size = bar_size; + pdev_resource[bar_nr].bar_res = bar_res; + pdev_resource[bar_nr].found_mem64 = found_mem64; + pdev_sort_resources(&pdev_resource[bar_nr], &head); - if (found_mem64) { - bar += 4; -#ifdef CONFIG_SYS_PCI_64BIT - dm_pci_write_config32(dev, bar, - (u32)(bar_value >> 32)); -#else - /* - * If we are a 64-bit decoder then increment to - * the upper 32 bits of the bar and force it to - * locate in the lower 4GB of memory. - */ - dm_pci_write_config32(dev, bar, 0x00000000); -#endif - } - } + if (found_mem64) + bar += 4; cmdstat |= (bar_response & PCI_BASE_ADDRESS_SPACE) ? PCI_COMMAND_IO : PCI_COMMAND_MEMORY; @@ -151,6 +203,8 @@ static void dm_pciauto_setup_device(struct udevice *dev, bar_nr++; } + pdev_assign_resources(dev, &head); + /* Configure the expansion ROM address */ if (header_type == PCI_HEADER_TYPE_NORMAL || header_type == PCI_HEADER_TYPE_BRIDGE) { -- 2.25.1

2 1

[PATCH 1/1] git-mailrc: remove invalid entry 'efi'
by Heinrich Schuchardt 10 Aug '22

10 Aug '22

Remove alias 'efi' with invalid data. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- doc/git-mailrc | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/git-mailrc b/doc/git-mailrc index b00c278190..96623c3b4e 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -111,7 +111,6 @@ alias x86 uboot, sjg, bmeng alias dm uboot, sjg alias cfi uboot, stroese alias dfu uboot, lukma -alias efi uboot, agraf alias eth uboot, jhersh alias kerneldoc uboot, marex alias fdt uboot, sjg -- 2.36.1

2 3