]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arm: mach-k3: Introduce the basic files to support AM62
authorSuman Anna <s-anna@ti.com>
Wed, 25 May 2022 08:08:42 +0000 (13:38 +0530)
committerTom Rini <trini@konsulko.com>
Fri, 10 Jun 2022 17:37:32 +0000 (13:37 -0400)
The AM62 SoC family is the follow on AM335x built on K3 Multicore SoC
architecture platform, providing ultra-low-power modes, dual display,
multi-sensor edge compute, security and other BOM-saving integration.
The AM62 SoC targets broad market to enable applications such as
Industrial HMI, PLC/CNC/Robot control, Medical Equipment, Building
Automation, Appliances and more.

Some highlights of this SoC are:

* Quad-Cortex-A53s (running up to 1.4GHz) in a single cluster.
  Pin-to-pin compatible options for single and quad core are available.
* Cortex-M4F for general-purpose or safety usage.
* Dual display support, providing 24-bit RBG parallel interface and
  OLDI/LVDS-4 Lane x2, up to 200MHz pixel clock support for 2K display
  resolution.
* Selectable GPUsupport, up to 8GFLOPS, providing better user experience
  in 3D graphic display case and Android.
* PRU(Programmable Realtime Unit) support for customized programmable
  interfaces/IOs.
* Integrated Giga-bit Ethernet switch supporting up to a total of two
  external ports (TSN capable).
* 9xUARTs, 5xSPI, 6xI2C, 2xUSB2, 3xCAN-FD, 3x eMMC and SD, GPMC for
  NAND/FPGA connection, OSPI memory controller, 3xMcASP for audio,
  1x CSI-RX-4L for Camera, eCAP/eQEP, ePWM, among other peripherals.
* Dedicated Centralized System Controller for Security, Power, and
  Resource Management.
* Multiple low power modes support, ex: Deep sleep,Standby, MCU-only,
  enabling battery powered system design.

AM625 is the first device of the family. Add DT bindings for the same.

More details can be found in the Technical Reference Manual:
https://www.ti.com/lit/pdf/spruiv7

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
Signed-off-by: Aswath Govindraju <a-govindraju@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
arch/arm/mach-k3/Kconfig
arch/arm/mach-k3/Makefile
arch/arm/mach-k3/am625_init.c [new file with mode: 0644]
arch/arm/mach-k3/arm64-mmu.c
arch/arm/mach-k3/include/mach/am62_hardware.h [new file with mode: 0644]
arch/arm/mach-k3/include/mach/am62_spl.h [new file with mode: 0644]
arch/arm/mach-k3/include/mach/hardware.h
arch/arm/mach-k3/include/mach/spl.h
drivers/ram/Kconfig

index a01bf23514990e3bdb2b18d37926975b814c275b..0dc4f44fdd228104ad6096239af244164f1ea7d3 100644 (file)
@@ -16,6 +16,9 @@ config SOC_K3_J721S2
 config SOC_K3_AM642
        bool "TI's K3 based AM642 SoC Family Support"
 
+config SOC_K3_AM625
+       bool "TI's K3 based AM625 SoC Family Support"
+
 endchoice
 
 config SYS_SOC
@@ -26,6 +29,7 @@ config SYS_K3_NON_SECURE_MSRAM_SIZE
        default 0x80000 if SOC_K3_AM6
        default 0x100000 if SOC_K3_J721E || SOC_K3_J721S2
        default 0x1c0000 if SOC_K3_AM642
+       default 0x3c000 if SOC_K3_AM625
        help
          Describes the total size of the MCU or OCMC MSRAM present on
          the SoC in use. This doesn't specify the total size of SPL as
@@ -37,6 +41,7 @@ config SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE
        default 0x58000 if SOC_K3_AM6
        default 0xc0000 if SOC_K3_J721E || SOC_K3_J721S2
        default 0x180000 if SOC_K3_AM642
+       default 0x38000 if SOC_K3_AM625
        help
          Describes the maximum size of the image that ROM can download
          from any boot media.
@@ -61,6 +66,7 @@ config SYS_K3_BOOT_PARAM_TABLE_INDEX
        default 0x41cffbfc if SOC_K3_J721E
        default 0x41cfdbfc if SOC_K3_J721S2
        default 0x701bebfc if SOC_K3_AM642
+       default 0x43c3f290 if SOC_K3_AM625
        help
          Address at which ROM stores the value which determines if SPL
          is booted up by primary boot media or secondary boot media.
@@ -129,6 +135,7 @@ config K3_SYSFW_IMAGE_MMCSD_RAW_MODE_PART
 config K3_SYSFW_IMAGE_SIZE_MAX
        int "Amount of memory dynamically allocated for loading SYSFW blob"
        depends on K3_LOAD_SYSFW
+       default 163840 if SOC_K3_AM625
        default 278000
        help
          Amount of memory (in bytes) reserved through dynamic allocation at
@@ -160,7 +167,7 @@ config K3_ATF_LOAD_ADDR
 
 config K3_DM_FW
        bool "Separate DM firmware image"
-       depends on SPL && CPU_V7R && (SOC_K3_J721E || SOC_K3_J721S2) && !CLK_TI_SCI && !TI_SCI_POWER_DOMAIN
+       depends on SPL && CPU_V7R && (SOC_K3_J721E || SOC_K3_J721S2 || SOC_K3_AM625) && !CLK_TI_SCI && !TI_SCI_POWER_DOMAIN
        default y
        help
          Enabling this will indicate that the system has separate DM
index c0a6a9c87d8fac4037a2591ed7e8e15e1db224f2..8459bef93bc8575620197e0878c01ffce03ae790 100644 (file)
@@ -7,6 +7,7 @@ obj-$(CONFIG_SOC_K3_AM6) += am6_init.o
 obj-$(CONFIG_SOC_K3_J721E) += j721e_init.o j721e/ j7200/
 obj-$(CONFIG_SOC_K3_J721S2) += j721s2_init.o j721s2/
 obj-$(CONFIG_SOC_K3_AM642) += am642_init.o
+obj-$(CONFIG_SOC_K3_AM625) += am625_init.o am62x/
 obj-$(CONFIG_ARM64) += arm64-mmu.o
 obj-$(CONFIG_CPU_V7R) += r5_mpu.o lowlevel_init.o
 obj-$(CONFIG_TI_SECURE_DEVICE) += security.o
diff --git a/arch/arm/mach-k3/am625_init.c b/arch/arm/mach-k3/am625_init.c
new file mode 100644 (file)
index 0000000..0d95259
--- /dev/null
@@ -0,0 +1,271 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * AM625: SoC specific initialization
+ *
+ * Copyright (C) 2020-2022 Texas Instruments Incorporated - https://www.ti.com/
+ *     Suman Anna <s-anna@ti.com>
+ */
+
+#include <spl.h>
+#include <asm/io.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/sysfw-loader.h>
+#include "common.h"
+#include <dm.h>
+#include <dm/uclass-internal.h>
+#include <dm/pinctrl.h>
+
+#if defined(CONFIG_SPL_BUILD)
+
+/*
+ * This uninitialized global variable would normal end up in the .bss section,
+ * but the .bss is cleared between writing and reading this variable, so move
+ * it to the .data section.
+ */
+u32 bootindex __section(".data");
+static struct rom_extended_boot_data bootdata __section(".data");
+
+static void store_boot_info_from_rom(void)
+{
+       bootindex = *(u32 *)(CONFIG_SYS_K3_BOOT_PARAM_TABLE_INDEX);
+       memcpy(&bootdata, (uintptr_t *)ROM_ENTENDED_BOOT_DATA_INFO,
+              sizeof(struct rom_extended_boot_data));
+}
+
+static void ctrl_mmr_unlock(void)
+{
+       /* Unlock all WKUP_CTRL_MMR0 module registers */
+       mmr_unlock(WKUP_CTRL_MMR0_BASE, 0);
+       mmr_unlock(WKUP_CTRL_MMR0_BASE, 1);
+       mmr_unlock(WKUP_CTRL_MMR0_BASE, 2);
+       mmr_unlock(WKUP_CTRL_MMR0_BASE, 3);
+       mmr_unlock(WKUP_CTRL_MMR0_BASE, 4);
+       mmr_unlock(WKUP_CTRL_MMR0_BASE, 5);
+       mmr_unlock(WKUP_CTRL_MMR0_BASE, 6);
+       mmr_unlock(WKUP_CTRL_MMR0_BASE, 7);
+
+       /* Unlock all CTRL_MMR0 module registers */
+       mmr_unlock(CTRL_MMR0_BASE, 0);
+       mmr_unlock(CTRL_MMR0_BASE, 1);
+       mmr_unlock(CTRL_MMR0_BASE, 2);
+       mmr_unlock(CTRL_MMR0_BASE, 4);
+       mmr_unlock(CTRL_MMR0_BASE, 6);
+
+       /* Unlock all MCU_CTRL_MMR0 module registers */
+       mmr_unlock(MCU_CTRL_MMR0_BASE, 0);
+       mmr_unlock(MCU_CTRL_MMR0_BASE, 1);
+       mmr_unlock(MCU_CTRL_MMR0_BASE, 2);
+       mmr_unlock(MCU_CTRL_MMR0_BASE, 3);
+       mmr_unlock(MCU_CTRL_MMR0_BASE, 4);
+       mmr_unlock(MCU_CTRL_MMR0_BASE, 6);
+
+       /* Unlock PADCFG_CTRL_MMR padconf registers */
+       mmr_unlock(PADCFG_MMR0_BASE, 1);
+       mmr_unlock(PADCFG_MMR1_BASE, 1);
+}
+
+void board_init_f(ulong dummy)
+{
+       struct udevice *dev;
+       int ret;
+
+#if defined(CONFIG_CPU_V7R)
+       setup_k3_mpu_regions();
+#endif
+
+       /*
+        * Cannot delay this further as there is a chance that
+        * K3_BOOT_PARAM_TABLE_INDEX can be over written by SPL MALLOC section.
+        */
+       store_boot_info_from_rom();
+
+       ctrl_mmr_unlock();
+
+       /* Init DM early */
+       spl_early_init();
+
+       /*
+        * Process pinctrl for the serial0 and serial3, aka WKUP_UART0 and
+        * MAIN_UART1 modules and continue regardless of the result of pinctrl.
+        * Do this without probing the device, but instead by searching the
+        * device that would request the given sequence number if probed. The
+        * UARTs will be used by the DM firmware and TIFS firmware images
+        * respectively and the firmware depend on SPL to initialize the pin
+        * settings.
+        */
+       ret = uclass_find_device_by_seq(UCLASS_SERIAL, 0, &dev);
+       if (!ret)
+               pinctrl_select_state(dev, "default");
+
+       ret = uclass_find_device_by_seq(UCLASS_SERIAL, 3, &dev);
+       if (!ret)
+               pinctrl_select_state(dev, "default");
+
+       preloader_console_init();
+
+#ifdef CONFIG_K3_EARLY_CONS
+       /*
+        * Allow establishing an early console as required for example when
+        * doing a UART-based boot. Note that this console may not "survive"
+        * through a SYSFW PM-init step and will need a re-init in some way
+        * due to changing module clock frequencies.
+        */
+       early_console_init();
+#endif
+
+#if defined(CONFIG_K3_LOAD_SYSFW)
+       /*
+        * Configure and start up system controller firmware. Provide
+        * the U-Boot console init function to the SYSFW post-PM configuration
+        * callback hook, effectively switching on (or over) the console
+        * output.
+        */
+       ret = is_rom_loaded_sysfw(&bootdata);
+       if (!ret)
+               panic("ROM has not loaded TIFS firmware\n");
+
+       k3_sysfw_loader(true, NULL, NULL);
+#endif
+
+       /*
+        * Force probe of clk_k3 driver here to ensure basic default clock
+        * configuration is always done.
+        */
+       if (IS_ENABLED(CONFIG_SPL_CLK_K3)) {
+               ret = uclass_get_device_by_driver(UCLASS_CLK,
+                                                 DM_DRIVER_GET(ti_clk),
+                                                 &dev);
+               if (ret)
+                       printf("Failed to initialize clk-k3!\n");
+       }
+
+       /* Output System Firmware version info */
+       k3_sysfw_print_ver();
+
+#if defined(CONFIG_K3_AM64_DDRSS)
+       ret = uclass_get_device(UCLASS_RAM, 0, &dev);
+       if (ret)
+               panic("DRAM init failed: %d\n", ret);
+#endif
+}
+
+u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device)
+{
+       u32 devstat = readl(CTRLMMR_MAIN_DEVSTAT);
+       u32 bootmode_cfg = (devstat & MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_MASK) >>
+                           MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_SHIFT;
+
+       switch (boot_device) {
+       case BOOT_DEVICE_MMC1:
+               if ((bootmode_cfg & MAIN_DEVSTAT_PRIMARY_MMC_FS_RAW_MASK) >>
+                    MAIN_DEVSTAT_PRIMARY_MMC_FS_RAW_SHIFT)
+                       return MMCSD_MODE_EMMCBOOT;
+               return MMCSD_MODE_FS;
+
+       case BOOT_DEVICE_MMC2:
+               return MMCSD_MODE_FS;
+
+       default:
+               return MMCSD_MODE_RAW;
+       }
+}
+
+static u32 __get_backup_bootmedia(u32 devstat)
+{
+       u32 bkup_bootmode = (devstat & MAIN_DEVSTAT_BACKUP_BOOTMODE_MASK) >>
+                               MAIN_DEVSTAT_BACKUP_BOOTMODE_SHIFT;
+       u32 bkup_bootmode_cfg =
+                       (devstat & MAIN_DEVSTAT_BACKUP_BOOTMODE_CFG_MASK) >>
+                               MAIN_DEVSTAT_BACKUP_BOOTMODE_CFG_SHIFT;
+
+       switch (bkup_bootmode) {
+       case BACKUP_BOOT_DEVICE_UART:
+               return BOOT_DEVICE_UART;
+
+       case BACKUP_BOOT_DEVICE_USB:
+               return BOOT_DEVICE_USB;
+
+       case BACKUP_BOOT_DEVICE_ETHERNET:
+               return BOOT_DEVICE_ETHERNET;
+
+       case BACKUP_BOOT_DEVICE_MMC:
+               if (bkup_bootmode_cfg)
+                       return BOOT_DEVICE_MMC2;
+               return BOOT_DEVICE_MMC1;
+
+       case BACKUP_BOOT_DEVICE_SPI:
+               return BOOT_DEVICE_SPI;
+
+       case BACKUP_BOOT_DEVICE_I2C:
+               return BOOT_DEVICE_I2C;
+
+       case BACKUP_BOOT_DEVICE_DFU:
+               if (bkup_bootmode_cfg & MAIN_DEVSTAT_BACKUP_USB_MODE_MASK)
+                       return BOOT_DEVICE_USB;
+               return BOOT_DEVICE_DFU;
+       };
+
+       return BOOT_DEVICE_RAM;
+}
+
+static u32 __get_primary_bootmedia(u32 devstat)
+{
+       u32 bootmode = (devstat & MAIN_DEVSTAT_PRIMARY_BOOTMODE_MASK) >>
+                               MAIN_DEVSTAT_PRIMARY_BOOTMODE_SHIFT;
+       u32 bootmode_cfg = (devstat & MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_MASK) >>
+                               MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_SHIFT;
+
+       switch (bootmode) {
+       case BOOT_DEVICE_OSPI:
+               fallthrough;
+       case BOOT_DEVICE_QSPI:
+               fallthrough;
+       case BOOT_DEVICE_XSPI:
+               fallthrough;
+       case BOOT_DEVICE_SPI:
+               return BOOT_DEVICE_SPI;
+
+       case BOOT_DEVICE_ETHERNET_RGMII:
+               fallthrough;
+       case BOOT_DEVICE_ETHERNET_RMII:
+               return BOOT_DEVICE_ETHERNET;
+
+       case BOOT_DEVICE_EMMC:
+               return BOOT_DEVICE_MMC1;
+
+       case BOOT_DEVICE_MMC:
+               if ((bootmode_cfg & MAIN_DEVSTAT_PRIMARY_MMC_PORT_MASK) >>
+                               MAIN_DEVSTAT_PRIMARY_MMC_PORT_SHIFT)
+                       return BOOT_DEVICE_MMC2;
+               return BOOT_DEVICE_MMC1;
+
+       case BOOT_DEVICE_DFU:
+               if ((bootmode_cfg & MAIN_DEVSTAT_PRIMARY_USB_MODE_MASK) >>
+                   MAIN_DEVSTAT_PRIMARY_USB_MODE_SHIFT)
+                       return BOOT_DEVICE_USB;
+               return BOOT_DEVICE_DFU;
+
+       case BOOT_DEVICE_NOBOOT:
+               return BOOT_DEVICE_RAM;
+       }
+
+       return bootmode;
+}
+
+u32 spl_boot_device(void)
+{
+       u32 devstat = readl(CTRLMMR_MAIN_DEVSTAT);
+       u32 bootmedia;
+
+       if (bootindex == K3_PRIMARY_BOOTMODE)
+               bootmedia = __get_primary_bootmedia(devstat);
+       else
+               bootmedia = __get_backup_bootmedia(devstat);
+
+       debug("am625_init: %s: devstat = 0x%x bootmedia = 0x%x bootindex = %d\n",
+             __func__, devstat, bootmedia, bootindex);
+
+       return bootmedia;
+}
+
+#endif /* CONFIG_SPL_BUILD */
index 527e664318883b2b3ea2d7792b21ec717bee4402..12cb89335ad3bccc76c7002f7c0439b3656a0690 100644 (file)
@@ -222,7 +222,7 @@ struct mm_region *mem_map = j721s2_mem_map;
 
 #endif /* CONFIG_SOC_K3_J721S2 */
 
-#ifdef CONFIG_SOC_K3_AM642
+#if (CONFIG_IS_ENABLED(SOC_K3_AM642) || CONFIG_IS_ENABLED(SOC_K3_AM625))
 /* NR_DRAM_BANKS + 32bit IO + 64bit IO + terminator */
 #define NR_MMU_REGIONS (CONFIG_NR_DRAM_BANKS + 3)
 
@@ -261,4 +261,4 @@ struct mm_region am64_mem_map[NR_MMU_REGIONS] = {
 };
 
 struct mm_region *mem_map = am64_mem_map;
-#endif /* CONFIG_SOC_K3_AM642 */
+#endif /* CONFIG_SOC_K3_AM642 || CONFIG_SOC_K3_AM625 */
diff --git a/arch/arm/mach-k3/include/mach/am62_hardware.h b/arch/arm/mach-k3/include/mach/am62_hardware.h
new file mode 100644 (file)
index 0000000..cfabd20
--- /dev/null
@@ -0,0 +1,75 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * K3: AM62 SoC definitions, structures etc.
+ *
+ * Copyright (C) 2020-2022 Texas Instruments Incorporated - https://www.ti.com/
+ *     Suman Anna <s-anna@ti.com>
+ */
+
+#ifndef __ASM_ARCH_AM62_HARDWARE_H
+#define __ASM_ARCH_AM62_HARDWARE_H
+
+#include <config.h>
+#ifndef __ASSEMBLY__
+#include <linux/bitops.h>
+#endif
+
+#define PADCFG_MMR0_BASE                       0x04080000
+#define PADCFG_MMR1_BASE                       0x000f0000
+#define CTRL_MMR0_BASE                         0x00100000
+#define MCU_CTRL_MMR0_BASE                     0x04500000
+#define WKUP_CTRL_MMR0_BASE                    0x43000000
+
+#define CTRLMMR_MAIN_DEVSTAT                   (WKUP_CTRL_MMR0_BASE + 0x30)
+#define MAIN_DEVSTAT_PRIMARY_BOOTMODE_MASK     GENMASK(6, 3)
+#define MAIN_DEVSTAT_PRIMARY_BOOTMODE_SHIFT    3
+#define MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_MASK GENMASK(9, 7)
+#define MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_SHIFT        7
+#define MAIN_DEVSTAT_BACKUP_BOOTMODE_MASK      GENMASK(12, 10)
+#define MAIN_DEVSTAT_BACKUP_BOOTMODE_SHIFT     10
+#define MAIN_DEVSTAT_BACKUP_BOOTMODE_CFG_MASK  BIT(13)
+#define MAIN_DEVSTAT_BACKUP_BOOTMODE_CFG_SHIFT 13
+
+/* Primary Bootmode MMC Config macros */
+#define MAIN_DEVSTAT_PRIMARY_MMC_PORT_MASK     0x4
+#define MAIN_DEVSTAT_PRIMARY_MMC_PORT_SHIFT    2
+#define MAIN_DEVSTAT_PRIMARY_MMC_FS_RAW_MASK   0x1
+#define MAIN_DEVSTAT_PRIMARY_MMC_FS_RAW_SHIFT  0
+
+/* Primary Bootmode USB Config macros */
+#define MAIN_DEVSTAT_PRIMARY_USB_MODE_SHIFT    1
+#define MAIN_DEVSTAT_PRIMARY_USB_MODE_MASK     0x02
+
+/* Backup Bootmode USB Config macros */
+#define MAIN_DEVSTAT_BACKUP_USB_MODE_MASK      0x01
+
+/*
+ * The CTRL_MMR0 memory space is divided into several equally-spaced
+ * partitions, so defining the partition size allows us to determine
+ * register addresses common to those partitions.
+ */
+#define CTRL_MMR0_PARTITION_SIZE               0x4000
+
+/*
+ * CTRL_MMR0, WKUP_CTRL_MMR0, and MCU_CTRL_MMR0 lock/kick-mechanism
+ * shared register definitions. The same registers are also used for
+ * PADCFG_MMR lock/kick-mechanism.
+ */
+#define CTRLMMR_LOCK_KICK0                     0x1008
+#define CTRLMMR_LOCK_KICK0_UNLOCK_VAL          0x68ef3490
+#define CTRLMMR_LOCK_KICK1                     0x100c
+#define CTRLMMR_LOCK_KICK1_UNLOCK_VAL          0xd172bc5a
+
+#define MCU_CTRL_LFXOSC_CTRL                   (MCU_CTRL_MMR0_BASE + 0x8038)
+#define MCU_CTRL_LFXOSC_TRIM                   (MCU_CTRL_MMR0_BASE + 0x803c)
+#define MCU_CTRL_LFXOSC_32K_DISABLE_VAL                BIT(7)
+
+#define MCU_CTRL_DEVICE_CLKOUT_32K_CTRL                (MCU_CTRL_MMR0_BASE + 0x8058)
+#define MCU_CTRL_DEVICE_CLKOUT_LFOSC_SELECT_VAL        (0x3)
+
+#define ROM_ENTENDED_BOOT_DATA_INFO            0x43c3f1e0
+
+/* Use Last 2K as Scratch pad */
+#define TI_SRAM_SCRATCH_BOARD_EEPROM_START             0x70000000
+
+#endif /* __ASM_ARCH_AM62_HARDWARE_H */
diff --git a/arch/arm/mach-k3/include/mach/am62_spl.h b/arch/arm/mach-k3/include/mach/am62_spl.h
new file mode 100644 (file)
index 0000000..2c9139d
--- /dev/null
@@ -0,0 +1,48 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2020-2022 Texas Instruments Incorporated - https://www.ti.com/
+ *     Suman Anna <s-anna@ti.com>
+ */
+
+#ifndef _ASM_ARCH_AM62_SPL_H_
+#define _ASM_ARCH_AM62_SPL_H_
+
+/* Primary BootMode devices */
+#define BOOT_DEVICE_RAM                        0x00
+#define BOOT_DEVICE_OSPI               0x01
+#define BOOT_DEVICE_QSPI               0x02
+#define BOOT_DEVICE_SPI                        0x03
+#define BOOT_DEVICE_CPGMAC             0x04
+#define BOOT_DEVICE_ETHERNET_RGMII     0x04
+#define BOOT_DEVICE_ETHERNET_RMII      0x05
+#define BOOT_DEVICE_I2C                        0x06
+#define BOOT_DEVICE_UART               0x07
+#define BOOT_DEVICE_MMC                        0x08
+#define BOOT_DEVICE_EMMC               0x09
+
+#define BOOT_DEVICE_USB                        0x2A
+#define BOOT_DEVICE_DFU                        0x0A
+#define BOOT_DEVICE_GPMC_NAND          0x0B
+#define BOOT_DEVICE_GPMC_NOR           0x0C
+#define BOOT_DEVICE_XSPI               0x0E
+#define BOOT_DEVICE_NOBOOT             0x0F
+
+/* U-Boot used aliases */
+#define BOOT_DEVICE_ETHERNET           0x04
+#define BOOT_DEVICE_MMC2               0x08
+#define BOOT_DEVICE_MMC1               0x09
+/* Invalid */
+#define BOOT_DEVICE_MMC2_2             0x1F
+
+/* Backup BootMode devices */
+#define BACKUP_BOOT_DEVICE_DFU         0x01
+#define BACKUP_BOOT_DEVICE_UART                0x03
+#define BACKUP_BOOT_DEVICE_ETHERNET    0x04
+#define BACKUP_BOOT_DEVICE_MMC         0x05
+#define BACKUP_BOOT_DEVICE_SPI         0x06
+#define BACKUP_BOOT_DEVICE_I2C         0x07
+#define BACKUP_BOOT_DEVICE_USB         0x09
+
+#define K3_PRIMARY_BOOTMODE            0x0
+
+#endif /* _ASM_ARCH_AM62_SPL_H_ */
index 5c1265ffe94963ff91a6180af996d91d8b7ca334..7c6928d5da1cbde314128330d8541e9c9225e679 100644 (file)
 #include "am64_hardware.h"
 #endif
 
+#ifdef CONFIG_SOC_K3_AM625
+#include "am62_hardware.h"
+#endif
+
 /* Assuming these addresses and definitions stay common across K3 devices */
 #define CTRLMMR_WKUP_JTAG_ID   0x43000014
 #define JTAG_ID_VARIANT_SHIFT  28
index 8a61398529567b2d0ea8472dca8109b0aabb8d65..17996f2938b76d5b0c8be36b14df430b3b84a597 100644 (file)
@@ -21,4 +21,9 @@
 #ifdef CONFIG_SOC_K3_AM642
 #include "am64_spl.h"
 #endif
+
+#ifdef CONFIG_SOC_K3_AM625
+#include "am62_spl.h"
+#endif
+
 #endif /* _ASM_ARCH_SPL_H_ */
index 709c916a2a112bca623e9f657ae01bfb4c21ca33..a4f9f1aad2ae5c871ef1d3f793c559a99880651f 100644 (file)
@@ -64,6 +64,7 @@ choice
 
        default K3_J721E_DDRSS if SOC_K3_J721E || SOC_K3_J721S2
        default K3_AM64_DDRSS if SOC_K3_AM642
+       default K3_AM64_DDRSS if SOC_K3_AM625
 
 config K3_J721E_DDRSS
        bool "Enable J721E DDRSS support"