Browse Source

dm: Kconfig: Move CONFIG_SYS_MALLOC_F_LEN to Kconfig

Move this option to Kconfig and update all boards.
Signed-off-by: Simon Glass <sjg@chromium.org>
tags/2020-06-01
Simon Glass 6 years ago
parent
commit
b724bd7d63
47 changed files with 97 additions and 24 deletions
  1. +19
    -0
      Kconfig
  2. +6
    -0
      arch/arm/cpu/armv7/exynos/Kconfig
  3. +6
    -0
      arch/arm/cpu/armv7/omap3/Kconfig
  4. +6
    -0
      arch/arm/cpu/armv7/tegra-common/Kconfig
  5. +6
    -0
      arch/arm/cpu/armv7/uniphier/Kconfig
  6. +6
    -0
      arch/x86/Kconfig
  7. +6
    -0
      board/ti/am335x/Kconfig
  8. +2
    -0
      configs/Linksprite_pcDuino3_fdt_defconfig
  9. +2
    -0
      configs/am335x_igep0033_defconfig
  10. +2
    -0
      configs/cm_fx6_defconfig
  11. +2
    -0
      configs/cm_t335_defconfig
  12. +2
    -0
      configs/gwventana_defconfig
  13. +2
    -0
      configs/mx6dlsabreauto_defconfig
  14. +2
    -0
      configs/mx6qsabreauto_defconfig
  15. +2
    -0
      configs/mx6qsabresd_defconfig
  16. +2
    -0
      configs/mx6sxsabresd_defconfig
  17. +2
    -0
      configs/nokia_rx51_defconfig
  18. +2
    -0
      configs/pcm051_rev1_defconfig
  19. +2
    -0
      configs/pcm051_rev3_defconfig
  20. +2
    -0
      configs/pengwyn_defconfig
  21. +2
    -0
      configs/pepper_defconfig
  22. +2
    -0
      configs/rpi_defconfig
  23. +2
    -0
      configs/s5p_goni_defconfig
  24. +2
    -0
      configs/sandbox_defconfig
  25. +2
    -0
      configs/smdkc100_defconfig
  26. +2
    -0
      configs/snapper9260_defconfig
  27. +2
    -0
      configs/snapper9g20_defconfig
  28. +2
    -0
      configs/stv0991_defconfig
  29. +0
    -3
      include/configs/cm_fx6.h
  30. +0
    -1
      include/configs/exynos-common.h
  31. +0
    -1
      include/configs/gw_ventana.h
  32. +0
    -1
      include/configs/mx6sabre_common.h
  33. +0
    -1
      include/configs/mx6sxsabresd.h
  34. +0
    -1
      include/configs/nokia_rx51.h
  35. +0
    -1
      include/configs/novena.h
  36. +0
    -1
      include/configs/rpi.h
  37. +0
    -1
      include/configs/s5p_goni.h
  38. +0
    -1
      include/configs/sandbox.h
  39. +0
    -3
      include/configs/smdkc100.h
  40. +0
    -1
      include/configs/snapper9260.h
  41. +0
    -1
      include/configs/stv0991.h
  42. +0
    -1
      include/configs/sunxi-common.h
  43. +0
    -1
      include/configs/tegra-common.h
  44. +0
    -1
      include/configs/ti_am335x_common.h
  45. +0
    -1
      include/configs/ti_omap3_common.h
  46. +0
    -2
      include/configs/uniphier.h
  47. +0
    -1
      include/configs/x86-common.h

+ 19
- 0
Kconfig View File

@@ -56,6 +56,25 @@ config CC_OPTIMIZE_FOR_SIZE

This option is enabled by default for U-Boot.

config SYS_MALLOC_F
bool "Enable malloc() pool before relocation"
default 0x400
help
Before relocation memory is very limited on many platforms. Still,
we can provide a small malloc() pool if needed. Driver model in
particular needs this to operate, so that it can allocate the
initial serial device and any others that are needed.

config SYS_MALLOC_F_LEN
hex "Size of malloc() pool before relocation"
depends on SYS_MALLOC_F
default 0x400
help
Before relocation memory is very limited on many platforms. Still,
we can provide a small malloc() pool if needed. Driver model in
particular needs this to operate, so that it can allocate the
initial serial device and any others that are needed.

menuconfig EXPERT
bool "Configure standard U-Boot features (expert users)"
help


+ 6
- 0
arch/arm/cpu/armv7/exynos/Kconfig View File

@@ -80,6 +80,12 @@ config DM_SPI_FLASH
config DM_GPIO
default y if !SPL_BUILD

config SYS_MALLOC_F
default y if !SPL_BUILD

config SYS_MALLOC_F_LEN
default 0x400 if !SPL_BUILD

source "board/samsung/smdkv310/Kconfig"
source "board/samsung/trats/Kconfig"
source "board/samsung/universal_c210/Kconfig"


+ 6
- 0
arch/arm/cpu/armv7/omap3/Kconfig View File

@@ -102,6 +102,12 @@ config DM_GPIO
config DM_SERIAL
default y if DM && !SPL_BUILD

config SYS_MALLOC_F
default y if DM && !SPL_BUILD

config SYS_MALLOC_F_LEN
default 0x400 if DM && !SPL_BUILD

config SYS_SOC
default "omap3"



+ 6
- 0
arch/arm/cpu/armv7/tegra-common/Kconfig View File

@@ -17,6 +17,12 @@ config TEGRA124

endchoice

config SYS_MALLOC_F
default y

config SYS_MALLOC_F_LEN
default 0x1800

config USE_PRIVATE_LIBGCC
default y if SPL_BUILD



+ 6
- 0
arch/arm/cpu/armv7/uniphier/Kconfig View File

@@ -48,6 +48,12 @@ config DCC_MICRO_SUPPORT_CARD

endchoice

config SYS_MALLOC_F
default y

config SYS_MALLOC_F_LEN
default 0x2000

config CMD_PINMON
bool "Enable boot mode pins monitor command"
default y


+ 6
- 0
arch/x86/Kconfig View File

@@ -76,6 +76,12 @@ config DM_GPIO
config DM_SERIAL
default y

config SYS_MALLOC_F
default y

config SYS_MALLOC_F_LEN
default 0x800

config RAMBASE
hex
default 0x100000


+ 6
- 0
board/ti/am335x/Kconfig View File

@@ -47,4 +47,10 @@ config DM_GPIO
config DM_SERIAL
default y if DM && !SPL_BUILD

config SYS_MALLOC_F
default y if DM && !SPL_BUILD

config SYS_MALLOC_F_LEN
default 0x400 if DM && !SPL_BUILD

endif

+ 2
- 0
configs/Linksprite_pcDuino3_fdt_defconfig View File

@@ -13,3 +13,5 @@ CONFIG_OF_SEPARATE=y
+S:CONFIG_DRAM_CLK=480
+S:CONFIG_DRAM_ZQ=122
+S:CONFIG_DRAM_EMR1=4
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x400

+ 2
- 0
configs/am335x_igep0033_defconfig View File

@@ -1,3 +1,5 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TARGET_AM335X_IGEP0033=y
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x400

+ 2
- 0
configs/cm_fx6_defconfig View File

@@ -5,3 +5,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
CONFIG_DM=y
CONFIG_DM_GPIO=y
CONFIG_DM_SERIAL=y
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x400

+ 2
- 0
configs/cm_t335_defconfig View File

@@ -1,3 +1,5 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TARGET_CM_T335=y
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x400

+ 2
- 0
configs/gwventana_defconfig View File

@@ -2,3 +2,5 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+S:CONFIG_ARM=y
+S:CONFIG_TARGET_GW_VENTANA=y
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x400

+ 2
- 0
configs/mx6dlsabreauto_defconfig View File

@@ -1,3 +1,5 @@
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL"
CONFIG_ARM=y
CONFIG_TARGET_MX6QSABREAUTO=y
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x400

+ 2
- 0
configs/mx6qsabreauto_defconfig View File

@@ -1,3 +1,5 @@
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q"
CONFIG_ARM=y
CONFIG_TARGET_MX6QSABREAUTO=y
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x400

+ 2
- 0
configs/mx6qsabresd_defconfig View File

@@ -1,3 +1,5 @@
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg,MX6Q"
CONFIG_ARM=y
CONFIG_TARGET_MX6SABRESD=y
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x400

+ 2
- 0
configs/mx6sxsabresd_defconfig View File

@@ -1,3 +1,5 @@
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg,MX6SX"
CONFIG_ARM=y
CONFIG_TARGET_MX6SXSABRESD=y
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x400

+ 2
- 0
configs/nokia_rx51_defconfig View File

@@ -4,3 +4,5 @@ CONFIG_TARGET_NOKIA_RX51=y
CONFIG_DM=n
CONFIG_DM_SERIAL=n
CONFIG_DM_GPIO=n
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x400

+ 2
- 0
configs/pcm051_rev1_defconfig View File

@@ -2,3 +2,5 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="REV1"
+S:CONFIG_ARM=y
+S:CONFIG_TARGET_PCM051=y
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x400

+ 2
- 0
configs/pcm051_rev3_defconfig View File

@@ -2,3 +2,5 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="REV3"
+S:CONFIG_ARM=y
+S:CONFIG_TARGET_PCM051=y
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x400

+ 2
- 0
configs/pengwyn_defconfig View File

@@ -1,3 +1,5 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TARGET_PENGWYN=y
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x400

+ 2
- 0
configs/pepper_defconfig View File

@@ -1,3 +1,5 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TARGET_PEPPER=y
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x400

+ 2
- 0
configs/rpi_defconfig View File

@@ -1,2 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_RPI=y
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x400

+ 2
- 0
configs/s5p_goni_defconfig View File

@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_ARCH_S5PC1XX=y
CONFIG_TARGET_S5P_GONI=y
CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-goni"
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x400

+ 2
- 0
configs/sandbox_defconfig View File

@@ -5,3 +5,5 @@ CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y
CONFIG_DM=y
CONFIG_DEFAULT_DEVICE_TREE="sandbox"
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x400

+ 2
- 0
configs/smdkc100_defconfig View File

@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_TARGET_SMDKC100=y
CONFIG_ARCH_S5PC1XX=y
CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100"
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x400

+ 2
- 0
configs/snapper9260_defconfig View File

@@ -4,3 +4,5 @@ CONFIG_TARGET_SNAPPER9260=y
CONFIG_DM=y
CONFIG_DM_GPIO=y
CONFIG_DM_SERIAL=y
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x400

+ 2
- 0
configs/snapper9g20_defconfig View File

@@ -4,3 +4,5 @@ CONFIG_TARGET_SNAPPER9260=y
CONFIG_DM=y
CONFIG_DM_GPIO=y
CONFIG_DM_SERIAL=y
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x400

+ 2
- 0
configs/stv0991_defconfig View File

@@ -1,3 +1,5 @@
CONFIG_SYS_EXTRA_OPTIONS="stv0991"
CONFIG_ARM=y
CONFIG_TARGET_STV0991=y
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x2000

+ 0
- 3
include/configs/cm_fx6.h View File

@@ -21,10 +21,7 @@
#define CONFIG_MACH_TYPE 4273

#ifndef CONFIG_SPL_BUILD

#define CONFIG_CMD_GPIO

#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)
#endif

/* Display information on boot */


+ 0
- 1
include/configs/exynos-common.h View File

@@ -36,7 +36,6 @@
#define CONFIG_ENV_OVERWRITE

/* Size of malloc() pool before and after relocation */
#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 << 20))

/* select serial console configuration */


+ 0
- 1
include/configs/gw_ventana.h View File

@@ -39,7 +39,6 @@

/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)
#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)

/* Init Functions */
#define CONFIG_BOARD_EARLY_INIT_F


+ 0
- 1
include/configs/mx6sabre_common.h View File

@@ -27,7 +27,6 @@

#define CONFIG_DM
#define CONFIG_DM_THERMAL
#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)
#define CONFIG_IMX6_THERMAL

#define CONFIG_SYS_GENERIC_BOARD


+ 0
- 1
include/configs/mx6sxsabresd.h View File

@@ -229,7 +229,6 @@

#define CONFIG_DM
#define CONFIG_DM_THERMAL
#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)
#define CONFIG_IMX6_THERMAL

#define CONFIG_CMD_FUSE


+ 0
- 1
include/configs/nokia_rx51.h View File

@@ -72,7 +72,6 @@
#define CONFIG_UBI_SIZE (512 << 10)
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + CONFIG_UBI_SIZE + \
(128 << 10))
#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)

/*
* Hardware drivers


+ 0
- 1
include/configs/novena.h View File

@@ -116,7 +116,6 @@
#define CONFIG_SYS_MEMTEST_END 0x20000000

#define CONFIG_SYS_MALLOC_LEN (64 * 1024 * 1024)
#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)

/* SPL */
#define CONFIG_SPL_FAT_SUPPORT


+ 0
- 1
include/configs/rpi.h View File

@@ -46,7 +46,6 @@
CONFIG_SYS_SDRAM_SIZE - \
GENERATED_GBL_DATA_SIZE)
#define CONFIG_SYS_MALLOC_LEN SZ_4M
#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)
#define CONFIG_SYS_MEMTEST_START 0x00100000
#define CONFIG_SYS_MEMTEST_END 0x00200000
#define CONFIG_LOADADDR 0x00200000


+ 0
- 1
include/configs/s5p_goni.h View File

@@ -40,7 +40,6 @@
#define CONFIG_CMDLINE_EDITING

/* Size of malloc() pool before and after relocation */
#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 << 20))

/*


+ 0
- 1
include/configs/sandbox.h View File

@@ -60,7 +60,6 @@
/*
* Size of malloc() pool, before and after relocation
*/
#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)
#define CONFIG_MALLOC_F_ADDR 0x0010000
#define CONFIG_SYS_MALLOC_LEN (32 << 20) /* 32MB */



+ 0
- 3
include/configs/smdkc100.h View File

@@ -48,9 +48,6 @@
*/
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (1 << 20))

/* Small malloc pool before relocation */
#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)

/*
* select serial console configuration
*/


+ 0
- 1
include/configs/snapper9260.h View File

@@ -21,7 +21,6 @@
#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000 /* External Crystal, in Hz */
#define CONFIG_SYS_AT91_SLOW_CLOCK 32768
#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)

/* CPU */
#define CONFIG_ARCH_CPU_INIT


+ 0
- 1
include/configs/stv0991.h View File

@@ -28,7 +28,6 @@
(PHYS_SDRAM_1_SIZE - CONFIG_ENV_SIZE)
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 16 * 1024)
#define CONFIG_SYS_MALLOC_F_LEN 0x2000

#define CONFIG_DM
/* serial port (PL011) configuration */


+ 0
- 1
include/configs/sunxi-common.h View File

@@ -29,7 +29,6 @@

#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_DM)
# define CONFIG_DW_SERIAL
# define CONFIG_SYS_MALLOC_F_LEN (1 << 10)
#endif

/*


+ 0
- 1
include/configs/tegra-common.h View File

@@ -37,7 +37,6 @@
* Size of malloc() pool
*/
#define CONFIG_SYS_MALLOC_LEN (4 << 20) /* 4MB */
#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)

#define CONFIG_SYS_NONCACHED_MEMORY (1 << 20) /* 1 MiB */



+ 0
- 1
include/configs/ti_am335x_common.h View File

@@ -21,7 +21,6 @@

#ifndef CONFIG_SPL_BUILD
# define CONFIG_OMAP_SERIAL
# define CONFIG_SYS_MALLOC_F_LEN (1 << 10)
#endif

#include <asm/arch/omap.h>


+ 0
- 1
include/configs/ti_omap3_common.h View File

@@ -20,7 +20,6 @@

#ifndef CONFIG_SPL_BUILD
# define CONFIG_OMAP_SERIAL
# define CONFIG_SYS_MALLOC_F_LEN (1 << 10)
#endif

/* The chip has SDRC controller */


+ 0
- 2
include/configs/uniphier.h View File

@@ -80,8 +80,6 @@
#define CONFIG_SMC911X_BASE CONFIG_SUPPORT_CARD_ETHER_BASE
#define CONFIG_SMC911X_32_BIT

#define CONFIG_SYS_MALLOC_F_LEN 0x2000

/*-----------------------------------------------------------------------
* MMU and Cache Setting
*----------------------------------------------------------------------*/


+ 0
- 1
include/configs/x86-common.h View File

@@ -187,7 +187,6 @@
#define CONFIG_SYS_STACK_SIZE (32 * 1024)
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_MALLOC_LEN 0x200000
#define CONFIG_SYS_MALLOC_F_LEN (2 << 10)

/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE