]> git.baikalelectronics.ru Git - arm-tf.git/commitdiff
rockchip: drop rockchip-specific imported linker symbols for bl31
authorHeiko Stuebner <heiko@sntech.de>
Wed, 29 May 2019 10:03:38 +0000 (12:03 +0200)
committerHeiko Stuebner <heiko@sntech.de>
Wed, 29 May 2019 10:06:30 +0000 (12:06 +0200)
In the rockchip bl31 setup the __RO_START__ and __RO_END__ symbols are
currently imported into special BL31_RO_* constants while the general
code also imports them as BL_CODE_BASE and BL_CODE_END.

So we can just use the general symbols and can drop the duplication.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Change-Id: Ibf1b48ad80bed897247a1690a32711030479262d

plat/rockchip/common/bl31_plat_setup.c

index 30782d1d5139c41e4b8ba704a5ff0f371ae81999..18f8dd915e9304f40b75758e2c796018a5f3d14d 100644 (file)
 #include <plat_private.h>
 #include <plat/common/platform.h>
 
-/*
- * The next 2 constants identify the extents of the code & RO data region.
- * These addresses are used by the MMU setup code and therefore they must be
- * page-aligned.  It is the responsibility of the linker script to ensure that
- * __RO_START__ and __RO_END__ linker symbols refer to page-aligned addresses.
- */
-IMPORT_SYM(unsigned long, __RO_START__,        BL31_RO_BASE);
-IMPORT_SYM(unsigned long, __RO_END__,  BL31_RO_LIMIT);
-
 static entry_point_info_t bl32_ep_info;
 static entry_point_info_t bl33_ep_info;
 
@@ -116,10 +107,10 @@ void bl31_plat_arch_setup(void)
 {
        plat_cci_init();
        plat_cci_enable();
-       plat_configure_mmu_el3(BL31_RO_BASE,
-                              BL_COHERENT_RAM_END - BL31_RO_BASE,
-                              BL31_RO_BASE,
-                              BL31_RO_LIMIT,
+       plat_configure_mmu_el3(BL_CODE_BASE,
+                              BL_COHERENT_RAM_END - BL_CODE_BASE,
+                              BL_CODE_BASE,
+                              BL_CODE_END,
                               BL_COHERENT_RAM_BASE,
                               BL_COHERENT_RAM_END);
 }