From ce743f168a31526508a06280e2c6b9c531a0360c Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Fri, 15 Sep 2023 09:43:23 -0500 Subject: Makefile: Force regeneration of env.txt If the source .env file changes to one that is also older than the generated env.txt file then the .env file is not regenerated. This means when switching board configs we do not regenerate the env. This can be tested with: $ make j721e_evm_a72_defconfig $ make # this may fail to complete but that is okay for this test $ make am64x_evm_a53_defconfig $ make $ vim include/generated/env.txt Note this is still the J721e env not the AM64 config as expected. As ENV_FILE is set based on configuration, regenerate anytime autoconf.h changes. Signed-off-by: Andrew Davis Reviewed-by: Simon Glass --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f67888b1b59..4a2d99e1027 100644 --- a/Makefile +++ b/Makefile @@ -1831,7 +1831,7 @@ quiet_cmd_envc = ENVC $@ touch $@ ; \ fi -include/generated/env.txt: $(wildcard $(ENV_FILE)) +include/generated/env.txt: $(wildcard $(ENV_FILE)) include/generated/autoconf.h $(call cmd,envc) # Write out the resulting environment, converted to a C string -- cgit v1.3.1 From deb746e0f6a22696e5c752e56755436e7e39d028 Mon Sep 17 00:00:00 2001 From: Tony Dinh Date: Tue, 19 Sep 2023 14:27:21 -0700 Subject: bootstd: use ARCH_DMA_MINALIGN in memalign() when allocating memory Use ARCH_DMA_MINALIGN in memalign() when allocating memory to read the script from the media. Ref: https://lore.kernel.org/u-boot/CAJaLiFy05F3Cr4X4G2mVkppXnBEFZrHQ+5CngYN8eJPg8ENWkg@mail.gmail.com/T/#m26daadc2463fe653b814a94e6309e5e6bb6be1d1 Note: this patch depends on the previous patch https://patchwork.ozlabs.org/project/uboot/patch/20230917230649.30357-1-mibodhi@gmail.com/ Signed-off-by: Tony Dinh Reviewed-by: Simon Glass --- boot/bootmeth_script.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/bootmeth_script.c b/boot/bootmeth_script.c index 58c57a2d4b5..345114dabf7 100644 --- a/boot/bootmeth_script.c +++ b/boot/bootmeth_script.c @@ -99,7 +99,7 @@ static int script_read_bootflow_file(struct udevice *bootstd, if (!bflow->subdir) return log_msg_ret("prefix", -ENOMEM); - ret = bootmeth_alloc_file(bflow, 0x10000, 1); + ret = bootmeth_alloc_file(bflow, 0x10000, ARCH_DMA_MINALIGN); if (ret) return log_msg_ret("read", ret); -- cgit v1.3.1 From 3d0fa4a4385e78a26096d9d806cfca6d8a7b7404 Mon Sep 17 00:00:00 2001 From: Patryk Biel Date: Wed, 20 Sep 2023 09:41:20 +0200 Subject: ARM: vexpress_ca9x4: Add missing flash width config option Allow for a proper configuration of CFI flash banks avaialble on the vexpress_ca9x4 board. Without this option, the CFI flash incorrectly detects that the board has two banks of 32MB flash devices, while in reality, the board provides two flash banks, each with 64MB size. As a result, it becomes impossible to e.g. to save u-boot env in flash. According to device tree for this board and its implementation in QEMU, the CFI width should be set to 32 bits. After applying this fix, CFI flash will correctly detect both flash banks each with a size of 64MB. As as result the functionality of e.g. saving u-boot env will work correctly. Tested on QEMU 6.2.0. Cc: Kristian Amlie Signed-off-by: Patryk Biel Reviewed-by: Kristian Amlie --- configs/vexpress_ca9x4_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig index 5cacecc7cbc..ac9c0e1d717 100644 --- a/configs/vexpress_ca9x4_defconfig +++ b/configs/vexpress_ca9x4_defconfig @@ -55,3 +55,4 @@ CONFIG_SMC911X_32_BIT=y CONFIG_BAUDRATE=38400 CONFIG_CONS_INDEX=0 CONFIG_SYS_TIMER_COUNTS_DOWN=y +CONFIG_SYS_FLASH_CFI_WIDTH_32BIT=y -- cgit v1.3.1 From 521ca0fa7832ee67ad2a1de37bf05fe8acd00b06 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 21 Sep 2023 19:32:46 -0400 Subject: Makefile: Allow for board directories to not have a Makefile It is entirely possible at this point to have platforms in U-Boot that do not have board-specific C code (just Kconfig or environment) and so make it optional to have to descend in to and then build in the board directory. Signed-off-by: Tom Rini --- Makefile | 2 +- scripts/Makefile.spl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4a2d99e1027..9d2e31e494a 100644 --- a/Makefile +++ b/Makefile @@ -886,7 +886,7 @@ libs-$(CONFIG_UT_ENV) += test/env/ libs-$(CONFIG_UT_OPTEE) += test/optee/ libs-$(CONFIG_UT_OVERLAY) += test/overlay/ -libs-y += $(if $(BOARDDIR),board/$(BOARDDIR)/) +libs-y += $(if $(wildcard $(srctree)/board/$(BOARDDIR)/Makefile),board/$(BOARDDIR)/) libs-y := $(sort $(libs-y)) diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 15ac87286d5..32f4384657b 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -96,7 +96,7 @@ c_flags := $(KBUILD_CFLAGS) $(cpp_flags) HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(srctree)/board/$(VENDOR)/common/Makefile),y,n) -libs-y += $(if $(BOARDDIR),board/$(BOARDDIR)/) +libs-y += $(if $(wildcard $(srctree)/board/$(BOARDDIR)/Makefile),board/$(BOARDDIR)/) libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/ ifeq ($(CONFIG_TPL_BUILD),y) -- cgit v1.3.1 From db7516b635692d2d4ab9ce0fefa13a637fb4698e Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 21 Sep 2023 19:32:47 -0400 Subject: board: Remove essentially empty board files and Makefiles As part of reviewing a new platform, Daniel Schwierzeck noted that we can have an empty Makefile in the board directory and don't need an empty board.c file as well. Further with further cleanup in the Makefile we can now omit the Makefile entirely. Remove a number of now unnecessary board.c and Makefiles. Signed-off-by: Tom Rini --- board/altera/arria10-socdk/Makefile | 5 ----- board/altera/arria10-socdk/socfpga.c | 6 ------ board/altera/arria5-socdk/Makefile | 7 ------- board/altera/arria5-socdk/socfpga.c | 5 ----- board/altera/cyclone5-socdk/Makefile | 7 ------- board/altera/cyclone5-socdk/socfpga.c | 5 ----- board/altera/stratix10-socdk/Makefile | 7 ------- board/altera/stratix10-socdk/socfpga.c | 7 ------- board/aries/mcvevk/Makefile | 7 ------- board/aries/mcvevk/socfpga.c | 5 ----- board/aspeed/evb_ast2500/Makefile | 1 - board/aspeed/evb_ast2500/evb_ast2500.c | 5 ----- board/aspeed/evb_ast2600/Makefile | 1 - board/aspeed/evb_ast2600/evb_ast2600.c | 5 ----- board/broadcom/bcm968380gerg/Makefile | 3 --- board/broadcom/bcm968380gerg/bcm968380gerg.c | 6 ------ board/broadcom/bcm968380gerg/board.c | 6 ------ board/comtrend/ar5315u/Makefile | 3 --- board/comtrend/ar5315u/ar-5315u.c | 6 ------ board/comtrend/ar5387un/Makefile | 3 --- board/comtrend/ar5387un/ar-5387un.c | 6 ------ board/comtrend/ct5361/Makefile | 3 --- board/comtrend/ct5361/ct-5361.c | 6 ------ board/comtrend/vr3032u/Makefile | 3 --- board/comtrend/vr3032u/vr-3032u.c | 6 ------ board/comtrend/wap5813n/Makefile | 3 --- board/comtrend/wap5813n/wap-5813n.c | 6 ------ board/devboards/dbm-soc1/Makefile | 5 ----- board/devboards/dbm-soc1/socfpga.c | 5 ----- board/ebv/socrates/Makefile | 7 ------- board/ebv/socrates/socfpga.c | 5 ----- board/edgeble/neural-compute-module-2/Makefile | 7 ------- board/edgeble/neural-compute-module-2/neu2.c | 4 ---- board/edgeble/neural-compute-module-6/Makefile | 7 ------- board/edgeble/neural-compute-module-6/neu6.c | 4 ---- board/efi/efi-x86_app/Makefile | 5 ----- board/efi/efi-x86_app/app.c | 6 ------ board/emulation/qemu-x86/Makefile | 5 ----- board/emulation/qemu-x86/qemu-x86.c | 0 board/engicam/px30_core/Makefile | 7 ------- board/engicam/px30_core/px30_core.c | 4 ---- board/geekbuying/geekbox/Makefile | 5 ----- board/geekbuying/geekbox/geekbox.c | 6 ------ board/google/chromebook_link/Makefile | 13 ------------- board/google/chromebook_link/link.c | 6 ------ board/google/chromebook_samus/Makefile | 5 ----- board/google/chromebook_samus/samus.c | 6 ------ board/google/chromebox_panther/Makefile | 5 ----- board/google/chromebox_panther/panther.c | 6 ------ board/hardkernel/odroid_m1/Makefile | 3 --- board/hardkernel/odroid_m1/odroid_m1.c | 1 - board/huawei/hg556a/Makefile | 3 --- board/huawei/hg556a/hg556a.c | 6 ------ board/intel/agilex-socdk/Makefile | 7 ------- board/intel/agilex-socdk/socfpga.c | 7 ------- board/intel/bayleybay/Makefile | 1 - board/intel/bayleybay/bayleybay.c | 7 ------- board/intel/n5x-socdk/Makefile | 7 ------- board/intel/n5x-socdk/socfpga.c | 7 ------- board/is1/Makefile | 5 ----- board/is1/socfpga.c | 4 ---- board/mediatek/mt7620/Makefile | 3 --- board/mediatek/mt7620/board.c | 6 ------ board/mediatek/mt7621/Makefile | 3 --- board/mediatek/mt7621/board.c | 6 ------ board/mediatek/mt7628/Makefile | 3 --- board/mediatek/mt7628/board.c | 8 -------- board/mqmaker/miqi_rk3288/Makefile | 7 ------- board/mqmaker/miqi_rk3288/miqi-rk3288.c | 4 ---- board/netgear/cg3100d/Makefile | 3 --- board/netgear/cg3100d/cg3100d.c | 6 ------ board/pine64/quartz64_rk3566/Makefile | 3 --- board/pine64/quartz64_rk3566/quartz64-rk3566.c | 1 - board/qualcomm/dragonboard845c/Makefile | 9 --------- board/qualcomm/dragonboard845c/dragonboard845c.c | 9 --------- board/radxa/rock/Makefile | 7 ------- board/radxa/rock/rock.c | 6 ------ board/radxa/rock2/Makefile | 7 ------- board/radxa/rock2/rock2.c | 6 ------ board/rikomagic/mk808/Makefile | 3 --- board/rikomagic/mk808/mk808.c | 3 --- board/rockchip/evb_px30/Makefile | 7 ------- board/rockchip/evb_px30/evb_px30.c | 4 ---- board/rockchip/evb_px5/Makefile | 5 ----- board/rockchip/evb_px5/evb-px5.c | 4 ---- board/rockchip/evb_rk3128/Makefile | 5 ----- board/rockchip/evb_rk3128/evk-rk3128.c | 0 board/rockchip/evb_rk3229/Makefile | 7 ------- board/rockchip/evb_rk3229/evb_rk3229.c | 9 --------- board/rockchip/evb_rk3288/Makefile | 7 ------- board/rockchip/evb_rk3288/evb-rk3288.c | 4 ---- board/rockchip/evb_rk3328/Makefile | 7 ------- board/rockchip/evb_rk3328/evb-rk3328.c | 4 ---- board/rockchip/evb_rk3568/Makefile | 7 ------- board/rockchip/evb_rk3568/evb_rk3568.c | 4 ---- board/rockchip/sheep_rk3368/Makefile | 5 ----- board/rockchip/sheep_rk3368/sheep_rk3368.c | 4 ---- board/sagem/f@st1704/Makefile | 3 --- board/sagem/f@st1704/f@st1704.c | 6 ------ board/samsung/starqltechn/Makefile | 9 --------- board/samsung/starqltechn/starqltechn.c | 10 ---------- board/sfr/nb4_ser/Makefile | 3 --- board/sfr/nb4_ser/nb4-ser.c | 6 ------ board/terasic/de0-nano-soc/Makefile | 7 ------- board/terasic/de0-nano-soc/socfpga.c | 5 ----- board/terasic/de10-nano/Makefile | 6 ------ board/terasic/de10-nano/socfpga.c | 5 ----- board/terasic/de10-standard/Makefile | 6 ------ board/terasic/de10-standard/socfpga.c | 5 ----- board/terasic/sockit/Makefile | 7 ------- board/terasic/sockit/socfpga.c | 5 ----- board/theobroma-systems/lion_rk3368/Makefile | 5 ----- board/theobroma-systems/lion_rk3368/lion_rk3368.c | 4 ---- board/vocore/vocore2/Makefile | 3 --- board/vocore/vocore2/board.c | 6 ------ 115 files changed, 601 deletions(-) delete mode 100644 board/altera/arria10-socdk/Makefile delete mode 100644 board/altera/arria10-socdk/socfpga.c delete mode 100644 board/altera/arria5-socdk/Makefile delete mode 100644 board/altera/arria5-socdk/socfpga.c delete mode 100644 board/altera/cyclone5-socdk/Makefile delete mode 100644 board/altera/cyclone5-socdk/socfpga.c delete mode 100644 board/altera/stratix10-socdk/Makefile delete mode 100644 board/altera/stratix10-socdk/socfpga.c delete mode 100644 board/aries/mcvevk/Makefile delete mode 100644 board/aries/mcvevk/socfpga.c delete mode 100644 board/aspeed/evb_ast2500/Makefile delete mode 100644 board/aspeed/evb_ast2500/evb_ast2500.c delete mode 100644 board/aspeed/evb_ast2600/Makefile delete mode 100644 board/aspeed/evb_ast2600/evb_ast2600.c delete mode 100644 board/broadcom/bcm968380gerg/Makefile delete mode 100644 board/broadcom/bcm968380gerg/bcm968380gerg.c delete mode 100644 board/broadcom/bcm968380gerg/board.c delete mode 100644 board/comtrend/ar5315u/Makefile delete mode 100644 board/comtrend/ar5315u/ar-5315u.c delete mode 100644 board/comtrend/ar5387un/Makefile delete mode 100644 board/comtrend/ar5387un/ar-5387un.c delete mode 100644 board/comtrend/ct5361/Makefile delete mode 100644 board/comtrend/ct5361/ct-5361.c delete mode 100644 board/comtrend/vr3032u/Makefile delete mode 100644 board/comtrend/vr3032u/vr-3032u.c delete mode 100644 board/comtrend/wap5813n/Makefile delete mode 100644 board/comtrend/wap5813n/wap-5813n.c delete mode 100644 board/devboards/dbm-soc1/Makefile delete mode 100644 board/devboards/dbm-soc1/socfpga.c delete mode 100644 board/ebv/socrates/Makefile delete mode 100644 board/ebv/socrates/socfpga.c delete mode 100644 board/edgeble/neural-compute-module-2/Makefile delete mode 100644 board/edgeble/neural-compute-module-2/neu2.c delete mode 100644 board/edgeble/neural-compute-module-6/Makefile delete mode 100644 board/edgeble/neural-compute-module-6/neu6.c delete mode 100644 board/efi/efi-x86_app/Makefile delete mode 100644 board/efi/efi-x86_app/app.c delete mode 100644 board/emulation/qemu-x86/Makefile delete mode 100644 board/emulation/qemu-x86/qemu-x86.c delete mode 100644 board/engicam/px30_core/Makefile delete mode 100644 board/engicam/px30_core/px30_core.c delete mode 100644 board/geekbuying/geekbox/Makefile delete mode 100644 board/geekbuying/geekbox/geekbox.c delete mode 100644 board/google/chromebook_link/Makefile delete mode 100644 board/google/chromebook_link/link.c delete mode 100644 board/google/chromebook_samus/Makefile delete mode 100644 board/google/chromebook_samus/samus.c delete mode 100644 board/google/chromebox_panther/Makefile delete mode 100644 board/google/chromebox_panther/panther.c delete mode 100644 board/hardkernel/odroid_m1/Makefile delete mode 100644 board/hardkernel/odroid_m1/odroid_m1.c delete mode 100644 board/huawei/hg556a/Makefile delete mode 100644 board/huawei/hg556a/hg556a.c delete mode 100644 board/intel/agilex-socdk/Makefile delete mode 100644 board/intel/agilex-socdk/socfpga.c delete mode 100644 board/intel/bayleybay/bayleybay.c delete mode 100644 board/intel/n5x-socdk/Makefile delete mode 100644 board/intel/n5x-socdk/socfpga.c delete mode 100644 board/is1/Makefile delete mode 100644 board/is1/socfpga.c delete mode 100644 board/mediatek/mt7620/Makefile delete mode 100644 board/mediatek/mt7620/board.c delete mode 100644 board/mediatek/mt7621/Makefile delete mode 100644 board/mediatek/mt7621/board.c delete mode 100644 board/mediatek/mt7628/Makefile delete mode 100644 board/mediatek/mt7628/board.c delete mode 100644 board/mqmaker/miqi_rk3288/Makefile delete mode 100644 board/mqmaker/miqi_rk3288/miqi-rk3288.c delete mode 100644 board/netgear/cg3100d/Makefile delete mode 100644 board/netgear/cg3100d/cg3100d.c delete mode 100644 board/pine64/quartz64_rk3566/Makefile delete mode 100644 board/pine64/quartz64_rk3566/quartz64-rk3566.c delete mode 100644 board/qualcomm/dragonboard845c/Makefile delete mode 100644 board/qualcomm/dragonboard845c/dragonboard845c.c delete mode 100644 board/radxa/rock/Makefile delete mode 100644 board/radxa/rock/rock.c delete mode 100644 board/radxa/rock2/Makefile delete mode 100644 board/radxa/rock2/rock2.c delete mode 100644 board/rikomagic/mk808/Makefile delete mode 100644 board/rikomagic/mk808/mk808.c delete mode 100644 board/rockchip/evb_px30/Makefile delete mode 100644 board/rockchip/evb_px30/evb_px30.c delete mode 100644 board/rockchip/evb_px5/Makefile delete mode 100644 board/rockchip/evb_px5/evb-px5.c delete mode 100644 board/rockchip/evb_rk3128/Makefile delete mode 100644 board/rockchip/evb_rk3128/evk-rk3128.c delete mode 100644 board/rockchip/evb_rk3229/Makefile delete mode 100644 board/rockchip/evb_rk3229/evb_rk3229.c delete mode 100644 board/rockchip/evb_rk3288/Makefile delete mode 100644 board/rockchip/evb_rk3288/evb-rk3288.c delete mode 100644 board/rockchip/evb_rk3328/Makefile delete mode 100644 board/rockchip/evb_rk3328/evb-rk3328.c delete mode 100644 board/rockchip/evb_rk3568/Makefile delete mode 100644 board/rockchip/evb_rk3568/evb_rk3568.c delete mode 100644 board/rockchip/sheep_rk3368/Makefile delete mode 100644 board/rockchip/sheep_rk3368/sheep_rk3368.c delete mode 100644 board/sagem/f@st1704/Makefile delete mode 100644 board/sagem/f@st1704/f@st1704.c delete mode 100644 board/samsung/starqltechn/Makefile delete mode 100644 board/samsung/starqltechn/starqltechn.c delete mode 100644 board/sfr/nb4_ser/Makefile delete mode 100644 board/sfr/nb4_ser/nb4-ser.c delete mode 100644 board/terasic/de0-nano-soc/Makefile delete mode 100644 board/terasic/de0-nano-soc/socfpga.c delete mode 100644 board/terasic/de10-nano/Makefile delete mode 100644 board/terasic/de10-nano/socfpga.c delete mode 100644 board/terasic/de10-standard/Makefile delete mode 100644 board/terasic/de10-standard/socfpga.c delete mode 100644 board/terasic/sockit/Makefile delete mode 100644 board/terasic/sockit/socfpga.c delete mode 100644 board/theobroma-systems/lion_rk3368/Makefile delete mode 100644 board/theobroma-systems/lion_rk3368/lion_rk3368.c delete mode 100644 board/vocore/vocore2/Makefile delete mode 100644 board/vocore/vocore2/board.c diff --git a/board/altera/arria10-socdk/Makefile b/board/altera/arria10-socdk/Makefile deleted file mode 100644 index 80d00043464..00000000000 --- a/board/altera/arria10-socdk/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# -# Copyright (C) 2015 Altera Corporation - -obj-y := socfpga.o diff --git a/board/altera/arria10-socdk/socfpga.c b/board/altera/arria10-socdk/socfpga.c deleted file mode 100644 index 4c466cb9444..00000000000 --- a/board/altera/arria10-socdk/socfpga.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (C) 2015 Altera Corporation - */ - -#include diff --git a/board/altera/arria5-socdk/Makefile b/board/altera/arria5-socdk/Makefile deleted file mode 100644 index e1c8a6b3c7c..00000000000 --- a/board/altera/arria5-socdk/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2001-2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# (C) Copyright 2010, Thomas Chou - -obj-y := socfpga.o diff --git a/board/altera/arria5-socdk/socfpga.c b/board/altera/arria5-socdk/socfpga.c deleted file mode 100644 index 48bfe329517..00000000000 --- a/board/altera/arria5-socdk/socfpga.c +++ /dev/null @@ -1,5 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2012 Altera Corporation - */ -#include diff --git a/board/altera/cyclone5-socdk/Makefile b/board/altera/cyclone5-socdk/Makefile deleted file mode 100644 index e1c8a6b3c7c..00000000000 --- a/board/altera/cyclone5-socdk/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2001-2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# (C) Copyright 2010, Thomas Chou - -obj-y := socfpga.o diff --git a/board/altera/cyclone5-socdk/socfpga.c b/board/altera/cyclone5-socdk/socfpga.c deleted file mode 100644 index 48bfe329517..00000000000 --- a/board/altera/cyclone5-socdk/socfpga.c +++ /dev/null @@ -1,5 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2012 Altera Corporation - */ -#include diff --git a/board/altera/stratix10-socdk/Makefile b/board/altera/stratix10-socdk/Makefile deleted file mode 100644 index 02a9cadf769..00000000000 --- a/board/altera/stratix10-socdk/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# Copyright (C) 2016-2017 Intel Corporation -# -# SPDX-License-Identifier: GPL-2.0 -# - -obj-y := socfpga.o diff --git a/board/altera/stratix10-socdk/socfpga.c b/board/altera/stratix10-socdk/socfpga.c deleted file mode 100644 index 043fc543f1d..00000000000 --- a/board/altera/stratix10-socdk/socfpga.c +++ /dev/null @@ -1,7 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (C) 2016-2018 Intel Corporation - * - */ - -#include diff --git a/board/aries/mcvevk/Makefile b/board/aries/mcvevk/Makefile deleted file mode 100644 index e1c8a6b3c7c..00000000000 --- a/board/aries/mcvevk/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2001-2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# (C) Copyright 2010, Thomas Chou - -obj-y := socfpga.o diff --git a/board/aries/mcvevk/socfpga.c b/board/aries/mcvevk/socfpga.c deleted file mode 100644 index f173bf84ac6..00000000000 --- a/board/aries/mcvevk/socfpga.c +++ /dev/null @@ -1,5 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2015 Marek Vasut - */ -#include diff --git a/board/aspeed/evb_ast2500/Makefile b/board/aspeed/evb_ast2500/Makefile deleted file mode 100644 index 4564098299d..00000000000 --- a/board/aspeed/evb_ast2500/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-y += evb_ast2500.o diff --git a/board/aspeed/evb_ast2500/evb_ast2500.c b/board/aspeed/evb_ast2500/evb_ast2500.c deleted file mode 100644 index ed162c4095f..00000000000 --- a/board/aspeed/evb_ast2500/evb_ast2500.c +++ /dev/null @@ -1,5 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (c) 2016 Google, Inc - */ -#include diff --git a/board/aspeed/evb_ast2600/Makefile b/board/aspeed/evb_ast2600/Makefile deleted file mode 100644 index 9291db6ee10..00000000000 --- a/board/aspeed/evb_ast2600/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-y += evb_ast2600.o diff --git a/board/aspeed/evb_ast2600/evb_ast2600.c b/board/aspeed/evb_ast2600/evb_ast2600.c deleted file mode 100644 index e6dc8c79525..00000000000 --- a/board/aspeed/evb_ast2600/evb_ast2600.c +++ /dev/null @@ -1,5 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (c) Aspeed Technology Inc. - */ -#include diff --git a/board/broadcom/bcm968380gerg/Makefile b/board/broadcom/bcm968380gerg/Makefile deleted file mode 100644 index a525b7b9b36..00000000000 --- a/board/broadcom/bcm968380gerg/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ - -obj-y += bcm968380gerg.o diff --git a/board/broadcom/bcm968380gerg/bcm968380gerg.c b/board/broadcom/bcm968380gerg/bcm968380gerg.c deleted file mode 100644 index 044b3554ba1..00000000000 --- a/board/broadcom/bcm968380gerg/bcm968380gerg.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2018 Philippe Reynes - */ - -#include diff --git a/board/broadcom/bcm968380gerg/board.c b/board/broadcom/bcm968380gerg/board.c deleted file mode 100644 index 044b3554ba1..00000000000 --- a/board/broadcom/bcm968380gerg/board.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2018 Philippe Reynes - */ - -#include diff --git a/board/comtrend/ar5315u/Makefile b/board/comtrend/ar5315u/Makefile deleted file mode 100644 index 25656a8cac3..00000000000 --- a/board/comtrend/ar5315u/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ - -obj-y += ar-5315u.o diff --git a/board/comtrend/ar5315u/ar-5315u.c b/board/comtrend/ar5315u/ar-5315u.c deleted file mode 100644 index 3437985878e..00000000000 --- a/board/comtrend/ar5315u/ar-5315u.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2018 Álvaro Fernández Rojas - */ - -#include diff --git a/board/comtrend/ar5387un/Makefile b/board/comtrend/ar5387un/Makefile deleted file mode 100644 index 572ae1f0916..00000000000 --- a/board/comtrend/ar5387un/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ - -obj-y += ar-5387un.o diff --git a/board/comtrend/ar5387un/ar-5387un.c b/board/comtrend/ar5387un/ar-5387un.c deleted file mode 100644 index 1e4b7281db6..00000000000 --- a/board/comtrend/ar5387un/ar-5387un.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2017 Álvaro Fernández Rojas - */ - -#include diff --git a/board/comtrend/ct5361/Makefile b/board/comtrend/ct5361/Makefile deleted file mode 100644 index 8b41c4a07e0..00000000000 --- a/board/comtrend/ct5361/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ - -obj-y += ct-5361.o diff --git a/board/comtrend/ct5361/ct-5361.c b/board/comtrend/ct5361/ct-5361.c deleted file mode 100644 index 1e4b7281db6..00000000000 --- a/board/comtrend/ct5361/ct-5361.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2017 Álvaro Fernández Rojas - */ - -#include diff --git a/board/comtrend/vr3032u/Makefile b/board/comtrend/vr3032u/Makefile deleted file mode 100644 index 3542fea5874..00000000000 --- a/board/comtrend/vr3032u/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ - -obj-y += vr-3032u.o diff --git a/board/comtrend/vr3032u/vr-3032u.c b/board/comtrend/vr3032u/vr-3032u.c deleted file mode 100644 index 1e4b7281db6..00000000000 --- a/board/comtrend/vr3032u/vr-3032u.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2017 Álvaro Fernández Rojas - */ - -#include diff --git a/board/comtrend/wap5813n/Makefile b/board/comtrend/wap5813n/Makefile deleted file mode 100644 index b8d4a6d5fd2..00000000000 --- a/board/comtrend/wap5813n/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ - -obj-y += wap-5813n.o diff --git a/board/comtrend/wap5813n/wap-5813n.c b/board/comtrend/wap5813n/wap-5813n.c deleted file mode 100644 index 1e4b7281db6..00000000000 --- a/board/comtrend/wap5813n/wap-5813n.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2017 Álvaro Fernández Rojas - */ - -#include diff --git a/board/devboards/dbm-soc1/Makefile b/board/devboards/dbm-soc1/Makefile deleted file mode 100644 index 88621b04c56..00000000000 --- a/board/devboards/dbm-soc1/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2018 Marek Vasut - -obj-y := socfpga.o diff --git a/board/devboards/dbm-soc1/socfpga.c b/board/devboards/dbm-soc1/socfpga.c deleted file mode 100644 index a907ee605e6..00000000000 --- a/board/devboards/dbm-soc1/socfpga.c +++ /dev/null @@ -1,5 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2018 Marek Vasut - */ -#include diff --git a/board/ebv/socrates/Makefile b/board/ebv/socrates/Makefile deleted file mode 100644 index e1c8a6b3c7c..00000000000 --- a/board/ebv/socrates/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2001-2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# (C) Copyright 2010, Thomas Chou - -obj-y := socfpga.o diff --git a/board/ebv/socrates/socfpga.c b/board/ebv/socrates/socfpga.c deleted file mode 100644 index 48bfe329517..00000000000 --- a/board/ebv/socrates/socfpga.c +++ /dev/null @@ -1,5 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2012 Altera Corporation - */ -#include diff --git a/board/edgeble/neural-compute-module-2/Makefile b/board/edgeble/neural-compute-module-2/Makefile deleted file mode 100644 index 3bfc89fa153..00000000000 --- a/board/edgeble/neural-compute-module-2/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += neu2.o diff --git a/board/edgeble/neural-compute-module-2/neu2.c b/board/edgeble/neural-compute-module-2/neu2.c deleted file mode 100644 index 3d2262ce977..00000000000 --- a/board/edgeble/neural-compute-module-2/neu2.c +++ /dev/null @@ -1,4 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. - */ diff --git a/board/edgeble/neural-compute-module-6/Makefile b/board/edgeble/neural-compute-module-6/Makefile deleted file mode 100644 index 28310b1b345..00000000000 --- a/board/edgeble/neural-compute-module-6/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += neu6.o diff --git a/board/edgeble/neural-compute-module-6/neu6.c b/board/edgeble/neural-compute-module-6/neu6.c deleted file mode 100644 index 3d2262ce977..00000000000 --- a/board/edgeble/neural-compute-module-6/neu6.c +++ /dev/null @@ -1,4 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. - */ diff --git a/board/efi/efi-x86_app/Makefile b/board/efi/efi-x86_app/Makefile deleted file mode 100644 index cb48d1ccc20..00000000000 --- a/board/efi/efi-x86_app/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (c) 2015 Google, Inc - -obj-y += app.o diff --git a/board/efi/efi-x86_app/app.c b/board/efi/efi-x86_app/app.c deleted file mode 100644 index da3445bb1d5..00000000000 --- a/board/efi/efi-x86_app/app.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2015 Google, Inc - */ - -#include diff --git a/board/emulation/qemu-x86/Makefile b/board/emulation/qemu-x86/Makefile deleted file mode 100644 index ff4aaa51c54..00000000000 --- a/board/emulation/qemu-x86/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2015, Bin Meng - -obj-y += qemu-x86.o diff --git a/board/emulation/qemu-x86/qemu-x86.c b/board/emulation/qemu-x86/qemu-x86.c deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/board/engicam/px30_core/Makefile b/board/engicam/px30_core/Makefile deleted file mode 100644 index 321fdb01731..00000000000 --- a/board/engicam/px30_core/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# Copyright (c) 2020 Amarula Solutions(India) -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += px30_core.o diff --git a/board/engicam/px30_core/px30_core.c b/board/engicam/px30_core/px30_core.c deleted file mode 100644 index 3adc2f11dea..00000000000 --- a/board/engicam/px30_core/px30_core.c +++ /dev/null @@ -1,4 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (c) 2020 Amarula Solutions(India) - */ diff --git a/board/geekbuying/geekbox/Makefile b/board/geekbuying/geekbox/Makefile deleted file mode 100644 index ced2ff75a55..00000000000 --- a/board/geekbuying/geekbox/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (c) 2016 Andreas Färber - -obj-y += geekbox.o diff --git a/board/geekbuying/geekbox/geekbox.c b/board/geekbuying/geekbox/geekbox.c deleted file mode 100644 index b0f9a5f9b70..00000000000 --- a/board/geekbuying/geekbox/geekbox.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (c) 2016 Andreas Färber - */ - -#include diff --git a/board/google/chromebook_link/Makefile b/board/google/chromebook_link/Makefile deleted file mode 100644 index d84a84899d1..00000000000 --- a/board/google/chromebook_link/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (c) 2011 The Chromium OS Authors. -# (C) Copyright 2008 -# Graeme Russ, graeme.russ@gmail.com. -# -# (C) Copyright 2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# (C) Copyright 2002 -# Daniel Engström, Omicron Ceti AB, daniel@omicron.se. - -obj-y += link.o diff --git a/board/google/chromebook_link/link.c b/board/google/chromebook_link/link.c deleted file mode 100644 index e357e6218e3..00000000000 --- a/board/google/chromebook_link/link.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2014 Google, Inc - */ - -#include diff --git a/board/google/chromebook_samus/Makefile b/board/google/chromebook_samus/Makefile deleted file mode 100644 index 68c9e4993d6..00000000000 --- a/board/google/chromebook_samus/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (c) 2016 Google, Inc - -obj-y += samus.o diff --git a/board/google/chromebook_samus/samus.c b/board/google/chromebook_samus/samus.c deleted file mode 100644 index 83edf89106a..00000000000 --- a/board/google/chromebook_samus/samus.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2016 Google, Inc - */ - -#include diff --git a/board/google/chromebox_panther/Makefile b/board/google/chromebox_panther/Makefile deleted file mode 100644 index 1a5518f1341..00000000000 --- a/board/google/chromebox_panther/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (c) 2015 Google, Inc - -obj-y += panther.o diff --git a/board/google/chromebox_panther/panther.c b/board/google/chromebox_panther/panther.c deleted file mode 100644 index da3445bb1d5..00000000000 --- a/board/google/chromebox_panther/panther.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2015 Google, Inc - */ - -#include diff --git a/board/hardkernel/odroid_m1/Makefile b/board/hardkernel/odroid_m1/Makefile deleted file mode 100644 index ae8ea3d9781..00000000000 --- a/board/hardkernel/odroid_m1/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ - -obj-y += odroid_m1.o diff --git a/board/hardkernel/odroid_m1/odroid_m1.c b/board/hardkernel/odroid_m1/odroid_m1.c deleted file mode 100644 index 4c027f2a7af..00000000000 --- a/board/hardkernel/odroid_m1/odroid_m1.c +++ /dev/null @@ -1 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ diff --git a/board/huawei/hg556a/Makefile b/board/huawei/hg556a/Makefile deleted file mode 100644 index 43e9be6bbaf..00000000000 --- a/board/huawei/hg556a/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ - -obj-y += hg556a.o diff --git a/board/huawei/hg556a/hg556a.c b/board/huawei/hg556a/hg556a.c deleted file mode 100644 index 1e4b7281db6..00000000000 --- a/board/huawei/hg556a/hg556a.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2017 Álvaro Fernández Rojas - */ - -#include diff --git a/board/intel/agilex-socdk/Makefile b/board/intel/agilex-socdk/Makefile deleted file mode 100644 index b86223a5714..00000000000 --- a/board/intel/agilex-socdk/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# Copyright (C) 2019 Intel Corporation -# -# SPDX-License-Identifier: GPL-2.0 -# - -obj-y := socfpga.o diff --git a/board/intel/agilex-socdk/socfpga.c b/board/intel/agilex-socdk/socfpga.c deleted file mode 100644 index 72a3e0836db..00000000000 --- a/board/intel/agilex-socdk/socfpga.c +++ /dev/null @@ -1,7 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (C) 2019 Intel Corporation - * - */ - -#include diff --git a/board/intel/bayleybay/Makefile b/board/intel/bayleybay/Makefile index fa263b7bf54..8b9934f9968 100644 --- a/board/intel/bayleybay/Makefile +++ b/board/intel/bayleybay/Makefile @@ -2,5 +2,4 @@ # # Copyright (C) 2015, Bin Meng -obj-y += bayleybay.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt_generated.o diff --git a/board/intel/bayleybay/bayleybay.c b/board/intel/bayleybay/bayleybay.c deleted file mode 100644 index 4f63c23a1b4..00000000000 --- a/board/intel/bayleybay/bayleybay.c +++ /dev/null @@ -1,7 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2015, Bin Meng - */ - -#include -#include diff --git a/board/intel/n5x-socdk/Makefile b/board/intel/n5x-socdk/Makefile deleted file mode 100644 index accfdcddcb4..00000000000 --- a/board/intel/n5x-socdk/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# Copyright (C) 2020-2021 Intel Corporation -# -# SPDX-License-Identifier: GPL-2.0 -# - -obj-y := socfpga.o diff --git a/board/intel/n5x-socdk/socfpga.c b/board/intel/n5x-socdk/socfpga.c deleted file mode 100644 index 985ba190d03..00000000000 --- a/board/intel/n5x-socdk/socfpga.c +++ /dev/null @@ -1,7 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (C) 2020-2021 Intel Corporation - * - */ - -#include diff --git a/board/is1/Makefile b/board/is1/Makefile deleted file mode 100644 index e499116b676..00000000000 --- a/board/is1/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2015 Stefan Roese - -obj-y := socfpga.o diff --git a/board/is1/socfpga.c b/board/is1/socfpga.c deleted file mode 100644 index 2a543bf7bad..00000000000 --- a/board/is1/socfpga.c +++ /dev/null @@ -1,4 +0,0 @@ -/* - * Currently nothing special is needed on this board, empty file to - * make build scripts happy - */ diff --git a/board/mediatek/mt7620/Makefile b/board/mediatek/mt7620/Makefile deleted file mode 100644 index db129c5abae..00000000000 --- a/board/mediatek/mt7620/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 - -obj-y += board.o diff --git a/board/mediatek/mt7620/board.c b/board/mediatek/mt7620/board.c deleted file mode 100644 index 119b8fc9e56..00000000000 --- a/board/mediatek/mt7620/board.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (C) 2020 MediaTek Inc. All Rights Reserved. - * - * Author: Weijie Gao - */ diff --git a/board/mediatek/mt7621/Makefile b/board/mediatek/mt7621/Makefile deleted file mode 100644 index db129c5abae..00000000000 --- a/board/mediatek/mt7621/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 - -obj-y += board.o diff --git a/board/mediatek/mt7621/board.c b/board/mediatek/mt7621/board.c deleted file mode 100644 index 0496f3f8067..00000000000 --- a/board/mediatek/mt7621/board.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (C) 2022 MediaTek Inc. All rights reserved. - * - * Author: Weijie Gao - */ diff --git a/board/mediatek/mt7628/Makefile b/board/mediatek/mt7628/Makefile deleted file mode 100644 index db129c5abae..00000000000 --- a/board/mediatek/mt7628/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 - -obj-y += board.o diff --git a/board/mediatek/mt7628/board.c b/board/mediatek/mt7628/board.c deleted file mode 100644 index f837a06fbbf..00000000000 --- a/board/mediatek/mt7628/board.c +++ /dev/null @@ -1,8 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (C) 2020 MediaTek Inc. All Rights Reserved. - * - * Author: Weijie Gao - */ - -#include diff --git a/board/mqmaker/miqi_rk3288/Makefile b/board/mqmaker/miqi_rk3288/Makefile deleted file mode 100644 index ec95affb397..00000000000 --- a/board/mqmaker/miqi_rk3288/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# (C) Copyright 2016 Rockchip Electronics Co., Ltd -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += miqi-rk3288.o diff --git a/board/mqmaker/miqi_rk3288/miqi-rk3288.c b/board/mqmaker/miqi_rk3288/miqi-rk3288.c deleted file mode 100644 index 1649bee063c..00000000000 --- a/board/mqmaker/miqi_rk3288/miqi-rk3288.c +++ /dev/null @@ -1,4 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * (C) Copyright 2016 Rockchip Electronics Co., Ltd - */ diff --git a/board/netgear/cg3100d/Makefile b/board/netgear/cg3100d/Makefile deleted file mode 100644 index 3e05bb55c1b..00000000000 --- a/board/netgear/cg3100d/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ - -obj-y += cg3100d.o diff --git a/board/netgear/cg3100d/cg3100d.c b/board/netgear/cg3100d/cg3100d.c deleted file mode 100644 index 1e4b7281db6..00000000000 --- a/board/netgear/cg3100d/cg3100d.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2017 Álvaro Fernández Rojas - */ - -#include diff --git a/board/pine64/quartz64_rk3566/Makefile b/board/pine64/quartz64_rk3566/Makefile deleted file mode 100644 index c24a40e724d..00000000000 --- a/board/pine64/quartz64_rk3566/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ - -obj-y += quartz64-rk3566.o diff --git a/board/pine64/quartz64_rk3566/quartz64-rk3566.c b/board/pine64/quartz64_rk3566/quartz64-rk3566.c deleted file mode 100644 index 4c027f2a7af..00000000000 --- a/board/pine64/quartz64_rk3566/quartz64-rk3566.c +++ /dev/null @@ -1 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ diff --git a/board/qualcomm/dragonboard845c/Makefile b/board/qualcomm/dragonboard845c/Makefile deleted file mode 100644 index fe585ad2631..00000000000 --- a/board/qualcomm/dragonboard845c/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2022 Sumit Garg -# -# This empty file prevents make error. -# Board logic defined in arch/arm/mach-snapdragon/init_sdm845.c, no custom logic for dragonboard845c so far. -# - -obj-y += dragonboard845c.o diff --git a/board/qualcomm/dragonboard845c/dragonboard845c.c b/board/qualcomm/dragonboard845c/dragonboard845c.c deleted file mode 100644 index c7685de306c..00000000000 --- a/board/qualcomm/dragonboard845c/dragonboard845c.c +++ /dev/null @@ -1,9 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * This empty file prevents make linking error. - * No custom logic for dragonboard845c so far. - * - * (C) Copyright 2022 Sumit Garg - */ - -void noop(void) {} diff --git a/board/radxa/rock/Makefile b/board/radxa/rock/Makefile deleted file mode 100644 index fe94b60c351..00000000000 --- a/board/radxa/rock/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# (C) Copyright 2015 Heiko Stuebner -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += rock.o diff --git a/board/radxa/rock/rock.c b/board/radxa/rock/rock.c deleted file mode 100644 index bdc02a6a792..00000000000 --- a/board/radxa/rock/rock.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * (C) Copyright 2015 Google, Inc - */ - -#include diff --git a/board/radxa/rock2/Makefile b/board/radxa/rock2/Makefile deleted file mode 100644 index caa305bbb57..00000000000 --- a/board/radxa/rock2/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# (C) Copyright 2015 Google, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += rock2.o diff --git a/board/radxa/rock2/rock2.c b/board/radxa/rock2/rock2.c deleted file mode 100644 index bdc02a6a792..00000000000 --- a/board/radxa/rock2/rock2.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * (C) Copyright 2015 Google, Inc - */ - -#include diff --git a/board/rikomagic/mk808/Makefile b/board/rikomagic/mk808/Makefile deleted file mode 100644 index a4d16884dfc..00000000000 --- a/board/rikomagic/mk808/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ - -obj-y += mk808.o diff --git a/board/rikomagic/mk808/mk808.c b/board/rikomagic/mk808/mk808.c deleted file mode 100644 index e0bfc6f3311..00000000000 --- a/board/rikomagic/mk808/mk808.c +++ /dev/null @@ -1,3 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -#include diff --git a/board/rockchip/evb_px30/Makefile b/board/rockchip/evb_px30/Makefile deleted file mode 100644 index 74b0b9f44fa..00000000000 --- a/board/rockchip/evb_px30/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# (C) Copyright 2017 Rockchip Electronics Co., Ltd -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += evb_px30.o diff --git a/board/rockchip/evb_px30/evb_px30.c b/board/rockchip/evb_px30/evb_px30.c deleted file mode 100644 index 29464ae63ec..00000000000 --- a/board/rockchip/evb_px30/evb_px30.c +++ /dev/null @@ -1,4 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * (C) Copyright 2019 Rockchip Electronics Co., Ltd - */ diff --git a/board/rockchip/evb_px5/Makefile b/board/rockchip/evb_px5/Makefile deleted file mode 100644 index 40f6ff8e7e1..00000000000 --- a/board/rockchip/evb_px5/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (c) 2017 Rockchip Electronics Co., Ltd - -obj-y += evb-px5.o diff --git a/board/rockchip/evb_px5/evb-px5.c b/board/rockchip/evb_px5/evb-px5.c deleted file mode 100644 index b81f9708834..00000000000 --- a/board/rockchip/evb_px5/evb-px5.c +++ /dev/null @@ -1,4 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (c) 2017 Andy Yan - */ diff --git a/board/rockchip/evb_rk3128/Makefile b/board/rockchip/evb_rk3128/Makefile deleted file mode 100644 index 078bb898c68..00000000000 --- a/board/rockchip/evb_rk3128/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += evk-rk3128.o diff --git a/board/rockchip/evb_rk3128/evk-rk3128.c b/board/rockchip/evb_rk3128/evk-rk3128.c deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/board/rockchip/evb_rk3229/Makefile b/board/rockchip/evb_rk3229/Makefile deleted file mode 100644 index 65dcd8be35a..00000000000 --- a/board/rockchip/evb_rk3229/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# (C) Copyright 2015 Google, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += evb_rk3229.o diff --git a/board/rockchip/evb_rk3229/evb_rk3229.c b/board/rockchip/evb_rk3229/evb_rk3229.c deleted file mode 100644 index 0b14b241b30..00000000000 --- a/board/rockchip/evb_rk3229/evb_rk3229.c +++ /dev/null @@ -1,9 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * (C) Copyright 2017 Rockchip Electronics Co., Ltd - */ - -#include -#include -#include -#include diff --git a/board/rockchip/evb_rk3288/Makefile b/board/rockchip/evb_rk3288/Makefile deleted file mode 100644 index c11b657601a..00000000000 --- a/board/rockchip/evb_rk3288/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# (C) Copyright 2016 Rockchip Electronics Co., Ltd -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += evb-rk3288.o diff --git a/board/rockchip/evb_rk3288/evb-rk3288.c b/board/rockchip/evb_rk3288/evb-rk3288.c deleted file mode 100644 index 1649bee063c..00000000000 --- a/board/rockchip/evb_rk3288/evb-rk3288.c +++ /dev/null @@ -1,4 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * (C) Copyright 2016 Rockchip Electronics Co., Ltd - */ diff --git a/board/rockchip/evb_rk3328/Makefile b/board/rockchip/evb_rk3328/Makefile deleted file mode 100644 index 81c5de86d47..00000000000 --- a/board/rockchip/evb_rk3328/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# (C) Copyright 2016 Rockchip Electronics Co., Ltd -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += evb-rk3328.o diff --git a/board/rockchip/evb_rk3328/evb-rk3328.c b/board/rockchip/evb_rk3328/evb-rk3328.c deleted file mode 100644 index 1649bee063c..00000000000 --- a/board/rockchip/evb_rk3328/evb-rk3328.c +++ /dev/null @@ -1,4 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * (C) Copyright 2016 Rockchip Electronics Co., Ltd - */ diff --git a/board/rockchip/evb_rk3568/Makefile b/board/rockchip/evb_rk3568/Makefile deleted file mode 100644 index cbda95fe94d..00000000000 --- a/board/rockchip/evb_rk3568/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# (C) Copyright 2021 Rockchip Electronics Co., Ltd -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += evb_rk3568.o diff --git a/board/rockchip/evb_rk3568/evb_rk3568.c b/board/rockchip/evb_rk3568/evb_rk3568.c deleted file mode 100644 index c2fdf95d9a1..00000000000 --- a/board/rockchip/evb_rk3568/evb_rk3568.c +++ /dev/null @@ -1,4 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * (C) Copyright 2021 Rockchip Electronics Co., Ltd - */ diff --git a/board/rockchip/sheep_rk3368/Makefile b/board/rockchip/sheep_rk3368/Makefile deleted file mode 100644 index 9661528114f..00000000000 --- a/board/rockchip/sheep_rk3368/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (c) 2017 Rockchip Electronics Co., Ltd - -obj-y += sheep_rk3368.o diff --git a/board/rockchip/sheep_rk3368/sheep_rk3368.c b/board/rockchip/sheep_rk3368/sheep_rk3368.c deleted file mode 100644 index b81f9708834..00000000000 --- a/board/rockchip/sheep_rk3368/sheep_rk3368.c +++ /dev/null @@ -1,4 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (c) 2017 Andy Yan - */ diff --git a/board/sagem/f@st1704/Makefile b/board/sagem/f@st1704/Makefile deleted file mode 100644 index 08d44a0b88f..00000000000 --- a/board/sagem/f@st1704/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ - -obj-y += f@st1704.o diff --git a/board/sagem/f@st1704/f@st1704.c b/board/sagem/f@st1704/f@st1704.c deleted file mode 100644 index 1e4b7281db6..00000000000 --- a/board/sagem/f@st1704/f@st1704.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2017 Álvaro Fernández Rojas - */ - -#include diff --git a/board/samsung/starqltechn/Makefile b/board/samsung/starqltechn/Makefile deleted file mode 100644 index e017c827a78..00000000000 --- a/board/samsung/starqltechn/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2021 Dzmitry Sankouski -# -# This empty file prevents make error. -# Board logic defined in arch/arm/mach-snapdragon/init_sdm845.c, no custom logic for starqltechn so far. -# - -obj-y += starqltechn.o diff --git a/board/samsung/starqltechn/starqltechn.c b/board/samsung/starqltechn/starqltechn.c deleted file mode 100644 index f2cdb4eec2c..00000000000 --- a/board/samsung/starqltechn/starqltechn.c +++ /dev/null @@ -1,10 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * This empty file prevents make linking error. - * No custom logic for starqltechn so far. - * - * (C) Copyright 2021 Dzmitry Sankouski - * - */ - -void nooop(void) {} diff --git a/board/sfr/nb4_ser/Makefile b/board/sfr/nb4_ser/Makefile deleted file mode 100644 index ab7ad76b2c2..00000000000 --- a/board/sfr/nb4_ser/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ - -obj-y += nb4-ser.o diff --git a/board/sfr/nb4_ser/nb4-ser.c b/board/sfr/nb4_ser/nb4-ser.c deleted file mode 100644 index 1e4b7281db6..00000000000 --- a/board/sfr/nb4_ser/nb4-ser.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2017 Álvaro Fernández Rojas - */ - -#include diff --git a/board/terasic/de0-nano-soc/Makefile b/board/terasic/de0-nano-soc/Makefile deleted file mode 100644 index e1c8a6b3c7c..00000000000 --- a/board/terasic/de0-nano-soc/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2001-2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# (C) Copyright 2010, Thomas Chou - -obj-y := socfpga.o diff --git a/board/terasic/de0-nano-soc/socfpga.c b/board/terasic/de0-nano-soc/socfpga.c deleted file mode 100644 index 48bfe329517..00000000000 --- a/board/terasic/de0-nano-soc/socfpga.c +++ /dev/null @@ -1,5 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2012 Altera Corporation - */ -#include diff --git a/board/terasic/de10-nano/Makefile b/board/terasic/de10-nano/Makefile deleted file mode 100644 index 2cf9240846a..00000000000 --- a/board/terasic/de10-nano/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# Copyright (C) 2017, Intel Corporation -# -# - -obj-y := socfpga.o diff --git a/board/terasic/de10-nano/socfpga.c b/board/terasic/de10-nano/socfpga.c deleted file mode 100644 index f9173f1921f..00000000000 --- a/board/terasic/de10-nano/socfpga.c +++ /dev/null @@ -1,5 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2017, Intel Corporation - */ -#include diff --git a/board/terasic/de10-standard/Makefile b/board/terasic/de10-standard/Makefile deleted file mode 100644 index 2cf9240846a..00000000000 --- a/board/terasic/de10-standard/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# Copyright (C) 2017, Intel Corporation -# -# - -obj-y := socfpga.o diff --git a/board/terasic/de10-standard/socfpga.c b/board/terasic/de10-standard/socfpga.c deleted file mode 100644 index f9173f1921f..00000000000 --- a/board/terasic/de10-standard/socfpga.c +++ /dev/null @@ -1,5 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2017, Intel Corporation - */ -#include diff --git a/board/terasic/sockit/Makefile b/board/terasic/sockit/Makefile deleted file mode 100644 index e1c8a6b3c7c..00000000000 --- a/board/terasic/sockit/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2001-2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# (C) Copyright 2010, Thomas Chou - -obj-y := socfpga.o diff --git a/board/terasic/sockit/socfpga.c b/board/terasic/sockit/socfpga.c deleted file mode 100644 index 48bfe329517..00000000000 --- a/board/terasic/sockit/socfpga.c +++ /dev/null @@ -1,5 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2012 Altera Corporation - */ -#include diff --git a/board/theobroma-systems/lion_rk3368/Makefile b/board/theobroma-systems/lion_rk3368/Makefile deleted file mode 100644 index fc8df271457..00000000000 --- a/board/theobroma-systems/lion_rk3368/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH - -obj-y += lion_rk3368.o diff --git a/board/theobroma-systems/lion_rk3368/lion_rk3368.c b/board/theobroma-systems/lion_rk3368/lion_rk3368.c deleted file mode 100644 index 1b0d504631e..00000000000 --- a/board/theobroma-systems/lion_rk3368/lion_rk3368.c +++ /dev/null @@ -1,4 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH - */ diff --git a/board/vocore/vocore2/Makefile b/board/vocore/vocore2/Makefile deleted file mode 100644 index 70cd7a8e568..00000000000 --- a/board/vocore/vocore2/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ - -obj-y += board.o diff --git a/board/vocore/vocore2/board.c b/board/vocore/vocore2/board.c deleted file mode 100644 index 27e42d14141..00000000000 --- a/board/vocore/vocore2/board.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2019 Mauro Condarelli - * - * Nothing actually needed here - */ -- cgit v1.3.1 From 4f9c7a9f547785dc6028e3d737ab7c53e7851b17 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 21 Sep 2023 19:32:48 -0400 Subject: exynos: Cleanup exynos_init - None of the callers perform error checking and based on the non-empty versions of this function, there's no checking to be done, so make this a void. - Add a default weak version of the function. - Remove the empty versions of exynos_init now that we have a weak version. Signed-off-by: Tom Rini --- arch/arm/mach-exynos/include/mach/board.h | 2 +- board/samsung/axy17lte/Makefile | 3 --- board/samsung/axy17lte/axy17lte.c | 11 ----------- board/samsung/common/board.c | 8 +++++++- board/samsung/common/exynos5-dt.c | 5 ----- board/samsung/espresso7420/Makefile | 6 ------ board/samsung/espresso7420/espresso7420.c | 13 ------------- board/samsung/odroid/odroid.c | 4 +--- board/samsung/origen/origen.c | 5 ----- board/samsung/trats/trats.c | 14 +++++--------- board/samsung/trats2/trats2.c | 4 +--- board/samsung/universal_c210/universal.c | 4 +--- 12 files changed, 16 insertions(+), 63 deletions(-) delete mode 100644 board/samsung/axy17lte/Makefile delete mode 100644 board/samsung/axy17lte/axy17lte.c delete mode 100644 board/samsung/espresso7420/Makefile delete mode 100644 board/samsung/espresso7420/espresso7420.c diff --git a/arch/arm/mach-exynos/include/mach/board.h b/arch/arm/mach-exynos/include/mach/board.h index 44ebdb829b2..a167f967933 100644 --- a/arch/arm/mach-exynos/include/mach/board.h +++ b/arch/arm/mach-exynos/include/mach/board.h @@ -11,7 +11,7 @@ * Exynos baord specific changes for * board_init */ -int exynos_init(void); +void exynos_init(void); /* * Exynos board specific changes for diff --git a/board/samsung/axy17lte/Makefile b/board/samsung/axy17lte/Makefile deleted file mode 100644 index 4e11f289dce..00000000000 --- a/board/samsung/axy17lte/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -obj-y += axy17lte.o diff --git a/board/samsung/axy17lte/axy17lte.c b/board/samsung/axy17lte/axy17lte.c deleted file mode 100644 index c38297a05ba..00000000000 --- a/board/samsung/axy17lte/axy17lte.c +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Samsung A5Y17 and A3Y17 LTE boards based on Exynos 7880 and Exynos 7870 SoCs - */ - -#include - -int exynos_init(void) -{ - return 0; -} diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c index 663d7ca991b..5a71982775d 100644 --- a/board/samsung/common/board.c +++ b/board/samsung/common/board.c @@ -43,6 +43,10 @@ __weak int exynos_early_init_f(void) return 0; } +__weak void exynos_init(void) +{ +} + __weak int exynos_power_init(void) { return 0; @@ -113,7 +117,9 @@ int board_init(void) gd->ram_size -= size; gd->bd->bi_dram[CONFIG_NR_DRAM_BANKS - 1].size -= size; #endif - return exynos_init(); + exynos_init(); + + return 0; } int dram_init(void) diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c index 1e88a82980e..95cf6d2acc2 100644 --- a/board/samsung/common/exynos5-dt.c +++ b/board/samsung/common/exynos5-dt.c @@ -38,11 +38,6 @@ DECLARE_GLOBAL_DATA_PTR; -int exynos_init(void) -{ - return 0; -} - static int exynos_set_regulator(const char *name, uint uv) { struct udevice *dev; diff --git a/board/samsung/espresso7420/Makefile b/board/samsung/espresso7420/Makefile deleted file mode 100644 index bb882eaa254..00000000000 --- a/board/samsung/espresso7420/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2016 Samsung Electronics -# Thomas Abraham - -obj-y += espresso7420.o diff --git a/board/samsung/espresso7420/espresso7420.c b/board/samsung/espresso7420/espresso7420.c deleted file mode 100644 index 9f6fa897477..00000000000 --- a/board/samsung/espresso7420/espresso7420.c +++ /dev/null @@ -1,13 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Espresso7420 board file - * Copyright (C) 2016 Samsung Electronics - * Thomas Abraham - */ - -#include - -int exynos_init(void) -{ - return 0; -} diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c index d237828364c..99e5613ced9 100644 --- a/board/samsung/odroid/odroid.c +++ b/board/samsung/odroid/odroid.c @@ -423,11 +423,9 @@ int exynos_early_init_f(void) return 0; } -int exynos_init(void) +void exynos_init(void) { board_gpio_init(); - - return 0; } int exynos_power_init(void) diff --git a/board/samsung/origen/origen.c b/board/samsung/origen/origen.c index 7a91f448969..ddf6a2b72fa 100644 --- a/board/samsung/origen/origen.c +++ b/board/samsung/origen/origen.c @@ -12,11 +12,6 @@ #include #include -int exynos_init(void) -{ - return 0; -} - int board_usb_init(int index, enum usb_init_type init) { return 0; diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c index 1608d60dd8d..6a3e5b29b98 100644 --- a/board/samsung/trats/trats.c +++ b/board/samsung/trats/trats.c @@ -40,17 +40,8 @@ u32 get_board_rev(void) } #endif -static void check_hw_revision(void); struct dwc2_plat_otg_data s5pc210_otg_data; -int exynos_init(void) -{ - check_hw_revision(); - printf("HW Revision:\t0x%x\n", board_rev); - - return 0; -} - #if !CONFIG_IS_ENABLED(DM_I2C) /* TODO(maintainer): Convert to driver model */ static void trats_low_power_mode(void) { @@ -215,6 +206,11 @@ static void check_hw_revision(void) board_rev |= hwrev; } +void exynos_init(void) +{ + check_hw_revision(); + printf("HW Revision:\t0x%x\n", board_rev); +} #ifdef CONFIG_USB_GADGET static int s5pc210_phy_control(int on) diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c index 93c9714d33f..81ccc124c80 100644 --- a/board/samsung/trats2/trats2.c +++ b/board/samsung/trats2/trats2.c @@ -107,7 +107,7 @@ int exynos_early_init_f(void) return 0; } -int exynos_init(void) +void exynos_init(void) { struct exynos4_power *pwr = (struct exynos4_power *)samsung_get_base_power(); @@ -124,8 +124,6 @@ int exynos_init(void) */ writel(0, &pwr->inform4); writel(0, &pwr->inform5); - - return 0; } int exynos_power_init(void) diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c index 37c9d7f452f..2d61dff89c2 100644 --- a/board/samsung/universal_c210/universal.c +++ b/board/samsung/universal_c210/universal.c @@ -265,7 +265,7 @@ static int init_pmic_lcd(void) return 0; } -int exynos_init(void) +void exynos_init(void) { gd->bd->bi_arch_number = MACH_TYPE_UNIVERSAL_C210; @@ -293,6 +293,4 @@ int exynos_init(void) check_hw_revision(); printf("HW Revision:\t0x%x\n", board_rev); - - return 0; } -- cgit v1.3.1 From edb5824be17f018c76d094372a4573750be7c631 Mon Sep 17 00:00:00 2001 From: Udit Kumar Date: Tue, 26 Sep 2023 16:54:42 +0530 Subject: lmb: remove overlapping region with next range In case of new memory range to be added is coalesced with any already added non last lmb region. And there is possibility that, then region in which new memory range added is not adjacent to next region. But have some sections are overlapping. So along with adjacency check with next lmb region, check for overlap should be done. In case overlap is found, adjust and merge these two lmb region into one. Reported-by: Suman Anna Signed-off-by: Udit Kumar --- lib/lmb.c | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/lib/lmb.c b/lib/lmb.c index b2c233edb64..da924c6789a 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -74,6 +74,16 @@ static long lmb_addrs_adjacent(phys_addr_t base1, phys_size_t size1, return 0; } +static long lmb_regions_overlap(struct lmb_region *rgn, unsigned long r1, + unsigned long r2) +{ + phys_addr_t base1 = rgn->region[r1].base; + phys_size_t size1 = rgn->region[r1].size; + phys_addr_t base2 = rgn->region[r2].base; + phys_size_t size2 = rgn->region[r2].size; + + return lmb_addrs_overlap(base1, size1, base2, size2); +} static long lmb_regions_adjacent(struct lmb_region *rgn, unsigned long r1, unsigned long r2) { @@ -81,7 +91,6 @@ static long lmb_regions_adjacent(struct lmb_region *rgn, unsigned long r1, phys_size_t size1 = rgn->region[r1].size; phys_addr_t base2 = rgn->region[r2].base; phys_size_t size2 = rgn->region[r2].size; - return lmb_addrs_adjacent(base1, size1, base2, size2); } @@ -105,6 +114,23 @@ static void lmb_coalesce_regions(struct lmb_region *rgn, unsigned long r1, lmb_remove_region(rgn, r2); } +/*Assumption : base addr of region 1 < base addr of region 2*/ +static void lmb_fix_over_lap_regions(struct lmb_region *rgn, unsigned long r1, + unsigned long r2) +{ + phys_addr_t base1 = rgn->region[r1].base; + phys_size_t size1 = rgn->region[r1].size; + phys_addr_t base2 = rgn->region[r2].base; + phys_size_t size2 = rgn->region[r2].size; + + if (base1 + size1 > base2 + size2) { + printf("This will not be a case any time\n"); + return; + } + rgn->region[r1].size = base2 + size2 - base1; + lmb_remove_region(rgn, r2); +} + void lmb_init(struct lmb *lmb) { #if IS_ENABLED(CONFIG_LMB_USE_MAX_REGIONS) @@ -249,7 +275,6 @@ static long lmb_add_region_flags(struct lmb_region *rgn, phys_addr_t base, phys_size_t rgnflags = rgn->region[i].flags; phys_addr_t end = base + size - 1; phys_addr_t rgnend = rgnbase + rgnsize - 1; - if (rgnbase <= base && end <= rgnend) { if (flags == rgnflags) /* Already have this region, so we're done */ @@ -278,10 +303,14 @@ static long lmb_add_region_flags(struct lmb_region *rgn, phys_addr_t base, } } - if ((i < rgn->cnt - 1) && lmb_regions_adjacent(rgn, i, i + 1)) { - if (rgn->region[i].flags == rgn->region[i + 1].flags) { + if (i < rgn->cnt - 1 && rgn->region[i].flags == rgn->region[i + 1].flags) { + if (lmb_regions_adjacent(rgn, i, i + 1)) { lmb_coalesce_regions(rgn, i, i + 1); coalesced++; + } else if (lmb_regions_overlap(rgn, i, i + 1)) { + /* fix overlapping area */ + lmb_fix_over_lap_regions(rgn, i, i + 1); + coalesced++; } } -- cgit v1.3.1 From 4a6105e7830e9e945a6dc556a43ffaf26f0156e5 Mon Sep 17 00:00:00 2001 From: Udit Kumar Date: Tue, 26 Sep 2023 16:54:43 +0530 Subject: test: lmb: Add test for coalescing and overlap range Add test case for an address range which is coalescing with one of range and overlapping with next range Cc: Simon Glass Signed-off-by: Udit Kumar Reviewed-by: Simon Glass --- test/lib/lmb.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/test/lib/lmb.c b/test/lib/lmb.c index 16288750358..15c68ce3961 100644 --- a/test/lib/lmb.c +++ b/test/lib/lmb.c @@ -451,12 +451,23 @@ static int lib_test_lmb_overlapping_reserve(struct unit_test_state *uts) ut_asserteq(ret, 0); ASSERT_LMB(&lmb, ram, ram_size, 2, 0x40010000, 0x10000, 0x40030000, 0x10000, 0, 0); - /* allocate 2nd region */ + /* allocate 2nd region , This should coalesced all region into one */ ret = lmb_reserve(&lmb, 0x40020000, 0x10000); ut_assert(ret >= 0); ASSERT_LMB(&lmb, ram, ram_size, 1, 0x40010000, 0x30000, 0, 0, 0, 0); + /* allocate 2nd region, which should be added as first region */ + ret = lmb_reserve(&lmb, 0x40000000, 0x8000); + ut_assert(ret >= 0); + ASSERT_LMB(&lmb, ram, ram_size, 2, 0x40000000, 0x8000, + 0x40010000, 0x30000, 0, 0); + + /* allocate 3rd region, coalesce with first and overlap with second */ + ret = lmb_reserve(&lmb, 0x40008000, 0x10000); + ut_assert(ret >= 0); + ASSERT_LMB(&lmb, ram, ram_size, 1, 0x40000000, 0x40000, + 0, 0, 0, 0); return 0; } -- cgit v1.3.1 From fb730a2c5ac906730ca9e91f0178a77bdef1bb3a Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 26 Sep 2023 14:42:54 +0200 Subject: mailbox: k3-sec-proxy: fix error handling for missing scfg in FDT The wrong field was checked. Fixes: f9aa41023bd9 ("mailbox: Introduce K3 Secure Proxy Driver") Signed-off-by: Matthias Schiffer Reviewed-by: Nishanth Menon --- drivers/mailbox/k3-sec-proxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mailbox/k3-sec-proxy.c b/drivers/mailbox/k3-sec-proxy.c index 815808498f2..27072610462 100644 --- a/drivers/mailbox/k3-sec-proxy.c +++ b/drivers/mailbox/k3-sec-proxy.c @@ -326,7 +326,7 @@ static int k3_sec_proxy_of_to_priv(struct udevice *dev, } spm->scfg = devfdt_get_addr_name(dev, "scfg"); - if (spm->rt == FDT_ADDR_T_NONE) { + if (spm->scfg == FDT_ADDR_T_NONE) { dev_err(dev, "No reg property for Secure Cfg base\n"); return -EINVAL; } -- cgit v1.3.1 From 34124ad9a433eb829b7a1942e074dd500302d964 Mon Sep 17 00:00:00 2001 From: Love Kumar Date: Wed, 27 Sep 2023 10:33:55 +0530 Subject: test/py: sleep: Add a test for the time command Execute "time ", and validate that it gives the approximately the correct amount of command execution time. Signed-off-by: Love Kumar --- test/py/tests/test_sleep.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/test/py/tests/test_sleep.py b/test/py/tests/test_sleep.py index 392af29db22..66a57434bff 100644 --- a/test/py/tests/test_sleep.py +++ b/test/py/tests/test_sleep.py @@ -41,3 +41,21 @@ def test_sleep(u_boot_console): if not u_boot_console.config.gdbserver: # margin is hopefully enough to account for any system overhead. assert elapsed < (sleep_time + sleep_margin) + +@pytest.mark.buildconfigspec("cmd_misc") +def test_time(u_boot_console): + """Test the time command, and validate that it gives approximately the + correct amount of command execution time.""" + + sleep_skip = u_boot_console.config.env.get("env__sleep_accurate", True) + if not sleep_skip: + pytest.skip("sleep is not accurate") + + sleep_time = u_boot_console.config.env.get("env__sleep_time", 10) + sleep_margin = u_boot_console.config.env.get("env__sleep_margin", 0.25) + output = u_boot_console.run_command("time sleep %d" % sleep_time) + execute_time = float(output.split()[1]) + assert sleep_time >= (execute_time - 0.01) + if not u_boot_console.config.gdbserver: + # margin is hopefully enough to account for any system overhead. + assert sleep_time < (execute_time + sleep_margin) -- cgit v1.3.1 From 17deab0edd2ba0a79a2b566c9a4e52e303bed362 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 27 Sep 2023 15:43:14 +0200 Subject: arm: mach-k3: common: fix compile warnings with PHYS_64BIT on 32bit Use uintptr_t instead of phys_addr_t where appropriate, so passing the addresses to writel() doesn't result in compile warnings when PHYS_64BIT is set for 32bit builds (which is actually a useful configuration, as the K3 SoC family boots from an R5 SPL, which may pass bank information based on gd->bd->bi_dram to fdt_fixup_memory_banks() etc., so PHYS_64BIT is needed for fixing up the upper bank). Signed-off-by: Matthias Schiffer --- arch/arm/mach-k3/common.c | 4 ++-- arch/arm/mach-k3/common.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c index cc755dd1bf6..c3006ba387e 100644 --- a/arch/arm/mach-k3/common.c +++ b/arch/arm/mach-k3/common.c @@ -84,10 +84,10 @@ void k3_sysfw_print_ver(void) ti_sci->version.firmware_revision, fw_desc); } -void mmr_unlock(phys_addr_t base, u32 partition) +void mmr_unlock(uintptr_t base, u32 partition) { /* Translate the base address */ - phys_addr_t part_base = base + partition * CTRL_MMR0_PARTITION_SIZE; + uintptr_t part_base = base + partition * CTRL_MMR0_PARTITION_SIZE; /* Unlock the requested partition if locked using two-step sequence */ writel(CTRLMMR_LOCK_KICK0_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK0); diff --git a/arch/arm/mach-k3/common.h b/arch/arm/mach-k3/common.h index 9bd9ad6d1a0..eabb44f6204 100644 --- a/arch/arm/mach-k3/common.h +++ b/arch/arm/mach-k3/common.h @@ -38,7 +38,7 @@ void remove_fwl_configs(struct fwl_data *fwl_data, size_t fwl_data_size); int load_firmware(char *name_fw, char *name_loadaddr, u32 *loadaddr); void k3_sysfw_print_ver(void); void spl_enable_dcache(void); -void mmr_unlock(phys_addr_t base, u32 partition); +void mmr_unlock(uintptr_t base, u32 partition); bool is_rom_loaded_sysfw(struct rom_extended_boot_data *data); enum k3_device_type get_device_type(void); void ti_secure_image_post_process(void **p_image, size_t *p_size); -- cgit v1.3.1 From 47e7f128c40c9bf856e76bf125e44522c99f3511 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Wed, 27 Sep 2023 17:41:09 +0200 Subject: tools: iot2050-sign-fw.sh: Make localization of tools dir more robust When building in-tree, there is no source link. Signed-off-by: Jan Kiszka --- tools/iot2050-sign-fw.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/iot2050-sign-fw.sh b/tools/iot2050-sign-fw.sh index 6b426c854c2..75ffd560823 100755 --- a/tools/iot2050-sign-fw.sh +++ b/tools/iot2050-sign-fw.sh @@ -5,6 +5,8 @@ if [ -z "$1" ]; then exit 1 fi +TOOLS_DIR=$(dirname $0) + TEMP_X509=$(mktemp XXXXXXXX.temp) REVISION=${2:-0} @@ -39,10 +41,10 @@ CERT_X509=$(mktemp XXXXXXXX.crt) openssl req -new -x509 -key $1 -nodes -outform DER -out $CERT_X509 -config $TEMP_X509 -sha512 cat $CERT_X509 tispl.bin > tispl.bin_signed -source/tools/binman/binman replace -i flash-pg1.bin -f tispl.bin_signed fit@180000 -source/tools/binman/binman replace -i flash-pg2.bin -f tispl.bin_signed fit@180000 +$TOOLS_DIR/binman/binman replace -i flash-pg1.bin -f tispl.bin_signed fit@180000 +$TOOLS_DIR/binman/binman replace -i flash-pg2.bin -f tispl.bin_signed fit@180000 rm $TEMP_X509 $CERT_X509 -source/tools/binman/binman sign -i flash-pg1.bin -k $1 -a sha256,rsa4096 fit@380000 -source/tools/binman/binman sign -i flash-pg2.bin -k $1 -a sha256,rsa4096 fit@380000 +$TOOLS_DIR/binman/binman sign -i flash-pg1.bin -k $1 -a sha256,rsa4096 fit@380000 +$TOOLS_DIR/binman/binman sign -i flash-pg2.bin -k $1 -a sha256,rsa4096 fit@380000 -- cgit v1.3.1 From a60d9686f21fdf2549858ca0e728bcef545d73d2 Mon Sep 17 00:00:00 2001 From: Chanho Park Date: Fri, 8 Sep 2023 17:08:56 +0900 Subject: spl: add __noreturn attribute to spl_invoke_atf function spl_invoke_atf function will not be returned to SPL. Thus, we need to set __noreturn function attribute to the function. Signed-off-by: Chanho Park --- common/spl/spl_atf.c | 8 ++++---- include/spl.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index 2c10252834f..3bdd013a35f 100644 --- a/common/spl/spl_atf.c +++ b/common/spl/spl_atf.c @@ -187,10 +187,10 @@ static inline void raw_write_daif(unsigned int daif) __asm__ __volatile__("msr DAIF, %x0\n\t" : : "r" (daif) : "memory"); } -typedef void (*atf_entry_t)(struct bl31_params *params, void *plat_params); +typedef void __noreturn (*atf_entry_t)(struct bl31_params *params, void *plat_params); -static void bl31_entry(uintptr_t bl31_entry, uintptr_t bl32_entry, - uintptr_t bl33_entry, uintptr_t fdt_addr) +static void __noreturn bl31_entry(uintptr_t bl31_entry, uintptr_t bl32_entry, + uintptr_t bl33_entry, uintptr_t fdt_addr) { atf_entry_t atf_entry = (atf_entry_t)bl31_entry; void *bl31_params; @@ -251,7 +251,7 @@ uintptr_t spl_fit_images_get_entry(void *blob, int node) return val; } -void spl_invoke_atf(struct spl_image_info *spl_image) +void __noreturn spl_invoke_atf(struct spl_image_info *spl_image) { uintptr_t bl32_entry = 0; uintptr_t bl33_entry = CONFIG_TEXT_BASE; diff --git a/include/spl.h b/include/spl.h index f713363f8cd..7d30fb57dac 100644 --- a/include/spl.h +++ b/include/spl.h @@ -793,7 +793,7 @@ int spl_ymodem_load_image(struct spl_image_info *spl_image, /** * spl_invoke_atf - boot using an ARM trusted firmware image */ -void spl_invoke_atf(struct spl_image_info *spl_image); +void __noreturn spl_invoke_atf(struct spl_image_info *spl_image); /** * bl2_plat_get_bl31_params() - return params for bl31. -- cgit v1.3.1 From 6826c432e35115bbdafc17062733f5030b7f8366 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Wed, 27 Sep 2023 21:44:13 +0000 Subject: spl: Jump to image at end of board_init_r spl_board_prepare_for_boot() is not called before jumping/invoking atf, optee, opensbi or linux images. Jump to image at the end of board_init_r() to fix this. Signed-off-by: Jonas Karlman Reviewed-by: Simon Glass --- common/spl/spl.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/common/spl/spl.c b/common/spl/spl.c index 0cf887fd626..66eeea41a34 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -643,6 +643,8 @@ void board_init_r(gd_t *dummy1, ulong dummy2) BOOT_DEVICE_NONE, BOOT_DEVICE_NONE, }; + typedef void __noreturn (*jump_to_image_t)(struct spl_image_info *); + jump_to_image_t jump_to_image = &jump_to_image_no_args; struct spl_image_info spl_image; int ret, os; @@ -731,20 +733,20 @@ void board_init_r(gd_t *dummy1, ulong dummy2) } else if (CONFIG_IS_ENABLED(ATF) && os == IH_OS_ARM_TRUSTED_FIRMWARE) { debug("Jumping to U-Boot via ARM Trusted Firmware\n"); spl_fixup_fdt(spl_image_fdt_addr(&spl_image)); - spl_invoke_atf(&spl_image); + jump_to_image = &spl_invoke_atf; } else if (CONFIG_IS_ENABLED(OPTEE_IMAGE) && os == IH_OS_TEE) { debug("Jumping to U-Boot via OP-TEE\n"); spl_board_prepare_for_optee(spl_image_fdt_addr(&spl_image)); - jump_to_image_optee(&spl_image); + jump_to_image = &jump_to_image_optee; } else if (CONFIG_IS_ENABLED(OPENSBI) && os == IH_OS_OPENSBI) { debug("Jumping to U-Boot via RISC-V OpenSBI\n"); - spl_invoke_opensbi(&spl_image); + jump_to_image = &spl_invoke_opensbi; } else if (CONFIG_IS_ENABLED(OS_BOOT) && os == IH_OS_LINUX) { debug("Jumping to Linux\n"); if (IS_ENABLED(CONFIG_SPL_OS_BOOT)) spl_fixup_fdt((void *)SPL_PAYLOAD_ARGS_ADDR); spl_board_prepare_for_linux(); - jump_to_image_linux(&spl_image); + jump_to_image = &jump_to_image_linux; } else { debug("Unsupported OS image.. Jumping nevertheless..\n"); } @@ -784,7 +786,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2) } spl_board_prepare_for_boot(); - jump_to_image_no_args(&spl_image); + jump_to_image(&spl_image); } /* -- cgit v1.3.1 From 6a1e0ae43e2108a88e022103b3b303c9f4964a64 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Fri, 29 Sep 2023 02:47:16 +0200 Subject: dm: serial: fix serial_post_probe() The size of the name of a udevice is not limited. When setting the fixed sized name field of a stdio device we must ensure that the target string is NUL terminated to avoid buffer overflows. Fixes: 57d92753d4ca ("dm: Add a uclass for serial devices") Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- drivers/serial/serial-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index 5e2e7dfbcb3..4a2da7a3317 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -520,7 +520,7 @@ static int serial_post_probe(struct udevice *dev) return 0; memset(&sdev, '\0', sizeof(sdev)); - strncpy(sdev.name, dev->name, sizeof(sdev.name)); + strlcpy(sdev.name, dev->name, sizeof(sdev.name)); sdev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_DM; sdev.priv = dev; sdev.putc = serial_stub_putc; -- cgit v1.3.1 From 6da11cc81ea773d9a1e3059da311c6f2e2aeb6ef Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Fri, 29 Sep 2023 02:47:17 +0200 Subject: stdio: fix stdio_deregister_dev() When copying the name of a stdio device we must ensure that it is NUL terminated before passing it to strcmp() to avoid a buffer overrun. Truncating the name field leads to failure to deregister a stdio device. When copying we must ensure that the name field sizes match. Addresses-Coverity-ID: 350462 String not null terminated Fixes: 5294e97832a6 ("stdio: extend "name" to 32 symbols") Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- common/stdio.c | 6 +++--- include/stdio_dev.h | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/stdio.c b/common/stdio.c index 010bf576af0..e3354f092dc 100644 --- a/common/stdio.c +++ b/common/stdio.c @@ -259,7 +259,7 @@ int stdio_register(struct stdio_dev *dev) int stdio_deregister_dev(struct stdio_dev *dev, int force) { struct list_head *pos; - char temp_names[3][16]; + char temp_names[3][STDIO_NAME_LEN]; int i; /* get stdio devices (ListRemoveItem changes the dev list) */ @@ -272,8 +272,8 @@ int stdio_deregister_dev(struct stdio_dev *dev, int force) /* Device is assigned -> report error */ return -EBUSY; } - memcpy(&temp_names[i][0], stdio_devices[i]->name, - sizeof(temp_names[i])); + strlcpy(&temp_names[i][0], stdio_devices[i]->name, + sizeof(temp_names[i])); } list_del(&dev->list); diff --git a/include/stdio_dev.h b/include/stdio_dev.h index 7f181020524..4e3c4708f80 100644 --- a/include/stdio_dev.h +++ b/include/stdio_dev.h @@ -17,6 +17,7 @@ #define DEV_FLAGS_INPUT 0x00000001 /* Device can be used as input console */ #define DEV_FLAGS_OUTPUT 0x00000002 /* Device can be used as output console */ #define DEV_FLAGS_DM 0x00000004 /* Device priv is a struct udevice * */ +#define STDIO_NAME_LEN 32 int stdio_file_to_flags(const int file); @@ -24,7 +25,7 @@ int stdio_file_to_flags(const int file); struct stdio_dev { int flags; /* Device flags: input/output/system */ int ext; /* Supported extensions */ - char name[32]; /* Device name */ + char name[STDIO_NAME_LEN]; /* Device name */ /* GENERAL functions */ -- cgit v1.3.1 From e483a7c8fff23d5aab27937f6054c883f99c8680 Mon Sep 17 00:00:00 2001 From: Francois Berder Date: Fri, 29 Sep 2023 16:11:00 +0200 Subject: board/km/cent2: Fix buffer overflow when fixing MAC address String "/soc/fman/ethernet@e8000" is 25 bytes long and not 24 due to extra byte for null character at the end. Signed-off-by: Francois Berder --- board/keymile/kmcent2/kmcent2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/keymile/kmcent2/kmcent2.c b/board/keymile/kmcent2/kmcent2.c index 572cc7bbdc6..783853d5c6f 100644 --- a/board/keymile/kmcent2/kmcent2.c +++ b/board/keymile/kmcent2/kmcent2.c @@ -292,7 +292,7 @@ EVENT_SPY_SIMPLE(EVT_LAST_STAGE_INIT, last_stage_init); void fdt_fixup_fman_mac_addresses(void *blob) { int node, ret; - char path[24]; + char path[25]; unsigned char mac_addr[6]; /* -- cgit v1.3.1 From 3f876cb7c57511174d1b6a3e089443ccbaf236ec Mon Sep 17 00:00:00 2001 From: Sean Anderson Date: Fri, 29 Sep 2023 12:06:54 -0400 Subject: test: Fix SPL tests not being run SPL doesn't have OF_LIVE enabled, so we can only run tests with a flat tree. Don't skip them even if they don't use the devicetree. Fixes: 6ec5178c0ef ("test: Skip flat-tree tests if devicetree is not used") Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- test/test-main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/test-main.c b/test/test-main.c index 778bf0a18a0..edb20bc4b9c 100644 --- a/test/test-main.c +++ b/test/test-main.c @@ -476,7 +476,8 @@ static int ut_run_test_live_flat(struct unit_test_state *uts, * (for sandbox we handle this by copying the tree, but not for other * boards) */ - if ((test->flags & UT_TESTF_SCAN_FDT) && + if ((!CONFIG_IS_ENABLED(OF_LIVE) || + (test->flags & UT_TESTF_SCAN_FDT)) && !(test->flags & UT_TESTF_LIVE_TREE) && (CONFIG_IS_ENABLED(OFNODE_MULTI_TREE) || !(test->flags & UT_TESTF_OTHER_FDT)) && -- cgit v1.3.1