Merge branch '2023-10-09-assorted-fixes'

- Cleanup how we pick what to launch in SPL, a few test changes, some TI
  K3 platform updates, top-level Makefile fixes and related cleanup,
  correct a problem with LMB overlap, other assorted fixes.
This commit is contained in:
Tom Rini 2023-10-10 08:54:17 -04:00
commit 833ff23047
146 changed files with 115 additions and 698 deletions

View file

@ -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

View file

@ -11,7 +11,7 @@
* Exynos baord specific changes for
* board_init
*/
int exynos_init(void);
void exynos_init(void);
/*
* Exynos board specific changes for

View file

@ -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);

View file

@ -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);

View file

@ -1,5 +0,0 @@
# SPDX-License-Identifier: GPL-2.0
#
# Copyright (C) 2015 Altera Corporation <www.altera.com>
obj-y := socfpga.o

View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2015 Altera Corporation <www.altera.com>
*/
#include <common.h>

View file

@ -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

View file

@ -1,5 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2012 Altera Corporation <www.altera.com>
*/
#include <common.h>

View file

@ -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

View file

@ -1,5 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2012 Altera Corporation <www.altera.com>
*/
#include <common.h>

View file

@ -1,7 +0,0 @@
#
# Copyright (C) 2016-2017 Intel Corporation <www.intel.com>
#
# SPDX-License-Identifier: GPL-2.0
#
obj-y := socfpga.o

View file

@ -1,7 +0,0 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2016-2018 Intel Corporation <www.intel.com>
*
*/
#include <common.h>

View file

@ -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

View file

@ -1,5 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2015 Marek Vasut <marex@denx.de>
*/
#include <common.h>

View file

@ -1 +0,0 @@
obj-y += evb_ast2500.o

View file

@ -1,5 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (c) 2016 Google, Inc
*/
#include <common.h>

View file

@ -1 +0,0 @@
obj-y += evb_ast2600.o

View file

@ -1,5 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (c) Aspeed Technology Inc.
*/
#include <common.h>

View file

@ -1,3 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
obj-y += bcm968380gerg.o

View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2018 Philippe Reynes <philippe.reynes@softathome.com>
*/
#include <common.h>

View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2018 Philippe Reynes <philippe.reynes@softathome.com>
*/
#include <common.h>

View file

@ -1,3 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
obj-y += ar-5315u.o

View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2018 Álvaro Fernández Rojas <noltari@gmail.com>
*/
#include <common.h>

View file

@ -1,3 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
obj-y += ar-5387un.o

View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
*/
#include <common.h>

View file

@ -1,3 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
obj-y += ct-5361.o

View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
*/
#include <common.h>

View file

@ -1,3 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
obj-y += vr-3032u.o

View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
*/
#include <common.h>

View file

@ -1,3 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
obj-y += wap-5813n.o

View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
*/
#include <common.h>

View file

@ -1,5 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2018 Marek Vasut <marex@denx.de>
obj-y := socfpga.o

View file

@ -1,5 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2018 Marek Vasut <marex@denx.de>
*/
#include <common.h>

View file

@ -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

View file

@ -1,5 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2012 Altera Corporation <www.altera.com>
*/
#include <common.h>

View file

@ -1,7 +0,0 @@
#
# Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd.
#
# SPDX-License-Identifier: GPL-2.0+
#
obj-y += neu2.o

View file

@ -1,4 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd.
*/

View file

@ -1,7 +0,0 @@
#
# Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd.
#
# SPDX-License-Identifier: GPL-2.0+
#
obj-y += neu6.o

View file

@ -1,4 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd.
*/

View file

@ -1,5 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (c) 2015 Google, Inc
obj-y += app.o

View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2015 Google, Inc
*/
#include <common.h>

View file

@ -1,5 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
obj-y += qemu-x86.o

View file

@ -1,7 +0,0 @@
#
# Copyright (c) 2020 Amarula Solutions(India)
#
# SPDX-License-Identifier: GPL-2.0+
#
obj-y += px30_core.o

View file

@ -1,4 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (c) 2020 Amarula Solutions(India)
*/

View file

@ -1,5 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (c) 2016 Andreas Färber
obj-y += geekbox.o

View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (c) 2016 Andreas Färber
*/
#include <common.h>

View file

@ -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

View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2014 Google, Inc
*/
#include <common.h>

View file

@ -1,5 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (c) 2016 Google, Inc
obj-y += samus.o

View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2016 Google, Inc
*/
#include <common.h>

View file

@ -1,5 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (c) 2015 Google, Inc
obj-y += panther.o

View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2015 Google, Inc
*/
#include <common.h>

View file

@ -1,3 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
obj-y += odroid_m1.o

View file

@ -1 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+

View file

@ -1,3 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
obj-y += hg556a.o

View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
*/
#include <common.h>

View file

@ -1,7 +0,0 @@
#
# Copyright (C) 2019 Intel Corporation <www.intel.com>
#
# SPDX-License-Identifier: GPL-2.0
#
obj-y := socfpga.o

View file

@ -1,7 +0,0 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2019 Intel Corporation <www.intel.com>
*
*/
#include <common.h>

View file

@ -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

View file

@ -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>

View file

@ -1,7 +0,0 @@
#
# Copyright (C) 2020-2021 Intel Corporation <www.intel.com>
#
# SPDX-License-Identifier: GPL-2.0
#
obj-y := socfpga.o

View file

@ -1,7 +0,0 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2020-2021 Intel Corporation <www.intel.com>
*
*/
#include <common.h>

View file

@ -1,5 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2015 Stefan Roese <sr@denx.de>
obj-y := socfpga.o

View file

@ -1,4 +0,0 @@
/*
* Currently nothing special is needed on this board, empty file to
* make build scripts happy
*/

View file

@ -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];
/*

View file

@ -1,3 +0,0 @@
# SPDX-License-Identifier: GPL-2.0
obj-y += board.o

View file

@ -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>
*/

View file

@ -1,3 +0,0 @@
# SPDX-License-Identifier: GPL-2.0
obj-y += board.o

View file

@ -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>
*/

View file

@ -1,3 +0,0 @@
# SPDX-License-Identifier: GPL-2.0
obj-y += board.o

View file

@ -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>

View file

@ -1,7 +0,0 @@
#
# (C) Copyright 2016 Rockchip Electronics Co., Ltd
#
# SPDX-License-Identifier: GPL-2.0+
#
obj-y += miqi-rk3288.o

View file

@ -1,4 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
*/

View file

@ -1,3 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
obj-y += cg3100d.o

View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
*/
#include <common.h>

View file

@ -1,3 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
obj-y += quartz64-rk3566.o

View file

@ -1 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+

View file

@ -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

View file

@ -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) {}

View file

@ -1,7 +0,0 @@
#
# (C) Copyright 2015 Heiko Stuebner
#
# SPDX-License-Identifier: GPL-2.0+
#
obj-y += rock.o

View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2015 Google, Inc
*/
#include <common.h>

View file

@ -1,7 +0,0 @@
#
# (C) Copyright 2015 Google, Inc
#
# SPDX-License-Identifier: GPL-2.0+
#
obj-y += rock2.o

View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2015 Google, Inc
*/
#include <common.h>

View file

@ -1,3 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
obj-y += mk808.o

View file

@ -1,3 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
#include <common.h>

View file

@ -1,7 +0,0 @@
#
# (C) Copyright 2017 Rockchip Electronics Co., Ltd
#
# SPDX-License-Identifier: GPL-2.0+
#
obj-y += evb_px30.o

View file

@ -1,4 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2019 Rockchip Electronics Co., Ltd
*/

View file

@ -1,5 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (c) 2017 Rockchip Electronics Co., Ltd
obj-y += evb-px5.o

View file

@ -1,4 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (c) 2017 Andy Yan
*/

View file

@ -1,5 +0,0 @@
#
# SPDX-License-Identifier: GPL-2.0+
#
obj-y += evk-rk3128.o

View file

@ -1,7 +0,0 @@
#
# (C) Copyright 2015 Google, Inc
#
# SPDX-License-Identifier: GPL-2.0+
#
obj-y += evb_rk3229.o

View file

@ -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>

View file

@ -1,7 +0,0 @@
#
# (C) Copyright 2016 Rockchip Electronics Co., Ltd
#
# SPDX-License-Identifier: GPL-2.0+
#
obj-y += evb-rk3288.o

View file

@ -1,4 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
*/

View file

@ -1,7 +0,0 @@
#
# (C) Copyright 2016 Rockchip Electronics Co., Ltd
#
# SPDX-License-Identifier: GPL-2.0+
#
obj-y += evb-rk3328.o

View file

@ -1,4 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
*/

View file

@ -1,7 +0,0 @@
#
# (C) Copyright 2021 Rockchip Electronics Co., Ltd
#
# SPDX-License-Identifier: GPL-2.0+
#
obj-y += evb_rk3568.o

View file

@ -1,4 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2021 Rockchip Electronics Co., Ltd
*/

Some files were not shown because too many files have changed in this diff Show more