* [U-Boot] [PATCH 0/3] Some Kconfig move/fixups
@ 2016-07-25 13:06 Masahiro Yamada
2016-07-25 13:06 ` [U-Boot] [PATCH 1/3] cmd: bootz: make CMD_BOOTZ depend on CMD_BOOTM Masahiro Yamada
` (3 more replies)
0 siblings, 4 replies; 16+ messages in thread
From: Masahiro Yamada @ 2016-07-25 13:06 UTC (permalink / raw)
To: u-boot
Masahiro Yamada (3):
cmd: bootz: make CMD_BOOTZ depend on CMD_BOOTM
cmd: booti: move CONFIG_CMD_BOOTI to Kconfig
arm64: thunderx_88xx_defconfig: remove unneeded
CONFIG_SYS_EXTRA_OPTIONS
Kconfig | 2 ++
cmd/Kconfig | 7 +++++++
configs/dragonboard410c_defconfig | 1 +
configs/e2220-1170_defconfig | 1 +
configs/hikey_defconfig | 1 +
configs/odroid-c2_defconfig | 1 +
configs/p2371-0000_defconfig | 1 +
configs/p2371-2180_defconfig | 1 +
configs/p2571_defconfig | 1 +
configs/p2771-0000-a02_defconfig | 1 +
configs/p2771-0000-b00_defconfig | 1 +
configs/rpi_3_defconfig | 1 +
configs/s32v234evb_defconfig | 1 +
configs/thunderx_88xx_defconfig | 1 -
configs/uniphier_ld11_defconfig | 1 +
configs/uniphier_ld20_defconfig | 1 +
configs/vexpress_aemv8a_dram_defconfig | 1 +
configs/vexpress_aemv8a_juno_defconfig | 1 +
configs/vexpress_aemv8a_semi_defconfig | 1 +
configs/xilinx_zynqmp_ep_defconfig | 1 +
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 +
configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
configs/xilinx_zynqmp_zcu102_defconfig | 1 +
configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 +
include/config_distro_defaults.h | 3 ---
include/configs/uniphier.h | 1 -
include/configs/vexpress_aemv8a.h | 1 -
include/configs/xilinx_zynqmp.h | 1 -
30 files changed, 32 insertions(+), 7 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 1/3] cmd: bootz: make CMD_BOOTZ depend on CMD_BOOTM
2016-07-25 13:06 [U-Boot] [PATCH 0/3] Some Kconfig move/fixups Masahiro Yamada
@ 2016-07-25 13:06 ` Masahiro Yamada
2016-07-25 13:17 ` Robert P. J. Day
2016-07-25 13:06 ` [U-Boot] [PATCH 2/3] cmd: booti: move CONFIG_CMD_BOOTI to Kconfig Masahiro Yamada
` (2 subsequent siblings)
3 siblings, 1 reply; 16+ messages in thread
From: Masahiro Yamada @ 2016-07-25 13:06 UTC (permalink / raw)
To: u-boot
The "bootz" command is implemented in the "bootm", so the dependency
should be reflected in Kconfig.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
Kconfig | 1 +
cmd/Kconfig | 1 +
2 files changed, 2 insertions(+)
diff --git a/Kconfig b/Kconfig
index ef12f9f..0d6afd2 100644
--- a/Kconfig
+++ b/Kconfig
@@ -57,6 +57,7 @@ config DISTRO_DEFAULTS
bool "Select defaults suitable for booting general purpose Linux distributions"
default y if ARCH_SUNXI
default n
+ select CMD_BOOTM
select CMD_BOOTZ
select CMD_DHCP
select CMD_EXT2
diff --git a/cmd/Kconfig b/cmd/Kconfig
index d69b817..171114d 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -162,6 +162,7 @@ config CMD_BOOTM
config CMD_BOOTZ
bool "bootz"
+ depends on CMD_BOOTM
help
Boot the Linux zImage
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 2/3] cmd: booti: move CONFIG_CMD_BOOTI to Kconfig
2016-07-25 13:06 [U-Boot] [PATCH 0/3] Some Kconfig move/fixups Masahiro Yamada
2016-07-25 13:06 ` [U-Boot] [PATCH 1/3] cmd: bootz: make CMD_BOOTZ depend on CMD_BOOTM Masahiro Yamada
@ 2016-07-25 13:06 ` Masahiro Yamada
2016-07-25 13:42 ` Michal Simek
2016-07-25 13:06 ` [U-Boot] [PATCH 3/3] arm64: thunderx_88xx_defconfig: remove unneeded CONFIG_SYS_EXTRA_OPTIONS Masahiro Yamada
2016-07-25 14:55 ` [U-Boot] [PATCH 0/3] Some Kconfig move/fixups Tom Rini
3 siblings, 1 reply; 16+ messages in thread
From: Masahiro Yamada @ 2016-07-25 13:06 UTC (permalink / raw)
To: u-boot
This command is used to boot ARM64 Linux.
I made DISTRO_DEFAULTS select this option for ARM64 to respect
include/config_distro_defaults.h.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
Kconfig | 1 +
cmd/Kconfig | 6 ++++++
configs/dragonboard410c_defconfig | 1 +
configs/e2220-1170_defconfig | 1 +
configs/hikey_defconfig | 1 +
configs/odroid-c2_defconfig | 1 +
configs/p2371-0000_defconfig | 1 +
configs/p2371-2180_defconfig | 1 +
configs/p2571_defconfig | 1 +
configs/p2771-0000-a02_defconfig | 1 +
configs/p2771-0000-b00_defconfig | 1 +
configs/rpi_3_defconfig | 1 +
configs/s32v234evb_defconfig | 1 +
configs/uniphier_ld11_defconfig | 1 +
configs/uniphier_ld20_defconfig | 1 +
configs/vexpress_aemv8a_dram_defconfig | 1 +
configs/vexpress_aemv8a_juno_defconfig | 1 +
configs/vexpress_aemv8a_semi_defconfig | 1 +
configs/xilinx_zynqmp_ep_defconfig | 1 +
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 +
configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
configs/xilinx_zynqmp_zcu102_defconfig | 1 +
configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 +
include/config_distro_defaults.h | 3 ---
include/configs/uniphier.h | 1 -
include/configs/vexpress_aemv8a.h | 1 -
include/configs/xilinx_zynqmp.h | 1 -
29 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/Kconfig b/Kconfig
index 0d6afd2..335efcd 100644
--- a/Kconfig
+++ b/Kconfig
@@ -59,6 +59,7 @@ config DISTRO_DEFAULTS
default n
select CMD_BOOTM
select CMD_BOOTZ
+ select CMD_BOOTI if ARM64
select CMD_DHCP
select CMD_EXT2
select CMD_EXT4
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 171114d..f7c609d 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -166,6 +166,12 @@ config CMD_BOOTZ
help
Boot the Linux zImage
+config CMD_BOOTI
+ bool "booti"
+ depends on CMD_BOOTM && ARM64
+ help
+ Boot the Linux Image for ARM64
+
config CMD_BOOTEFI
bool "bootefi"
depends on EFI_LOADER
diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig
index ad2e8b8..4aa21eb 100644
--- a/configs/dragonboard410c_defconfig
+++ b/configs/dragonboard410c_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_SNAPDRAGON=y
CONFIG_DEFAULT_DEVICE_TREE="dragonboard410c"
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="dragonboard410c => "
+CONFIG_CMD_BOOTI=y
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_MEMINFO=y
diff --git a/configs/e2220-1170_defconfig b/configs/e2220-1170_defconfig
index eb01dec..c2fb6e6 100644
--- a/configs/e2220-1170_defconfig
+++ b/configs/e2220-1170_defconfig
@@ -5,6 +5,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-e2220-1170"
CONFIG_OF_SYSTEM_SETUP=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Tegra210 (E2220-1170) # "
+CONFIG_CMD_BOOTI=y
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
diff --git a/configs/hikey_defconfig b/configs/hikey_defconfig
index d150dd3..343ec87 100644
--- a/configs/hikey_defconfig
+++ b/configs/hikey_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_HUSH_PARSER=y
+CONFIG_CMD_BOOTI=y
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_MMC=y
CONFIG_CMD_USB=y
diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig
index 808bbc2..8805b43 100644
--- a/configs/odroid-c2_defconfig
+++ b/configs/odroid-c2_defconfig
@@ -5,6 +5,7 @@ CONFIG_TARGET_ODROID_C2=y
CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-odroidc2"
CONFIG_HUSH_PARSER=y
# CONFIG_CMD_BDI is not set
+CONFIG_CMD_BOOTI=y
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_LOADS is not set
diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig
index d27fd6d..0f47283 100644
--- a/configs/p2371-0000_defconfig
+++ b/configs/p2371-0000_defconfig
@@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-0000"
CONFIG_OF_SYSTEM_SETUP=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Tegra210 (P2371-0000) # "
+CONFIG_CMD_BOOTI=y
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig
index 4e365b5..f398988 100644
--- a/configs/p2371-2180_defconfig
+++ b/configs/p2371-2180_defconfig
@@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-2180"
CONFIG_OF_SYSTEM_SETUP=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Tegra210 (P2371-2180) # "
+CONFIG_CMD_BOOTI=y
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig
index 2b3c5c6..9f35df5 100644
--- a/configs/p2571_defconfig
+++ b/configs/p2571_defconfig
@@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2571"
CONFIG_OF_SYSTEM_SETUP=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Tegra210 (P2571) # "
+CONFIG_CMD_BOOTI=y
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
diff --git a/configs/p2771-0000-a02_defconfig b/configs/p2771-0000-a02_defconfig
index 1fe25f5..5b5d921 100644
--- a/configs/p2771-0000-a02_defconfig
+++ b/configs/p2771-0000-a02_defconfig
@@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-a02"
CONFIG_OF_SYSTEM_SETUP=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Tegra186 (P2771-0000 A02) # "
+CONFIG_CMD_BOOTI=y
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
diff --git a/configs/p2771-0000-b00_defconfig b/configs/p2771-0000-b00_defconfig
index 552fb6c..57e9c40 100644
--- a/configs/p2771-0000-b00_defconfig
+++ b/configs/p2771-0000-b00_defconfig
@@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-b00"
CONFIG_OF_SYSTEM_SETUP=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Tegra186 (P2771-0000 B00) # "
+CONFIG_CMD_BOOTI=y
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
index bff92df..14be2fb 100644
--- a/configs/rpi_3_defconfig
+++ b/configs/rpi_3_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_RPI_3=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="U-Boot> "
+CONFIG_CMD_BOOTI=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_MMC=y
diff --git a/configs/s32v234evb_defconfig b/configs/s32v234evb_defconfig
index dfedf82..4a4e4c1 100644
--- a/configs/s32v234evb_defconfig
+++ b/configs/s32v234evb_defconfig
@@ -4,4 +4,5 @@ CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/s32v234evb/s32v234evb.cfg"
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_BOOTI=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/uniphier_ld11_defconfig b/configs/uniphier_ld11_defconfig
index ffcac79..14c8fad 100644
--- a/configs/uniphier_ld11_defconfig
+++ b/configs/uniphier_ld11_defconfig
@@ -6,6 +6,7 @@ CONFIG_MICRO_SUPPORT_CARD=y
CONFIG_SYS_TEXT_BASE=0x84000000
CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-ld11-ref"
CONFIG_HUSH_PARSER=y
+CONFIG_CMD_BOOTI=y
# CONFIG_CMD_XIMG is not set
# CONFIG_CMD_ENV_EXISTS is not set
CONFIG_CMD_MMC=y
diff --git a/configs/uniphier_ld20_defconfig b/configs/uniphier_ld20_defconfig
index cbc65dd..1f40d23 100644
--- a/configs/uniphier_ld20_defconfig
+++ b/configs/uniphier_ld20_defconfig
@@ -6,6 +6,7 @@ CONFIG_MICRO_SUPPORT_CARD=y
CONFIG_SYS_TEXT_BASE=0x84000000
CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-ld20-ref"
CONFIG_HUSH_PARSER=y
+CONFIG_CMD_BOOTI=y
# CONFIG_CMD_XIMG is not set
# CONFIG_CMD_ENV_EXISTS is not set
CONFIG_CMD_MMC=y
diff --git a/configs/vexpress_aemv8a_dram_defconfig b/configs/vexpress_aemv8a_dram_defconfig
index 5dd6e75..58c912b 100644
--- a/configs/vexpress_aemv8a_dram_defconfig
+++ b/configs/vexpress_aemv8a_dram_defconfig
@@ -6,6 +6,7 @@ CONFIG_BOOTDELAY=1
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="VExpress64# "
# CONFIG_CMD_CONSOLE is not set
+CONFIG_CMD_BOOTI=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_XIMG is not set
# CONFIG_CMD_EDITENV is not set
diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig
index 26cbc85..291c10c 100644
--- a/configs/vexpress_aemv8a_juno_defconfig
+++ b/configs/vexpress_aemv8a_juno_defconfig
@@ -6,6 +6,7 @@ CONFIG_BOOTDELAY=1
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="VExpress64# "
# CONFIG_CMD_CONSOLE is not set
+CONFIG_CMD_BOOTI=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_XIMG is not set
# CONFIG_CMD_EDITENV is not set
diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig
index 27c04ba..ee133e8 100644
--- a/configs/vexpress_aemv8a_semi_defconfig
+++ b/configs/vexpress_aemv8a_semi_defconfig
@@ -6,6 +6,7 @@ CONFIG_BOOTDELAY=1
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="VExpress64# "
# CONFIG_CMD_CONSOLE is not set
+CONFIG_CMD_BOOTI=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_XIMG is not set
# CONFIG_CMD_EDITENV is not set
diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig
index 79f3adc..76a5366 100644
--- a/configs/xilinx_zynqmp_ep_defconfig
+++ b/configs/xilinx_zynqmp_ep_defconfig
@@ -16,6 +16,7 @@ CONFIG_SPL_LOAD_FIT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_CONSOLE is not set
+CONFIG_CMD_BOOTI=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_XIMG is not set
# CONFIG_CMD_EDITENV is not set
diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
index 51637fc..dc62ca6 100644
--- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
@@ -15,6 +15,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> "
+CONFIG_CMD_BOOTI=y
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_MEMTEST=y
# CONFIG_CMD_FLASH is not set
diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
index 9fa1562..6c1eb39 100644
--- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
@@ -15,6 +15,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> "
+CONFIG_CMD_BOOTI=y
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_MEMTEST=y
# CONFIG_CMD_FLASH is not set
diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
index efa7b8c..4e3ef05 100644
--- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
@@ -14,6 +14,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> "
+CONFIG_CMD_BOOTI=y
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_MEMTEST=y
# CONFIG_CMD_FLASH is not set
diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
index a6818c1..ef3626e 100644
--- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
@@ -14,6 +14,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> "
+CONFIG_CMD_BOOTI=y
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_MEMTEST=y
# CONFIG_CMD_FLASH is not set
diff --git a/configs/xilinx_zynqmp_zcu102_defconfig b/configs/xilinx_zynqmp_zcu102_defconfig
index b0303f6..73289df 100644
--- a/configs/xilinx_zynqmp_zcu102_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_defconfig
@@ -14,6 +14,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> "
+CONFIG_CMD_BOOTI=y
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_MEMTEST=y
# CONFIG_CMD_FLASH is not set
diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig
index b2b5208..545643d 100644
--- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
@@ -14,6 +14,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> "
+CONFIG_CMD_BOOTI=y
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_MEMTEST=y
# CONFIG_CMD_FLASH is not set
diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
index 9244680..b5efab5 100644
--- a/include/config_distro_defaults.h
+++ b/include/config_distro_defaults.h
@@ -20,9 +20,6 @@
#define CONFIG_BOOTP_PXE
#define CONFIG_BOOTP_SUBNETMASK
-#ifdef CONFIG_ARM64
-#define CONFIG_CMD_BOOTI
-#endif
#define CONFIG_CMD_PXE
#define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 169c197..a0b5447 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -184,7 +184,6 @@
"__nfsboot=run tftpboot\0"
#else
#ifdef CONFIG_ARM64
-#define CONFIG_CMD_BOOTI
#define CONFIG_BOOTFILE "Image"
#define LINUXBOOT_CMD "booti"
#define KERNEL_ADDR_R "kernel_addr_r=0x80080000\0"
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 46cf83b..9aca393 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -133,7 +133,6 @@
/* Command line configuration */
#define CONFIG_MENU
/*#define CONFIG_MENU_SHOW*/
-#define CONFIG_CMD_BOOTI
#define CONFIG_CMD_UNZIP
#define CONFIG_CMD_PXE
#define CONFIG_CMD_ENV
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index e776e32..173e0c9 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -206,7 +206,6 @@
#define CONFIG_SYS_BOOTM_LEN (60 * 1024 * 1024)
-#define CONFIG_CMD_BOOTI
#define CONFIG_CMD_UNZIP
#define CONFIG_BOARD_EARLY_INIT_R
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 3/3] arm64: thunderx_88xx_defconfig: remove unneeded CONFIG_SYS_EXTRA_OPTIONS
2016-07-25 13:06 [U-Boot] [PATCH 0/3] Some Kconfig move/fixups Masahiro Yamada
2016-07-25 13:06 ` [U-Boot] [PATCH 1/3] cmd: bootz: make CMD_BOOTZ depend on CMD_BOOTM Masahiro Yamada
2016-07-25 13:06 ` [U-Boot] [PATCH 2/3] cmd: booti: move CONFIG_CMD_BOOTI to Kconfig Masahiro Yamada
@ 2016-07-25 13:06 ` Masahiro Yamada
2016-07-25 14:56 ` Tom Rini
2016-07-26 2:33 ` [U-Boot] [U-Boot, " Tom Rini
2016-07-25 14:55 ` [U-Boot] [PATCH 0/3] Some Kconfig move/fixups Tom Rini
3 siblings, 2 replies; 16+ messages in thread
From: Masahiro Yamada @ 2016-07-25 13:06 UTC (permalink / raw)
To: u-boot
ARM64 is correctly select'ed in arch/arm/Kconfig, so this line in
the defconfig is unneeded.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
configs/thunderx_88xx_defconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/configs/thunderx_88xx_defconfig b/configs/thunderx_88xx_defconfig
index 4a8655f..28797f9 100644
--- a/configs/thunderx_88xx_defconfig
+++ b/configs/thunderx_88xx_defconfig
@@ -2,7 +2,6 @@ CONFIG_ARM=y
CONFIG_TARGET_THUNDERX_88XX=y
CONFIG_DM_SERIAL=y
CONFIG_DEFAULT_DEVICE_TREE="thunderx-88xx"
-CONFIG_SYS_EXTRA_OPTIONS="ARM64"
CONFIG_BOOTDELAY=5
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ThunderX_88XX> "
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 1/3] cmd: bootz: make CMD_BOOTZ depend on CMD_BOOTM
2016-07-25 13:06 ` [U-Boot] [PATCH 1/3] cmd: bootz: make CMD_BOOTZ depend on CMD_BOOTM Masahiro Yamada
@ 2016-07-25 13:17 ` Robert P. J. Day
2016-07-26 4:15 ` Masahiro Yamada
0 siblings, 1 reply; 16+ messages in thread
From: Robert P. J. Day @ 2016-07-25 13:17 UTC (permalink / raw)
To: u-boot
On Mon, 25 Jul 2016, Masahiro Yamada wrote:
> The "bootz" command is implemented in the "bootm", so the dependency
> should be reflected in Kconfig.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> Kconfig | 1 +
> cmd/Kconfig | 1 +
> 2 files changed, 2 insertions(+)
>
> diff --git a/Kconfig b/Kconfig
> index ef12f9f..0d6afd2 100644
> --- a/Kconfig
> +++ b/Kconfig
> @@ -57,6 +57,7 @@ config DISTRO_DEFAULTS
> bool "Select defaults suitable for booting general purpose Linux distributions"
> default y if ARCH_SUNXI
> default n
> + select CMD_BOOTM
> select CMD_BOOTZ
> select CMD_DHCP
> select CMD_EXT2
> diff --git a/cmd/Kconfig b/cmd/Kconfig
> index d69b817..171114d 100644
> --- a/cmd/Kconfig
> +++ b/cmd/Kconfig
> @@ -162,6 +162,7 @@ config CMD_BOOTM
>
> config CMD_BOOTZ
> bool "bootz"
> + depends on CMD_BOOTM
> help
> Boot the Linux zImage
if bootz already depends on bootm, why then do you need to select
both?
rday
--
========================================================================
Robert P. J. Day Ottawa, Ontario, CANADA
http://crashcourse.ca
Twitter: http://twitter.com/rpjday
LinkedIn: http://ca.linkedin.com/in/rpjday
========================================================================
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 2/3] cmd: booti: move CONFIG_CMD_BOOTI to Kconfig
2016-07-25 13:06 ` [U-Boot] [PATCH 2/3] cmd: booti: move CONFIG_CMD_BOOTI to Kconfig Masahiro Yamada
@ 2016-07-25 13:42 ` Michal Simek
2016-07-25 14:15 ` Ryan Harkin
2016-07-31 16:27 ` Masahiro Yamada
0 siblings, 2 replies; 16+ messages in thread
From: Michal Simek @ 2016-07-25 13:42 UTC (permalink / raw)
To: u-boot
On 25.7.2016 15:06, Masahiro Yamada wrote:
> This command is used to boot ARM64 Linux.
>
> I made DISTRO_DEFAULTS select this option for ARM64 to respect
> include/config_distro_defaults.h.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> Kconfig | 1 +
> cmd/Kconfig | 6 ++++++
> configs/dragonboard410c_defconfig | 1 +
> configs/e2220-1170_defconfig | 1 +
> configs/hikey_defconfig | 1 +
> configs/odroid-c2_defconfig | 1 +
> configs/p2371-0000_defconfig | 1 +
> configs/p2371-2180_defconfig | 1 +
> configs/p2571_defconfig | 1 +
> configs/p2771-0000-a02_defconfig | 1 +
> configs/p2771-0000-b00_defconfig | 1 +
> configs/rpi_3_defconfig | 1 +
> configs/s32v234evb_defconfig | 1 +
> configs/uniphier_ld11_defconfig | 1 +
> configs/uniphier_ld20_defconfig | 1 +
> configs/vexpress_aemv8a_dram_defconfig | 1 +
> configs/vexpress_aemv8a_juno_defconfig | 1 +
> configs/vexpress_aemv8a_semi_defconfig | 1 +
> configs/xilinx_zynqmp_ep_defconfig | 1 +
> configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
> configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 +
> configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
> configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
> configs/xilinx_zynqmp_zcu102_defconfig | 1 +
> configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 +
> include/config_distro_defaults.h | 3 ---
> include/configs/uniphier.h | 1 -
> include/configs/vexpress_aemv8a.h | 1 -
> include/configs/xilinx_zynqmp.h | 1 -
> 29 files changed, 30 insertions(+), 6 deletions(-)
>
> diff --git a/Kconfig b/Kconfig
> index 0d6afd2..335efcd 100644
> --- a/Kconfig
> +++ b/Kconfig
> @@ -59,6 +59,7 @@ config DISTRO_DEFAULTS
> default n
> select CMD_BOOTM
> select CMD_BOOTZ
> + select CMD_BOOTI if ARM64
> select CMD_DHCP
> select CMD_EXT2
> select CMD_EXT4
> diff --git a/cmd/Kconfig b/cmd/Kconfig
> index 171114d..f7c609d 100644
> --- a/cmd/Kconfig
> +++ b/cmd/Kconfig
> @@ -166,6 +166,12 @@ config CMD_BOOTZ
> help
> Boot the Linux zImage
>
> +config CMD_BOOTI
> + bool "booti"
> + depends on CMD_BOOTM && ARM64
> + help
> + Boot the Linux Image for ARM64
I would even add here default y which can shorten defconfigs and you can
disable it if you don't want it.
What do you think?
Thanks,
Michal
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 2/3] cmd: booti: move CONFIG_CMD_BOOTI to Kconfig
2016-07-25 13:42 ` Michal Simek
@ 2016-07-25 14:15 ` Ryan Harkin
2016-07-31 16:27 ` Masahiro Yamada
1 sibling, 0 replies; 16+ messages in thread
From: Ryan Harkin @ 2016-07-25 14:15 UTC (permalink / raw)
To: u-boot
On 25 July 2016 at 14:42, Michal Simek <michal.simek@xilinx.com> wrote:
> On 25.7.2016 15:06, Masahiro Yamada wrote:
>> This command is used to boot ARM64 Linux.
>>
>> I made DISTRO_DEFAULTS select this option for ARM64 to respect
>> include/config_distro_defaults.h.
>>
>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>> ---
>>
>> Kconfig | 1 +
>> cmd/Kconfig | 6 ++++++
>> configs/dragonboard410c_defconfig | 1 +
>> configs/e2220-1170_defconfig | 1 +
>> configs/hikey_defconfig | 1 +
>> configs/odroid-c2_defconfig | 1 +
>> configs/p2371-0000_defconfig | 1 +
>> configs/p2371-2180_defconfig | 1 +
>> configs/p2571_defconfig | 1 +
>> configs/p2771-0000-a02_defconfig | 1 +
>> configs/p2771-0000-b00_defconfig | 1 +
>> configs/rpi_3_defconfig | 1 +
>> configs/s32v234evb_defconfig | 1 +
>> configs/uniphier_ld11_defconfig | 1 +
>> configs/uniphier_ld20_defconfig | 1 +
>> configs/vexpress_aemv8a_dram_defconfig | 1 +
>> configs/vexpress_aemv8a_juno_defconfig | 1 +
>> configs/vexpress_aemv8a_semi_defconfig | 1 +
>> configs/xilinx_zynqmp_ep_defconfig | 1 +
>> configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
>> configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 +
>> configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
>> configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
>> configs/xilinx_zynqmp_zcu102_defconfig | 1 +
>> configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 +
>> include/config_distro_defaults.h | 3 ---
>> include/configs/uniphier.h | 1 -
>> include/configs/vexpress_aemv8a.h | 1 -
>> include/configs/xilinx_zynqmp.h | 1 -
>> 29 files changed, 30 insertions(+), 6 deletions(-)
>>
>> diff --git a/Kconfig b/Kconfig
>> index 0d6afd2..335efcd 100644
>> --- a/Kconfig
>> +++ b/Kconfig
>> @@ -59,6 +59,7 @@ config DISTRO_DEFAULTS
>> default n
>> select CMD_BOOTM
>> select CMD_BOOTZ
>> + select CMD_BOOTI if ARM64
>> select CMD_DHCP
>> select CMD_EXT2
>> select CMD_EXT4
>> diff --git a/cmd/Kconfig b/cmd/Kconfig
>> index 171114d..f7c609d 100644
>> --- a/cmd/Kconfig
>> +++ b/cmd/Kconfig
>> @@ -166,6 +166,12 @@ config CMD_BOOTZ
>> help
>> Boot the Linux zImage
>>
>> +config CMD_BOOTI
>> + bool "booti"
>> + depends on CMD_BOOTM && ARM64
>> + help
>> + Boot the Linux Image for ARM64
>
> I would even add here default y which can shorten defconfigs and you can
> disable it if you don't want it.
> What do you think?
>
That sounds like a good idea to me.
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 0/3] Some Kconfig move/fixups
2016-07-25 13:06 [U-Boot] [PATCH 0/3] Some Kconfig move/fixups Masahiro Yamada
` (2 preceding siblings ...)
2016-07-25 13:06 ` [U-Boot] [PATCH 3/3] arm64: thunderx_88xx_defconfig: remove unneeded CONFIG_SYS_EXTRA_OPTIONS Masahiro Yamada
@ 2016-07-25 14:55 ` Tom Rini
2016-07-31 16:24 ` Masahiro Yamada
3 siblings, 1 reply; 16+ messages in thread
From: Tom Rini @ 2016-07-25 14:55 UTC (permalink / raw)
To: u-boot
On Mon, Jul 25, 2016 at 10:06:05PM +0900, Masahiro Yamada wrote:
>
> Masahiro Yamada (3):
> cmd: bootz: make CMD_BOOTZ depend on CMD_BOOTM
> cmd: booti: move CONFIG_CMD_BOOTI to Kconfig
After a quick skim of the code, I think we could split bootz/booti into
cmd/boot[zi].c and this I think might have been why I didn't make sure
that CMD_BOOT[ZI] depended on CMD_BOOTM in the first place. Can you
re-work them that way? Thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160725/d964782b/attachment.sig>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 3/3] arm64: thunderx_88xx_defconfig: remove unneeded CONFIG_SYS_EXTRA_OPTIONS
2016-07-25 13:06 ` [U-Boot] [PATCH 3/3] arm64: thunderx_88xx_defconfig: remove unneeded CONFIG_SYS_EXTRA_OPTIONS Masahiro Yamada
@ 2016-07-25 14:56 ` Tom Rini
2016-07-26 2:33 ` [U-Boot] [U-Boot, " Tom Rini
1 sibling, 0 replies; 16+ messages in thread
From: Tom Rini @ 2016-07-25 14:56 UTC (permalink / raw)
To: u-boot
On Mon, Jul 25, 2016 at 10:06:08PM +0900, Masahiro Yamada wrote:
> ARM64 is correctly select'ed in arch/arm/Kconfig, so this line in
> the defconfig is unneeded.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160725/6529bafe/attachment.sig>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [U-Boot, 3/3] arm64: thunderx_88xx_defconfig: remove unneeded CONFIG_SYS_EXTRA_OPTIONS
2016-07-25 13:06 ` [U-Boot] [PATCH 3/3] arm64: thunderx_88xx_defconfig: remove unneeded CONFIG_SYS_EXTRA_OPTIONS Masahiro Yamada
2016-07-25 14:56 ` Tom Rini
@ 2016-07-26 2:33 ` Tom Rini
1 sibling, 0 replies; 16+ messages in thread
From: Tom Rini @ 2016-07-26 2:33 UTC (permalink / raw)
To: u-boot
On Mon, Jul 25, 2016 at 10:06:08PM +0900, Masahiro Yamada wrote:
> ARM64 is correctly select'ed in arch/arm/Kconfig, so this line in
> the defconfig is unneeded.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160725/02248ed1/attachment.sig>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 1/3] cmd: bootz: make CMD_BOOTZ depend on CMD_BOOTM
2016-07-25 13:17 ` Robert P. J. Day
@ 2016-07-26 4:15 ` Masahiro Yamada
0 siblings, 0 replies; 16+ messages in thread
From: Masahiro Yamada @ 2016-07-26 4:15 UTC (permalink / raw)
To: u-boot
Hi Robert,
2016-07-25 22:17 GMT+09:00 Robert P. J. Day <rpjday@crashcourse.ca>:
> On Mon, 25 Jul 2016, Masahiro Yamada wrote:
>
>> The "bootz" command is implemented in the "bootm", so the dependency
>> should be reflected in Kconfig.
>>
>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>> ---
>>
>> Kconfig | 1 +
>> cmd/Kconfig | 1 +
>> 2 files changed, 2 insertions(+)
>>
>> diff --git a/Kconfig b/Kconfig
>> index ef12f9f..0d6afd2 100644
>> --- a/Kconfig
>> +++ b/Kconfig
>> @@ -57,6 +57,7 @@ config DISTRO_DEFAULTS
>> bool "Select defaults suitable for booting general purpose Linux distributions"
>> default y if ARCH_SUNXI
>> default n
>> + select CMD_BOOTM
>> select CMD_BOOTZ
>> select CMD_DHCP
>> select CMD_EXT2
>> diff --git a/cmd/Kconfig b/cmd/Kconfig
>> index d69b817..171114d 100644
>> --- a/cmd/Kconfig
>> +++ b/cmd/Kconfig
>> @@ -162,6 +162,7 @@ config CMD_BOOTM
>>
>> config CMD_BOOTZ
>> bool "bootz"
>> + depends on CMD_BOOTM
>> help
>> Boot the Linux zImage
>
> if bootz already depends on bootm, why then do you need to select
> both?
>
To avoid unmet dependency.
I recommend you to read Linux's Documentation/kbuild/kconfig-language.txt,
especially the following part:
- reverse dependencies: "select" <symbol> ["if" <expr>]
While normal dependencies reduce the upper limit of a symbol (see
below), reverse dependencies can be used to force a lower limit of
another symbol. The value of the current menu symbol is used as the
minimal value <symbol> can be set to. If <symbol> is selected multiple
times, the limit is set to the largest selection.
Reverse dependencies can only be used with boolean or tristate
symbols.
Note:
select should be used with care. select will force
a symbol to a value without visiting the dependencies.
By abusing select you are able to select a symbol FOO even
if FOO depends on BAR that is not set.
In general use select only for non-visible symbols
(no prompts anywhere) and for symbols with no dependencies.
That will limit the usefulness but on the other hand avoid
the illegal configurations all over.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 0/3] Some Kconfig move/fixups
2016-07-25 14:55 ` [U-Boot] [PATCH 0/3] Some Kconfig move/fixups Tom Rini
@ 2016-07-31 16:24 ` Masahiro Yamada
2016-07-31 17:21 ` Tom Rini
0 siblings, 1 reply; 16+ messages in thread
From: Masahiro Yamada @ 2016-07-31 16:24 UTC (permalink / raw)
To: u-boot
Hi Tom,
2016-07-25 23:55 GMT+09:00 Tom Rini <trini@konsulko.com>:
> On Mon, Jul 25, 2016 at 10:06:05PM +0900, Masahiro Yamada wrote:
>
>>
>> Masahiro Yamada (3):
>> cmd: bootz: make CMD_BOOTZ depend on CMD_BOOTM
>> cmd: booti: move CONFIG_CMD_BOOTI to Kconfig
>
> After a quick skim of the code, I think we could split bootz/booti into
> cmd/boot[zi].c and this I think might have been why I didn't make sure
> that CMD_BOOT[ZI] depended on CMD_BOOTM in the first place. Can you
> re-work them that way? Thanks!
>
bootz and boom are implemented
heavily depending on bootm infrastructure,
which is enabled by CONFIG_CMD_BOOTM.
./arch/mips/lib/Makefile:11:obj-$(CONFIG_CMD_BOOTM) += bootm.o
./arch/sparc/lib/Makefile:9:obj-$(CONFIG_CMD_BOOTM) += bootm.o
./arch/powerpc/lib/Makefile:32:obj-$(CONFIG_CMD_BOOTM) += bootm.o
./arch/openrisc/lib/Makefile:8:obj-$(CONFIG_CMD_BOOTM) += bootm.o
./arch/arm/lib/Makefile:29:obj-$(CONFIG_CMD_BOOTM) += bootm.o
./arch/arm/lib/Makefile:30:obj-$(CONFIG_CMD_BOOTM) += zimage.o
./arch/nios2/lib/Makefile:9:obj-$(CONFIG_CMD_BOOTM) += bootm.o
./arch/m68k/lib/Makefile:12:obj-$(CONFIG_CMD_BOOTM) += bootm.o
./arch/nds32/lib/Makefile:13:obj-$(CONFIG_CMD_BOOTM) += bootm.o
./arch/microblaze/lib/Makefile:8:obj-$(CONFIG_CMD_BOOTM) += bootm.o
./arch/sh/lib/Makefile:9:obj-$(CONFIG_CMD_BOOTM) += bootm.o
./arch/sandbox/lib/Makefile:14:obj-$(CONFIG_CMD_BOOTM) += bootm.o
./arch/x86/lib/Makefile:11:obj-$(CONFIG_CMD_BOOTM) += bootm.o
./arch/avr32/lib/Makefile:11:obj-$(CONFIG_CMD_BOOTM) += bootm.o
./arch/arc/lib/Makefile:26:obj-$(CONFIG_CMD_BOOTM) += bootm.o
./cmd/Makefile:11:obj-$(CONFIG_CMD_BOOTM) += bootm.o
./common/Makefile:28:obj-$(CONFIG_CMD_BOOTM) += bootm.o bootm_os.o
Are you requesting me to rework them entirely?
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 2/3] cmd: booti: move CONFIG_CMD_BOOTI to Kconfig
2016-07-25 13:42 ` Michal Simek
2016-07-25 14:15 ` Ryan Harkin
@ 2016-07-31 16:27 ` Masahiro Yamada
2016-07-31 17:23 ` Tom Rini
1 sibling, 1 reply; 16+ messages in thread
From: Masahiro Yamada @ 2016-07-31 16:27 UTC (permalink / raw)
To: u-boot
2016-07-25 22:42 GMT+09:00 Michal Simek <michal.simek@xilinx.com>:
> On 25.7.2016 15:06, Masahiro Yamada wrote:
>> This command is used to boot ARM64 Linux.
>>
>> I made DISTRO_DEFAULTS select this option for ARM64 to respect
>> include/config_distro_defaults.h.
>>
>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>> ---
>>
>> Kconfig | 1 +
>> cmd/Kconfig | 6 ++++++
>> configs/dragonboard410c_defconfig | 1 +
>> configs/e2220-1170_defconfig | 1 +
>> configs/hikey_defconfig | 1 +
>> configs/odroid-c2_defconfig | 1 +
>> configs/p2371-0000_defconfig | 1 +
>> configs/p2371-2180_defconfig | 1 +
>> configs/p2571_defconfig | 1 +
>> configs/p2771-0000-a02_defconfig | 1 +
>> configs/p2771-0000-b00_defconfig | 1 +
>> configs/rpi_3_defconfig | 1 +
>> configs/s32v234evb_defconfig | 1 +
>> configs/uniphier_ld11_defconfig | 1 +
>> configs/uniphier_ld20_defconfig | 1 +
>> configs/vexpress_aemv8a_dram_defconfig | 1 +
>> configs/vexpress_aemv8a_juno_defconfig | 1 +
>> configs/vexpress_aemv8a_semi_defconfig | 1 +
>> configs/xilinx_zynqmp_ep_defconfig | 1 +
>> configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
>> configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 +
>> configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
>> configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
>> configs/xilinx_zynqmp_zcu102_defconfig | 1 +
>> configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 +
>> include/config_distro_defaults.h | 3 ---
>> include/configs/uniphier.h | 1 -
>> include/configs/vexpress_aemv8a.h | 1 -
>> include/configs/xilinx_zynqmp.h | 1 -
>> 29 files changed, 30 insertions(+), 6 deletions(-)
>>
>> diff --git a/Kconfig b/Kconfig
>> index 0d6afd2..335efcd 100644
>> --- a/Kconfig
>> +++ b/Kconfig
>> @@ -59,6 +59,7 @@ config DISTRO_DEFAULTS
>> default n
>> select CMD_BOOTM
>> select CMD_BOOTZ
>> + select CMD_BOOTI if ARM64
>> select CMD_DHCP
>> select CMD_EXT2
>> select CMD_EXT4
>> diff --git a/cmd/Kconfig b/cmd/Kconfig
>> index 171114d..f7c609d 100644
>> --- a/cmd/Kconfig
>> +++ b/cmd/Kconfig
>> @@ -166,6 +166,12 @@ config CMD_BOOTZ
>> help
>> Boot the Linux zImage
>>
>> +config CMD_BOOTI
>> + bool "booti"
>> + depends on CMD_BOOTM && ARM64
>> + help
>> + Boot the Linux Image for ARM64
>
> I would even add here default y which can shorten defconfigs and you can
> disable it if you don't want it.
> What do you think?
Actually "default y" will give us shorter defconfigs.
(but not shorter than I have expected.)
I am OK with flipping the default if Tom requests v2.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 0/3] Some Kconfig move/fixups
2016-07-31 16:24 ` Masahiro Yamada
@ 2016-07-31 17:21 ` Tom Rini
2016-08-01 2:26 ` Masahiro Yamada
0 siblings, 1 reply; 16+ messages in thread
From: Tom Rini @ 2016-07-31 17:21 UTC (permalink / raw)
To: u-boot
On Mon, Aug 01, 2016 at 01:24:21AM +0900, Masahiro Yamada wrote:
> Hi Tom,
>
>
> 2016-07-25 23:55 GMT+09:00 Tom Rini <trini@konsulko.com>:
> > On Mon, Jul 25, 2016 at 10:06:05PM +0900, Masahiro Yamada wrote:
> >
> >>
> >> Masahiro Yamada (3):
> >> cmd: bootz: make CMD_BOOTZ depend on CMD_BOOTM
> >> cmd: booti: move CONFIG_CMD_BOOTI to Kconfig
> >
> > After a quick skim of the code, I think we could split bootz/booti into
> > cmd/boot[zi].c and this I think might have been why I didn't make sure
> > that CMD_BOOT[ZI] depended on CMD_BOOTM in the first place. Can you
> > re-work them that way? Thanks!
> >
>
> bootz and boom are implemented
> heavily depending on bootm infrastructure,
> which is enabled by CONFIG_CMD_BOOTM.
>
> ./arch/mips/lib/Makefile:11:obj-$(CONFIG_CMD_BOOTM) += bootm.o
> ./arch/sparc/lib/Makefile:9:obj-$(CONFIG_CMD_BOOTM) += bootm.o
> ./arch/powerpc/lib/Makefile:32:obj-$(CONFIG_CMD_BOOTM) += bootm.o
> ./arch/openrisc/lib/Makefile:8:obj-$(CONFIG_CMD_BOOTM) += bootm.o
> ./arch/arm/lib/Makefile:29:obj-$(CONFIG_CMD_BOOTM) += bootm.o
> ./arch/arm/lib/Makefile:30:obj-$(CONFIG_CMD_BOOTM) += zimage.o
> ./arch/nios2/lib/Makefile:9:obj-$(CONFIG_CMD_BOOTM) += bootm.o
> ./arch/m68k/lib/Makefile:12:obj-$(CONFIG_CMD_BOOTM) += bootm.o
> ./arch/nds32/lib/Makefile:13:obj-$(CONFIG_CMD_BOOTM) += bootm.o
> ./arch/microblaze/lib/Makefile:8:obj-$(CONFIG_CMD_BOOTM) += bootm.o
> ./arch/sh/lib/Makefile:9:obj-$(CONFIG_CMD_BOOTM) += bootm.o
> ./arch/sandbox/lib/Makefile:14:obj-$(CONFIG_CMD_BOOTM) += bootm.o
> ./arch/x86/lib/Makefile:11:obj-$(CONFIG_CMD_BOOTM) += bootm.o
> ./arch/avr32/lib/Makefile:11:obj-$(CONFIG_CMD_BOOTM) += bootm.o
> ./arch/arc/lib/Makefile:26:obj-$(CONFIG_CMD_BOOTM) += bootm.o
Right, and in the cases where bootz/booti makes sense we should also add
in:
obj-$(CONFIG_CMD_BOOTZ) += bootm.o
and a comment about common infrastructure.
> ./cmd/Makefile:11:obj-$(CONFIG_CMD_BOOTM) += bootm.o
Right, and this gets split into 3 files.
> ./common/Makefile:28:obj-$(CONFIG_CMD_BOOTM) += bootm.o bootm_os.o
And we include these also for CONFIG_CMD_BOOTZ / CMD_BOOTI. Duplicates
are OK, they get sorted, I would swear..
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160731/2a4bc077/attachment.sig>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 2/3] cmd: booti: move CONFIG_CMD_BOOTI to Kconfig
2016-07-31 16:27 ` Masahiro Yamada
@ 2016-07-31 17:23 ` Tom Rini
0 siblings, 0 replies; 16+ messages in thread
From: Tom Rini @ 2016-07-31 17:23 UTC (permalink / raw)
To: u-boot
On Mon, Aug 01, 2016 at 01:27:45AM +0900, Masahiro Yamada wrote:
> 2016-07-25 22:42 GMT+09:00 Michal Simek <michal.simek@xilinx.com>:
> > On 25.7.2016 15:06, Masahiro Yamada wrote:
> >> This command is used to boot ARM64 Linux.
> >>
> >> I made DISTRO_DEFAULTS select this option for ARM64 to respect
> >> include/config_distro_defaults.h.
> >>
> >> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> >> ---
> >>
> >> Kconfig | 1 +
> >> cmd/Kconfig | 6 ++++++
> >> configs/dragonboard410c_defconfig | 1 +
> >> configs/e2220-1170_defconfig | 1 +
> >> configs/hikey_defconfig | 1 +
> >> configs/odroid-c2_defconfig | 1 +
> >> configs/p2371-0000_defconfig | 1 +
> >> configs/p2371-2180_defconfig | 1 +
> >> configs/p2571_defconfig | 1 +
> >> configs/p2771-0000-a02_defconfig | 1 +
> >> configs/p2771-0000-b00_defconfig | 1 +
> >> configs/rpi_3_defconfig | 1 +
> >> configs/s32v234evb_defconfig | 1 +
> >> configs/uniphier_ld11_defconfig | 1 +
> >> configs/uniphier_ld20_defconfig | 1 +
> >> configs/vexpress_aemv8a_dram_defconfig | 1 +
> >> configs/vexpress_aemv8a_juno_defconfig | 1 +
> >> configs/vexpress_aemv8a_semi_defconfig | 1 +
> >> configs/xilinx_zynqmp_ep_defconfig | 1 +
> >> configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
> >> configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 +
> >> configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
> >> configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
> >> configs/xilinx_zynqmp_zcu102_defconfig | 1 +
> >> configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 +
> >> include/config_distro_defaults.h | 3 ---
> >> include/configs/uniphier.h | 1 -
> >> include/configs/vexpress_aemv8a.h | 1 -
> >> include/configs/xilinx_zynqmp.h | 1 -
> >> 29 files changed, 30 insertions(+), 6 deletions(-)
> >>
> >> diff --git a/Kconfig b/Kconfig
> >> index 0d6afd2..335efcd 100644
> >> --- a/Kconfig
> >> +++ b/Kconfig
> >> @@ -59,6 +59,7 @@ config DISTRO_DEFAULTS
> >> default n
> >> select CMD_BOOTM
> >> select CMD_BOOTZ
> >> + select CMD_BOOTI if ARM64
> >> select CMD_DHCP
> >> select CMD_EXT2
> >> select CMD_EXT4
> >> diff --git a/cmd/Kconfig b/cmd/Kconfig
> >> index 171114d..f7c609d 100644
> >> --- a/cmd/Kconfig
> >> +++ b/cmd/Kconfig
> >> @@ -166,6 +166,12 @@ config CMD_BOOTZ
> >> help
> >> Boot the Linux zImage
> >>
> >> +config CMD_BOOTI
> >> + bool "booti"
> >> + depends on CMD_BOOTM && ARM64
> >> + help
> >> + Boot the Linux Image for ARM64
> >
> > I would even add here default y which can shorten defconfigs and you can
> > disable it if you don't want it.
> > What do you think?
>
>
> Actually "default y" will give us shorter defconfigs.
> (but not shorter than I have expected.)
>
> I am OK with flipping the default if Tom requests v2.
Yes please, make it default on ARM64. And similarly bootz on the
architectures that support it (which is just ARM and SANDBOX).
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160731/a8e81f41/attachment.sig>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 0/3] Some Kconfig move/fixups
2016-07-31 17:21 ` Tom Rini
@ 2016-08-01 2:26 ` Masahiro Yamada
0 siblings, 0 replies; 16+ messages in thread
From: Masahiro Yamada @ 2016-08-01 2:26 UTC (permalink / raw)
To: u-boot
2016-08-01 2:21 GMT+09:00 Tom Rini <trini@konsulko.com>:
> On Mon, Aug 01, 2016 at 01:24:21AM +0900, Masahiro Yamada wrote:
>> Hi Tom,
>>
>>
>> 2016-07-25 23:55 GMT+09:00 Tom Rini <trini@konsulko.com>:
>> > On Mon, Jul 25, 2016 at 10:06:05PM +0900, Masahiro Yamada wrote:
>> >
>> >>
>> >> Masahiro Yamada (3):
>> >> cmd: bootz: make CMD_BOOTZ depend on CMD_BOOTM
>> >> cmd: booti: move CONFIG_CMD_BOOTI to Kconfig
>> >
>> > After a quick skim of the code, I think we could split bootz/booti into
>> > cmd/boot[zi].c and this I think might have been why I didn't make sure
>> > that CMD_BOOT[ZI] depended on CMD_BOOTM in the first place. Can you
>> > re-work them that way? Thanks!
>> >
>>
>> bootz and boom are implemented
>> heavily depending on bootm infrastructure,
>> which is enabled by CONFIG_CMD_BOOTM.
>>
>> ./arch/mips/lib/Makefile:11:obj-$(CONFIG_CMD_BOOTM) += bootm.o
>> ./arch/sparc/lib/Makefile:9:obj-$(CONFIG_CMD_BOOTM) += bootm.o
>> ./arch/powerpc/lib/Makefile:32:obj-$(CONFIG_CMD_BOOTM) += bootm.o
>> ./arch/openrisc/lib/Makefile:8:obj-$(CONFIG_CMD_BOOTM) += bootm.o
>> ./arch/arm/lib/Makefile:29:obj-$(CONFIG_CMD_BOOTM) += bootm.o
>> ./arch/arm/lib/Makefile:30:obj-$(CONFIG_CMD_BOOTM) += zimage.o
>> ./arch/nios2/lib/Makefile:9:obj-$(CONFIG_CMD_BOOTM) += bootm.o
>> ./arch/m68k/lib/Makefile:12:obj-$(CONFIG_CMD_BOOTM) += bootm.o
>> ./arch/nds32/lib/Makefile:13:obj-$(CONFIG_CMD_BOOTM) += bootm.o
>> ./arch/microblaze/lib/Makefile:8:obj-$(CONFIG_CMD_BOOTM) += bootm.o
>> ./arch/sh/lib/Makefile:9:obj-$(CONFIG_CMD_BOOTM) += bootm.o
>> ./arch/sandbox/lib/Makefile:14:obj-$(CONFIG_CMD_BOOTM) += bootm.o
>> ./arch/x86/lib/Makefile:11:obj-$(CONFIG_CMD_BOOTM) += bootm.o
>> ./arch/avr32/lib/Makefile:11:obj-$(CONFIG_CMD_BOOTM) += bootm.o
>> ./arch/arc/lib/Makefile:26:obj-$(CONFIG_CMD_BOOTM) += bootm.o
>
> Right, and in the cases where bootz/booti makes sense we should also add
> in:
> obj-$(CONFIG_CMD_BOOTZ) += bootm.o
> and a comment about common infrastructure.
>
>> ./cmd/Makefile:11:obj-$(CONFIG_CMD_BOOTM) += bootm.o
>
> Right, and this gets split into 3 files.
>
>> ./common/Makefile:28:obj-$(CONFIG_CMD_BOOTM) += bootm.o bootm_os.o
>
> And we include these also for CONFIG_CMD_BOOTZ / CMD_BOOTI. Duplicates
> are OK, they get sorted, I would swear..
>
I'd hand over this task to somebody.
This is too much burden for me
and I do not volunteer to what I do not want to do.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2016-08-01 2:26 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-25 13:06 [U-Boot] [PATCH 0/3] Some Kconfig move/fixups Masahiro Yamada
2016-07-25 13:06 ` [U-Boot] [PATCH 1/3] cmd: bootz: make CMD_BOOTZ depend on CMD_BOOTM Masahiro Yamada
2016-07-25 13:17 ` Robert P. J. Day
2016-07-26 4:15 ` Masahiro Yamada
2016-07-25 13:06 ` [U-Boot] [PATCH 2/3] cmd: booti: move CONFIG_CMD_BOOTI to Kconfig Masahiro Yamada
2016-07-25 13:42 ` Michal Simek
2016-07-25 14:15 ` Ryan Harkin
2016-07-31 16:27 ` Masahiro Yamada
2016-07-31 17:23 ` Tom Rini
2016-07-25 13:06 ` [U-Boot] [PATCH 3/3] arm64: thunderx_88xx_defconfig: remove unneeded CONFIG_SYS_EXTRA_OPTIONS Masahiro Yamada
2016-07-25 14:56 ` Tom Rini
2016-07-26 2:33 ` [U-Boot] [U-Boot, " Tom Rini
2016-07-25 14:55 ` [U-Boot] [PATCH 0/3] Some Kconfig move/fixups Tom Rini
2016-07-31 16:24 ` Masahiro Yamada
2016-07-31 17:21 ` Tom Rini
2016-08-01 2:26 ` Masahiro Yamada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox