diff options
| -rw-r--r-- | arch/arm/boards/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/boards/tqma93xx/Makefile (renamed from arch/arm/boards/tqmba9xxxca/Makefile) | 0 | ||||
| -rw-r--r-- | arch/arm/boards/tqma93xx/board.c (renamed from arch/arm/boards/tqmba9xxxca/board.c) | 0 | ||||
| -rw-r--r-- | arch/arm/boards/tqma93xx/lowlevel.c (renamed from arch/arm/boards/tqmba9xxxca/lowlevel.c) | 6 | ||||
| -rw-r--r-- | arch/arm/boards/tqma93xx/lpddr4x_tqma93xxca_timing.c (renamed from arch/arm/boards/tqmba9xxxca/lpddr4x_tqma93xxca_timing.c) | 0 | ||||
| -rw-r--r-- | arch/arm/configs/imx_v8_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/multi_v8_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/dts/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 4 | ||||
| -rw-r--r-- | images/Makefile.imx | 6 |
10 files changed, 12 insertions, 12 deletions
diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile index 875d011573..e597b02be6 100644 --- a/arch/arm/boards/Makefile +++ b/arch/arm/boards/Makefile @@ -200,4 +200,4 @@ obj-$(CONFIG_MACH_RADXA_ROCK3) += radxa-rock3/ obj-$(CONFIG_MACH_RADXA_ROCK5) += radxa-rock5/ obj-$(CONFIG_MACH_VARISCITE_DT8MCUSTOMBOARD_IMX8MP) += variscite-dt8mcustomboard-imx8mp/ obj-$(CONFIG_MACH_RADXA_CM3) += radxa-cm3/ -obj-$(CONFIG_MACH_TQ_MBA9XXXCA) += tqmba9xxxca/ +obj-$(CONFIG_MACH_TQMA93XX) += tqma93xx/ diff --git a/arch/arm/boards/tqmba9xxxca/Makefile b/arch/arm/boards/tqma93xx/Makefile index 2957523cdd..2957523cdd 100644 --- a/arch/arm/boards/tqmba9xxxca/Makefile +++ b/arch/arm/boards/tqma93xx/Makefile diff --git a/arch/arm/boards/tqmba9xxxca/board.c b/arch/arm/boards/tqma93xx/board.c index b181784079..b181784079 100644 --- a/arch/arm/boards/tqmba9xxxca/board.c +++ b/arch/arm/boards/tqma93xx/board.c diff --git a/arch/arm/boards/tqmba9xxxca/lowlevel.c b/arch/arm/boards/tqma93xx/lowlevel.c index 64913b8de9..9e2e0828ca 100644 --- a/arch/arm/boards/tqmba9xxxca/lowlevel.c +++ b/arch/arm/boards/tqma93xx/lowlevel.c @@ -15,7 +15,7 @@ extern char __dtb_z_imx93_tqma9352_mba93xxca_start[]; extern struct dram_timing_info tqma93xxca_dram_timing; -static noinline void tqma9352_mba93xxca_continue(void) +static noinline void tqma93xx_continue(void) { void *base = IOMEM(MX9_UART1_BASE_ADDR); void *muxbase = IOMEM(MX9_IOMUXC_BASE_ADDR); @@ -34,7 +34,7 @@ static noinline void tqma9352_mba93xxca_continue(void) imx93_barebox_entry(__dtb_z_imx93_tqma9352_mba93xxca_start); } -ENTRY_FUNCTION(start_imx93_tqma9352_mba93xxca, r0, r1, r2) +ENTRY_FUNCTION(start_imx93_tqma93xx, r0, r1, r2) { if (current_el() == 3) imx93_cpu_lowlevel_init(); @@ -42,5 +42,5 @@ ENTRY_FUNCTION(start_imx93_tqma9352_mba93xxca, r0, r1, r2) relocate_to_current_adr(); setup_c(); - tqma9352_mba93xxca_continue(); + tqma93xx_continue(); } diff --git a/arch/arm/boards/tqmba9xxxca/lpddr4x_tqma93xxca_timing.c b/arch/arm/boards/tqma93xx/lpddr4x_tqma93xxca_timing.c index 68d8da3b5b..68d8da3b5b 100644 --- a/arch/arm/boards/tqmba9xxxca/lpddr4x_tqma93xxca_timing.c +++ b/arch/arm/boards/tqma93xx/lpddr4x_tqma93xxca_timing.c diff --git a/arch/arm/configs/imx_v8_defconfig b/arch/arm/configs/imx_v8_defconfig index 731156e4fe..902c22e8b2 100644 --- a/arch/arm/configs/imx_v8_defconfig +++ b/arch/arm/configs/imx_v8_defconfig @@ -13,7 +13,7 @@ CONFIG_MACH_TQ_MBA8MPXL=y CONFIG_MACH_VARISCITE_DT8MCUSTOMBOARD_IMX8MP=y CONFIG_MACH_ZII_IMX8MQ_DEV=y CONFIG_64BIT=y -CONFIG_MACH_TQ_MBA9XXXCA=y +CONFIG_MACH_TQMA93XX=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_MMU=y CONFIG_MALLOC_SIZE=0x0 diff --git a/arch/arm/configs/multi_v8_defconfig b/arch/arm/configs/multi_v8_defconfig index 677395b1f9..31d849bcce 100644 --- a/arch/arm/configs/multi_v8_defconfig +++ b/arch/arm/configs/multi_v8_defconfig @@ -18,7 +18,7 @@ CONFIG_MACH_SKOV_IMX8MP=y CONFIG_MACH_TQ_MBA8MPXL=y CONFIG_MACH_VARISCITE_DT8MCUSTOMBOARD_IMX8MP=y CONFIG_MACH_ZII_IMX8MQ_DEV=y -CONFIG_MACH_TQ_MBA9XXXCA=y +CONFIG_MACH_TQMA93XX=y CONFIG_IMX_IIM=y CONFIG_ARCH_LAYERSCAPE_PPA=y CONFIG_MACH_LS1028ARDB=y diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 301014eaff..9b08fe5643 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -221,6 +221,6 @@ lwl-$(CONFIG_MACH_LS1021AIOT) += fsl-ls1021a-iot.dtb.o lwl-$(CONFIG_MACH_ZEDBOARD) += zynq-zed.dtb.o lwl-$(CONFIG_MACH_MNT_REFORM) += imx8mq-mnt-reform2.dtb.o lwl-$(CONFIG_MACH_VARISCITE_DT8MCUSTOMBOARD_IMX8MP) += imx8mp-var-dart-dt8mcustomboard.dtb.o -lwl-$(CONFIG_MACH_TQ_MBA9XXXCA) += imx93-tqma9352-mba93xxca.dtb.o +lwl-$(CONFIG_MACH_TQMA93XX) += imx93-tqma9352-mba93xxca.dtb.o clean-files := *.dtb *.dtb.S .*.dtc .*.pre .*.dts *.dtb.z diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 60d01fe0f9..f52b7a4dd8 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -732,8 +732,8 @@ config MACH_ZII_IMX8MQ_DEV comment "i.MX93 boards" -config MACH_TQ_MBA9XXXCA - bool "TQ i.MX93 on MBa9xxxCA Board" +config MACH_TQMA93XX + bool "TQ i.MX93 on TQMA93XX Board" select ARCH_IMX93 select IMX9_DRAM select FIRMWARE_IMX93_ATF diff --git a/images/Makefile.imx b/images/Makefile.imx index 7f2f58b0f5..08496d36b7 100644 --- a/images/Makefile.imx +++ b/images/Makefile.imx @@ -509,6 +509,6 @@ cmd_imx9img = $(objtree)/scripts/imx9image -soc IMX9 -c -ap $< a55 0x2049A000 -o $(obj)/%.imx9img: $(obj)/% FORCE $(call if_changed,imx9img) -pblb-$(CONFIG_MACH_TQ_MBA9XXXCA) += start_imx93_tqma9352_mba93xxca -FILE_barebox-tqmba9xxxca.img = start_imx93_tqma9352_mba93xxca.pblb.imx9img -image-$(CONFIG_MACH_TQ_MBA9XXXCA) += barebox-tqmba9xxxca.img +pblb-$(CONFIG_MACH_TQMA93XX) += start_imx93_tqma93xx +FILE_barebox-tqma93xx.img = start_imx93_tqma93xx.pblb.imx9img +image-$(CONFIG_MACH_TQMA93XX) += barebox-tqma93xx.img |