Skip to content
Snippets Groups Projects
Commit c20ae2ff authored by Heiko Schocher's avatar Heiko Schocher Committed by Tom Rini
Browse files

spl: move SPL_OS_BOOT to Kconfig


Move SPL_OS_BOOT to Kconfig and cleanup existing
uses.

Signed-off-by: default avatarHeiko Schocher <hs@denx.de>
parent 2b2c6e51
No related branches found
No related tags found
No related merge requests found
Showing
with 20 additions and 2 deletions
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_AM33XX=y CONFIG_AM33XX=y
CONFIG_TARGET_PENGWYN=y
CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
...@@ -13,6 +12,7 @@ CONFIG_SPL_NAND_SUPPORT=y ...@@ -13,6 +12,7 @@ CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y
CONFIG_TARGET_PENGWYN=y
CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y
CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y
CONFIG_VERSION_VARIABLE=y CONFIG_VERSION_VARIABLE=y
...@@ -21,6 +21,7 @@ CONFIG_SPL_ETH_SUPPORT=y ...@@ -21,6 +21,7 @@ CONFIG_SPL_ETH_SUPPORT=y
CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_SUPPORT=y
CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL" CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL"
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
......
...@@ -5,6 +5,7 @@ CONFIG_TARGET_TWISTER=y ...@@ -5,6 +5,7 @@ CONFIG_TARGET_TWISTER=y
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_BOOTDELAY=10 CONFIG_BOOTDELAY=10
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="twister => " CONFIG_SYS_PROMPT="twister => "
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
......
...@@ -13,6 +13,7 @@ CONFIG_SPL_LOAD_FIT=y ...@@ -13,6 +13,7 @@ CONFIG_SPL_LOAD_FIT=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_CONSOLE is not set
......
...@@ -13,6 +13,7 @@ CONFIG_SPL_LOAD_FIT=y ...@@ -13,6 +13,7 @@ CONFIG_SPL_LOAD_FIT=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
......
...@@ -16,6 +16,7 @@ CONFIG_SPL_LOAD_FIT=y ...@@ -16,6 +16,7 @@ CONFIG_SPL_LOAD_FIT=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
......
...@@ -11,6 +11,7 @@ CONFIG_SPL_LOAD_FIT=y ...@@ -11,6 +11,7 @@ CONFIG_SPL_LOAD_FIT=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
......
...@@ -12,6 +12,7 @@ CONFIG_SPL_LOAD_FIT=y ...@@ -12,6 +12,7 @@ CONFIG_SPL_LOAD_FIT=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
......
...@@ -14,6 +14,7 @@ CONFIG_SPL_LOAD_FIT=y ...@@ -14,6 +14,7 @@ CONFIG_SPL_LOAD_FIT=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
......
...@@ -14,6 +14,7 @@ CONFIG_SPL_LOAD_FIT=y ...@@ -14,6 +14,7 @@ CONFIG_SPL_LOAD_FIT=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
......
...@@ -7,6 +7,7 @@ CONFIG_FIT_SIGNATURE=y ...@@ -7,6 +7,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_NO_FLASH=y CONFIG_SYS_NO_FLASH=y
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> " CONFIG_SYS_PROMPT="Zynq> "
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
......
...@@ -4,6 +4,7 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-picozed" ...@@ -4,6 +4,7 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-picozed"
CONFIG_SYS_NO_FLASH=y CONFIG_SYS_NO_FLASH=y
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> " CONFIG_SYS_PROMPT="Zynq> "
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
......
...@@ -8,6 +8,7 @@ CONFIG_FIT_SIGNATURE=y ...@@ -8,6 +8,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_NO_FLASH=y CONFIG_SYS_NO_FLASH=y
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> " CONFIG_SYS_PROMPT="Zynq> "
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
......
...@@ -8,6 +8,7 @@ CONFIG_FIT_SIGNATURE=y ...@@ -8,6 +8,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_NO_FLASH=y CONFIG_SYS_NO_FLASH=y
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> " CONFIG_SYS_PROMPT="Zynq> "
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
......
...@@ -8,6 +8,7 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010" ...@@ -8,6 +8,7 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
CONFIG_SYS_NO_FLASH=y CONFIG_SYS_NO_FLASH=y
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> " CONFIG_SYS_PROMPT="Zynq> "
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
......
...@@ -8,6 +8,7 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM011" ...@@ -8,6 +8,7 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM011"
CONFIG_SYS_NO_FLASH=y CONFIG_SYS_NO_FLASH=y
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> " CONFIG_SYS_PROMPT="Zynq> "
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
......
...@@ -7,6 +7,7 @@ CONFIG_FIT_SIGNATURE=y ...@@ -7,6 +7,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012" CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> " CONFIG_SYS_PROMPT="Zynq> "
CONFIG_CMD_GPIO=y CONFIG_CMD_GPIO=y
......
...@@ -8,6 +8,7 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013" ...@@ -8,6 +8,7 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
CONFIG_SYS_NO_FLASH=y CONFIG_SYS_NO_FLASH=y
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> " CONFIG_SYS_PROMPT="Zynq> "
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
......
...@@ -7,6 +7,7 @@ CONFIG_FIT_SIGNATURE=y ...@@ -7,6 +7,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_NO_FLASH=y CONFIG_SYS_NO_FLASH=y
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> " CONFIG_SYS_PROMPT="Zynq> "
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
......
...@@ -8,6 +8,7 @@ CONFIG_FIT_SIGNATURE=y ...@@ -8,6 +8,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_NO_FLASH=y CONFIG_SYS_NO_FLASH=y
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> " CONFIG_SYS_PROMPT="Zynq> "
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
......
...@@ -401,7 +401,6 @@ ...@@ -401,7 +401,6 @@
#define CONFIG_SPL_BSS_START_ADDR ((128 - 1) << 20) #define CONFIG_SPL_BSS_START_ADDR ((128 - 1) << 20)
#define CONFIG_SPL_BSS_MAX_SIZE (64 << 10) #define CONFIG_SPL_BSS_MAX_SIZE (64 << 10)
#define CONFIG_SPL_OS_BOOT
/* Place patched DT blob (fdt) at this address */ /* Place patched DT blob (fdt) at this address */
#define CONFIG_SYS_SPL_ARGS_ADDR 0x01800000 #define CONFIG_SYS_SPL_ARGS_ADDR 0x01800000
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment