From: Laurentiu Tudor Date: Wed, 23 Aug 2023 13:25:46 +0000 (+0300) Subject: fsl-layerscape: drop obsolete PPA secure firmware support X-Git-Url: http://git.dujemihanovic.xyz/img/static/%7B%7B%20%28.OutputFormats.Get?a=commitdiff_plain;h=487fa1aa97bb69eeaf620a229da0aa27b9375a52;p=u-boot.git fsl-layerscape: drop obsolete PPA secure firmware support PPA was a secure firmware developed in-house which is no longer supported and replaced by TF-A quite some years ago. Drop support for it. Signed-off-by: Laurentiu Tudor Signed-off-by: Peng Fan --- diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index d46934c2dc..080fe3fc32 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -390,66 +390,6 @@ config HAS_FEATURE_ENHANCED_MSI bool default y if ARCH_LS1043A -menu "Layerscape PPA" -config FSL_LS_PPA - bool "FSL Layerscape PPA firmware support" - depends on !ARMV8_PSCI - select ARMV8_SEC_FIRMWARE_SUPPORT - select SEC_FIRMWARE_ARMV8_PSCI - select ARMV8_SEC_FIRMWARE_ERET_ADDR_REVERT if FSL_LSCH2 - help - The FSL Primary Protected Application (PPA) is a software component - which is loaded during boot stage, and then remains resident in RAM - and runs in the TrustZone after boot. - Say y to enable it. - -config SPL_FSL_LS_PPA - bool "FSL Layerscape PPA firmware support for SPL build" - depends on !ARMV8_PSCI - select SPL_ARMV8_SEC_FIRMWARE_SUPPORT - select SEC_FIRMWARE_ARMV8_PSCI - select ARMV8_SEC_FIRMWARE_ERET_ADDR_REVERT if FSL_LSCH2 - help - The FSL Primary Protected Application (PPA) is a software component - which is loaded during boot stage, and then remains resident in RAM - and runs in the TrustZone after boot. This is to load PPA during SPL - stage instead of the RAM version of U-Boot. Once PPA is initialized, - the rest of U-Boot (including RAM version) runs at EL2. -choice - prompt "FSL Layerscape PPA firmware loading-media select" - depends on FSL_LS_PPA - default SYS_LS_PPA_FW_IN_MMC if SD_BOOT - default SYS_LS_PPA_FW_IN_NAND if NAND_BOOT - default SYS_LS_PPA_FW_IN_XIP - -config SYS_LS_PPA_FW_IN_XIP - bool "XIP" - help - Say Y here if the PPA firmware locate at XIP flash, such - as NOR or QSPI flash. - -config SYS_LS_PPA_FW_IN_MMC - bool "eMMC or SD Card" - help - Say Y here if the PPA firmware locate at eMMC/SD card. - -config SYS_LS_PPA_FW_IN_NAND - bool "NAND" - help - Say Y here if the PPA firmware locate at NAND flash. - -endchoice - -config LS_PPA_ESBC_HDR_SIZE - hex "Length of PPA ESBC header" - depends on FSL_LS_PPA && CHAIN_OF_TRUST && !SYS_LS_PPA_FW_IN_XIP - default 0x2000 - help - Length (in bytes) of PPA ESBC header to be copied from MMC/SD or - NAND to memory to validate PPA image. - -endmenu - config SYS_FSL_ERRATUM_A008997 bool "Workaround for USB PHY erratum A008997" diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Makefile b/arch/arm/cpu/armv8/fsl-layerscape/Makefile index 598c36ee66..eefdf12369 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Makefile +++ b/arch/arm/cpu/armv8/fsl-layerscape/Makefile @@ -10,7 +10,6 @@ obj-$(CONFIG_MP) += mp.o spintable.o obj-$(CONFIG_OF_LIBFDT) += fdt.o endif obj-$(CONFIG_SPL) += spl.o -obj-$(CONFIG_$(SPL_)FSL_LS_PPA) += ppa.o ifneq ($(CONFIG_FSL_LSCH3),) obj-y += fsl_lsch3_speed.o diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c deleted file mode 100644 index 117b7a053c..0000000000 --- a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c +++ /dev/null @@ -1,284 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright 2016 NXP Semiconductor, Inc. - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef CONFIG_FSL_LSCH3 -#include -#elif defined(CONFIG_FSL_LSCH2) -#include -#endif -#if CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT) -#include -#endif -#ifdef CONFIG_CHAIN_OF_TRUST -#include -#endif - -#ifdef CONFIG_SYS_LS_PPA_FW_IN_NAND -#include -#elif defined(CONFIG_SYS_LS_PPA_FW_IN_MMC) -#include -#endif - -DECLARE_GLOBAL_DATA_PTR; - -int ppa_init(void) -{ - unsigned int el = current_el(); - void *ppa_fit_addr; - u32 *boot_loc_ptr_l, *boot_loc_ptr_h; - u32 *loadable_l, *loadable_h; - int ret; - -#ifdef CONFIG_CHAIN_OF_TRUST - uintptr_t ppa_esbc_hdr = 0; - uintptr_t ppa_img_addr = 0; -#if defined(CONFIG_SYS_LS_PPA_FW_IN_MMC) || \ - defined(CONFIG_SYS_LS_PPA_FW_IN_NAND) - void *ppa_hdr_ddr; -#endif -#endif - - /* Skip if running at lower exception level */ - if (el < 3) { - debug("Skipping PPA init, running at EL%d\n", el); - return 0; - } - -#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP - ppa_fit_addr = (void *)CONFIG_SYS_LS_PPA_FW_ADDR; - debug("%s: PPA image load from XIP\n", __func__); -#ifdef CONFIG_CHAIN_OF_TRUST - ppa_esbc_hdr = CONFIG_SYS_LS_PPA_ESBC_ADDR; -#endif -#else /* !CONFIG_SYS_LS_PPA_FW_IN_XIP */ - size_t fw_length, fdt_header_len = sizeof(struct fdt_header); - - /* Copy PPA image from MMC/SD/NAND to allocated memory */ -#ifdef CONFIG_SYS_LS_PPA_FW_IN_MMC - struct mmc *mmc; - int dev = CONFIG_SYS_MMC_ENV_DEV; - struct fdt_header *fitp; - u32 cnt; - u32 blk; - - debug("%s: PPA image load from eMMC/SD\n", __func__); - - ret = mmc_initialize(gd->bd); - if (ret) { - printf("%s: mmc_initialize() failed\n", __func__); - return ret; - } - mmc = find_mmc_device(dev); - if (!mmc) { - printf("PPA: MMC cannot find device for PPA firmware\n"); - return -ENODEV; - } - - ret = mmc_init(mmc); - if (ret) { - printf("%s: mmc_init() failed\n", __func__); - return ret; - } - - fitp = malloc(roundup(fdt_header_len, 512)); - if (!fitp) { - printf("PPA: malloc failed for FIT header(size 0x%zx)\n", - roundup(fdt_header_len, 512)); - return -ENOMEM; - } - - blk = CONFIG_SYS_LS_PPA_FW_ADDR / 512; - cnt = DIV_ROUND_UP(fdt_header_len, 512); - debug("%s: MMC read PPA FIT header: dev # %u, block # %u, count %u\n", - __func__, dev, blk, cnt); - ret = blk_dread(mmc_get_blk_desc(mmc), blk, cnt, fitp); - if (ret != cnt) { - free(fitp); - printf("MMC/SD read of PPA FIT header at offset 0x%x failed\n", - CONFIG_SYS_LS_PPA_FW_ADDR); - return -EIO; - } - - ret = fdt_check_header(fitp); - if (ret) { - free(fitp); - printf("%s: fdt_check_header() failed\n", __func__); - return ret; - } - -#ifdef CONFIG_CHAIN_OF_TRUST - ppa_hdr_ddr = malloc(CONFIG_LS_PPA_ESBC_HDR_SIZE); - if (!ppa_hdr_ddr) { - printf("PPA: malloc failed for PPA header\n"); - return -ENOMEM; - } - - blk = CONFIG_SYS_LS_PPA_ESBC_ADDR >> 9; - cnt = DIV_ROUND_UP(CONFIG_LS_PPA_ESBC_HDR_SIZE, 512); - ret = blk_dread(mmc_get_blk_desc(mmc), blk, cnt, ppa_hdr_ddr); - if (ret != cnt) { - free(ppa_hdr_ddr); - printf("MMC/SD read of PPA header failed\n"); - return -EIO; - } - debug("Read PPA header to 0x%p\n", ppa_hdr_ddr); - - ppa_esbc_hdr = (uintptr_t)ppa_hdr_ddr; -#endif - - fw_length = fdt_totalsize(fitp); - free(fitp); - - fw_length = roundup(fw_length, 512); - ppa_fit_addr = malloc(fw_length); - if (!ppa_fit_addr) { - printf("PPA: malloc failed for PPA image(size 0x%zx)\n", - fw_length); - return -ENOMEM; - } - - blk = CONFIG_SYS_LS_PPA_FW_ADDR / 512; - cnt = DIV_ROUND_UP(fw_length, 512); - debug("%s: MMC read PPA FIT image: dev # %u, block # %u, count %u\n", - __func__, dev, blk, cnt); - ret = blk_dread(mmc_get_blk_desc(mmc), blk, cnt, ppa_fit_addr); - if (ret != cnt) { - free(ppa_fit_addr); - printf("MMC/SD read of PPA FIT header at offset 0x%x failed\n", - CONFIG_SYS_LS_PPA_FW_ADDR); - return -EIO; - } - -#elif defined(CONFIG_SYS_LS_PPA_FW_IN_NAND) - struct fdt_header fit; - - debug("%s: PPA image load from NAND\n", __func__); - - nand_init(); - ret = nand_read(get_nand_dev_by_index(0), - (loff_t)CONFIG_SYS_LS_PPA_FW_ADDR, - &fdt_header_len, (u_char *)&fit); - if (ret == -EUCLEAN) { - printf("NAND read of PPA FIT header at offset 0x%x failed\n", - CONFIG_SYS_LS_PPA_FW_ADDR); - return -EIO; - } - - ret = fdt_check_header(&fit); - if (ret) { - printf("%s: fdt_check_header() failed\n", __func__); - return ret; - } - -#ifdef CONFIG_CHAIN_OF_TRUST - ppa_hdr_ddr = malloc(CONFIG_LS_PPA_ESBC_HDR_SIZE); - if (!ppa_hdr_ddr) { - printf("PPA: malloc failed for PPA header\n"); - return -ENOMEM; - } - - fw_length = CONFIG_LS_PPA_ESBC_HDR_SIZE; - - ret = nand_read(get_nand_dev_by_index(0), - (loff_t)CONFIG_SYS_LS_PPA_ESBC_ADDR, - &fw_length, (u_char *)ppa_hdr_ddr); - if (ret == -EUCLEAN) { - free(ppa_hdr_ddr); - printf("NAND read of PPA firmware at offset 0x%x failed\n", - CONFIG_SYS_LS_PPA_FW_ADDR); - return -EIO; - } - debug("Read PPA header to 0x%p\n", ppa_hdr_ddr); - - ppa_esbc_hdr = (uintptr_t)ppa_hdr_ddr; -#endif - - fw_length = fdt_totalsize(&fit); - - ppa_fit_addr = malloc(fw_length); - if (!ppa_fit_addr) { - printf("PPA: malloc failed for PPA image(size 0x%zx)\n", - fw_length); - return -ENOMEM; - } - - ret = nand_read(get_nand_dev_by_index(0), - (loff_t)CONFIG_SYS_LS_PPA_FW_ADDR, - &fw_length, (u_char *)ppa_fit_addr); - if (ret == -EUCLEAN) { - free(ppa_fit_addr); - printf("NAND read of PPA firmware at offset 0x%x failed\n", - CONFIG_SYS_LS_PPA_FW_ADDR); - return -EIO; - } -#else -#error "No CONFIG_SYS_LS_PPA_FW_IN_xxx defined" -#endif - -#endif - -#ifdef CONFIG_CHAIN_OF_TRUST - ppa_img_addr = (uintptr_t)ppa_fit_addr; - if (fsl_check_boot_mode_secure() != 0) { - /* - * In case of failure in validation, fsl_secboot_validate - * would not return back in case of Production environment - * with ITS=1. In Development environment (ITS=0 and - * SB_EN=1), the function may return back in case of - * non-fatal failures. - */ - ret = fsl_secboot_validate(ppa_esbc_hdr, - PPA_KEY_HASH, - &ppa_img_addr); - if (ret != 0) - printf("SEC firmware(s) validation failed\n"); - else - printf("SEC firmware(s) validation Successful\n"); - } -#if defined(CONFIG_SYS_LS_PPA_FW_IN_MMC) || \ - defined(CONFIG_SYS_LS_PPA_FW_IN_NAND) - free(ppa_hdr_ddr); -#endif -#endif - -#ifdef CONFIG_FSL_LSCH3 - struct ccsr_gur __iomem *gur = (void *)(CFG_SYS_FSL_GUTS_ADDR); - boot_loc_ptr_l = &gur->bootlocptrl; - boot_loc_ptr_h = &gur->bootlocptrh; - - /* Assign addresses to loadable ptrs */ - loadable_l = &gur->scratchrw[4]; - loadable_h = &gur->scratchrw[5]; -#elif defined(CONFIG_FSL_LSCH2) - struct ccsr_scfg __iomem *scfg = (void *)(CFG_SYS_FSL_SCFG_ADDR); - boot_loc_ptr_l = &scfg->scratchrw[1]; - boot_loc_ptr_h = &scfg->scratchrw[0]; - - /* Assign addresses to loadable ptrs */ - loadable_l = &scfg->scratchrw[2]; - loadable_h = &scfg->scratchrw[3]; -#endif - - debug("fsl-ppa: boot_loc_ptr_l = 0x%p, boot_loc_ptr_h =0x%p\n", - boot_loc_ptr_l, boot_loc_ptr_h); - ret = sec_firmware_init(ppa_fit_addr, boot_loc_ptr_l, boot_loc_ptr_h, - loadable_l, loadable_h); - -#if defined(CONFIG_SYS_LS_PPA_FW_IN_MMC) || \ - defined(CONFIG_SYS_LS_PPA_FW_IN_NAND) - free(ppa_fit_addr); -#endif - - return ret; -} diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c index 033f48d04b..232adfa843 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c @@ -21,7 +21,6 @@ #include #include #include -#include #include DECLARE_GLOBAL_DATA_PTR; @@ -62,9 +61,6 @@ void spl_board_init(void) #ifdef CONFIG_LAYERSCAPE_NS_ACCESS enable_layerscape_ns_access(); #endif -#ifdef CONFIG_SPL_FSL_LS_PPA - ppa_init(); -#endif } void tzpc_init(void) @@ -120,36 +116,6 @@ void board_init_f(ulong dummy) init_func_vid(); #endif dram_init(); -#ifdef CONFIG_SPL_FSL_LS_PPA -#ifndef CFG_SYS_MEM_RESERVE_SECURE -#error Need secure RAM for PPA -#endif - /* - * Secure memory location is determined in dram_init_banksize(). - * gd->ram_size is deducted by the size of secure ram. - */ - dram_init_banksize(); - - /* - * After dram_init_bank_size(), we know U-Boot only uses the first - * memory bank regardless how big the memory is. - */ - gd->ram_top = gd->bd->bi_dram[0].start + gd->bd->bi_dram[0].size; - - /* - * If PPA is loaded, U-Boot will resume running at EL2. - * Cache and MMU will be enabled. Need a place for TLB. - * U-Boot will be relocated to the end of available memory - * in first bank. At this point, we cannot know how much - * memory U-Boot uses. Put TLB table lower by SPL_TLB_SETBACK - * to avoid overlapping. As soon as the RAM version U-Boot sets - * up new MMU, this space is no longer needed. - */ - gd->ram_top -= SPL_TLB_SETBACK; - gd->arch.tlb_size = PGTABLE_SIZE; - gd->arch.tlb_addr = (gd->ram_top - gd->arch.tlb_size) & ~(0x10000 - 1); - gd->arch.tlb_allocated = gd->arch.tlb_addr; -#endif /* CONFIG_SPL_FSL_LS_PPA */ #if defined(CONFIG_QSPI_AHB_INIT) && defined(CONFIG_QSPI_BOOT) qspi_ahb_init(); #endif diff --git a/arch/arm/include/asm/arch-fsl-layerscape/ppa.h b/arch/arm/include/asm/arch-fsl-layerscape/ppa.h deleted file mode 100644 index f0c4a84f7c..0000000000 --- a/arch/arm/include/asm/arch-fsl-layerscape/ppa.h +++ /dev/null @@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright 2016 NXP Semiconductor, Inc. - */ - -#ifndef __FSL_PPA_H_ -#define __FSL_PPA_H_ - -#ifdef CONFIG_FSL_LS_PPA -int ppa_init(void); -#endif -#endif diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index 6a9d198cb8..15627c96e9 100644 --- a/arch/arm/include/asm/fsl_secure_boot.h +++ b/arch/arm/include/asm/fsl_secure_boot.h @@ -9,15 +9,6 @@ #ifdef CONFIG_CHAIN_OF_TRUST #ifndef CONFIG_SPL_BUILD -#ifdef CONFIG_FSL_LS_PPA -/* Define the key hash here if SRK used for signing PPA image is - * different from SRK hash put in SFP used for U-Boot. - * Example - * #define PPA_KEY_HASH \ - * "41066b564c6ffcef40ccbc1e0a5d0d519604000c785d97bbefd25e4d288d1c8b" - */ -#define PPA_KEY_HASH NULL -#endif /* ifdef CONFIG_FSL_LS_PPA */ #endif /* #ifndef CONFIG_SPL_BUILD */ #endif /* #ifdef CONFIG_CHAIN_OF_TRUST */ diff --git a/board/freescale/ls1012afrdm/Kconfig b/board/freescale/ls1012afrdm/Kconfig index 75de782afc..a7e59e6265 100644 --- a/board/freescale/ls1012afrdm/Kconfig +++ b/board/freescale/ls1012afrdm/Kconfig @@ -20,9 +20,6 @@ config SYS_LS_PFE_FW_LENGTH hex "length of PFE firmware" default 0x40000 -config SYS_LS_PPA_FW_ADDR - hex "PPA Firmware Addr" - default 0x40400000 endif if FSL_PFE @@ -73,14 +70,6 @@ config SYS_LS_PFE_FW_LENGTH hex "length of PFE firmware" default 0x40000 -config SYS_LS_PPA_FW_ADDR - hex "PPA Firmware Addr" - default 0x40060000 - -config SYS_LS_PPA_ESBC_ADDR - hex "PPA Firmware HDR Addr" - default 0x401f4000 - config SYS_LS_PFE_ESBC_ADDR hex "PFE Firmware HDR Addr" default 0x401f8000 diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c index f2b8750a3f..271072bf7a 100644 --- a/board/freescale/ls1012afrdm/ls1012afrdm.c +++ b/board/freescale/ls1012afrdm/ls1012afrdm.c @@ -12,9 +12,6 @@ #include #include #include -#ifdef CONFIG_FSL_LS_PPA -#include -#endif #include #include #include @@ -171,9 +168,6 @@ int board_init(void) if (current_el() == 3) out_le32(&cci->ctrl_ord, CCI400_CTRLORD_EN_BARRIER); -#ifdef CONFIG_FSL_LS_PPA - ppa_init(); -#endif return 0; } diff --git a/board/freescale/ls1012aqds/Kconfig b/board/freescale/ls1012aqds/Kconfig index 991ba6044d..d333069898 100644 --- a/board/freescale/ls1012aqds/Kconfig +++ b/board/freescale/ls1012aqds/Kconfig @@ -12,15 +12,7 @@ config SYS_SOC config SYS_CONFIG_NAME default "ls1012aqds" -config SYS_LS_PPA_FW_ADDR - hex "PPA Firmware Addr" - default 0x40400000 - if CHAIN_OF_TRUST -config SYS_LS_PPA_ESBC_ADDR - hex "PPA Firmware HDR Addr" - default 0x40680000 - config SYS_LS_PFE_ESBC_ADDR hex "PFE Firmware HDR Addr" default 0x40700000 diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c index 194b5d2729..a5ea8d634e 100644 --- a/board/freescale/ls1012aqds/ls1012aqds.c +++ b/board/freescale/ls1012aqds/ls1012aqds.c @@ -13,9 +13,6 @@ #include #include #include -#ifdef CONFIG_FSL_LS_PPA -#include -#endif #include #include #include @@ -150,9 +147,6 @@ int board_init(void) erratum_a010315(); #endif -#ifdef CONFIG_FSL_LS_PPA - ppa_init(); -#endif return 0; } diff --git a/board/freescale/ls1012ardb/Kconfig b/board/freescale/ls1012ardb/Kconfig index aa15f5a027..b55660d485 100644 --- a/board/freescale/ls1012ardb/Kconfig +++ b/board/freescale/ls1012ardb/Kconfig @@ -12,15 +12,7 @@ config SYS_SOC config SYS_CONFIG_NAME default "ls1012ardb" -config SYS_LS_PPA_FW_ADDR - hex "PPA Firmware Addr" - default 0x40400000 - if CHAIN_OF_TRUST -config SYS_LS_PPA_ESBC_ADDR - hex "PPA Firmware HDR Addr" - default 0x40680000 - config SYS_LS_PFE_ESBC_ADDR hex "PFE Firmware HDR Addr" default 0x40640000 @@ -79,10 +71,6 @@ config SYS_SOC config SYS_CONFIG_NAME default "ls1012a2g5rdb" -config SYS_LS_PPA_FW_ADDR - hex "PPA Firmware Addr" - default 0x40400000 - if FSL_PFE config BOARD_SPECIFIC_OPTIONS # dummy diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c index 62c935e4d3..18f92089ca 100644 --- a/board/freescale/ls1012ardb/ls1012ardb.c +++ b/board/freescale/ls1012ardb/ls1012ardb.c @@ -15,9 +15,6 @@ #include #include #include -#ifdef CONFIG_FSL_LS_PPA -#include -#endif #include #include #include @@ -173,9 +170,6 @@ int board_init(void) erratum_a010315(); #endif -#ifdef CONFIG_FSL_LS_PPA - ppa_init(); -#endif return 0; } diff --git a/board/freescale/ls1028a/Kconfig b/board/freescale/ls1028a/Kconfig index 7d73d20c8f..fb6ee17ce8 100644 --- a/board/freescale/ls1028a/Kconfig +++ b/board/freescale/ls1028a/Kconfig @@ -20,18 +20,6 @@ config TEXT_BASE default 0x82000000 if TFABOOT default 0x20100000 -if FSL_LS_PPA -config SYS_LS_PPA_FW_ADDR - hex "PPA Firmware Addr" - default 0x20400000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1028A - default 0x400000 if SYS_LS_PPA_FW_IN_MMC && ARCH_LS1028A -if CHAIN_OF_TRUST -config SYS_LS_PPA_ESBC_ADDR - hex "PPA header Addr" - default 0x20600000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1028A -endif -endif - endif if TARGET_LS1028ARDB diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c index faecb60992..7f181ab3df 100644 --- a/board/freescale/ls1028a/ls1028a.c +++ b/board/freescale/ls1028a/ls1028a.c @@ -20,9 +20,6 @@ #include #include #include -#ifdef CONFIG_FSL_LS_PPA -#include -#endif #include #include @@ -74,10 +71,6 @@ u32 get_lpuart_clk(void) int board_init(void) { -#ifdef CONFIG_FSL_LS_PPA - ppa_init(); -#endif - #ifndef CONFIG_SYS_EARLY_PCI_INIT pci_init(); #endif diff --git a/board/freescale/ls1043aqds/Kconfig b/board/freescale/ls1043aqds/Kconfig index 4be445e8c8..7e27f8f5b1 100644 --- a/board/freescale/ls1043aqds/Kconfig +++ b/board/freescale/ls1043aqds/Kconfig @@ -12,20 +12,4 @@ config SYS_SOC config SYS_CONFIG_NAME default "ls1043aqds" -if FSL_LS_PPA -config SYS_LS_PPA_FW_ADDR - hex "PPA Firmware Addr" - default 0x40400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT - default 0x60400000 if SYS_LS_PPA_FW_IN_XIP - default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND - -if CHAIN_OF_TRUST -config SYS_LS_PPA_ESBC_ADDR - hex "PPA Firmware HDR Addr" - default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT - default 0x60680000 if SYS_LS_PPA_FW_IN_XIP - default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND -endif -endif - endif diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c index 841d8b59bb..b87da41e40 100644 --- a/board/freescale/ls1043aqds/ls1043aqds.c +++ b/board/freescale/ls1043aqds/ls1043aqds.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include @@ -533,10 +532,6 @@ int board_init(void) config_serdes_mux(); #endif -#ifdef CONFIG_FSL_LS_PPA - ppa_init(); -#endif - return 0; } diff --git a/board/freescale/ls1043ardb/Kconfig b/board/freescale/ls1043ardb/Kconfig index 56502f9f9c..51818ec580 100644 --- a/board/freescale/ls1043ardb/Kconfig +++ b/board/freescale/ls1043ardb/Kconfig @@ -13,18 +13,4 @@ config SYS_SOC config SYS_CONFIG_NAME default "ls1043ardb" -if FSL_LS_PPA -config SYS_LS_PPA_FW_ADDR - hex "PPA Firmware Addr" - default 0x60400000 if SYS_LS_PPA_FW_IN_XIP - default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND - -if CHAIN_OF_TRUST -config SYS_LS_PPA_ESBC_ADDR - hex "PPA Firmware HDR Addr" - default 0x60680000 if SYS_LS_PPA_FW_IN_XIP - default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND -endif -endif - endif diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c index 741a4d64ea..18869d8c1d 100644 --- a/board/freescale/ls1043ardb/ls1043ardb.c +++ b/board/freescale/ls1043ardb/ls1043ardb.c @@ -25,7 +25,6 @@ #ifdef CONFIG_U_QE #include #endif -#include DECLARE_GLOBAL_DATA_PTR; @@ -211,10 +210,6 @@ int board_init(void) out_le32(SMMU_NSCR0, val); #endif -#ifdef CONFIG_FSL_LS_PPA - ppa_init(); -#endif - #if !defined(CONFIG_SYS_EARLY_PCI_INIT) && defined(CONFIG_DM_ETH) pci_init(); #endif diff --git a/board/freescale/ls1046aqds/Kconfig b/board/freescale/ls1046aqds/Kconfig index adf325f4ef..723f4ba90a 100644 --- a/board/freescale/ls1046aqds/Kconfig +++ b/board/freescale/ls1046aqds/Kconfig @@ -12,20 +12,4 @@ config SYS_SOC config SYS_CONFIG_NAME default "ls1046aqds" -if FSL_LS_PPA -config SYS_LS_PPA_FW_ADDR - hex "PPA Firmware Addr" - default 0x40400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT - default 0x60400000 if SYS_LS_PPA_FW_IN_XIP - default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND - -if CHAIN_OF_TRUST -config SYS_LS_PPA_ESBC_ADDR - hex "PPA Firmware HDR Addr" - default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT - default 0x60680000 if SYS_LS_PPA_FW_IN_XIP - default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND -endif -endif - endif diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c index 3d0881643c..2faac54a0e 100644 --- a/board/freescale/ls1046aqds/ls1046aqds.c +++ b/board/freescale/ls1046aqds/ls1046aqds.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -402,10 +401,6 @@ int board_init(void) if (adjust_vdd(0)) printf("Warning: Adjusting core voltage failed.\n"); -#ifdef CONFIG_FSL_LS_PPA - ppa_init(); -#endif - #ifdef CONFIG_NXP_ESBC /* * In case of Secure Boot, the IBR configures the SMMU diff --git a/board/freescale/ls1046ardb/Kconfig b/board/freescale/ls1046ardb/Kconfig index 1fb391c991..a62255c78d 100644 --- a/board/freescale/ls1046ardb/Kconfig +++ b/board/freescale/ls1046ardb/Kconfig @@ -13,18 +13,4 @@ config SYS_SOC config SYS_CONFIG_NAME default "ls1046ardb" -if FSL_LS_PPA -config SYS_LS_PPA_FW_ADDR - hex "PPA Firmware Addr" - default 0x40400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT - default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND - -if CHAIN_OF_TRUST -config SYS_LS_PPA_ESBC_ADDR - hex "PPA Firmware HDR Addr" - default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT - default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND -endif -endif - endif diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/freescale/ls1046ardb/ls1046ardb.c index 1d12d9189b..26e69db55f 100644 --- a/board/freescale/ls1046ardb/ls1046ardb.c +++ b/board/freescale/ls1046ardb/ls1046ardb.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -96,10 +95,6 @@ int board_init(void) out_le32(SMMU_NSCR0, val); #endif -#ifdef CONFIG_FSL_LS_PPA - ppa_init(); -#endif - #if !defined(CONFIG_SYS_EARLY_PCI_INIT) && defined(CONFIG_DM_ETH) pci_init(); #endif diff --git a/board/freescale/ls1088a/Kconfig b/board/freescale/ls1088a/Kconfig index f1a4523606..1ada661743 100644 --- a/board/freescale/ls1088a/Kconfig +++ b/board/freescale/ls1088a/Kconfig @@ -12,20 +12,6 @@ config SYS_SOC config SYS_CONFIG_NAME default "ls1088aqds" -if FSL_LS_PPA -config SYS_LS_PPA_FW_ADDR - hex "PPA Firmware Addr" - default 0x20400000 if SYS_LS_PPA_FW_IN_XIP - default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND - -if CHAIN_OF_TRUST -config SYS_LS_PPA_ESBC_ADDR - hex "PPA Firmware HDR Addr" - default 0x20680000 if SYS_LS_PPA_FW_IN_XIP - default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND -endif -endif - endif if TARGET_LS1088ARDB @@ -42,18 +28,4 @@ config SYS_SOC config SYS_CONFIG_NAME default "ls1088ardb" -if FSL_LS_PPA -config SYS_LS_PPA_FW_ADDR - hex "PPA Firmware Addr" - default 0x20400000 if SYS_LS_PPA_FW_IN_XIP - default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND - -if CHAIN_OF_TRUST -config SYS_LS_PPA_ESBC_ADDR - hex "PPA Firmware HDR Addr" - default 0x20680000 if SYS_LS_PPA_FW_IN_XIP - default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND -endif -endif - endif diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c index f2b8bec037..72126bd93a 100644 --- a/board/freescale/ls1088a/ls1088a.c +++ b/board/freescale/ls1088a/ls1088a.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -821,10 +820,6 @@ int board_init(void) out_le32(irq_ccsr + IRQCR_OFFSET / 4, AQR105_IRQ_MASK); #endif -#ifdef CONFIG_FSL_LS_PPA - ppa_init(); -#endif - #if !defined(CONFIG_SYS_EARLY_PCI_INIT) pci_init(); #endif diff --git a/board/freescale/ls2080aqds/Kconfig b/board/freescale/ls2080aqds/Kconfig index 1036f33c61..2f997e9de1 100644 --- a/board/freescale/ls2080aqds/Kconfig +++ b/board/freescale/ls2080aqds/Kconfig @@ -13,20 +13,4 @@ config SYS_SOC config SYS_CONFIG_NAME default "ls2080aqds" -if FSL_LS_PPA -config SYS_LS_PPA_FW_ADDR - hex "PPA Firmware Addr" - default 0x20400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT - default 0x580400000 if SYS_LS_PPA_FW_IN_XIP - default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND - -if CHAIN_OF_TRUST -config SYS_LS_PPA_ESBC_ADDR - hex "PPA Firmware HDR Addr" - default 0x20680000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT - default 0x580680000 if SYS_LS_PPA_FW_IN_XIP - default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND -endif -endif - endif diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c index ab5ff6f62c..ba25e9b0b8 100644 --- a/board/freescale/ls2080aqds/ls2080aqds.c +++ b/board/freescale/ls2080aqds/ls2080aqds.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include "../common/i2c_mux.h" @@ -223,10 +222,6 @@ int board_init(void) #endif #endif -#ifdef CONFIG_FSL_LS_PPA - ppa_init(); -#endif - #if !defined(CONFIG_SYS_EARLY_PCI_INIT) pci_init(); #endif diff --git a/board/freescale/ls2080ardb/Kconfig b/board/freescale/ls2080ardb/Kconfig index c8b0b94596..671eead5f7 100644 --- a/board/freescale/ls2080ardb/Kconfig +++ b/board/freescale/ls2080ardb/Kconfig @@ -12,20 +12,4 @@ config SYS_SOC config SYS_CONFIG_NAME default "ls2080ardb" -if FSL_LS_PPA -config SYS_LS_PPA_FW_ADDR - hex "PPA Firmware Addr" - default 0x20400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT - default 0x580400000 if SYS_LS_PPA_FW_IN_XIP - default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND - -if CHAIN_OF_TRUST -config SYS_LS_PPA_ESBC_ADDR - hex "PPA Firmware HDR Addr" - default 0x20680000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT - default 0x580680000 if SYS_LS_PPA_FW_IN_XIP - default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND -endif -endif - endif diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c index a7fc2b2076..8d340f17a2 100644 --- a/board/freescale/ls2080ardb/ls2080ardb.c +++ b/board/freescale/ls2080ardb/ls2080ardb.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include "../common/i2c_mux.h" @@ -288,10 +287,6 @@ int board_init(void) QIXIS_WRITE(rst_ctl, QIXIS_RST_CTL_RESET_EN); #endif -#ifdef CONFIG_FSL_LS_PPA - ppa_init(); -#endif - #ifdef CONFIG_FSL_MC_ENET /* invert AQR405 IRQ pins polarity */ out_le32(irq_ccsr + IRQCR_OFFSET / 4, AQR405_IRQ_MASK); diff --git a/board/traverse/ten64/ten64.c b/board/traverse/ten64/ten64.c index df9f0afe1a..6ff5312d6d 100644 --- a/board/traverse/ten64/ten64.c +++ b/board/traverse/ten64/ten64.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/env/Kconfig b/env/Kconfig index 54203faa89..67b819d47a 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -645,7 +645,7 @@ config SYS_RELOC_GD_ENV_ADDR config SYS_MMC_ENV_DEV int "mmc device number" - depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT || SYS_LS_PPA_FW_IN_MMC || \ + depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT || \ CMD_MVEBU_BUBT || FMAN_ENET || QE || PHY_CORTINA default 0 help diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 38fb1d45bc..867b098a07 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -21,8 +21,7 @@ (defined(CONFIG_NAND_BOOT) || defined(CONFIG_QSPI_BOOT)) #define SPL_NO_MMC #endif -#if defined(CONFIG_SPL_BUILD) && \ - !defined(CONFIG_SPL_FSL_LS_PPA) +#if defined(CONFIG_SPL_BUILD) #define SPL_NO_IFC #endif