From 66bda092cf2af51f2731991fe7d2d14de8aa32fa Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 20 May 2022 12:36:05 -0400 Subject: Convert CONFIG_SPL_SYS_MALLOC_SIMPLE to Kconfig 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 --- include/configs/clearfog.h | 4 ---- include/configs/controlcenterdc.h | 4 ---- include/configs/db-88f6720.h | 4 ---- include/configs/db-88f6820-amc.h | 4 ---- include/configs/db-88f6820-gp.h | 4 ---- include/configs/db-mv784mp-gp.h | 4 ---- include/configs/ds414.h | 4 ---- include/configs/helios4.h | 4 ---- include/configs/maxbcm.h | 4 ---- include/configs/theadorable.h | 4 ---- include/configs/x530.h | 4 ---- 11 files changed, 44 deletions(-) (limited to 'include') diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 22f37495299..b67a31981b0 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -47,10 +47,6 @@ #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_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index 9fafa8fe35f..08eb0dbbf95 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -39,10 +39,6 @@ #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_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h index f8d50d25965..89786044c83 100644 --- a/include/configs/db-88f6720.h +++ b/include/configs/db-88f6720.h @@ -37,10 +37,6 @@ #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_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index 06161e46702..56fd872272d 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -44,10 +44,6 @@ #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_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 6294092f874..0c42ef415da 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -44,10 +44,6 @@ #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_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 14b307343ce..4e0563dd5da 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -56,10 +56,6 @@ #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_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 94b4ebc3934..41f72eef4fc 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -48,10 +48,6 @@ #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_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) diff --git a/include/configs/helios4.h b/include/configs/helios4.h index 3a748ea3b89..aed4d7e8f53 100644 --- a/include/configs/helios4.h +++ b/include/configs/helios4.h @@ -47,10 +47,6 @@ #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_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index a57946fb0f8..0eaf08e18c9 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -51,10 +51,6 @@ #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_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index dbc358d9d8d..8e13b47eab9 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -76,10 +76,6 @@ #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_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) diff --git a/include/configs/x530.h b/include/configs/x530.h index 6218291c56f..5065eb87a39 100644 --- a/include/configs/x530.h +++ b/include/configs/x530.h @@ -71,10 +71,6 @@ #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_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) -- cgit v1.2.3