Skip to contentSkip to conversation

Convert CONFIG_SYS_BOOT_GET_{CMDLINE, KBD} to Kconfig

PATCH Superseded Derald D. Woods 2 participants 4 messages Dec 28, 2017 – Jan 31, 2018

Subsystems (2)
PowerPC m68k architecture
lore
Share & tools
lore

Derald D. Woods

author
#0 lore raw

PATCH 1/1 Convert CONFIG_SYS_BOOT_GET_{CMDLINE, KBD} to Kconfig

This converts the following to Kconfig:
CONFIG_SYS_BOOT_GET_CMDLINE
CONFIG_SYS_BOOT_GET_KBD

Additionally, ARM now selects CONFIG_SYS_BOOT_GET_CMDLINE. This enables the 'boot_get_cmdline' call to be reached from 'image_setup_linux' in "common/image.c".

Signed-off-by Derald D. Woods <[email protected]>
---
 Kconfig                           | 12 ++++++++++++
 arch/Kconfig                      |  5 +++++
 arch/m68k/include/asm/config.h    |  2 --
 arch/powerpc/include/asm/config.h |  2 --
 scripts/config_whitelist.txt      |  2 --
 5 files changed, 17 insertions(+), 6 deletions(-)
Kconfig +12 -0
index 9b8a807799..f713c6a9b1 100644
@@ -83,6 +83,18 @@ config DISTRO_DEFAULTS
 	  Select this to enable various options and commands which are suitable
 	  for building u-boot for booting general purpose Linux distributions.
 
+config SYS_BOOT_GET_CMDLINE
+	bool "Enable kernel command line setup"
+	help
+	  Enables allocating and saving kernel cmdline in space between
+	  "bootm_low" and "bootm_low" + BOOTMAPSZ.
+
+config SYS_BOOT_GET_KBD
+	bool "Enable kernel board information setup"
+	help
+	  Enables allocating and saving a kernel copy of the bd_info in
+	  space between "bootm_low" and "bootm_low" + BOOTMAPSZ.
+
 config SYS_MALLOC_F
 	bool "Enable malloc() pool before relocation"
 	default y if DM
arch/Kconfig +5 -0
index 0b12ed986c..41f61a46dc 100644
@@ -22,10 +22,13 @@ config ARM
 	select CREATE_ARCH_SYMLINK
 	select HAVE_PRIVATE_LIBGCC if !ARM64
 	select SUPPORT_OF_CONTROL
+	select SYS_BOOT_GET_CMDLINE
 
 config M68K
 	bool "M68000 architecture"
 	select HAVE_PRIVATE_LIBGCC
+	select SYS_BOOT_GET_CMDLINE
+	select SYS_BOOT_GET_KBD
 
 config MICROBLAZE
 	bool "MicroBlaze architecture"

@@ -53,6 +56,8 @@ config PPC
 	bool "PowerPC architecture"
 	select HAVE_PRIVATE_LIBGCC
 	select SUPPORT_OF_CONTROL
+	select SYS_BOOT_GET_CMDLINE
+	select SYS_BOOT_GET_KBD
 
 config SANDBOX
 	bool "Sandbox"
arch/m68k/include/asm/config.h +0 -2
index 9c4d3fb8fd..fd0b5513ee 100644
@@ -11,7 +11,5 @@
 
 #define CONFIG_LMB
 #define CONFIG_SYS_BOOT_RAMDISK_HIGH
-#define CONFIG_SYS_BOOT_GET_CMDLINE
-#define CONFIG_SYS_BOOT_GET_KBD
 
 #endif
arch/powerpc/include/asm/config.h +0 -2
index 6aec815c71..67e4b48a96 100644
@@ -31,8 +31,6 @@
 
 #define CONFIG_LMB
 #define CONFIG_SYS_BOOT_RAMDISK_HIGH
-#define CONFIG_SYS_BOOT_GET_CMDLINE
-#define CONFIG_SYS_BOOT_GET_KBD
 
 #ifndef CONFIG_MAX_MEM_MAPPED
 #if	defined(CONFIG_E500)		|| \
scripts/config_whitelist.txt +0 -2
index 43a4ff0892..8117d485ec 100644
@@ -2322,8 +2322,6 @@ CONFIG_SYS_BOOTM_LEN
 CONFIG_SYS_BOOTPARAMS_LEN
 CONFIG_SYS_BOOTSZ
 CONFIG_SYS_BOOT_BLOCK
-CONFIG_SYS_BOOT_GET_CMDLINE
-CONFIG_SYS_BOOT_GET_KBD
 CONFIG_SYS_BOOT_RAMDISK_HIGH
 CONFIG_SYS_BR0_64M
 CONFIG_SYS_BR0_8M
Signature · 1 line
2.15.1
#1 lore raw
Quoted 8 lines · Derald D. Woods

This converts the following to Kconfig:
CONFIG_SYS_BOOT_GET_CMDLINE
CONFIG_SYS_BOOT_GET_KBD

Additionally, ARM now selects CONFIG_SYS_BOOT_GET_CMDLINE. This enables the 'boot_get_cmdline' call to be reached from 'image_setup_linux' in "common/image.c".

Quoted 8 lines
Signed-off-by Derald D. Woods <[email protected]>
---
 Kconfig                           | 12 ++++++++++++
 arch/Kconfig                      |  5 +++++
 arch/m68k/include/asm/config.h    |  2 --
 arch/powerpc/include/asm/config.h |  2 --
 scripts/config_whitelist.txt      |  2 --
 5 files changed, 17 insertions(+), 6 deletions(-)

Why are you enabling this on ARM as well here? It causes a size grow (of course, we're adding in a function) on all ARM boards and I don't quite see why we need to put a copy of the bootargs in that location.

Off the top of my head it seems like it only makes sense on pre-DTB PowerPC where the cmdline needed to be in a good location. On pre-DTB ARM that's done via ATAGS instead, so already covered. Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180122/3bc753b5/attachment.sig>
author
#2 lore raw

PATCH v2 1/1 Convert CONFIG_SYS_BOOT_GET_{CMDLINE, KBD} to Kconfig

In reply to Derald D. Woods

This converts the following to Kconfig:
CONFIG_SYS_BOOT_GET_CMDLINE
CONFIG_SYS_BOOT_GET_KBD

Signed-off-by Derald D. Woods <[email protected]>

---
v2:
- Drop selection for ARM

---
 Kconfig                           | 12 ++++++++++++
 arch/Kconfig                      |  4 ++++
 arch/m68k/include/asm/config.h    |  2 --
 arch/powerpc/include/asm/config.h |  2 --
 scripts/config_whitelist.txt      |  2 --
 5 files changed, 16 insertions(+), 6 deletions(-)
Kconfig +12 -0
index 9b8a807799..f713c6a9b1 100644
@@ -83,6 +83,18 @@ config DISTRO_DEFAULTS
 	  Select this to enable various options and commands which are suitable
 	  for building u-boot for booting general purpose Linux distributions.
 
+config SYS_BOOT_GET_CMDLINE
+	bool "Enable kernel command line setup"
+	help
+	  Enables allocating and saving kernel cmdline in space between
+	  "bootm_low" and "bootm_low" + BOOTMAPSZ.
+
+config SYS_BOOT_GET_KBD
+	bool "Enable kernel board information setup"
+	help
+	  Enables allocating and saving a kernel copy of the bd_info in
+	  space between "bootm_low" and "bootm_low" + BOOTMAPSZ.
+
 config SYS_MALLOC_F
 	bool "Enable malloc() pool before relocation"
 	default y if DM
arch/Kconfig +4 -0
index 762230cd56..5d57d6da2c 100644
@@ -26,6 +26,8 @@ config ARM
 config M68K
 	bool "M68000 architecture"
 	select HAVE_PRIVATE_LIBGCC
+	select SYS_BOOT_GET_CMDLINE
+	select SYS_BOOT_GET_KBD
 
 config MICROBLAZE
 	bool "MicroBlaze architecture"

@@ -53,6 +55,8 @@ config PPC
 	bool "PowerPC architecture"
 	select HAVE_PRIVATE_LIBGCC
 	select SUPPORT_OF_CONTROL
+	select SYS_BOOT_GET_CMDLINE
+	select SYS_BOOT_GET_KBD
 
 config RISCV
 	bool "riscv architecture"
arch/m68k/include/asm/config.h +0 -2
index 9c4d3fb8fd..fd0b5513ee 100644
@@ -11,7 +11,5 @@
 
 #define CONFIG_LMB
 #define CONFIG_SYS_BOOT_RAMDISK_HIGH
-#define CONFIG_SYS_BOOT_GET_CMDLINE
-#define CONFIG_SYS_BOOT_GET_KBD
 
 #endif
arch/powerpc/include/asm/config.h +0 -2
index 6aec815c71..67e4b48a96 100644
@@ -31,8 +31,6 @@
 
 #define CONFIG_LMB
 #define CONFIG_SYS_BOOT_RAMDISK_HIGH
-#define CONFIG_SYS_BOOT_GET_CMDLINE
-#define CONFIG_SYS_BOOT_GET_KBD
 
 #ifndef CONFIG_MAX_MEM_MAPPED
 #if	defined(CONFIG_E500)		|| \
scripts/config_whitelist.txt +0 -2
index c98f262079..6e9750eb16 100644
@@ -2273,8 +2273,6 @@ CONFIG_SYS_BOOTM_LEN
 CONFIG_SYS_BOOTPARAMS_LEN
 CONFIG_SYS_BOOTSZ
 CONFIG_SYS_BOOT_BLOCK
-CONFIG_SYS_BOOT_GET_CMDLINE
-CONFIG_SYS_BOOT_GET_KBD
 CONFIG_SYS_BOOT_RAMDISK_HIGH
 CONFIG_SYS_BR0_64M
 CONFIG_SYS_BR0_8M
Signature · 1 line
2.16.0
#3 lore raw

PATCH v2 1/1 Convert CONFIG_SYS_BOOT_GET_{CMDLINE, KBD} to Kconfig

Quoted 5 lines · Derald D. Woods

This converts the following to Kconfig:
CONFIG_SYS_BOOT_GET_CMDLINE
CONFIG_SYS_BOOT_GET_KBD

Signed-off-by Derald D. Woods <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180130/4442176c/attachment.sig>