Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 15:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

arm: mach-k3: Rename SOC_K3_AM6 to SOC_K3_AM654

Browse source 
The first AM6x device was the AM654x, but being the first we named it
just AM6, since more devices have come out with this same prefix we
should switch it to the normal convention of using the full name of the
first compatibility device the series. This makes what device we are
talking about more clear and matches all the K3 devices added since.

Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Andrew Davis 2022-07-15 10:25:27 -05:00 committed by Tom Rini
parent 46da163b72
commit 80b93bb71c
19 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/dts/Makefile
View file

@ -1194,7 +1194,7 @@ dtb-$(CONFIG_STM32MP15x) += \
stm32mp15xx-dhcor-avenger96.dtb \ stm32mp15xx-dhcor-avenger96.dtb \
stm32mp15xx-dhcor-drc-compact.dtb stm32mp15xx-dhcor-drc-compact.dtb
dtb-$(CONFIG_SOC_K3_AM6) += \ dtb-$(CONFIG_SOC_K3_AM654) += \
k3-am654-base-board.dtb \ k3-am654-base-board.dtb \
k3-am654-r5-base-board.dtb \ k3-am654-r5-base-board.dtb \
k3-am65-iot2050-spl.dtb \ k3-am65-iot2050-spl.dtb \

14
arch/arm/mach-k3/Kconfig
View file

@ -4,8 +4,8 @@ choice
prompt "Texas Instruments' K3 based SoC select" prompt "Texas Instruments' K3 based SoC select"
optional optional
config SOC_K3_AM6 config SOC_K3_AM654
bool "TI's K3 based AM6 SoC Family Support" bool "TI's K3 based AM654 SoC Family Support"
config SOC_K3_J721E config SOC_K3_J721E
bool "TI's K3 based J721E SoC Family Support" bool "TI's K3 based J721E SoC Family Support"
@ -26,7 +26,7 @@ config SYS_SOC
config SYS_K3_NON_SECURE_MSRAM_SIZE config SYS_K3_NON_SECURE_MSRAM_SIZE
hex hex
default 0x80000 if SOC_K3_AM6 default 0x80000 if SOC_K3_AM654
default 0x100000 if SOC_K3_J721E || SOC_K3_J721S2 default 0x100000 if SOC_K3_J721E || SOC_K3_J721S2
default 0x1c0000 if SOC_K3_AM642 default 0x1c0000 if SOC_K3_AM642
default 0x3c000 if SOC_K3_AM625 default 0x3c000 if SOC_K3_AM625
@ -38,7 +38,7 @@ config SYS_K3_NON_SECURE_MSRAM_SIZE
config SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE config SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE
hex hex
default 0x58000 if SOC_K3_AM6 default 0x58000 if SOC_K3_AM654
default 0xc0000 if SOC_K3_J721E || SOC_K3_J721S2 default 0xc0000 if SOC_K3_J721E || SOC_K3_J721S2
default 0x180000 if SOC_K3_AM642 default 0x180000 if SOC_K3_AM642
default 0x38000 if SOC_K3_AM625 default 0x38000 if SOC_K3_AM625
@ -48,21 +48,21 @@ config SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE
config SYS_K3_MCU_SCRATCHPAD_BASE config SYS_K3_MCU_SCRATCHPAD_BASE
hex hex
default 0x40280000 if SOC_K3_AM6 default 0x40280000 if SOC_K3_AM654
default 0x40280000 if SOC_K3_J721E || SOC_K3_J721S2 default 0x40280000 if SOC_K3_J721E || SOC_K3_J721S2
help help
Describes the base address of MCU Scratchpad RAM. Describes the base address of MCU Scratchpad RAM.
config SYS_K3_MCU_SCRATCHPAD_SIZE config SYS_K3_MCU_SCRATCHPAD_SIZE
hex hex
default 0x200 if SOC_K3_AM6 default 0x200 if SOC_K3_AM654
default 0x200 if SOC_K3_J721E || SOC_K3_J721S2 default 0x200 if SOC_K3_J721E || SOC_K3_J721S2
help help
Describes the size of MCU Scratchpad RAM. Describes the size of MCU Scratchpad RAM.
config SYS_K3_BOOT_PARAM_TABLE_INDEX config SYS_K3_BOOT_PARAM_TABLE_INDEX
hex hex
default 0x41c7fbfc if SOC_K3_AM6 default 0x41c7fbfc if SOC_K3_AM654
default 0x41cffbfc if SOC_K3_J721E default 0x41cffbfc if SOC_K3_J721E
default 0x41cfdbfc if SOC_K3_J721S2 default 0x41cfdbfc if SOC_K3_J721S2
default 0x701bebfc if SOC_K3_AM642 default 0x701bebfc if SOC_K3_AM642

2
arch/arm/mach-k3/Makefile
View file

@ -11,7 +11,7 @@ obj-$(CONFIG_CPU_V7R) += r5_mpu.o lowlevel_init.o
obj-$(CONFIG_TI_SECURE_DEVICE) += security.o obj-$(CONFIG_TI_SECURE_DEVICE) += security.o
obj-$(CONFIG_ARM64) += cache.o obj-$(CONFIG_ARM64) += cache.o
ifeq ($(CONFIG_SPL_BUILD),y) ifeq ($(CONFIG_SPL_BUILD),y)
obj-$(CONFIG_SOC_K3_AM6) += am6_init.o obj-$(CONFIG_SOC_K3_AM654) += am654_init.o
obj-$(CONFIG_SOC_K3_J721E) += j721e_init.o obj-$(CONFIG_SOC_K3_J721E) += j721e_init.o
obj-$(CONFIG_SOC_K3_J721S2) += j721s2_init.o obj-$(CONFIG_SOC_K3_J721S2) += j721s2_init.o
obj-$(CONFIG_SOC_K3_AM642) += am642_init.o obj-$(CONFIG_SOC_K3_AM642) += am642_init.o

0
arch/arm/mach-k3/am6_init.c → arch/arm/mach-k3/am654_init.c
View file

4
arch/arm/mach-k3/arm64-mmu.c
View file

@ -13,7 +13,7 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/armv8/mmu.h> #include <asm/armv8/mmu.h>
#ifdef CONFIG_SOC_K3_AM6 #ifdef CONFIG_SOC_K3_AM654
/* NR_DRAM_BANKS + 32bit IO + 64bit IO + terminator */ /* NR_DRAM_BANKS + 32bit IO + 64bit IO + terminator */
#define NR_MMU_REGIONS (CONFIG_NR_DRAM_BANKS + 5) #define NR_MMU_REGIONS (CONFIG_NR_DRAM_BANKS + 5)
@ -64,7 +64,7 @@ struct mm_region am654_mem_map[NR_MMU_REGIONS] = {
}; };
struct mm_region *mem_map = am654_mem_map; struct mm_region *mem_map = am654_mem_map;
#endif /* CONFIG_SOC_K3_AM6 */ #endif /* CONFIG_SOC_K3_AM654 */
#ifdef CONFIG_SOC_K3_J721E #ifdef CONFIG_SOC_K3_J721E

2
arch/arm/mach-k3/include/mach/hardware.h
View file

@ -6,7 +6,7 @@
#ifndef _ASM_ARCH_HARDWARE_H_ #ifndef _ASM_ARCH_HARDWARE_H_
#define _ASM_ARCH_HARDWARE_H_ #define _ASM_ARCH_HARDWARE_H_
#ifdef CONFIG_SOC_K3_AM6 #ifdef CONFIG_SOC_K3_AM654
#include "am6_hardware.h" #include "am6_hardware.h"
#endif #endif

2
arch/arm/mach-k3/include/mach/spl.h
View file

@ -6,7 +6,7 @@
#ifndef _ASM_ARCH_SPL_H_ #ifndef _ASM_ARCH_SPL_H_
#define _ASM_ARCH_SPL_H_ #define _ASM_ARCH_SPL_H_
#ifdef CONFIG_SOC_K3_AM6 #ifdef CONFIG_SOC_K3_AM654
#include "am6_spl.h" #include "am6_spl.h"
#endif #endif

2
board/siemens/iot2050/Kconfig
View file

@ -9,7 +9,7 @@
config TARGET_IOT2050_A53 config TARGET_IOT2050_A53
bool "IOT2050 running on A53" bool "IOT2050 running on A53"
select ARM64 select ARM64
select SOC_K3_AM6 select SOC_K3_AM654
select BOARD_LATE_INIT select BOARD_LATE_INIT
select SYS_DISABLE_DCACHE_OPS select SYS_DISABLE_DCACHE_OPS
select BINMAN select BINMAN

4
board/ti/am65x/Kconfig
View file

@ -10,7 +10,7 @@ choice
config TARGET_AM654_A53_EVM config TARGET_AM654_A53_EVM
bool "TI K3 based AM654 EVM running on A53" bool "TI K3 based AM654 EVM running on A53"
select ARM64 select ARM64
select SOC_K3_AM6 select SOC_K3_AM654
select SYS_DISABLE_DCACHE_OPS select SYS_DISABLE_DCACHE_OPS
select BOARD_LATE_INIT select BOARD_LATE_INIT
imply TI_I2C_BOARD_DETECT imply TI_I2C_BOARD_DETECT
@ -19,7 +19,7 @@ config TARGET_AM654_R5_EVM
bool "TI K3 based AM654 EVM running on R5" bool "TI K3 based AM654 EVM running on R5"
select CPU_V7R select CPU_V7R
select SYS_THUMB_BUILD select SYS_THUMB_BUILD
select SOC_K3_AM6 select SOC_K3_AM654
select K3_LOAD_SYSFW select K3_LOAD_SYSFW
select K3_AM654_DDRSS select K3_AM654_DDRSS
imply SYS_K3_SPL_ATF imply SYS_K3_SPL_ATF

2
configs/am65x_evm_a53_defconfig
View file

@ -6,7 +6,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_SOC_K3_AM6=y CONFIG_SOC_K3_AM654=y
CONFIG_TARGET_AM654_A53_EVM=y CONFIG_TARGET_AM654_A53_EVM=y
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0x680000 CONFIG_ENV_OFFSET=0x680000

2
configs/am65x_evm_r5_defconfig
View file

@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_SOC_K3_AM6=y CONFIG_SOC_K3_AM654=y
CONFIG_K3_EARLY_CONS=y CONFIG_K3_EARLY_CONS=y
CONFIG_TARGET_AM654_R5_EVM=y CONFIG_TARGET_AM654_R5_EVM=y
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000

2
configs/am65x_evm_r5_usbdfu_defconfig
View file

@ -7,7 +7,7 @@ CONFIG_SPL_MISC=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_SOC_K3_AM6=y CONFIG_SOC_K3_AM654=y
CONFIG_K3_EARLY_CONS=y CONFIG_K3_EARLY_CONS=y
CONFIG_TARGET_AM654_R5_EVM=y CONFIG_TARGET_AM654_R5_EVM=y
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000

2
configs/am65x_evm_r5_usbmsc_defconfig
View file

@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_SOC_K3_AM6=y CONFIG_SOC_K3_AM654=y
CONFIG_K3_EARLY_CONS=y CONFIG_K3_EARLY_CONS=y
CONFIG_TARGET_AM654_R5_EVM=y CONFIG_TARGET_AM654_R5_EVM=y
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000

2
configs/am65x_hs_evm_a53_defconfig
View file

@ -7,7 +7,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_SOC_K3_AM6=y CONFIG_SOC_K3_AM654=y
CONFIG_TARGET_AM654_A53_EVM=y CONFIG_TARGET_AM654_A53_EVM=y
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0x680000 CONFIG_ENV_OFFSET=0x680000

2
configs/am65x_hs_evm_r5_defconfig
View file

@ -7,7 +7,7 @@ CONFIG_SPL_GPIO=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_SOC_K3_AM6=y CONFIG_SOC_K3_AM654=y
CONFIG_K3_EARLY_CONS=y CONFIG_K3_EARLY_CONS=y
CONFIG_TARGET_AM654_R5_EVM=y CONFIG_TARGET_AM654_R5_EVM=y
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000

2
configs/iot2050_defconfig
View file

@ -7,7 +7,7 @@ CONFIG_SPL_GPIO=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_SOC_K3_AM6=y CONFIG_SOC_K3_AM654=y
CONFIG_TARGET_IOT2050_A53=y CONFIG_TARGET_IOT2050_A53=y
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0x680000 CONFIG_ENV_OFFSET=0x680000

2
drivers/dma/ti/Makefile
View file

@ -3,7 +3,7 @@
obj-$(CONFIG_TI_K3_NAVSS_UDMA) += k3-udma.o obj-$(CONFIG_TI_K3_NAVSS_UDMA) += k3-udma.o
obj-$(CONFIG_TI_K3_PSIL) += k3-psil-data.o obj-$(CONFIG_TI_K3_PSIL) += k3-psil-data.o
k3-psil-data-y += k3-psil.o k3-psil-data-y += k3-psil.o
k3-psil-data-$(CONFIG_SOC_K3_AM6) += k3-psil-am654.o k3-psil-data-$(CONFIG_SOC_K3_AM654) += k3-psil-am654.o
k3-psil-data-$(CONFIG_SOC_K3_J721E) += k3-psil-j721e.o k3-psil-data-$(CONFIG_SOC_K3_J721E) += k3-psil-j721e.o
k3-psil-data-$(CONFIG_SOC_K3_J721S2) += k3-psil-j721s2.o k3-psil-data-$(CONFIG_SOC_K3_J721S2) += k3-psil-j721s2.o
k3-psil-data-$(CONFIG_SOC_K3_AM642) += k3-psil-am64.o k3-psil-data-$(CONFIG_SOC_K3_AM642) += k3-psil-am64.o

2
drivers/dma/ti/k3-psil.c
View file

@ -16,7 +16,7 @@ struct psil_endpoint_config *psil_get_ep_config(u32 thread_id)
int i; int i;
if (!soc_ep_map) { if (!soc_ep_map) {
if (IS_ENABLED(CONFIG_SOC_K3_AM6)) if (IS_ENABLED(CONFIG_SOC_K3_AM654))
soc_ep_map = &am654_ep_map; soc_ep_map = &am654_ep_map;
else if (IS_ENABLED(CONFIG_SOC_K3_J721E)) else if (IS_ENABLED(CONFIG_SOC_K3_J721E))
soc_ep_map = &j721e_ep_map; soc_ep_map = &j721e_ep_map;

2
drivers/ram/Kconfig
View file

@ -45,7 +45,7 @@ config MPC83XX_SDRAM
config K3_AM654_DDRSS config K3_AM654_DDRSS
bool "Enable AM654 DDRSS support" bool "Enable AM654 DDRSS support"
depends on RAM && SOC_K3_AM6 depends on RAM && SOC_K3_AM654
help help
K3 based AM654 devices has DDR memory subsystem that comprises K3 based AM654 devices has DDR memory subsystem that comprises
Synopys DDR controller, Synopsis DDR phy and wrapper logic to Synopys DDR controller, Synopsis DDR phy and wrapper logic to