diff options
146 files changed, 115 insertions, 698 deletions
@@ -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)) @@ -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 diff --git a/arch/arm/mach-exynos/include/mach/board.h b/arch/arm/mach-exynos/include/mach/board.h index 44ebdb829b..a167f96793 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/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c index cc755dd1bf..c3006ba387 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 9bd9ad6d1a..eabb44f620 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); diff --git a/board/altera/arria10-socdk/Makefile b/board/altera/arria10-socdk/Makefile deleted file mode 100644 index 80d0004346..0000000000 --- a/board/altera/arria10-socdk/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# -# Copyright (C) 2015 Altera Corporation <www.altera.com> - -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 4c466cb944..0000000000 --- a/board/altera/arria10-socdk/socfpga.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (C) 2015 Altera Corporation <www.altera.com> - */ - -#include <common.h> diff --git a/board/altera/arria5-socdk/Makefile b/board/altera/arria5-socdk/Makefile deleted file mode 100644 index e1c8a6b3c7..0000000000 --- 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 <thomas@wytron.com.tw> - -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 48bfe32951..0000000000 --- a/board/altera/arria5-socdk/socfpga.c +++ /dev/null @@ -1,5 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2012 Altera Corporation <www.altera.com> - */ -#include <common.h> diff --git a/board/altera/cyclone5-socdk/Makefile b/board/altera/cyclone5-socdk/Makefile deleted file mode 100644 index e1c8a6b3c7..0000000000 --- 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 <thomas@wytron.com.tw> - -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 48bfe32951..0000000000 --- a/board/altera/cyclone5-socdk/socfpga.c +++ /dev/null @@ -1,5 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2012 Altera Corporation <www.altera.com> - */ -#include <common.h> diff --git a/board/altera/stratix10-socdk/Makefile b/board/altera/stratix10-socdk/Makefile deleted file mode 100644 index 02a9cadf76..0000000000 --- a/board/altera/stratix10-socdk/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# Copyright (C) 2016-2017 Intel Corporation <www.intel.com> -# -# 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 043fc543f1..0000000000 --- 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 <www.intel.com> - * - */ - -#include <common.h> diff --git a/board/aries/mcvevk/Makefile b/board/aries/mcvevk/Makefile deleted file mode 100644 index e1c8a6b3c7..0000000000 --- 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 <thomas@wytron.com.tw> - -obj-y := socfpga.o diff --git a/board/aries/mcvevk/socfpga.c b/board/aries/mcvevk/socfpga.c deleted file mode 100644 index f173bf84ac..0000000000 --- a/board/aries/mcvevk/socfpga.c +++ /dev/null @@ -1,5 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2015 Marek Vasut <marex@denx.de> - */ -#include <common.h> diff --git a/board/aspeed/evb_ast2500/Makefile b/board/aspeed/evb_ast2500/Makefile deleted file mode 100644 index 4564098299..0000000000 --- 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 ed162c4095..0000000000 --- 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 <common.h> diff --git a/board/aspeed/evb_ast2600/Makefile b/board/aspeed/evb_ast2600/Makefile deleted file mode 100644 index 9291db6ee1..0000000000 --- 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 e6dc8c7952..0000000000 --- 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 <common.h> diff --git a/board/broadcom/bcm968380gerg/Makefile b/board/broadcom/bcm968380gerg/Makefile deleted file mode 100644 index a525b7b9b3..0000000000 --- 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 044b3554ba..0000000000 --- a/board/broadcom/bcm968380gerg/bcm968380gerg.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2018 Philippe Reynes <philippe.reynes@softathome.com> - */ - -#include <common.h> diff --git a/board/broadcom/bcm968380gerg/board.c b/board/broadcom/bcm968380gerg/board.c deleted file mode 100644 index 044b3554ba..0000000000 --- a/board/broadcom/bcm968380gerg/board.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2018 Philippe Reynes <philippe.reynes@softathome.com> - */ - -#include <common.h> diff --git a/board/comtrend/ar5315u/Makefile b/board/comtrend/ar5315u/Makefile deleted file mode 100644 index 25656a8cac..0000000000 --- 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 3437985878..0000000000 --- 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 <noltari@gmail.com> - */ - -#include <common.h> diff --git a/board/comtrend/ar5387un/Makefile b/board/comtrend/ar5387un/Makefile deleted file mode 100644 index 572ae1f091..0000000000 --- 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 1e4b7281db..0000000000 --- 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 <noltari@gmail.com> - */ - -#include <common.h> diff --git a/board/comtrend/ct5361/Makefile b/board/comtrend/ct5361/Makefile deleted file mode 100644 index 8b41c4a07e..0000000000 --- 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 1e4b7281db..0000000000 --- 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 <noltari@gmail.com> - */ - -#include <common.h> diff --git a/board/comtrend/vr3032u/Makefile b/board/comtrend/vr3032u/Makefile deleted file mode 100644 index 3542fea587..0000000000 --- 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 1e4b7281db..0000000000 --- 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 <noltari@gmail.com> - */ - -#include <common.h> diff --git a/board/comtrend/wap5813n/Makefile b/board/comtrend/wap5813n/Makefile deleted file mode 100644 index b8d4a6d5fd..0000000000 --- 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 1e4b7281db..0000000000 --- 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 <noltari@gmail.com> - */ - -#include <common.h> diff --git a/board/devboards/dbm-soc1/Makefile b/board/devboards/dbm-soc1/Makefile deleted file mode 100644 index 88621b04c5..0000000000 --- a/board/devboards/dbm-soc1/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2018 Marek Vasut <marex@denx.de> - -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 a907ee605e..0000000000 --- a/board/devboards/dbm-soc1/socfpga.c +++ /dev/null @@ -1,5 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2018 Marek Vasut <marex@denx.de> - */ -#include <common.h> diff --git a/board/ebv/socrates/Makefile b/board/ebv/socrates/Makefile deleted file mode 100644 index e1c8a6b3c7..0000000000 --- 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 <thomas@wytron.com.tw> - -obj-y := socfpga.o diff --git a/board/ebv/socrates/socfpga.c b/board/ebv/socrates/socfpga.c deleted file mode 100644 index 48bfe32951..0000000000 --- a/board/ebv/socrates/socfpga.c +++ /dev/null @@ -1,5 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2012 Altera Corporation <www.altera.com> - */ -#include <common.h> diff --git a/board/edgeble/neural-compute-module-2/Makefile b/board/edgeble/neural-compute-module-2/Makefile deleted file mode 100644 index 3bfc89fa15..0000000000 --- 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 3d2262ce97..0000000000 --- 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 28310b1b34..0000000000 --- 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 3d2262ce97..0000000000 --- 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 cb48d1ccc2..0000000000 --- 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 da3445bb1d..0000000000 --- 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 <common.h> diff --git a/board/emulation/qemu-x86/Makefile b/board/emulation/qemu-x86/Makefile deleted file mode 100644 index ff4aaa51c5..0000000000 --- a/board/emulation/qemu-x86/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - -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 e69de29bb2..0000000000 --- a/board/emulation/qemu-x86/qemu-x86.c +++ /dev/null diff --git a/board/engicam/px30_core/Makefile b/board/engicam/px30_core/Makefile deleted file mode 100644 index 321fdb0173..0000000000 --- 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 3adc2f11de..0000000000 --- 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 ced2ff75a5..0000000000 --- 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 b0f9a5f9b7..0000000000 --- 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 <common.h> diff --git a/board/google/chromebook_link/Makefile b/board/google/chromebook_link/Makefile deleted file mode 100644 index d84a84899d..0000000000 --- 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 e357e6218e..0000000000 --- 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 <common.h> diff --git a/board/google/chromebook_samus/Makefile b/board/google/chromebook_samus/Makefile deleted file mode 100644 index 68c9e4993d..0000000000 --- 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 83edf89106..0000000000 --- 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 <common.h> diff --git a/board/google/chromebox_panther/Makefile b/board/google/chromebox_panther/Makefile deleted file mode 100644 index 1a5518f134..0000000000 --- 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 da3445bb1d..0000000000 --- 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 <common.h> diff --git a/board/hardkernel/odroid_m1/Makefile b/board/hardkernel/odroid_m1/Makefile deleted file mode 100644 index ae8ea3d978..0000000000 --- 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 4c027f2a7a..0000000000 --- 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 43e9be6bba..0000000000 --- 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 1e4b7281db..0000000000 --- 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 <noltari@gmail.com> - */ - -#include <common.h> diff --git a/board/intel/agilex-socdk/Makefile b/board/intel/agilex-socdk/Makefile deleted file mode 100644 index b86223a571..0000000000 --- a/board/intel/agilex-socdk/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# Copyright (C) 2019 Intel Corporation <www.intel.com> -# -# 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 72a3e0836d..0000000000 --- a/board/intel/agilex-socdk/socfpga.c +++ /dev/null @@ -1,7 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (C) 2019 Intel Corporation <www.intel.com> - * - */ - -#include <common.h> diff --git a/board/intel/bayleybay/Makefile b/board/intel/bayleybay/Makefile index fa263b7bf5..8b9934f996 100644 --- a/board/intel/bayleybay/Makefile +++ b/board/intel/bayleybay/Makefile @@ -2,5 +2,4 @@ # # Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> -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 4f63c23a1b..0000000000 --- a/board/intel/bayleybay/bayleybay.c +++ /dev/null @@ -1,7 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - */ - -#include <common.h> -#include <asm/gpio.h> diff --git a/board/intel/n5x-socdk/Makefile b/board/intel/n5x-socdk/Makefile deleted file mode 100644 index accfdcddcb..0000000000 --- a/board/intel/n5x-socdk/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# Copyright (C) 2020-2021 Intel Corporation <www.intel.com> -# -# 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 985ba190d0..0000000000 --- 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 <www.intel.com> - * - */ - -#include <common.h> diff --git a/board/is1/Makefile b/board/is1/Makefile deleted file mode 100644 index e499116b67..0000000000 --- a/board/is1/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2015 Stefan Roese <sr@denx.de> - -obj-y := socfpga.o diff --git a/board/is1/socfpga.c b/board/is1/socfpga.c deleted file mode 100644 index 2a543bf7ba..0000000000 --- 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/keymile/kmcent2/kmcent2.c b/board/keymile/kmcent2/kmcent2.c index 572cc7bbdc..783853d5c6 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]; /* diff --git a/board/mediatek/mt7620/Makefile b/board/mediatek/mt7620/Makefile deleted file mode 100644 index db129c5aba..0000000000 --- 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 119b8fc9e5..0000000000 --- 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 <weijie.gao@mediatek.com> - */ diff --git a/board/mediatek/mt7621/Makefile b/board/mediatek/mt7621/Makefile deleted file mode 100644 index db129c5aba..0000000000 --- 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 0496f3f806..0000000000 --- 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 <weijie.gao@mediatek.com> - */ diff --git a/board/mediatek/mt7628/Makefile b/board/mediatek/mt7628/Makefile deleted file mode 100644 index db129c5aba..0000000000 --- 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 f837a06fbb..0000000000 --- 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 <weijie.gao@mediatek.com> - */ - -#include <common.h> diff --git a/board/mqmaker/miqi_rk3288/Makefile b/board/mqmaker/miqi_rk3288/Makefile deleted file mode 100644 index ec95affb39..0000000000 --- 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 1649bee063..0000000000 --- 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 3e05bb55c1..0000000000 --- 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 1e4b7281db..0000000000 --- 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 <noltari@gmail.com> - */ - -#include <common.h> diff --git a/board/pine64/quartz64_rk3566/Makefile b/board/pine64/quartz64_rk3566/Makefile deleted file mode 100644 index c24a40e724..0000000000 --- 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 4c027f2a7a..0000000000 --- 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 fe585ad263..0000000000 --- a/board/qualcomm/dragonboard845c/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2022 Sumit Garg <sumit.garg@linaro.org> -# -# 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 c7685de306..0000000000 --- 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 <sumit.garg@linaro.org> - */ - -void noop(void) {} diff --git a/board/radxa/rock/Makefile b/board/radxa/rock/Makefile deleted file mode 100644 index fe94b60c35..0000000000 --- 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 bdc02a6a79..0000000000 --- a/board/radxa/rock/rock.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * (C) Copyright 2015 Google, Inc - */ - -#include <common.h> diff --git a/board/radxa/rock2/Makefile b/board/radxa/rock2/Makefile deleted file mode 100644 index caa305bbb5..0000000000 --- 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 bdc02a6a79..0000000000 --- a/board/radxa/rock2/rock2.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * (C) Copyright 2015 Google, Inc - */ - -#include <common.h> diff --git a/board/rikomagic/mk808/Makefile b/board/rikomagic/mk808/Makefile deleted file mode 100644 index a4d16884df..0000000000 --- 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 e0bfc6f331..0000000000 --- a/board/rikomagic/mk808/mk808.c +++ /dev/null @@ -1,3 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -#include <common.h> diff --git a/board/rockchip/evb_px30/Makefile b/board/rockchip/evb_px30/Makefile deleted file mode 100644 index 74b0b9f44f..0000000000 --- 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 29464ae63e..0000000000 --- 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 40f6ff8e7e..0000000000 --- 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 b81f970883..0000000000 --- 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 078bb898c6..0000000000 --- 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 e69de29bb2..0000000000 --- a/board/rockchip/evb_rk3128/evk-rk3128.c +++ /dev/null diff --git a/board/rockchip/evb_rk3229/Makefile b/board/rockchip/evb_rk3229/Makefile deleted file mode 100644 index 65dcd8be35..0000000000 --- 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 0b14b241b3..0000000000 --- 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 <common.h> -#include <dm.h> -#include <asm/io.h> -#include <asm/arch-rockchip/uart.h> diff --git a/board/rockchip/evb_rk3288/Makefile b/board/rockchip/evb_rk3288/Makefile deleted file mode 100644 index c11b657601..0000000000 --- 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 1649bee063..0000000000 --- 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 81c5de86d4..0000000000 --- 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 1649bee063..0000000000 --- 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 cbda95fe94..0000000000 --- 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 c2fdf95d9a..0000000000 --- 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 9661528114..0000000000 --- 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 b81f970883..0000000000 --- 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 08d44a0b88..0000000000 --- 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 1e4b7281db..0000000000 --- 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 <noltari@gmail.com> - */ - -#include <common.h> diff --git a/board/samsung/axy17lte/Makefile b/board/samsung/axy17lte/Makefile deleted file mode 100644 index 4e11f289dc..0000000000 --- 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 c38297a05b..0000000000 --- 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 <common.h> - -int exynos_init(void) -{ - return 0; -} diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c index 663d7ca991..5a71982775 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 1e88a82980..95cf6d2acc 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 bb882eaa25..0000000000 --- a/board/samsung/espresso7420/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2016 Samsung Electronics -# Thomas Abraham <thomas.ab@samsung.com> - -obj-y += espresso7420.o diff --git a/board/samsung/espresso7420/espresso7420.c b/board/samsung/espresso7420/espresso7420.c deleted file mode 100644 index 9f6fa89747..0000000000 --- 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 <thomas.ab@samsung.com> - */ - -#include <common.h> - -int exynos_init(void) -{ - return 0; -} diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c index d237828364..99e5613ced 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 7a91f44896..ddf6a2b72f 100644 --- a/board/samsung/origen/origen.c +++ b/board/samsung/origen/origen.c @@ -12,11 +12,6 @@ #include <asm/arch/pinmux.h> #include <usb.h> -int exynos_init(void) -{ - return 0; -} - int board_usb_init(int index, enum usb_init_type init) { return 0; diff --git a/board/samsung/starqltechn/Makefile b/board/samsung/starqltechn/Makefile deleted file mode 100644 index e017c827a7..0000000000 --- a/board/samsung/starqltechn/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2021 Dzmitry Sankouski <dsankouski@gmail.com> -# -# 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 f2cdb4eec2..0000000000 --- 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 <dsankouski@gmail.com> - * - */ - -void nooop(void) {} diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c index 1608d60dd8..6a3e5b29b9 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 93c9714d33..81ccc124c8 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 37c9d7f452..2d61dff89c 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; } diff --git a/board/sfr/nb4_ser/Makefile b/board/sfr/nb4_ser/Makefile deleted file mode 100644 index ab7ad76b2c..0000000000 --- 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 1e4b7281db..0000000000 --- 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 <noltari@gmail.com> - */ - -#include <common.h> diff --git a/board/terasic/de0-nano-soc/Makefile b/board/terasic/de0-nano-soc/Makefile deleted file mode 100644 index e1c8a6b3c7..0000000000 --- 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 <thomas@wytron.com.tw> - -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 48bfe32951..0000000000 --- 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 <www.altera.com> - */ -#include <common.h> diff --git a/board/terasic/de10-nano/Makefile b/board/terasic/de10-nano/Makefile deleted file mode 100644 index 2cf9240846..0000000000 --- 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 f9173f1921..0000000000 --- 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 <common.h> diff --git a/board/terasic/de10-standard/Makefile b/board/terasic/de10-standard/Makefile deleted file mode 100644 index 2cf9240846..0000000000 --- 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 f9173f1921..0000000000 --- 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 <common.h> diff --git a/board/terasic/sockit/Makefile b/board/terasic/sockit/Makefile deleted file mode 100644 index e1c8a6b3c7..0000000000 --- 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 <thomas@wytron.com.tw> - -obj-y := socfpga.o diff --git a/board/terasic/sockit/socfpga.c b/board/terasic/sockit/socfpga.c deleted file mode 100644 index 48bfe32951..0000000000 --- a/board/terasic/sockit/socfpga.c +++ /dev/null @@ -1,5 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2012 Altera Corporation <www.altera.com> - */ -#include <common.h> diff --git a/board/theobroma-systems/lion_rk3368/Makefile b/board/theobroma-systems/lion_rk3368/Makefile deleted file mode 100644 index fc8df27145..0000000000 --- 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 1b0d504631..0000000000 --- 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 70cd7a8e56..0000000000 --- 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 27e42d1414..0000000000 --- a/board/vocore/vocore2/board.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2019 Mauro Condarelli <mc5686@mclink.it> - * - * Nothing actually needed here - */ diff --git a/boot/bootmeth_script.c b/boot/bootmeth_script.c index 58c57a2d4b..345114dabf 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); diff --git a/common/spl/spl.c b/common/spl/spl.c index 0cf887fd62..66eeea41a3 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); } /* diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index 2c10252834..3bdd013a35 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/common/stdio.c b/common/stdio.c index 010bf576af..e3354f092d 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/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig index 5cacecc7cb..ac9c0e1d71 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 diff --git a/drivers/mailbox/k3-sec-proxy.c b/drivers/mailbox/k3-sec-proxy.c index 815808498f..2707261046 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; } diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index 5e2e7dfbcb..4a2da7a331 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; diff --git a/include/spl.h b/include/spl.h index f713363f8c..7d30fb57da 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. diff --git a/include/stdio_dev.h b/include/stdio_dev.h index 7f18102052..4e3c4708f8 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 */ @@ -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++; } } diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 15ac87286d..32f4384657 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) diff --git a/test/lib/lmb.c b/test/lib/lmb.c index 1628875035..15c68ce396 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; } diff --git a/test/py/tests/test_sleep.py b/test/py/tests/test_sleep.py index 392af29db2..66a57434bf 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) diff --git a/test/test-main.c b/test/test-main.c index 778bf0a18a..edb20bc4b9 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)) && diff --git a/tools/iot2050-sign-fw.sh b/tools/iot2050-sign-fw.sh index 6b426c854c..75ffd56082 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 |