Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-13 15:03:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

arm: mach-k3: Move code specific to a SoC into that SoC's directory

Browse Source 
Each SoC now has a directory in mach-k3, let's move the SoC specific
files into their respective directories.

Signed-off-by: Andrew Davis <afd@ti.com>
This commit is contained in:
Andrew Davis
2024-05-10 15:21:24 -05:00
committed by Tom Rini
parent 830d83ec38
commit 42826664e4
23 changed files with 88 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
arch/arm/mach-k3/Makefile
View File

@@ -6,24 +6,12 @@
obj-$(CONFIG_ARM64) += arm64/
obj-$(CONFIG_CPU_V7R) += r5/
obj-$(CONFIG_OF_LIBFDT) += common_fdt.o
ifeq ($(CONFIG_OF_LIBFDT)$(CONFIG_OF_SYSTEM_SETUP),yy)
obj-$(CONFIG_SOC_K3_AM654) += am654_fdt.o
obj-$(CONFIG_SOC_K3_J721E) += j721e_fdt.o
obj-$(CONFIG_SOC_K3_J721S2) += j721s2_fdt.o
obj-$(CONFIG_SOC_K3_AM625) += am625_fdt.o
obj-$(CONFIG_SOC_K3_AM62A7) += am62a7_fdt.o
obj-$(CONFIG_SOC_K3_J784S4) += j784s4_fdt.o
endif
ifeq ($(CONFIG_SPL_BUILD),y)
obj-$(CONFIG_SOC_K3_AM654) += am654_init.o
obj-$(CONFIG_SOC_K3_J721E) += j721e_init.o
obj-$(CONFIG_SOC_K3_J721S2) += j721s2_init.o
obj-$(CONFIG_SOC_K3_AM642) += am642_init.o
obj-$(CONFIG_SOC_K3_AM625) += am625_init.o
obj-$(CONFIG_SOC_K3_AM62A7) += am62a7_init.o
obj-$(CONFIG_SOC_K3_J784S4) += j784s4_init.o
obj-$(CONFIG_SOC_K3_AM62P5) += am62p5_init.o
endif
obj-y += common.o security.o
obj-$(CONFIG_SOC_K3_AM62A7) += am62ax/
obj-$(CONFIG_SOC_K3_AM62P5) += am62px/
obj-$(CONFIG_SOC_K3_AM625) += am62x/
obj-$(CONFIG_SOC_K3_AM642) += am64x/
obj-$(CONFIG_SOC_K3_AM654) += am65x/
obj-$(CONFIG_SOC_K3_J721E) += j721e/
obj-$(CONFIG_SOC_K3_J721S2) += j721s2/
obj-$(CONFIG_SOC_K3_J784S4) += j784s4/

7
arch/arm/mach-k3/am62ax/Makefile Normal file
View File

@@ -0,0 +1,7 @@
# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2024 Texas Instruments Incorporated - https://www.ti.com/
# Andrew Davis <afd@ti.com>
obj-$(CONFIG_OF_SYSTEM_SETUP) += am62a7_fdt.o
obj-$(CONFIG_SPL_BUILD) += am62a7_init.o

3
arch/arm/mach-k3/am62a7_fdt.c → arch/arm/mach-k3/am62ax/am62a7_fdt.c
View File

@@ -4,9 +4,10 @@
*/
#include <asm/hardware.h>
#include "common_fdt.h"
#include <fdt_support.h>
#include "../common_fdt.h"
int ft_system_setup(void *blob, struct bd_info *bd)
{
fdt_fixup_reserved(blob, "tfa", CONFIG_K3_ATF_LOAD_ADDR, 0x80000);

5
arch/arm/mach-k3/am62a7_init.c → arch/arm/mach-k3/am62ax/am62a7_init.c
View File

@@ -8,12 +8,13 @@
#include <spl.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
#include "sysfw-loader.h"
#include "common.h"
#include <dm.h>
#include <dm/uclass-internal.h>
#include <dm/pinctrl.h>
#include "../sysfw-loader.h"
#include "../common.h"
struct fwl_data cbass_main_fwls[] = {
{ "FSS_DAT_REG3", 7, 8 },
};

6
arch/arm/mach-k3/am62px/Makefile Normal file
View File

@@ -0,0 +1,6 @@
# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2024 Texas Instruments Incorporated - https://www.ti.com/
# Andrew Davis <afd@ti.com>
obj-$(CONFIG_SPL_BUILD) += am62p5_init.o

5
arch/arm/mach-k3/am62p5_init.c → arch/arm/mach-k3/am62px/am62p5_init.c
View File

@@ -8,12 +8,13 @@
#include <spl.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
#include "sysfw-loader.h"
#include "common.h"
#include <dm.h>
#include <dm/uclass-internal.h>
#include <dm/pinctrl.h>
#include "../sysfw-loader.h"
#include "../common.h"
struct fwl_data cbass_main_fwls[] = {
{ "FSS_DAT_REG3", 7, 8 },
};

3
arch/arm/mach-k3/am62x/Makefile
View File

@@ -1,2 +1,5 @@
# SPDX-License-Identifier: GPL-2.0+
obj-$(CONFIG_OF_SYSTEM_SETUP) += am625_fdt.o
obj-$(CONFIG_SPL_BUILD) += am625_init.o
obj-y += boot.o

3
arch/arm/mach-k3/am625_fdt.c → arch/arm/mach-k3/am62x/am625_fdt.c
View File

@@ -4,9 +4,10 @@
*/
#include <asm/hardware.h>
#include "common_fdt.h"
#include <fdt_support.h>
#include "../common_fdt.h"
static void fdt_fixup_cores_nodes_am625(void *blob, int core_nr)
{
char node_path[32];

5
arch/arm/mach-k3/am625_init.c → arch/arm/mach-k3/am62x/am625_init.c
View File

@@ -9,13 +9,14 @@
#include <spl.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
#include "sysfw-loader.h"
#include "common.h"
#include <dm.h>
#include <dm/uclass-internal.h>
#include <dm/pinctrl.h>
#include <dm/ofnode.h>
#include "../sysfw-loader.h"
#include "../common.h"
#define RTC_BASE_ADDRESS 0x2b1f0000
#define REG_K3RTC_S_CNT_LSW (RTC_BASE_ADDRESS + 0x18)
#define REG_K3RTC_KICK0 (RTC_BASE_ADDRESS + 0x70)

2
arch/arm/mach-k3/am64x/Makefile
View File

@@ -1,2 +1,4 @@
# SPDX-License-Identifier: GPL-2.0+
obj-$(CONFIG_SPL_BUILD) += am642_init.o
obj-y += boot.o

5
arch/arm/mach-k3/am642_init.c → arch/arm/mach-k3/am64x/am642_init.c
View File

@@ -11,8 +11,6 @@
#include <spl.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
#include "sysfw-loader.h"
#include "common.h"
#include <linux/soc/ti/ti_sci_protocol.h>
#include <dm.h>
#include <dm/uclass-internal.h>
@@ -21,6 +19,9 @@
#include <dm/root.h>
#include <command.h>
#include "../sysfw-loader.h"
#include "../common.h"
#define CTRLMMR_MCU_RST_CTRL 0x04518170
#define CTRLMMR_MCU_RST_SRC (MCU_CTRL_MMR0_BASE + 0x18178)

7
arch/arm/mach-k3/am65x/Makefile Normal file
View File

@@ -0,0 +1,7 @@
# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2024 Texas Instruments Incorporated - https://www.ti.com/
# Andrew Davis <afd@ti.com>
obj-$(CONFIG_OF_SYSTEM_SETUP) += am654_fdt.o
obj-$(CONFIG_SPL_BUILD) += am654_init.o

3
arch/arm/mach-k3/am654_fdt.c → arch/arm/mach-k3/am65x/am654_fdt.c
View File

@@ -3,9 +3,10 @@
* Copyright 2023 Toradex - https://www.toradex.com/
*/
#include "common_fdt.h"
#include <fdt_support.h>
#include "../common_fdt.h"
int ft_system_setup(void *blob, struct bd_info *bd)
{
return fdt_fixup_msmc_ram_k3(blob);

5
arch/arm/mach-k3/am654_init.c → arch/arm/mach-k3/am65x/am654_init.c
View File

@@ -12,8 +12,6 @@
#include <asm/io.h>
#include <spl.h>
#include <asm/arch/hardware.h>
#include "sysfw-loader.h"
#include "common.h"
#include <dm.h>
#include <dm/uclass-internal.h>
#include <dm/pinctrl.h>
@@ -22,6 +20,9 @@
#include <mmc.h>
#include <stdlib.h>
#include "../sysfw-loader.h"
#include "../common.h"
DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_K3_LOAD_SYSFW

7
arch/arm/mach-k3/j721e/Makefile Normal file
View File

@@ -0,0 +1,7 @@
# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2024 Texas Instruments Incorporated - https://www.ti.com/
# Andrew Davis <afd@ti.com>
obj-$(CONFIG_OF_SYSTEM_SETUP) += j721e_fdt.o
obj-$(CONFIG_SPL_BUILD) += j721e_init.o

3
arch/arm/mach-k3/j721e_fdt.c → arch/arm/mach-k3/j721e/j721e_fdt.c
View File

@@ -3,9 +3,10 @@
* Copyright 2023 Toradex - https://www.toradex.com/
*/
#include "common_fdt.h"
#include <fdt_support.h>
#include "../common_fdt.h"
int ft_system_setup(void *blob, struct bd_info *bd)
{
return fdt_fixup_msmc_ram_k3(blob);

5
arch/arm/mach-k3/j721e_init.c → arch/arm/mach-k3/j721e/j721e_init.c
View File

@@ -11,8 +11,6 @@
#include <asm/io.h>
#include <asm/armv7_mpu.h>
#include <asm/arch/hardware.h>
#include "sysfw-loader.h"
#include "common.h"
#include <linux/soc/ti/ti_sci_protocol.h>
#include <dm.h>
#include <dm/uclass-internal.h>
@@ -22,6 +20,9 @@
#include <mmc.h>
#include <remoteproc.h>
#include "../sysfw-loader.h"
#include "../common.h"
#ifdef CONFIG_K3_LOAD_SYSFW
struct fwl_data cbass_hc_cfg0_fwls[] = {
#if defined(CONFIG_TARGET_J721E_R5_EVM)

7
arch/arm/mach-k3/j721s2/Makefile Normal file
View File

@@ -0,0 +1,7 @@
# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2024 Texas Instruments Incorporated - https://www.ti.com/
# Andrew Davis <afd@ti.com>
obj-$(CONFIG_OF_SYSTEM_SETUP) += j721s2_fdt.o
obj-$(CONFIG_SPL_BUILD) += j721s2_init.o

3
arch/arm/mach-k3/j721s2_fdt.c → arch/arm/mach-k3/j721s2/j721s2_fdt.c
View File

@@ -3,9 +3,10 @@
* Copyright 2023 Toradex - https://www.toradex.com/
*/
#include "common_fdt.h"
#include <fdt_support.h>
#include "../common_fdt.h"
int ft_system_setup(void *blob, struct bd_info *bd)
{
return fdt_fixup_msmc_ram_k3(blob);

5
arch/arm/mach-k3/j721s2_init.c → arch/arm/mach-k3/j721s2/j721s2_init.c
View File

@@ -11,8 +11,6 @@
#include <asm/io.h>
#include <asm/armv7_mpu.h>
#include <asm/arch/hardware.h>
#include "sysfw-loader.h"
#include "common.h"
#include <linux/soc/ti/ti_sci_protocol.h>
#include <dm.h>
#include <dm/uclass-internal.h>
@@ -21,6 +19,9 @@
#include <mmc.h>
#include <remoteproc.h>
#include "../sysfw-loader.h"
#include "../common.h"
struct fwl_data cbass_hc_cfg0_fwls[] = {
{ "PCIE0_CFG", 2577, 7 },
{ "EMMC8SS0_CFG", 2579, 4 },

7
arch/arm/mach-k3/j784s4/Makefile Normal file
View File

@@ -0,0 +1,7 @@
# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2024 Texas Instruments Incorporated - https://www.ti.com/
# Andrew Davis <afd@ti.com>
obj-$(CONFIG_OF_SYSTEM_SETUP) += j784s4_fdt.o
obj-$(CONFIG_SPL_BUILD) += j784s4_init.o

3
arch/arm/mach-k3/j784s4_fdt.c → arch/arm/mach-k3/j784s4/j784s4_fdt.c
View File

@@ -6,9 +6,10 @@
* Apurva Nandan <a-nandan@ti.com>
*/
#include "common_fdt.h"
#include <fdt_support.h>
#include "../common_fdt.h"
int ft_system_setup(void *blob, struct bd_info *bd)
{
return fdt_fixup_msmc_ram_k3(blob);

5
arch/arm/mach-k3/j784s4_init.c → arch/arm/mach-k3/j784s4/j784s4_init.c
View File

@@ -11,8 +11,6 @@
#include <asm/io.h>
#include <asm/armv7_mpu.h>
#include <asm/arch/hardware.h>
#include "sysfw-loader.h"
#include "common.h"
#include <linux/soc/ti/ti_sci_protocol.h>
#include <dm.h>
#include <dm/uclass-internal.h>
@@ -20,6 +18,9 @@
#include <mmc.h>
#include <remoteproc.h>
#include "../sysfw-loader.h"
#include "../common.h"
#define J784S4_MAX_DDR_CONTROLLERS 4
struct fwl_data infra_cbass0_fwls[] = {