Message ID | 1469451968-26992-3-git-send-email-yamada.masahiro@socionext.com |
---|---|
State | Changes Requested |
Delegated to: | Tom Rini |
Headers | show |
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
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.
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.
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).
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
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(-)