Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-26 12:27:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Convert CONFIG_SPL_SYS_MALLOC_SIMPLE to Kconfig

Browse source 
This converts the following to Kconfig:
   CONFIG_SPL_SYS_MALLOC_SIMPLE

The problem here is that a few platforms have been doing:
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_MALLOC_SIMPLE
#endif

instead of defining CONFIG_SPL_SYS_MALLOC_SIMPLE directly.  Correct this
and update the documentation in a few places to match usage.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2022-05-20 12:36:05 -04:00
parent 9b5f9aeb3b
commit 66bda092cf
23 changed files with 14 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configs/clearfog_defconfig
View file

@ -26,6 +26,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SPL_MAX_SIZE=0x22fd0 CONFIG_SPL_MAX_SIZE=0x22fd0
CONFIG_SPL_BSS_MAX_SIZE=0x4000 CONFIG_SPL_BSS_MAX_SIZE=0x4000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_I2C=y CONFIG_SPL_I2C=y
CONFIG_SYS_MAXARGS=32 CONFIG_SYS_MAXARGS=32
CONFIG_CMD_TLV_EEPROM=y CONFIG_CMD_TLV_EEPROM=y

1
configs/db-88f6720_defconfig
View file

@ -25,6 +25,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SPL_MAX_SIZE=0x1ffd0 CONFIG_SPL_MAX_SIZE=0x1ffd0
CONFIG_SPL_BSS_MAX_SIZE=0x4000 CONFIG_SPL_BSS_MAX_SIZE=0x4000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_I2C=y CONFIG_SPL_I2C=y
CONFIG_SYS_MAXARGS=32 CONFIG_SYS_MAXARGS=32
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y

1
configs/db-88f6820-amc_defconfig
View file

@ -26,6 +26,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SPL_MAX_SIZE=0x22fd0 CONFIG_SPL_MAX_SIZE=0x22fd0
CONFIG_SPL_BSS_MAX_SIZE=0x4000 CONFIG_SPL_BSS_MAX_SIZE=0x4000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_I2C=y CONFIG_SPL_I2C=y
CONFIG_SYS_MAXARGS=96 CONFIG_SYS_MAXARGS=96
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

1
configs/db-88f6820-gp_defconfig
View file

@ -25,6 +25,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SPL_MAX_SIZE=0x22fd0 CONFIG_SPL_MAX_SIZE=0x22fd0
CONFIG_SPL_BSS_MAX_SIZE=0x4000 CONFIG_SPL_BSS_MAX_SIZE=0x4000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_I2C=y CONFIG_SPL_I2C=y
CONFIG_SYS_MAXARGS=32 CONFIG_SYS_MAXARGS=32
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y

1
configs/db-mv784mp-gp_defconfig
View file

@ -25,6 +25,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SPL_MAX_SIZE=0x1bfd0 CONFIG_SPL_MAX_SIZE=0x1bfd0
CONFIG_SPL_BSS_MAX_SIZE=0x4000 CONFIG_SPL_BSS_MAX_SIZE=0x4000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_I2C=y CONFIG_SPL_I2C=y
CONFIG_SYS_MAXARGS=32 CONFIG_SYS_MAXARGS=32
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

1
configs/ds414_defconfig
View file

@ -33,6 +33,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_MISC_INIT_R=y CONFIG_MISC_INIT_R=y
CONFIG_SPL_MAX_SIZE=0x1bfd0 CONFIG_SPL_MAX_SIZE=0x1bfd0
CONFIG_SPL_BSS_MAX_SIZE=0x4000 CONFIG_SPL_BSS_MAX_SIZE=0x4000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_I2C=y CONFIG_SPL_I2C=y
CONFIG_SYS_MAXARGS=32 CONFIG_SYS_MAXARGS=32
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

1
configs/helios4_defconfig
View file

@ -26,6 +26,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SPL_MAX_SIZE=0x22fd0 CONFIG_SPL_MAX_SIZE=0x22fd0
CONFIG_SPL_BSS_MAX_SIZE=0x4000 CONFIG_SPL_BSS_MAX_SIZE=0x4000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_I2C=y CONFIG_SPL_I2C=y
CONFIG_SYS_MAXARGS=32 CONFIG_SYS_MAXARGS=32
CONFIG_CMD_TLV_EEPROM=y CONFIG_CMD_TLV_EEPROM=y

1
configs/maxbcm_defconfig
View file

@ -24,6 +24,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SPL_MAX_SIZE=0x1bfd0 CONFIG_SPL_MAX_SIZE=0x1bfd0
CONFIG_SPL_BSS_MAX_SIZE=0x4000 CONFIG_SPL_BSS_MAX_SIZE=0x4000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_I2C=y CONFIG_SPL_I2C=y
CONFIG_SYS_MAXARGS=32 CONFIG_SYS_MAXARGS=32
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y

1
configs/theadorable_debug_defconfig
View file

@ -29,6 +29,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SPL_MAX_SIZE=0x1bfd0 CONFIG_SPL_MAX_SIZE=0x1bfd0
CONFIG_SPL_BSS_MAX_SIZE=0x4000 CONFIG_SPL_BSS_MAX_SIZE=0x4000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_I2C=y CONFIG_SPL_I2C=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_MAXARGS=32 CONFIG_SYS_MAXARGS=32

1
configs/x530_defconfig
View file

@ -29,6 +29,7 @@ CONFIG_MISC_INIT_R=y
CONFIG_SPL_MAX_SIZE=0x22fd0 CONFIG_SPL_MAX_SIZE=0x22fd0
CONFIG_SPL_BSS_MAX_SIZE=0x4000 CONFIG_SPL_BSS_MAX_SIZE=0x4000
CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_WATCHDOG=y CONFIG_SPL_WATCHDOG=y
CONFIG_SYS_CBSIZE=256 CONFIG_SYS_CBSIZE=256
CONFIG_SYS_PBSIZE=276 CONFIG_SYS_PBSIZE=276

2
doc/develop/driver-model/design.rst
View file

@ -1135,7 +1135,7 @@ constrained systems.
To enable driver model in SPL, define CONFIG_SPL_DM. You might want to To enable driver model in SPL, define CONFIG_SPL_DM. You might want to
consider the following option also. See the main README for more details. consider the following option also. See the main README for more details.
- CONFIG_SYS_MALLOC_SIMPLE - CONFIG_SPL_SYS_MALLOC_SIMPLE
- CONFIG_DM_WARN - CONFIG_DM_WARN
- CONFIG_DM_DEVICE_REMOVE - CONFIG_DM_DEVICE_REMOVE
- CONFIG_DM_STDIO - CONFIG_DM_STDIO

6
drivers/core/Kconfig
View file

@ -15,7 +15,7 @@ config SPL_DM
Enable driver model in SPL. You will need to provide a Enable driver model in SPL. You will need to provide a
suitable malloc() implementation. If you are not using the suitable malloc() implementation. If you are not using the
full malloc() enabled by CONFIG_SYS_SPL_MALLOC_START, full malloc() enabled by CONFIG_SYS_SPL_MALLOC_START,
consider using CONFIG_SYS_MALLOC_SIMPLE. In that case you consider using CONFIG_SPL_SYS_MALLOC_SIMPLE. In that case you
must provide CONFIG_SPL_SYS_MALLOC_F_LEN to set the size. must provide CONFIG_SPL_SYS_MALLOC_F_LEN to set the size.
In most cases driver model will only allocate a few uclasses In most cases driver model will only allocate a few uclasses
and devices in SPL, so 1KB should be enable. See and devices in SPL, so 1KB should be enable. See
@ -28,7 +28,7 @@ config TPL_DM
Enable driver model in TPL. You will need to provide a Enable driver model in TPL. You will need to provide a
suitable malloc() implementation. If you are not using the suitable malloc() implementation. If you are not using the
full malloc() enabled by CONFIG_SYS_SPL_MALLOC_START, full malloc() enabled by CONFIG_SYS_SPL_MALLOC_START,
consider using CONFIG_SYS_MALLOC_SIMPLE. In that case you consider using CONFIG_TPL_SYS_MALLOC_SIMPLE. In that case you
must provide CONFIG_SPL_SYS_MALLOC_F_LEN to set the size. must provide CONFIG_SPL_SYS_MALLOC_F_LEN to set the size.
In most cases driver model will only allocate a few uclasses In most cases driver model will only allocate a few uclasses
and devices in SPL, so 1KB should be enough. See and devices in SPL, so 1KB should be enough. See
@ -43,7 +43,7 @@ config VPL_DM
Enable driver model in VPL. You will need to provide a Enable driver model in VPL. You will need to provide a
suitable malloc() implementation. If you are not using the suitable malloc() implementation. If you are not using the
full malloc() enabled by CONFIG_SYS_SPL_MALLOC_START, full malloc() enabled by CONFIG_SYS_SPL_MALLOC_START,
consider using CONFIG_SYS_MALLOC_SIMPLE. consider using CONFIG_SPL_SYS_MALLOC_SIMPLE.
config DM_WARN config DM_WARN
bool "Enable warnings in driver model" bool "Enable warnings in driver model"

4
include/configs/clearfog.h
View file

@ -47,10 +47,6 @@
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE) #define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE)
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_MALLOC_SIMPLE
#endif
#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10)) #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)

4
include/configs/controlcenterdc.h
View file

@ -39,10 +39,6 @@
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE) #define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE)
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_MALLOC_SIMPLE
#endif
#define CONFIG_SPL_STACK (0x40000000 + ((212 - 16) << 10)) #define CONFIG_SPL_STACK (0x40000000 + ((212 - 16) << 10))
#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)

4
include/configs/db-88f6720.h
View file

@ -37,10 +37,6 @@
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + (128 << 10)) #define CONFIG_SPL_BSS_START_ADDR (0x40000000 + (128 << 10))
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_MALLOC_SIMPLE
#endif
#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10)) #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)

4
include/configs/db-88f6820-amc.h
View file

@ -44,10 +44,6 @@
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE) #define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE)
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_MALLOC_SIMPLE
#endif
#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10)) #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)

4
include/configs/db-88f6820-gp.h
View file

@ -44,10 +44,6 @@
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE) #define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE)
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_MALLOC_SIMPLE
#endif
#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10)) #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)

4
include/configs/db-mv784mp-gp.h
View file

@ -56,10 +56,6 @@
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + (128 << 10)) #define CONFIG_SPL_BSS_START_ADDR (0x40000000 + (128 << 10))
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_MALLOC_SIMPLE
#endif
#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10)) #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)

4
include/configs/ds414.h
View file

@ -48,10 +48,6 @@
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + (128 << 10)) #define CONFIG_SPL_BSS_START_ADDR (0x40000000 + (128 << 10))
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_MALLOC_SIMPLE
#endif
#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10)) #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)

4
include/configs/helios4.h
View file

@ -47,10 +47,6 @@
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE) #define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE)
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_MALLOC_SIMPLE
#endif
#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10)) #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)

4
include/configs/maxbcm.h
View file

@ -51,10 +51,6 @@
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + (128 << 10)) #define CONFIG_SPL_BSS_START_ADDR (0x40000000 + (128 << 10))
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_MALLOC_SIMPLE
#endif
#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10)) #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)

4
include/configs/theadorable.h
View file

@ -76,10 +76,6 @@
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + (128 << 10)) #define CONFIG_SPL_BSS_START_ADDR (0x40000000 + (128 << 10))
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_MALLOC_SIMPLE
#endif
#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10)) #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)

4
include/configs/x530.h
View file

@ -71,10 +71,6 @@
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE) #define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE)
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_MALLOC_SIMPLE
#endif
#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10)) #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)