Browse Source

cmd: booti: move CONFIG_CMD_BOOTI to Kconfig

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>
Signed-off-by: Tom Rini <trini@konsulko.com>
tags/2020-06-01
Masahiro Yamada 4 years ago
committed by Tom Rini
parent
commit
2695927198
6 changed files with 8 additions and 6 deletions
  1. +1
    -0
      Kconfig
  2. +7
    -0
      cmd/Kconfig
  3. +0
    -3
      include/config_distro_defaults.h
  4. +0
    -1
      include/configs/uniphier.h
  5. +0
    -1
      include/configs/vexpress_aemv8a.h
  6. +0
    -1
      include/configs/xilinx_zynqmp.h

+ 1
- 0
Kconfig View File

@@ -58,6 +58,7 @@ config DISTRO_DEFAULTS
default y if ARCH_SUNXI
default n
select CMD_BOOTZ
select CMD_BOOTI if ARM64
select CMD_DHCP
select CMD_EXT2
select CMD_EXT4


+ 7
- 0
cmd/Kconfig View File

@@ -165,6 +165,13 @@ config CMD_BOOTZ
help
Boot the Linux zImage

config CMD_BOOTI
bool "booti"
depends on ARM64
default y
help
Boot an AArch64 Linux Kernel image from memory.

config CMD_BOOTEFI
bool "bootefi"
depends on EFI_LOADER


+ 0
- 3
include/config_distro_defaults.h View File

@@ -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


+ 0
- 1
include/configs/uniphier.h View File

@@ -189,7 +189,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"


+ 0
- 1
include/configs/vexpress_aemv8a.h View File

@@ -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


+ 0
- 1
include/configs/xilinx_zynqmp.h View File

@@ -205,7 +205,6 @@

#define CONFIG_SYS_BOOTM_LEN (60 * 1024 * 1024)

#define CONFIG_CMD_BOOTI
#define CONFIG_CMD_UNZIP

#define CONFIG_BOARD_EARLY_INIT_R