Merge branch 'next'

[pandora-u-boot.git] / arch / arm / mach-imx / imx8m / soc.c

diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 431ad95..fc82958 100644 (file)
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -244,7 +244,7 @@ int dram_init(void)
                return ret;
 
        /* rom_pointer[1] contains the size of TEE occupies */
-       if (!IS_ENABLED(CONFIG_ARMV8_PSCI) && rom_pointer[1])
+       if (!IS_ENABLED(CONFIG_ARMV8_PSCI) && !IS_ENABLED(CONFIG_SPL_BUILD) && rom_pointer[1])
                gd->ram_size = sdram_size - rom_pointer[1];
        else
                gd->ram_size = sdram_size;
@@ -273,7 +273,7 @@ int dram_init_banksize(void)
        }
 
        gd->bd->bi_dram[bank].start = PHYS_SDRAM;
-       if (!IS_ENABLED(CONFIG_ARMV8_PSCI) && rom_pointer[1]) {
+       if (!IS_ENABLED(CONFIG_ARMV8_PSCI) && !IS_ENABLED(CONFIG_SPL_BUILD) && rom_pointer[1]) {
                phys_addr_t optee_start = (phys_addr_t)rom_pointer[0];
                phys_size_t optee_size = (size_t)rom_pointer[1];
 
@@ -318,7 +318,8 @@ phys_size_t get_effective_memsize(void)
                        sdram_b1_size = sdram_size;
                }
 
-               if (!IS_ENABLED(CONFIG_ARMV8_PSCI) && rom_pointer[1]) {
+               if (!IS_ENABLED(CONFIG_ARMV8_PSCI) && !IS_ENABLED(CONFIG_SPL_BUILD) &&
+                   rom_pointer[1]) {
                        /* We will relocate u-boot to Top of dram1. Tee position has two cases:
                         * 1. At the top of dram1,  Then return the size removed optee size.
                         * 2. In the middle of dram1, return the size of dram1.