| Message ID | 20181119155413.158098-69-sjg@chromium.org |
|---|---|
| State | RFC |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | dm: Move towards completing CONFIG_BLK migration | expand |
Hi Simon, On 11/19/2018 9:23 PM, Simon Glass wrote: > This board has not been converted to CONFIG_DM_BLK by the deadline. > Remove it. > > Signed-off-by: Simon Glass <sjg@chromium.org> Not sure if this is by mistake, but I see CONFIG_BLK is enabled in both the configs. Am I missing something? ➜ u-boot git:(master) make am65x_evm_r5_defconfig;cat .config | grep BLK # # configuration written to .config # CONFIG_BLK=y CONFIG_SPL_BLK=y ➜ u-boot git:(master) make am65x_evm_a53_defconfig;cat .config | grep BLK # # configuration written to .config # CONFIG_BLK=y CONFIG_SPL_BLK=y Thanks and regards, Lokesh > --- > > arch/arm/mach-k3/Kconfig | 1 - > board/ti/am65x/Kconfig | 52 -------- > board/ti/am65x/MAINTAINERS | 7 -- > board/ti/am65x/Makefile | 8 -- > board/ti/am65x/README | 211 -------------------------------- > board/ti/am65x/evm.c | 68 ---------- > configs/am65x_evm_a53_defconfig | 71 ----------- > configs/am65x_evm_r5_defconfig | 87 ------------- > include/configs/am65x_evm.h | 75 ------------ > 9 files changed, 580 deletions(-) > delete mode 100644 board/ti/am65x/Kconfig > delete mode 100644 board/ti/am65x/MAINTAINERS > delete mode 100644 board/ti/am65x/Makefile > delete mode 100644 board/ti/am65x/README > delete mode 100644 board/ti/am65x/evm.c > delete mode 100644 configs/am65x_evm_a53_defconfig > delete mode 100644 configs/am65x_evm_r5_defconfig > delete mode 100644 include/configs/am65x_evm.h > > diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig > index e677a2e01b8..6b55b3c8c1f 100644 > --- a/arch/arm/mach-k3/Kconfig > +++ b/arch/arm/mach-k3/Kconfig > @@ -65,5 +65,4 @@ config SYS_K3_SPL_ATF > Enabling this will try to start Cortex-A (typically with ATF) > after SPL from R5. > > -source "board/ti/am65x/Kconfig" > endif > diff --git a/board/ti/am65x/Kconfig b/board/ti/am65x/Kconfig > deleted file mode 100644 > index d4b36dbb42f..00000000000 > --- a/board/ti/am65x/Kconfig > +++ /dev/null > @@ -1,52 +0,0 @@ > -# SPDX-License-Identifier: GPL-2.0+ > -# > -# Copyright (C) 2017-2018 Texas Instruments Incorporated - http://www.ti.com/ > -# Lokesh Vutla <lokeshvutla@ti.com> > - > -choice > - prompt "K3 AM65 based boards" > - optional > - > -config TARGET_AM654_A53_EVM > - bool "TI K3 based AM654 EVM running on A53" > - select ARM64 > - select SOC_K3_AM6 > - > -config TARGET_AM654_R5_EVM > - bool "TI K3 based AM654 EVM running on R5" > - select CPU_V7R > - select SYS_THUMB_BUILD > - select SOC_K3_AM6 > - select K3_AM654_DDRSS > - imply SYS_K3_SPL_ATF > - > -endchoice > - > -if TARGET_AM654_A53_EVM > - > -config SYS_BOARD > - default "am65x" > - > -config SYS_VENDOR > - default "ti" > - > -config SYS_CONFIG_NAME > - default "am65x_evm" > - > -endif > - > -if TARGET_AM654_R5_EVM > - > -config SYS_BOARD > - default "am65x" > - > -config SYS_VENDOR > - default "ti" > - > -config SYS_CONFIG_NAME > - default "am65x_evm" > - > -config SPL_LDSCRIPT > - default "arch/arm/mach-omap2/u-boot-spl.lds" > - > -endif > diff --git a/board/ti/am65x/MAINTAINERS b/board/ti/am65x/MAINTAINERS > deleted file mode 100644 > index 7c52e7599e0..00000000000 > --- a/board/ti/am65x/MAINTAINERS > +++ /dev/null > @@ -1,7 +0,0 @@ > -AM65x BOARD > -M: Lokesh Vutla <lokeshvutla@ti.com> > -S: Maintained > -F: board/ti/am65x/ > -F: include/configs/am65x_evm.h > -F: configs/am65x_evm_a53_defconfig > -F: configs/am65x_evm_r5_defconfig > diff --git a/board/ti/am65x/Makefile b/board/ti/am65x/Makefile > deleted file mode 100644 > index 94dddfcc4a5..00000000000 > --- a/board/ti/am65x/Makefile > +++ /dev/null > @@ -1,8 +0,0 @@ > -# > -# Copyright (C) 2017-2018 Texas Instruments Incorporated - http://www.ti.com/ > -# Lokesh Vutla <lokeshvutla@ti.com> > -# > -# SPDX-License-Identifier: GPL-2.0+ > -# > - > -obj-y := evm.o > diff --git a/board/ti/am65x/README b/board/ti/am65x/README > deleted file mode 100644 > index 0b82bd557b5..00000000000 > --- a/board/ti/am65x/README > +++ /dev/null > @@ -1,211 +0,0 @@ > -Introduction: > -------------- > -The AM65x family of SoCs is the first device family from K3 Multicore > -SoC architecture, targeted for broad market and industrial control with > -aim to meet the complex processing needs of modern embedded products. > - > -The device is built over three domains, each containing specific processing > -cores, voltage domains and peripherals: > -1. Wake-up (WKUP) domain: > - - Device Management and Security Controller (DMSC) > -2. Microcontroller (MCU) domain: > - - Dual Core ARM Cortex-R5F processor > -3. MAIN domain: > - - Quad core 64-bit ARM Cortex-A53 > - > -More info can be found in TRM: http://www.ti.com/lit/pdf/spruid7 > - > -Boot Flow: > ----------- > -On AM65x family devices, ROM supports boot only via MCU(R5). This means that > -bootloader has to run on R5 core. In order to meet this constraint, and for > -the following reasons the boot flow is designed as mentioned: > -1. Need to move away from R5 asap, so that we want to start *any* > -firmware on the r5 cores like.... autosar can be loaded to receive CAN > -response and other safety operations to be started. This operation is > -very time critical and is applicable for all automotive use cases. > -2. U-Boot on A53 should start other remotecores for various > -applications. This should happen before running Linux. > -3. In production boot flow, we might not like to use full u-boot, > -instead use Flacon boot flow to reduce boot time. > - > -+------------------------------------------------------------------------+ > -| DMSC | R5 | A53 | > -+------------------------------------------------------------------------+ > -| +--------+ | | | > -| | Reset | | | | > -| +--------+ | | | > -| : | | | > -| +--------+ | +-----------+ | | > -| | *ROM* |----------|-->| Reset rls | | | > -| +--------+ | +-----------+ | | > -| | | | : | | > -| | ROM | | : | | > -| |services| | : | | > -| | | | +-------------+ | | > -| | | | | *R5 ROM* | | | > -| | | | +-------------+ | | > -| | |<---------|---|Load and auth| | | > -| | | | | tiboot3.bin | | | > -| | | | +-------------+ | | > -| | | | : | | > -| | | | : | | > -| | | | : | | > -| | | | +-------------+ | | > -| | | | | *R5 SPL* | | | > -| | | | +-------------+ | | > -| | | | | Load | | | > -| | | | | sysfw.itb | | | > -| | Start | | +-------------+ | | > -| | System |<---------|---| Start | | | > -| |Firmware| | | SYSFW | | | > -| +--------+ | +-------------+ | | > -| : | | | | | > -| +---------+ | | Load | | | > -| | *SYSFW* | | | system | | | > -| +---------+ | | Config data | | | > -| | |<--------|---| | | | > -| | | | +-------------+ | | > -| | | | | | | | > -| | | | | DDR | | | > -| | | | | config | | | > -| | | | +-------------+ | | > -| | | | | | | | > -| | |<--------|---| Start A53 | | | > -| | | | | and Reset | | | > -| | | | +-------------+ | | > -| | | | | +-----------+ | > -| | |---------|-----------------------|---->| Reset rls | | > -| | | | | +-----------+ | > -| | DMSC | | | : | > -| |Services | | | +-----------+ | > -| | |<--------|-----------------------|---->|*ATF/OPTEE*| | > -| | | | | +-----------+ | > -| | | | | : | > -| | | | | +-----------+ | > -| | |<--------|-----------------------|---->| *A53 SPL* | | > -| | | | | +-----------+ | > -| | | | | | Load | | > -| | | | | | u-boot.img| | > -| | | | | +-----------+ | > -| | | | | : | > -| | | | | +-----------+ | > -| | |<--------|-----------------------|---->| *U-Boot* | | > -| | | | | +-----------+ | > -| | | | | | prompt | | > -| | | | | +-----------+ | > -| +---------+ | | | > -| | | | > -+------------------------------------------------------------------------+ > - > -- Here DMSC acts as master and provides all the critical services. R5/A53 > -requests DMSC to get these services done as shown in the above diagram. > - > -Sources: > --------- > -1. SYSFW: > - Tree: git://git.ti.com/processor-firmware/system-firmware-image-gen.git > - Branch: master > - > -2. ATF: > - Tree: https://github.com/ARM-software/arm-trusted-firmware.git > - Branch: master > - > -3. OPTEE: > - Tree: https://github.com/OP-TEE/optee_os.git > - Branch: master > - > -4. U-Boot: > - Tree: http://git.denx.de/u-boot.git > - Branch: master > - > -Build procedure: > ----------------- > -1. SYSFW: > -$ make CROSS_COMPILE=arm-linux-gnueabihf- > - > -2. ATF: > -$ make CROSS_COMPILE=aarch64-linux-gnu- ARCH=aarch64 PLAT=k3 TARGET_BOARD=generic SPD=opteed > - > -3. OPTEE: > -$ make PLATFORM=k3-am65x CFG_ARM64_core=y > - > -4. U-Boot: > - > -4.1. R5: > -$ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- am65x_evm_r5_defconfig O=/tmp/r5 > -$ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- O=/tmp/r5 > - > -4.2. A53: > -$ make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu- am65x_evm_a53_defconfig O=/tmp/a53 > -$ make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu- ATF=<path to ATF dir>/build/k3/generic/release/bl31.bin TEE=<path to OPTEE OS dir>/out/arm-plat-k3/core/tee-pager.bin O=/tmp/a53 > - > -Target Images > --------------- > -Copy the below images to an SD card and boot: > -- sysfw.itb from step 1 > -- tiboot3.bin from step 4.1 > -- tispl.bin, u-boot.img from 4.2 > - > -Image formats: > --------------- > - > -- tiboot3.bin: > - +-----------------------+ > - | X.509 | > - | Certificate | > - | +-------------------+ | > - | | | | > - | | R5 | | > - | | u-boot-spl.bin | | > - | | | | > - | +-------------------+ | > - | | | | > - | | FIT header | | > - | | +---------------+ | | > - | | | | | | > - | | | DTB 1...N | | | > - | | +---------------+ | | > - | +-------------------+ | > - +-----------------------+ > - > -- tispl.bin > - +-----------------------+ > - | | > - | FIT HEADER | > - | +-------------------+ | > - | | | | > - | | A53 ATF | | > - | +-------------------+ | > - | | | | > - | | A53 OPTEE | | > - | +-------------------+ | > - | | | | > - | | A53 SPL | | > - | +-------------------+ | > - | | | | > - | | SPL DTB 1...N | | > - | +-------------------+ | > - +-----------------------+ > - > -- sysfw.itb > - +-----------------------+ > - | | > - | FIT HEADER | > - | +-------------------+ | > - | | | | > - | | sysfw.bin | | > - | +-------------------+ | > - | | | | > - | | board config | | > - | +-------------------+ | > - | | | | > - | | PM config | | > - | +-------------------+ | > - | | | | > - | | RM config | | > - | +-------------------+ | > - | | | | > - | | Secure config | | > - | +-------------------+ | > - +-----------------------+ > diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c > deleted file mode 100644 > index 784b2b0191d..00000000000 > --- a/board/ti/am65x/evm.c > +++ /dev/null > @@ -1,68 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0+ > -/* > - * Board specific initialization for AM654 EVM > - * > - * Copyright (C) 2017-2018 Texas Instruments Incorporated - http://www.ti.com/ > - * Lokesh Vutla <lokeshvutla@ti.com> > - * > - */ > - > -#include <common.h> > -#include <asm/io.h> > -#include <spl.h> > - > -DECLARE_GLOBAL_DATA_PTR; > - > -int board_init(void) > -{ > - return 0; > -} > - > -int dram_init(void) > -{ > -#ifdef CONFIG_PHYS_64BIT > - gd->ram_size = 0x100000000; > -#else > - gd->ram_size = 0x80000000; > -#endif > - > - return 0; > -} > - > -ulong board_get_usable_ram_top(ulong total_size) > -{ > -#ifdef CONFIG_PHYS_64BIT > - /* Limit RAM used by U-Boot to the DDR low region */ > - if (gd->ram_top > 0x100000000) > - return 0x100000000; > -#endif > - > - return gd->ram_top; > -} > - > -int dram_init_banksize(void) > -{ > - /* Bank 0 declares the memory available in the DDR low region */ > - gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; > - gd->bd->bi_dram[0].size = 0x80000000; > - > -#ifdef CONFIG_PHYS_64BIT > - /* Bank 1 declares the memory available in the DDR high region */ > - gd->bd->bi_dram[1].start = CONFIG_SYS_SDRAM_BASE1; > - gd->bd->bi_dram[1].size = 0x80000000; > -#endif > - > - return 0; > -} > - > -#ifdef CONFIG_SPL_LOAD_FIT > -int board_fit_config_name_match(const char *name) > -{ > -#ifdef CONFIG_TARGET_AM654_A53_EVM > - if (!strcmp(name, "k3-am654-base-board")) > - return 0; > -#endif > - > - return -1; > -} > -#endif > diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig > deleted file mode 100644 > index a17cf7cb504..00000000000 > --- a/configs/am65x_evm_a53_defconfig > +++ /dev/null > @@ -1,71 +0,0 @@ > -CONFIG_ARM=y > -CONFIG_ARCH_K3=y > -CONFIG_SPL_LIBCOMMON_SUPPORT=y > -CONFIG_SPL_LIBGENERIC_SUPPORT=y > -CONFIG_SYS_MALLOC_F_LEN=0x2000 > -CONFIG_SOC_K3_AM6=y > -CONFIG_TARGET_AM654_A53_EVM=y > -CONFIG_SPL_MMC_SUPPORT=y > -CONFIG_SPL_SERIAL_SUPPORT=y > -CONFIG_SPL_DRIVERS_MISC_SUPPORT=y > -CONFIG_SPL_STACK_R_ADDR=0x82000000 > -CONFIG_SPL_FAT_SUPPORT=y > -CONFIG_SPL_LIBDISK_SUPPORT=y > -CONFIG_DISTRO_DEFAULTS=y > -CONFIG_NR_DRAM_BANKS=2 > -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set > -CONFIG_SPL_LOAD_FIT=y > -CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run get_kern_${boot}; run get_fdt_${boot}; run run_kern" > -# CONFIG_DISPLAY_CPUINFO is not set > -CONFIG_SPL_SYS_MALLOC_SIMPLE=y > -CONFIG_SPL_STACK_R=y > -CONFIG_SPL_SEPARATE_BSS=y > -CONFIG_SPL_I2C_SUPPORT=y > -CONFIG_SPL_DM_MAILBOX=y > -CONFIG_SPL_DM_RESET=y > -CONFIG_SPL_POWER_DOMAIN=y > -CONFIG_SPL_REMOTEPROC=y > -CONFIG_SPL_YMODEM_SUPPORT=y > -CONFIG_CMD_ASKENV=y > -# CONFIG_CMD_FLASH is not set > -CONFIG_CMD_MMC=y > -CONFIG_CMD_REMOTEPROC=y > -# CONFIG_CMD_SETEXPR is not set > -CONFIG_CMD_TIME=y > -# CONFIG_ISO_PARTITION is not set > -# CONFIG_EFI_PARTITION is not set > -CONFIG_OF_CONTROL=y > -CONFIG_SPL_OF_CONTROL=y > -CONFIG_DEFAULT_DEVICE_TREE="k3-am654-base-board" > -CONFIG_SPL_MULTI_DTB_FIT=y > -CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y > -CONFIG_ENV_IS_IN_FAT=y > -CONFIG_ENV_FAT_INTERFACE="mmc" > -CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" > -CONFIG_DM=y > -CONFIG_SPL_DM=y > -CONFIG_SPL_DM_SEQ_ALIAS=y > -CONFIG_CLK=y > -CONFIG_SPL_CLK=y > -CONFIG_CLK_TI_SCI=y > -CONFIG_TI_SCI_PROTOCOL=y > -CONFIG_DM_MAILBOX=y > -CONFIG_K3_SEC_PROXY=y > -CONFIG_MISC=y > -CONFIG_DM_MMC=y > -CONFIG_MMC_SDHCI=y > -CONFIG_MMC_SDHCI_K3_ARASAN=y > -CONFIG_PINCTRL=y > -# CONFIG_PINCTRL_GENERIC is not set > -CONFIG_SPL_PINCTRL=y > -# CONFIG_SPL_PINCTRL_GENERIC is not set > -CONFIG_PINCTRL_SINGLE=y > -CONFIG_POWER_DOMAIN=y > -CONFIG_TI_SCI_POWER_DOMAIN=y > -CONFIG_K3_SYSTEM_CONTROLLER=y > -CONFIG_REMOTEPROC_K3=y > -CONFIG_DM_RESET=y > -CONFIG_RESET_TI_SCI=y > -CONFIG_DM_SERIAL=y > -CONFIG_SYSRESET=y > -CONFIG_SYSRESET_TI_SCI=y > diff --git a/configs/am65x_evm_r5_defconfig b/configs/am65x_evm_r5_defconfig > deleted file mode 100644 > index 237b9e8229b..00000000000 > --- a/configs/am65x_evm_r5_defconfig > +++ /dev/null > @@ -1,87 +0,0 @@ > -CONFIG_ARM=y > -CONFIG_ARCH_K3=y > -CONFIG_SPL_GPIO_SUPPORT=y > -CONFIG_SPL_LIBCOMMON_SUPPORT=y > -CONFIG_SPL_LIBGENERIC_SUPPORT=y > -CONFIG_SYS_MALLOC_F_LEN=0x2000 > -CONFIG_SOC_K3_AM6=y > -CONFIG_TARGET_AM654_R5_EVM=y > -CONFIG_SPL_MMC_SUPPORT=y > -CONFIG_SPL_SERIAL_SUPPORT=y > -CONFIG_SPL_DRIVERS_MISC_SUPPORT=y > -CONFIG_SPL_STACK_R_ADDR=0x82000000 > -CONFIG_SPL_FAT_SUPPORT=y > -CONFIG_SPL_LIBDISK_SUPPORT=y > -CONFIG_NR_DRAM_BANKS=2 > -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set > -CONFIG_SPL_LOAD_FIT=y > -CONFIG_USE_BOOTCOMMAND=y > -# CONFIG_DISPLAY_CPUINFO is not set > -CONFIG_SPL_SYS_MALLOC_SIMPLE=y > -CONFIG_SPL_STACK_R=y > -CONFIG_SPL_SEPARATE_BSS=y > -CONFIG_SPL_I2C_SUPPORT=y > -CONFIG_SPL_DM_MAILBOX=y > -CONFIG_SPL_DM_RESET=y > -CONFIG_SPL_POWER_SUPPORT=y > -CONFIG_SPL_POWER_DOMAIN=y > -CONFIG_SPL_RAM_SUPPORT=y > -CONFIG_SPL_RAM_DEVICE=y > -CONFIG_SPL_REMOTEPROC=y > -CONFIG_SPL_YMODEM_SUPPORT=y > -CONFIG_HUSH_PARSER=y > -CONFIG_CMD_BOOTZ=y > -CONFIG_CMD_ASKENV=y > -# CONFIG_CMD_FLASH is not set > -CONFIG_CMD_MMC=y > -CONFIG_CMD_REMOTEPROC=y > -# CONFIG_CMD_SETEXPR is not set > -CONFIG_CMD_TIME=y > -CONFIG_CMD_FAT=y > -CONFIG_OF_CONTROL=y > -CONFIG_SPL_OF_CONTROL=y > -CONFIG_DEFAULT_DEVICE_TREE="k3-am654-r5-base-board" > -CONFIG_SPL_MULTI_DTB_FIT=y > -CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y > -CONFIG_ENV_IS_IN_FAT=y > -CONFIG_ENV_FAT_INTERFACE="mmc" > -CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" > -CONFIG_DM=y > -CONFIG_SPL_DM=y > -CONFIG_SPL_DM_SEQ_ALIAS=y > -CONFIG_SPL_OF_TRANSLATE=y > -CONFIG_CLK=y > -CONFIG_SPL_CLK=y > -CONFIG_CLK_TI_SCI=y > -CONFIG_TI_SCI_PROTOCOL=y > -CONFIG_DM_GPIO=y > -CONFIG_DA8XX_GPIO=y > -CONFIG_DM_MAILBOX=y > -CONFIG_K3_SEC_PROXY=y > -CONFIG_MISC=y > -CONFIG_DM_MMC=y > -CONFIG_MMC_SDHCI=y > -CONFIG_MMC_SDHCI_K3_ARASAN=y > -CONFIG_PINCTRL=y > -# CONFIG_PINCTRL_GENERIC is not set > -CONFIG_SPL_PINCTRL=y > -# CONFIG_SPL_PINCTRL_GENERIC is not set > -CONFIG_PINCTRL_SINGLE=y > -CONFIG_POWER_DOMAIN=y > -CONFIG_TI_SCI_POWER_DOMAIN=y > -CONFIG_DM_REGULATOR=y > -CONFIG_SPL_DM_REGULATOR=y > -CONFIG_DM_REGULATOR_GPIO=y > -CONFIG_SPL_DM_REGULATOR_GPIO=y > -CONFIG_RAM=y > -CONFIG_SPL_RAM=y > -CONFIG_K3_SYSTEM_CONTROLLER=y > -CONFIG_REMOTEPROC_K3=y > -CONFIG_DM_RESET=y > -CONFIG_RESET_TI_SCI=y > -CONFIG_DM_SERIAL=y > -CONFIG_SYSRESET=y > -CONFIG_SYSRESET_TI_SCI=y > -CONFIG_TIMER=y > -CONFIG_SPL_TIMER=y > -CONFIG_OMAP_TIMER=y > diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h > deleted file mode 100644 > index 484c5ef2fe1..00000000000 > --- a/include/configs/am65x_evm.h > +++ /dev/null > @@ -1,75 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > -/* > - * Configuration header file for K3 AM654 EVM > - * > - * Copyright (C) 2017-2018 Texas Instruments Incorporated - http://www.ti.com/ > - * Lokesh Vutla <lokeshvutla@ti.com> > - */ > - > -#ifndef __CONFIG_AM654_EVM_H > -#define __CONFIG_AM654_EVM_H > - > -#include <linux/sizes.h> > -#include <config_distro_bootcmd.h> > -#include <environment/ti/mmc.h> > - > -#define CONFIG_ENV_SIZE (128 << 10) > - > -/* DDR Configuration */ > -#define CONFIG_SYS_SDRAM_BASE1 0x880000000 > - > -/* SPL Loader Configuration */ > -#ifdef CONFIG_TARGET_AM654_A53_EVM > -#define CONFIG_SPL_TEXT_BASE 0x80080000 > -#else > -#define CONFIG_SPL_TEXT_BASE 0x41c00000 > -#endif > - > -#ifdef CONFIG_SYS_K3_SPL_ATF > -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "tispl.bin" > -#endif > - > -#define CONFIG_SKIP_LOWLEVEL_INIT > - > -#define CONFIG_SPL_MAX_SIZE CONFIG_SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE > -#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SPL_TEXT_BASE + \ > - CONFIG_SYS_K3_NON_SECURE_MSRAM_SIZE - 4) > - > -/* U-Boot general configuration */ > -#define EXTRA_ENV_AM65X_BOARD_SETTINGS \ > - "findfdt=" \ > - "if test $board_name = am65x; then " \ > - "setenv name_fdt k3-am654-base-board.dtb; " \ > - "else if test $name_fdt = undefined; then " \ > - "echo WARNING: Could not determine device tree to use;"\ > - "fi; fi; " \ > - "setenv fdtfile ${name_fdt}\0" \ > - "loadaddr=0x80080000\0" \ > - "fdtaddr=0x82000000\0" \ > - "name_kern=Image\0" \ > - "console=ttyS2,115200n8\0" \ > - "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000\0" \ > - "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0" > - > -/* U-Boot MMC-specific configuration */ > -#define EXTRA_ENV_AM65X_BOARD_SETTINGS_MMC \ > - "boot=mmc\0" \ > - "mmcdev=1\0" \ > - "bootpart=1:2\0" \ > - "bootdir=/boot\0" \ > - "rd_spec=-\0" \ > - "init_mmc=run args_all args_mmc\0" \ > - "get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}\0" \ > - "get_kern_mmc=load mmc ${bootpart} ${loadaddr} " \ > - "${bootdir}/${name_kern}\0" > - > -/* Incorporate settings into the U-Boot environment */ > -#define CONFIG_EXTRA_ENV_SETTINGS \ > - DEFAULT_MMC_TI_ARGS \ > - EXTRA_ENV_AM65X_BOARD_SETTINGS \ > - EXTRA_ENV_AM65X_BOARD_SETTINGS_MMC > - > -/* Now for the remaining common defines */ > -#include <configs/ti_armv7_common.h> > - > -#endif /* __CONFIG_AM654_EVM_H */ >
Hi Lokesh, On Mon, 19 Nov 2018 at 09:58, Lokesh Vutla <lokeshvutla@ti.com> wrote: > > Hi Simon, > > On 11/19/2018 9:23 PM, Simon Glass wrote: > > This board has not been converted to CONFIG_DM_BLK by the deadline. > > Remove it. > > > > Signed-off-by: Simon Glass <sjg@chromium.org> > > Not sure if this is by mistake, but I see CONFIG_BLK is enabled in both > the configs. Am I missing something? > > ➜ u-boot git:(master) make am65x_evm_r5_defconfig;cat .config | grep BLK > # > # configuration written to .config > # > CONFIG_BLK=y > CONFIG_SPL_BLK=y > > ➜ u-boot git:(master) make am65x_evm_a53_defconfig;cat .config | grep BLK > # > # configuration written to .config > # > CONFIG_BLK=y > CONFIG_SPL_BLK=y > This was the result of my removing the default CONFIG_SPL_BLK=y in the Kconfig, since it produced a smaller list of broken boards. But having thought about it, it is not the right thing to do. So your board should be fine. Sorry for the trouble. Regards, Simon
diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig index e677a2e01b8..6b55b3c8c1f 100644 --- a/arch/arm/mach-k3/Kconfig +++ b/arch/arm/mach-k3/Kconfig @@ -65,5 +65,4 @@ config SYS_K3_SPL_ATF Enabling this will try to start Cortex-A (typically with ATF) after SPL from R5. -source "board/ti/am65x/Kconfig" endif diff --git a/board/ti/am65x/Kconfig b/board/ti/am65x/Kconfig deleted file mode 100644 index d4b36dbb42f..00000000000 --- a/board/ti/am65x/Kconfig +++ /dev/null @@ -1,52 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2017-2018 Texas Instruments Incorporated - http://www.ti.com/ -# Lokesh Vutla <lokeshvutla@ti.com> - -choice - prompt "K3 AM65 based boards" - optional - -config TARGET_AM654_A53_EVM - bool "TI K3 based AM654 EVM running on A53" - select ARM64 - select SOC_K3_AM6 - -config TARGET_AM654_R5_EVM - bool "TI K3 based AM654 EVM running on R5" - select CPU_V7R - select SYS_THUMB_BUILD - select SOC_K3_AM6 - select K3_AM654_DDRSS - imply SYS_K3_SPL_ATF - -endchoice - -if TARGET_AM654_A53_EVM - -config SYS_BOARD - default "am65x" - -config SYS_VENDOR - default "ti" - -config SYS_CONFIG_NAME - default "am65x_evm" - -endif - -if TARGET_AM654_R5_EVM - -config SYS_BOARD - default "am65x" - -config SYS_VENDOR - default "ti" - -config SYS_CONFIG_NAME - default "am65x_evm" - -config SPL_LDSCRIPT - default "arch/arm/mach-omap2/u-boot-spl.lds" - -endif diff --git a/board/ti/am65x/MAINTAINERS b/board/ti/am65x/MAINTAINERS deleted file mode 100644 index 7c52e7599e0..00000000000 --- a/board/ti/am65x/MAINTAINERS +++ /dev/null @@ -1,7 +0,0 @@ -AM65x BOARD -M: Lokesh Vutla <lokeshvutla@ti.com> -S: Maintained -F: board/ti/am65x/ -F: include/configs/am65x_evm.h -F: configs/am65x_evm_a53_defconfig -F: configs/am65x_evm_r5_defconfig diff --git a/board/ti/am65x/Makefile b/board/ti/am65x/Makefile deleted file mode 100644 index 94dddfcc4a5..00000000000 --- a/board/ti/am65x/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright (C) 2017-2018 Texas Instruments Incorporated - http://www.ti.com/ -# Lokesh Vutla <lokeshvutla@ti.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y := evm.o diff --git a/board/ti/am65x/README b/board/ti/am65x/README deleted file mode 100644 index 0b82bd557b5..00000000000 --- a/board/ti/am65x/README +++ /dev/null @@ -1,211 +0,0 @@ -Introduction: -------------- -The AM65x family of SoCs is the first device family from K3 Multicore -SoC architecture, targeted for broad market and industrial control with -aim to meet the complex processing needs of modern embedded products. - -The device is built over three domains, each containing specific processing -cores, voltage domains and peripherals: -1. Wake-up (WKUP) domain: - - Device Management and Security Controller (DMSC) -2. Microcontroller (MCU) domain: - - Dual Core ARM Cortex-R5F processor -3. MAIN domain: - - Quad core 64-bit ARM Cortex-A53 - -More info can be found in TRM: http://www.ti.com/lit/pdf/spruid7 - -Boot Flow: ----------- -On AM65x family devices, ROM supports boot only via MCU(R5). This means that -bootloader has to run on R5 core. In order to meet this constraint, and for -the following reasons the boot flow is designed as mentioned: -1. Need to move away from R5 asap, so that we want to start *any* -firmware on the r5 cores like.... autosar can be loaded to receive CAN -response and other safety operations to be started. This operation is -very time critical and is applicable for all automotive use cases. -2. U-Boot on A53 should start other remotecores for various -applications. This should happen before running Linux. -3. In production boot flow, we might not like to use full u-boot, -instead use Flacon boot flow to reduce boot time. - -+------------------------------------------------------------------------+ -| DMSC | R5 | A53 | -+------------------------------------------------------------------------+ -| +--------+ | | | -| | Reset | | | | -| +--------+ | | | -| : | | | -| +--------+ | +-----------+ | | -| | *ROM* |----------|-->| Reset rls | | | -| +--------+ | +-----------+ | | -| | | | : | | -| | ROM | | : | | -| |services| | : | | -| | | | +-------------+ | | -| | | | | *R5 ROM* | | | -| | | | +-------------+ | | -| | |<---------|---|Load and auth| | | -| | | | | tiboot3.bin | | | -| | | | +-------------+ | | -| | | | : | | -| | | | : | | -| | | | : | | -| | | | +-------------+ | | -| | | | | *R5 SPL* | | | -| | | | +-------------+ | | -| | | | | Load | | | -| | | | | sysfw.itb | | | -| | Start | | +-------------+ | | -| | System |<---------|---| Start | | | -| |Firmware| | | SYSFW | | | -| +--------+ | +-------------+ | | -| : | | | | | -| +---------+ | | Load | | | -| | *SYSFW* | | | system | | | -| +---------+ | | Config data | | | -| | |<--------|---| | | | -| | | | +-------------+ | | -| | | | | | | | -| | | | | DDR | | | -| | | | | config | | | -| | | | +-------------+ | | -| | | | | | | | -| | |<--------|---| Start A53 | | | -| | | | | and Reset | | | -| | | | +-------------+ | | -| | | | | +-----------+ | -| | |---------|-----------------------|---->| Reset rls | | -| | | | | +-----------+ | -| | DMSC | | | : | -| |Services | | | +-----------+ | -| | |<--------|-----------------------|---->|*ATF/OPTEE*| | -| | | | | +-----------+ | -| | | | | : | -| | | | | +-----------+ | -| | |<--------|-----------------------|---->| *A53 SPL* | | -| | | | | +-----------+ | -| | | | | | Load | | -| | | | | | u-boot.img| | -| | | | | +-----------+ | -| | | | | : | -| | | | | +-----------+ | -| | |<--------|-----------------------|---->| *U-Boot* | | -| | | | | +-----------+ | -| | | | | | prompt | | -| | | | | +-----------+ | -| +---------+ | | | -| | | | -+------------------------------------------------------------------------+ - -- Here DMSC acts as master and provides all the critical services. R5/A53 -requests DMSC to get these services done as shown in the above diagram. - -Sources: --------- -1. SYSFW: - Tree: git://git.ti.com/processor-firmware/system-firmware-image-gen.git - Branch: master - -2. ATF: - Tree: https://github.com/ARM-software/arm-trusted-firmware.git - Branch: master - -3. OPTEE: - Tree: https://github.com/OP-TEE/optee_os.git - Branch: master - -4. U-Boot: - Tree: http://git.denx.de/u-boot.git - Branch: master - -Build procedure: ----------------- -1. SYSFW: -$ make CROSS_COMPILE=arm-linux-gnueabihf- - -2. ATF: -$ make CROSS_COMPILE=aarch64-linux-gnu- ARCH=aarch64 PLAT=k3 TARGET_BOARD=generic SPD=opteed - -3. OPTEE: -$ make PLATFORM=k3-am65x CFG_ARM64_core=y - -4. U-Boot: - -4.1. R5: -$ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- am65x_evm_r5_defconfig O=/tmp/r5 -$ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- O=/tmp/r5 - -4.2. A53: -$ make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu- am65x_evm_a53_defconfig O=/tmp/a53 -$ make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu- ATF=<path to ATF dir>/build/k3/generic/release/bl31.bin TEE=<path to OPTEE OS dir>/out/arm-plat-k3/core/tee-pager.bin O=/tmp/a53 - -Target Images --------------- -Copy the below images to an SD card and boot: -- sysfw.itb from step 1 -- tiboot3.bin from step 4.1 -- tispl.bin, u-boot.img from 4.2 - -Image formats: --------------- - -- tiboot3.bin: - +-----------------------+ - | X.509 | - | Certificate | - | +-------------------+ | - | | | | - | | R5 | | - | | u-boot-spl.bin | | - | | | | - | +-------------------+ | - | | | | - | | FIT header | | - | | +---------------+ | | - | | | | | | - | | | DTB 1...N | | | - | | +---------------+ | | - | +-------------------+ | - +-----------------------+ - -- tispl.bin - +-----------------------+ - | | - | FIT HEADER | - | +-------------------+ | - | | | | - | | A53 ATF | | - | +-------------------+ | - | | | | - | | A53 OPTEE | | - | +-------------------+ | - | | | | - | | A53 SPL | | - | +-------------------+ | - | | | | - | | SPL DTB 1...N | | - | +-------------------+ | - +-----------------------+ - -- sysfw.itb - +-----------------------+ - | | - | FIT HEADER | - | +-------------------+ | - | | | | - | | sysfw.bin | | - | +-------------------+ | - | | | | - | | board config | | - | +-------------------+ | - | | | | - | | PM config | | - | +-------------------+ | - | | | | - | | RM config | | - | +-------------------+ | - | | | | - | | Secure config | | - | +-------------------+ | - +-----------------------+ diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c deleted file mode 100644 index 784b2b0191d..00000000000 --- a/board/ti/am65x/evm.c +++ /dev/null @@ -1,68 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Board specific initialization for AM654 EVM - * - * Copyright (C) 2017-2018 Texas Instruments Incorporated - http://www.ti.com/ - * Lokesh Vutla <lokeshvutla@ti.com> - * - */ - -#include <common.h> -#include <asm/io.h> -#include <spl.h> - -DECLARE_GLOBAL_DATA_PTR; - -int board_init(void) -{ - return 0; -} - -int dram_init(void) -{ -#ifdef CONFIG_PHYS_64BIT - gd->ram_size = 0x100000000; -#else - gd->ram_size = 0x80000000; -#endif - - return 0; -} - -ulong board_get_usable_ram_top(ulong total_size) -{ -#ifdef CONFIG_PHYS_64BIT - /* Limit RAM used by U-Boot to the DDR low region */ - if (gd->ram_top > 0x100000000) - return 0x100000000; -#endif - - return gd->ram_top; -} - -int dram_init_banksize(void) -{ - /* Bank 0 declares the memory available in the DDR low region */ - gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; - gd->bd->bi_dram[0].size = 0x80000000; - -#ifdef CONFIG_PHYS_64BIT - /* Bank 1 declares the memory available in the DDR high region */ - gd->bd->bi_dram[1].start = CONFIG_SYS_SDRAM_BASE1; - gd->bd->bi_dram[1].size = 0x80000000; -#endif - - return 0; -} - -#ifdef CONFIG_SPL_LOAD_FIT -int board_fit_config_name_match(const char *name) -{ -#ifdef CONFIG_TARGET_AM654_A53_EVM - if (!strcmp(name, "k3-am654-base-board")) - return 0; -#endif - - return -1; -} -#endif diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig deleted file mode 100644 index a17cf7cb504..00000000000 --- a/configs/am65x_evm_a53_defconfig +++ /dev/null @@ -1,71 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_K3=y -CONFIG_SPL_LIBCOMMON_SUPPORT=y -CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_SOC_K3_AM6=y -CONFIG_TARGET_AM654_A53_EVM=y -CONFIG_SPL_MMC_SUPPORT=y -CONFIG_SPL_SERIAL_SUPPORT=y -CONFIG_SPL_DRIVERS_MISC_SUPPORT=y -CONFIG_SPL_STACK_R_ADDR=0x82000000 -CONFIG_SPL_FAT_SUPPORT=y -CONFIG_SPL_LIBDISK_SUPPORT=y -CONFIG_DISTRO_DEFAULTS=y -CONFIG_NR_DRAM_BANKS=2 -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_SPL_LOAD_FIT=y -CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run get_kern_${boot}; run get_fdt_${boot}; run run_kern" -# CONFIG_DISPLAY_CPUINFO is not set -CONFIG_SPL_SYS_MALLOC_SIMPLE=y -CONFIG_SPL_STACK_R=y -CONFIG_SPL_SEPARATE_BSS=y -CONFIG_SPL_I2C_SUPPORT=y -CONFIG_SPL_DM_MAILBOX=y -CONFIG_SPL_DM_RESET=y -CONFIG_SPL_POWER_DOMAIN=y -CONFIG_SPL_REMOTEPROC=y -CONFIG_SPL_YMODEM_SUPPORT=y -CONFIG_CMD_ASKENV=y -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_MMC=y -CONFIG_CMD_REMOTEPROC=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_TIME=y -# CONFIG_ISO_PARTITION is not set -# CONFIG_EFI_PARTITION is not set -CONFIG_OF_CONTROL=y -CONFIG_SPL_OF_CONTROL=y -CONFIG_DEFAULT_DEVICE_TREE="k3-am654-base-board" -CONFIG_SPL_MULTI_DTB_FIT=y -CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y -CONFIG_ENV_IS_IN_FAT=y -CONFIG_ENV_FAT_INTERFACE="mmc" -CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" -CONFIG_DM=y -CONFIG_SPL_DM=y -CONFIG_SPL_DM_SEQ_ALIAS=y -CONFIG_CLK=y -CONFIG_SPL_CLK=y -CONFIG_CLK_TI_SCI=y -CONFIG_TI_SCI_PROTOCOL=y -CONFIG_DM_MAILBOX=y -CONFIG_K3_SEC_PROXY=y -CONFIG_MISC=y -CONFIG_DM_MMC=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_K3_ARASAN=y -CONFIG_PINCTRL=y -# CONFIG_PINCTRL_GENERIC is not set -CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_GENERIC is not set -CONFIG_PINCTRL_SINGLE=y -CONFIG_POWER_DOMAIN=y -CONFIG_TI_SCI_POWER_DOMAIN=y -CONFIG_K3_SYSTEM_CONTROLLER=y -CONFIG_REMOTEPROC_K3=y -CONFIG_DM_RESET=y -CONFIG_RESET_TI_SCI=y -CONFIG_DM_SERIAL=y -CONFIG_SYSRESET=y -CONFIG_SYSRESET_TI_SCI=y diff --git a/configs/am65x_evm_r5_defconfig b/configs/am65x_evm_r5_defconfig deleted file mode 100644 index 237b9e8229b..00000000000 --- a/configs/am65x_evm_r5_defconfig +++ /dev/null @@ -1,87 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_K3=y -CONFIG_SPL_GPIO_SUPPORT=y -CONFIG_SPL_LIBCOMMON_SUPPORT=y -CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_SOC_K3_AM6=y -CONFIG_TARGET_AM654_R5_EVM=y -CONFIG_SPL_MMC_SUPPORT=y -CONFIG_SPL_SERIAL_SUPPORT=y -CONFIG_SPL_DRIVERS_MISC_SUPPORT=y -CONFIG_SPL_STACK_R_ADDR=0x82000000 -CONFIG_SPL_FAT_SUPPORT=y -CONFIG_SPL_LIBDISK_SUPPORT=y -CONFIG_NR_DRAM_BANKS=2 -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_SPL_LOAD_FIT=y -CONFIG_USE_BOOTCOMMAND=y -# CONFIG_DISPLAY_CPUINFO is not set -CONFIG_SPL_SYS_MALLOC_SIMPLE=y -CONFIG_SPL_STACK_R=y -CONFIG_SPL_SEPARATE_BSS=y -CONFIG_SPL_I2C_SUPPORT=y -CONFIG_SPL_DM_MAILBOX=y -CONFIG_SPL_DM_RESET=y -CONFIG_SPL_POWER_SUPPORT=y -CONFIG_SPL_POWER_DOMAIN=y -CONFIG_SPL_RAM_SUPPORT=y -CONFIG_SPL_RAM_DEVICE=y -CONFIG_SPL_REMOTEPROC=y -CONFIG_SPL_YMODEM_SUPPORT=y -CONFIG_HUSH_PARSER=y -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_ASKENV=y -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_MMC=y -CONFIG_CMD_REMOTEPROC=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_TIME=y -CONFIG_CMD_FAT=y -CONFIG_OF_CONTROL=y -CONFIG_SPL_OF_CONTROL=y -CONFIG_DEFAULT_DEVICE_TREE="k3-am654-r5-base-board" -CONFIG_SPL_MULTI_DTB_FIT=y -CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y -CONFIG_ENV_IS_IN_FAT=y -CONFIG_ENV_FAT_INTERFACE="mmc" -CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" -CONFIG_DM=y -CONFIG_SPL_DM=y -CONFIG_SPL_DM_SEQ_ALIAS=y -CONFIG_SPL_OF_TRANSLATE=y -CONFIG_CLK=y -CONFIG_SPL_CLK=y -CONFIG_CLK_TI_SCI=y -CONFIG_TI_SCI_PROTOCOL=y -CONFIG_DM_GPIO=y -CONFIG_DA8XX_GPIO=y -CONFIG_DM_MAILBOX=y -CONFIG_K3_SEC_PROXY=y -CONFIG_MISC=y -CONFIG_DM_MMC=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_K3_ARASAN=y -CONFIG_PINCTRL=y -# CONFIG_PINCTRL_GENERIC is not set -CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_GENERIC is not set -CONFIG_PINCTRL_SINGLE=y -CONFIG_POWER_DOMAIN=y -CONFIG_TI_SCI_POWER_DOMAIN=y -CONFIG_DM_REGULATOR=y -CONFIG_SPL_DM_REGULATOR=y -CONFIG_DM_REGULATOR_GPIO=y -CONFIG_SPL_DM_REGULATOR_GPIO=y -CONFIG_RAM=y -CONFIG_SPL_RAM=y -CONFIG_K3_SYSTEM_CONTROLLER=y -CONFIG_REMOTEPROC_K3=y -CONFIG_DM_RESET=y -CONFIG_RESET_TI_SCI=y -CONFIG_DM_SERIAL=y -CONFIG_SYSRESET=y -CONFIG_SYSRESET_TI_SCI=y -CONFIG_TIMER=y -CONFIG_SPL_TIMER=y -CONFIG_OMAP_TIMER=y diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h deleted file mode 100644 index 484c5ef2fe1..00000000000 --- a/include/configs/am65x_evm.h +++ /dev/null @@ -1,75 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Configuration header file for K3 AM654 EVM - * - * Copyright (C) 2017-2018 Texas Instruments Incorporated - http://www.ti.com/ - * Lokesh Vutla <lokeshvutla@ti.com> - */ - -#ifndef __CONFIG_AM654_EVM_H -#define __CONFIG_AM654_EVM_H - -#include <linux/sizes.h> -#include <config_distro_bootcmd.h> -#include <environment/ti/mmc.h> - -#define CONFIG_ENV_SIZE (128 << 10) - -/* DDR Configuration */ -#define CONFIG_SYS_SDRAM_BASE1 0x880000000 - -/* SPL Loader Configuration */ -#ifdef CONFIG_TARGET_AM654_A53_EVM -#define CONFIG_SPL_TEXT_BASE 0x80080000 -#else -#define CONFIG_SPL_TEXT_BASE 0x41c00000 -#endif - -#ifdef CONFIG_SYS_K3_SPL_ATF -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "tispl.bin" -#endif - -#define CONFIG_SKIP_LOWLEVEL_INIT - -#define CONFIG_SPL_MAX_SIZE CONFIG_SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE -#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SPL_TEXT_BASE + \ - CONFIG_SYS_K3_NON_SECURE_MSRAM_SIZE - 4) - -/* U-Boot general configuration */ -#define EXTRA_ENV_AM65X_BOARD_SETTINGS \ - "findfdt=" \ - "if test $board_name = am65x; then " \ - "setenv name_fdt k3-am654-base-board.dtb; " \ - "else if test $name_fdt = undefined; then " \ - "echo WARNING: Could not determine device tree to use;"\ - "fi; fi; " \ - "setenv fdtfile ${name_fdt}\0" \ - "loadaddr=0x80080000\0" \ - "fdtaddr=0x82000000\0" \ - "name_kern=Image\0" \ - "console=ttyS2,115200n8\0" \ - "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000\0" \ - "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0" - -/* U-Boot MMC-specific configuration */ -#define EXTRA_ENV_AM65X_BOARD_SETTINGS_MMC \ - "boot=mmc\0" \ - "mmcdev=1\0" \ - "bootpart=1:2\0" \ - "bootdir=/boot\0" \ - "rd_spec=-\0" \ - "init_mmc=run args_all args_mmc\0" \ - "get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}\0" \ - "get_kern_mmc=load mmc ${bootpart} ${loadaddr} " \ - "${bootdir}/${name_kern}\0" - -/* Incorporate settings into the U-Boot environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ - DEFAULT_MMC_TI_ARGS \ - EXTRA_ENV_AM65X_BOARD_SETTINGS \ - EXTRA_ENV_AM65X_BOARD_SETTINGS_MMC - -/* Now for the remaining common defines */ -#include <configs/ti_armv7_common.h> - -#endif /* __CONFIG_AM654_EVM_H */
This board has not been converted to CONFIG_DM_BLK by the deadline. Remove it. Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/arm/mach-k3/Kconfig | 1 - board/ti/am65x/Kconfig | 52 -------- board/ti/am65x/MAINTAINERS | 7 -- board/ti/am65x/Makefile | 8 -- board/ti/am65x/README | 211 -------------------------------- board/ti/am65x/evm.c | 68 ---------- configs/am65x_evm_a53_defconfig | 71 ----------- configs/am65x_evm_r5_defconfig | 87 ------------- include/configs/am65x_evm.h | 75 ------------ 9 files changed, 580 deletions(-) delete mode 100644 board/ti/am65x/Kconfig delete mode 100644 board/ti/am65x/MAINTAINERS delete mode 100644 board/ti/am65x/Makefile delete mode 100644 board/ti/am65x/README delete mode 100644 board/ti/am65x/evm.c delete mode 100644 configs/am65x_evm_a53_defconfig delete mode 100644 configs/am65x_evm_r5_defconfig delete mode 100644 include/configs/am65x_evm.h