fsl-layerscape: drop obsolete PPA secure firmware support
authorLaurentiu Tudor <laurentiu.tudor@nxp.com>
Wed, 23 Aug 2023 13:25:46 +0000 (16:25 +0300)
committerPeng Fan <peng.fan@nxp.com>
Tue, 10 Oct 2023 02:13:32 +0000 (10:13 +0800)
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 <laurentiu.tudor@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
31 files changed:
arch/arm/cpu/armv8/fsl-layerscape/Kconfig
arch/arm/cpu/armv8/fsl-layerscape/Makefile
arch/arm/cpu/armv8/fsl-layerscape/ppa.c [deleted file]
arch/arm/cpu/armv8/fsl-layerscape/spl.c
arch/arm/include/asm/arch-fsl-layerscape/ppa.h [deleted file]
arch/arm/include/asm/fsl_secure_boot.h
board/freescale/ls1012afrdm/Kconfig
board/freescale/ls1012afrdm/ls1012afrdm.c
board/freescale/ls1012aqds/Kconfig
board/freescale/ls1012aqds/ls1012aqds.c
board/freescale/ls1012ardb/Kconfig
board/freescale/ls1012ardb/ls1012ardb.c
board/freescale/ls1028a/Kconfig
board/freescale/ls1028a/ls1028a.c
board/freescale/ls1043aqds/Kconfig
board/freescale/ls1043aqds/ls1043aqds.c
board/freescale/ls1043ardb/Kconfig
board/freescale/ls1043ardb/ls1043ardb.c
board/freescale/ls1046aqds/Kconfig
board/freescale/ls1046aqds/ls1046aqds.c
board/freescale/ls1046ardb/Kconfig
board/freescale/ls1046ardb/ls1046ardb.c
board/freescale/ls1088a/Kconfig
board/freescale/ls1088a/ls1088a.c
board/freescale/ls2080aqds/Kconfig
board/freescale/ls2080aqds/ls2080aqds.c
board/freescale/ls2080ardb/Kconfig
board/freescale/ls2080ardb/ls2080ardb.c
board/traverse/ten64/ten64.c
env/Kconfig
include/configs/ls1046a_common.h

index d46934c..080fe3f 100644 (file)
@@ -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"
 
index 598c36e..eefdf12 100644 (file)
@@ -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 (file)
index 117b7a0..0000000
+++ /dev/null
@@ -1,284 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2016 NXP Semiconductor, Inc.
- */
-#include <common.h>
-#include <log.h>
-#include <malloc.h>
-#include <config.h>
-#include <errno.h>
-#include <asm/cache.h>
-#include <asm/global_data.h>
-#include <asm/system.h>
-#include <asm/types.h>
-#include <asm/arch/soc.h>
-#ifdef CONFIG_FSL_LSCH3
-#include <asm/arch/immap_lsch3.h>
-#elif defined(CONFIG_FSL_LSCH2)
-#include <asm/arch/immap_lsch2.h>
-#endif
-#if CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT)
-#include <asm/armv8/sec_firmware.h>
-#endif
-#ifdef CONFIG_CHAIN_OF_TRUST
-#include <fsl_validate.h>
-#endif
-
-#ifdef CONFIG_SYS_LS_PPA_FW_IN_NAND
-#include <nand.h>
-#elif defined(CONFIG_SYS_LS_PPA_FW_IN_MMC)
-#include <mmc.h>
-#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;
-}
index 033f48d..232adfa 100644 (file)
@@ -21,7 +21,6 @@
 #include <i2c.h>
 #include <fsl_csu.h>
 #include <asm/arch/fdt.h>
-#include <asm/arch/ppa.h>
 #include <asm/arch/soc.h>
 
 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 (file)
index f0c4a84..0000000
+++ /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
index 6a9d198..15627c9 100644 (file)
@@ -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 */
index 75de782..a7e59e6 100644 (file)
@@ -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
index f2b8750..271072b 100644 (file)
@@ -12,9 +12,6 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
-#ifdef CONFIG_FSL_LS_PPA
-#include <asm/arch/ppa.h>
-#endif
 #include <asm/arch/mmu.h>
 #include <asm/arch/soc.h>
 #include <fsl_esdhc.h>
@@ -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;
 }
 
index 991ba60..d333069 100644 (file)
@@ -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
index 194b5d2..a5ea8d6 100644 (file)
@@ -13,9 +13,6 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
-#ifdef CONFIG_FSL_LS_PPA
-#include <asm/arch/ppa.h>
-#endif
 #include <asm/arch/fdt.h>
 #include <asm/arch/mmu.h>
 #include <asm/arch/soc.h>
@@ -150,9 +147,6 @@ int board_init(void)
        erratum_a010315();
 #endif
 
-#ifdef CONFIG_FSL_LS_PPA
-       ppa_init();
-#endif
        return 0;
 }
 
index aa15f5a..b55660d 100644 (file)
@@ -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
index 62c935e..18f9208 100644 (file)
@@ -15,9 +15,6 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
-#ifdef CONFIG_FSL_LS_PPA
-#include <asm/arch/ppa.h>
-#endif
 #include <asm/arch/mmu.h>
 #include <asm/arch/soc.h>
 #include <hwconfig.h>
@@ -173,9 +170,6 @@ int board_init(void)
        erratum_a010315();
 #endif
 
-#ifdef CONFIG_FSL_LS_PPA
-       ppa_init();
-#endif
        return 0;
 }
 
index 7d73d20..fb6ee17 100644 (file)
@@ -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
index faecb60..7f181ab 100644 (file)
@@ -20,9 +20,6 @@
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <i2c.h>
 #include <asm/arch/soc.h>
-#ifdef CONFIG_FSL_LS_PPA
-#include <asm/arch/ppa.h>
-#endif
 #include <fsl_immap.h>
 #include <netdev.h>
 
@@ -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
index 4be445e..7e27f8f 100644 (file)
@@ -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
index 841d8b5..b87da41 100644 (file)
@@ -15,7 +15,6 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
-#include <asm/arch/ppa.h>
 #include <asm/arch/fdt.h>
 #include <asm/arch/mmu.h>
 #include <asm/arch/cpu.h>
@@ -533,10 +532,6 @@ int board_init(void)
        config_serdes_mux();
 #endif
 
-#ifdef CONFIG_FSL_LS_PPA
-       ppa_init();
-#endif
-
        return 0;
 }
 
index 56502f9..51818ec 100644 (file)
@@ -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
index 741a4d6..18869d8 100644 (file)
@@ -25,7 +25,6 @@
 #ifdef CONFIG_U_QE
 #include <fsl_qe.h>
 #endif
-#include <asm/arch/ppa.h>
 
 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
index adf325f..723f4ba 100644 (file)
@@ -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
index 3d08816..2faac54 100644 (file)
@@ -14,7 +14,6 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
-#include <asm/arch/ppa.h>
 #include <asm/arch/fdt.h>
 #include <asm/arch/mmu.h>
 #include <asm/arch/cpu.h>
@@ -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
index 1fb391c..a62255c 100644 (file)
@@ -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
index 1d12d91..26e69db 100644 (file)
@@ -14,7 +14,6 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
-#include <asm/arch/ppa.h>
 #include <asm/arch/soc.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <hwconfig.h>
@@ -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
index f1a4523..1ada661 100644 (file)
@@ -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
index f2b8bec..72126bd 100644 (file)
@@ -22,7 +22,6 @@
 #include <fsl-mc/fsl_mc.h>
 #include <env_internal.h>
 #include <asm/arch-fsl-layerscape/soc.h>
-#include <asm/arch/ppa.h>
 #include <hwconfig.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
@@ -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
index 1036f33..2f997e9 100644 (file)
@@ -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
index ab5ff6f..ba25e9b 100644 (file)
@@ -23,7 +23,6 @@
 #include <rtc.h>
 #include <asm/arch/soc.h>
 #include <hwconfig.h>
-#include <asm/arch/ppa.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #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
index c8b0b94..671eead 100644 (file)
@@ -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
index a7fc2b2..8d340f1 100644 (file)
@@ -24,7 +24,6 @@
 #include <i2c.h>
 #include <asm/arch/mmu.h>
 #include <asm/arch/soc.h>
-#include <asm/arch/ppa.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #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);
index df9f0af..6ff5312 100644 (file)
@@ -26,7 +26,6 @@
 #include <fsl-mc/fsl_mc.h>
 #include <env_internal.h>
 #include <asm/arch-fsl-layerscape/soc.h>
-#include <asm/arch/ppa.h>
 #include <hwconfig.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
index 54203fa..67b819d 100644 (file)
@@ -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
index 38fb1d4..867b098 100644 (file)
@@ -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