diff options
author | Tom Rini <trini@konsulko.com> | 2023-10-11 10:21:33 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-10-11 10:21:33 -0400 |
commit | 5ae883c7160cf8b0604ec6d03798dd90fc81ee38 (patch) | |
tree | ae73bc9a0ce880b85ab4898438dd99cf33194f7e /board | |
parent | be98a786b67dfcccde1f18ec7cbfe1584e03cebe (diff) | |
parent | 131e44c5448fb0ba9f8b6084cb848a84d729b2c5 (diff) | |
download | u-boot-5ae883c7160cf8b0604ec6d03798dd90fc81ee38.zip u-boot-5ae883c7160cf8b0604ec6d03798dd90fc81ee38.tar.gz u-boot-5ae883c7160cf8b0604ec6d03798dd90fc81ee38.tar.bz2 |
Merge tag 'fsl-qoirq-2023-10-10' of https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq
Drop legacy PPA secure FW support
support for MC reserved memory
reset the FLSHxCR1 registers for nxp_fspi
Diffstat (limited to 'board')
24 files changed, 4 insertions, 224 deletions
diff --git a/board/freescale/ls1012afrdm/Kconfig b/board/freescale/ls1012afrdm/Kconfig index 75de782af..a7e59e6 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 f2b8750..271072b 100644 --- a/board/freescale/ls1012afrdm/ls1012afrdm.c +++ b/board/freescale/ls1012afrdm/ls1012afrdm.c @@ -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; } diff --git a/board/freescale/ls1012aqds/Kconfig b/board/freescale/ls1012aqds/Kconfig index 991ba60..d333069 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 194b5d2..a5ea8d6 100644 --- a/board/freescale/ls1012aqds/ls1012aqds.c +++ b/board/freescale/ls1012aqds/ls1012aqds.c @@ -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; } diff --git a/board/freescale/ls1012ardb/Kconfig b/board/freescale/ls1012ardb/Kconfig index aa15f5a..b55660d 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 62c935e..18f9208 100644 --- a/board/freescale/ls1012ardb/ls1012ardb.c +++ b/board/freescale/ls1012ardb/ls1012ardb.c @@ -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; } diff --git a/board/freescale/ls1028a/Kconfig b/board/freescale/ls1028a/Kconfig index 7d73d20..fb6ee17 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 faecb60..7f181ab 100644 --- a/board/freescale/ls1028a/ls1028a.c +++ b/board/freescale/ls1028a/ls1028a.c @@ -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 diff --git a/board/freescale/ls1043aqds/Kconfig b/board/freescale/ls1043aqds/Kconfig index 4be445e..7e27f8f 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 841d8b5..b87da41 100644 --- a/board/freescale/ls1043aqds/ls1043aqds.c +++ b/board/freescale/ls1043aqds/ls1043aqds.c @@ -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; } diff --git a/board/freescale/ls1043ardb/Kconfig b/board/freescale/ls1043ardb/Kconfig index 56502f9..51818ec 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 741a4d6..18869d8 100644 --- a/board/freescale/ls1043ardb/ls1043ardb.c +++ b/board/freescale/ls1043ardb/ls1043ardb.c @@ -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 diff --git a/board/freescale/ls1046aqds/Kconfig b/board/freescale/ls1046aqds/Kconfig index adf325f..723f4ba 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 3d08816..2faac54 100644 --- a/board/freescale/ls1046aqds/ls1046aqds.c +++ b/board/freescale/ls1046aqds/ls1046aqds.c @@ -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 diff --git a/board/freescale/ls1046ardb/Kconfig b/board/freescale/ls1046ardb/Kconfig index 1fb391c..a62255c 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 1d12d91..26e69db 100644 --- a/board/freescale/ls1046ardb/ls1046ardb.c +++ b/board/freescale/ls1046ardb/ls1046ardb.c @@ -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 diff --git a/board/freescale/ls1088a/Kconfig b/board/freescale/ls1088a/Kconfig index f1a4523..1ada661 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 f2b8bec..98a91c4 100644 --- a/board/freescale/ls1088a/ls1088a.c +++ b/board/freescale/ls1088a/ls1088a.c @@ -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 @@ -989,6 +984,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) #ifdef CONFIG_FSL_MC_ENET fdt_fixup_board_enet(blob); + fdt_reserve_mc_mem(blob, 0x300); #endif fdt_fixup_icid(blob); diff --git a/board/freescale/ls2080aqds/Kconfig b/board/freescale/ls2080aqds/Kconfig index 1036f33..2f997e9 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 ab5ff6f..5c94c83 100644 --- a/board/freescale/ls2080aqds/ls2080aqds.c +++ b/board/freescale/ls2080aqds/ls2080aqds.c @@ -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 @@ -330,6 +325,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) #if defined(CONFIG_FSL_MC_ENET) && !defined(CONFIG_SPL_BUILD) fdt_fixup_board_enet(blob); + fdt_reserve_mc_mem(blob, 0x300); #endif fdt_fixup_icid(blob); diff --git a/board/freescale/ls2080ardb/Kconfig b/board/freescale/ls2080ardb/Kconfig index c8b0b94..671eead 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 a7fc2b2..5c30de8 100644 --- a/board/freescale/ls2080ardb/ls2080ardb.c +++ b/board/freescale/ls2080ardb/ls2080ardb.c @@ -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); @@ -527,6 +522,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) #ifdef CONFIG_FSL_MC_ENET fdt_fixup_board_enet(blob); + fdt_reserve_mc_mem(blob, 0x300); #endif fdt_fixup_icid(blob); diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index 2883848..b3187a1 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -836,6 +836,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) #ifdef CONFIG_FSL_MC_ENET fdt_fsl_mc_fixup_iommu_map_entry(blob); fdt_fixup_board_enet(blob); + fdt_reserve_mc_mem(blob, 0x4000); #endif fdt_fixup_icid(blob); diff --git a/board/traverse/ten64/ten64.c b/board/traverse/ten64/ten64.c index df9f0af..6ff5312 100644 --- a/board/traverse/ten64/ten64.c +++ b/board/traverse/ten64/ten64.c @@ -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> |