Migrate CONFIG_LMB in Kconfig.
Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com ---
(no changes since v1)
arch/arc/include/asm/config.h | 2 -- arch/arm/include/asm/config.h | 1 - arch/m68k/include/asm/config.h | 1 - arch/microblaze/include/asm/config.h | 2 -- arch/mips/include/asm/config.h | 1 - arch/nds32/include/asm/config.h | 1 - arch/powerpc/include/asm/config.h | 1 - arch/riscv/include/asm/config.h | 1 - arch/sh/include/asm/config.h | 2 -- arch/x86/include/asm/config.h | 1 - arch/xtensa/include/asm/config.h | 2 -- include/configs/10m50_devboard.h | 5 ----- include/configs/3c120_devboard.h | 5 ----- include/configs/sandbox.h | 2 -- include/configs/x86-common.h | 2 -- include/image.h | 2 +- lib/Kconfig | 7 +++++++ scripts/config_whitelist.txt | 1 - 18 files changed, 8 insertions(+), 31 deletions(-)
diff --git a/arch/arc/include/asm/config.h b/arch/arc/include/asm/config.h index d88c361488..46e94be141 100644 --- a/arch/arc/include/asm/config.h +++ b/arch/arc/include/asm/config.h @@ -8,6 +8,4 @@
#define CONFIG_SYS_BOOT_RAMDISK_HIGH
-#define CONFIG_LMB - #endif /*__ASM_ARC_CONFIG_H_ */ diff --git a/arch/arm/include/asm/config.h b/arch/arm/include/asm/config.h index bf692ce279..14860d89b6 100644 --- a/arch/arm/include/asm/config.h +++ b/arch/arm/include/asm/config.h @@ -6,7 +6,6 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_
-#define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH
#if defined(CONFIG_ARCH_LS1021A) || \ diff --git a/arch/m68k/include/asm/config.h b/arch/m68k/include/asm/config.h index 7ea443673a..221eb93d58 100644 --- a/arch/m68k/include/asm/config.h +++ b/arch/m68k/include/asm/config.h @@ -6,7 +6,6 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_
-#define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH
#endif diff --git a/arch/microblaze/include/asm/config.h b/arch/microblaze/include/asm/config.h index 3ae71b3e01..221eb93d58 100644 --- a/arch/microblaze/include/asm/config.h +++ b/arch/microblaze/include/asm/config.h @@ -6,8 +6,6 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_
-#define CONFIG_LMB - #define CONFIG_SYS_BOOT_RAMDISK_HIGH
#endif diff --git a/arch/mips/include/asm/config.h b/arch/mips/include/asm/config.h index 7ea443673a..221eb93d58 100644 --- a/arch/mips/include/asm/config.h +++ b/arch/mips/include/asm/config.h @@ -6,7 +6,6 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_
-#define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH
#endif diff --git a/arch/nds32/include/asm/config.h b/arch/nds32/include/asm/config.h index 8964a58f27..6c1cbce7ef 100644 --- a/arch/nds32/include/asm/config.h +++ b/arch/nds32/include/asm/config.h @@ -7,6 +7,5 @@
#ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_ -#define CONFIG_LMB
#endif diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h index c9c9964630..99b410dc9b 100644 --- a/arch/powerpc/include/asm/config.h +++ b/arch/powerpc/include/asm/config.h @@ -18,7 +18,6 @@ #define HWCONFIG_BUFFER_SIZE 256 #endif
-#define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH
#ifndef CONFIG_MAX_MEM_MAPPED diff --git a/arch/riscv/include/asm/config.h b/arch/riscv/include/asm/config.h index 156cb94dc0..d911007537 100644 --- a/arch/riscv/include/asm/config.h +++ b/arch/riscv/include/asm/config.h @@ -7,7 +7,6 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_
-#define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH
#endif diff --git a/arch/sh/include/asm/config.h b/arch/sh/include/asm/config.h index e1cd322152..406156dff5 100644 --- a/arch/sh/include/asm/config.h +++ b/arch/sh/include/asm/config.h @@ -8,8 +8,6 @@
#include <asm/processor.h>
-#define CONFIG_LMB - /* Timer */ #define CONFIG_SYS_TIMER_COUNTS_DOWN #define CONFIG_SYS_TIMER_COUNTER (TMU_BASE + 0xc) /* TCNT0 */ diff --git a/arch/x86/include/asm/config.h b/arch/x86/include/asm/config.h index 7ea443673a..221eb93d58 100644 --- a/arch/x86/include/asm/config.h +++ b/arch/x86/include/asm/config.h @@ -6,7 +6,6 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_
-#define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH
#endif diff --git a/arch/xtensa/include/asm/config.h b/arch/xtensa/include/asm/config.h index 5a95fc93f7..a1096ab196 100644 --- a/arch/xtensa/include/asm/config.h +++ b/arch/xtensa/include/asm/config.h @@ -9,8 +9,6 @@
#include <asm/arch/core.h>
-#define CONFIG_LMB - /* * Make boot parameters available in the MMUv2 virtual memory layout by * restricting used physical memory to the first 128MB. diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index 768b4a6dfc..3ffc744928 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -34,11 +34,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE
-/* - * FDT options - */ -#define CONFIG_LMB - /* * MEMORY ORGANIZATION * -Monitor at top of sdram. diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index 30bbd716b2..3f065ff315 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -34,11 +34,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE
-/* - * FDT options - */ -#define CONFIG_LMB - /* * MEMORY ORGANIZATION * -Monitor at top of sdram. diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index e0708fe573..6abb78611a 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -22,8 +22,6 @@ #define CONFIG_SYS_TIMER_RATE 1000000 #endif
-#define CONFIG_LMB - #define CONFIG_HOST_MAX_DEVICES 4
/* diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 641ed2c5ec..f186dd6b82 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -16,8 +16,6 @@ */ #define CONFIG_PHYSMEM
-#define CONFIG_LMB - #define CONFIG_SYS_BOOTM_LEN (16 << 20)
/* SATA AHCI storage */ diff --git a/include/image.h b/include/image.h index 138c83dd28..a8ca76b21f 100644 --- a/include/image.h +++ b/include/image.h @@ -434,7 +434,7 @@ typedef struct bootm_headers { #define BOOTM_STATE_OS_GO (0x00000400) int state;
-#ifdef CONFIG_LMB +#if defined(CONFIG_LMB) && !defined(USE_HOSTCC) struct lmb lmb; /* for memory mgmt */ #endif } bootm_headers_t; diff --git a/lib/Kconfig b/lib/Kconfig index b35a71ac36..43bd7190b9 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -699,6 +699,13 @@ config LIB_ELF Support basic elf loading/validating functions. This supports for 32 bit and 64 bit versions.
+config LMB + bool "Enable the logical memory blocks library (lmb)" + default y if ARC || ARM || M68K || MICROBLAZE || MIPS || NDS32 || \ + NIOS2 || PPC || RISCV || SANDBOX || SH || X86 || XTENSA + help + Support the library logical memory blocks. + endmenu
config PHANDLE_CHECK_SEQ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7340e95bd4..d464f04b6b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -954,7 +954,6 @@ CONFIG_LEGACY_BOOTCMD_ENV CONFIG_LINUX CONFIG_LINUX_RESET_VEC CONFIG_LITTLETON_LCD -CONFIG_LMB CONFIG_LMS283GF05 CONFIG_LOADADDR CONFIG_LOADCMD