sunxi: Switch to using malloc_simple for the spl

common/dlmalloc.c is quite big, both in .text and .data usage. E.g. for a
Mele_M9 sun6i board build this reduces .text from 0x4214 to 0x3b94 bytes,
and .data from 0x54c to 0x144 bytes.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1a7e916acddca341f8a298ee077b338f620a8219..9bc59465a30b2291133725c05e7418677923c5c7 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -523,6 +523,7 @@ config ARCH_SUNXI
        select OF_CONTROL
        select OF_SEPARATE
        select SPL_STACK_R if !MACH_SUN9I
+       select SPL_SYS_MALLOC_SIMPLE if !MACH_SUN9I
        select USB
        select USB_STORAGE
        select USB_KEYBOARD

diff --git a/arch/arm/cpu/armv7/sunxi/board.c b/arch/arm/cpu/armv7/sunxi/board.c
index d11365b65bc3f4f9c1f07830a1de0bd79fe19cf9..1d79ba1126ae7a9f157843ec0dc2ed6149b37d39 100644 (file)
--- a/arch/arm/cpu/armv7/sunxi/board.c
+++ b/arch/arm/cpu/armv7/sunxi/board.c
@@ -192,6 +192,7 @@ u32 spl_boot_mode(void)
 
 void board_init_f(ulong dummy)
 {
+       spl_init();
        preloader_console_init();
 
 #ifdef CONFIG_SPL_I2C_SUPPORT

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 2ba21b3245150f4f70e2ea74426c8270d0f23375..ed7879aad5ed6a129a0c3f3484fb61ecb2030595 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -77,7 +77,6 @@
  * since it needs to fit in with the other values. By also #defining it
  * we get warnings if the Kconfig value mismatches. */
 #define CONFIG_SPL_STACK_R_ADDR                0x2fe00000
-#define CONFIG_SYS_SPL_MALLOC_START    0x2ff00000
 #define CONFIG_SPL_BSS_START_ADDR      0x2ff80000
 #else
 #define SDRAM_OFFSET(x) 0x4##x
@@ -89,12 +88,10 @@
  * since it needs to fit in with the other values. By also #defining it
  * we get warnings if the Kconfig value mismatches. */
 #define CONFIG_SPL_STACK_R_ADDR                0x4fe00000
-#define CONFIG_SYS_SPL_MALLOC_START    0x4ff00000
 #define CONFIG_SPL_BSS_START_ADDR      0x4ff80000
 #endif
 
 #define CONFIG_SPL_BSS_MAX_SIZE                0x00080000 /* 512 KiB */
-#define CONFIG_SYS_SPL_MALLOC_SIZE     0x00080000 /* 512 KiB */
 
 #ifdef CONFIG_MACH_SUN9I
 /*