diff options
author | Tom Rini | 2019-09-20 17:36:50 -0400 |
---|---|---|
committer | Tom Rini | 2019-10-04 12:21:23 -0400 |
commit | 4b0bcfa7c4ecd5d5e02c5e7d10d128a7da53414b (patch) | |
tree | 060f3586e2fd91d0c34e0cc5363f68de7f1fb720 /include | |
parent | 400b9554cc3ef6d301940d43a2a6f9c098df5fb9 (diff) |
Kconfig: Migrate CONFIG_BOOTM_* options
Migrate all of the existing OS support options that are under
CONFIG_BOOTM_* to Kconfig.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/config_defaults.h | 7 | ||||
-rw-r--r-- | include/configs/apalis-imx8.h | 2 | ||||
-rw-r--r-- | include/configs/brsmarc1.h | 5 | ||||
-rw-r--r-- | include/configs/brxre1.h | 5 | ||||
-rw-r--r-- | include/configs/cl-som-imx7.h | 4 | ||||
-rw-r--r-- | include/configs/colibri-imx6ull.h | 3 | ||||
-rw-r--r-- | include/configs/colibri-imx8x.h | 2 | ||||
-rw-r--r-- | include/configs/colibri_imx7.h | 3 | ||||
-rw-r--r-- | include/configs/imx8mq_evk.h | 1 | ||||
-rw-r--r-- | include/configs/imx8qm_mek.h | 1 | ||||
-rw-r--r-- | include/configs/imx8qxp_mek.h | 1 | ||||
-rw-r--r-- | include/configs/mx7dsabresd.h | 4 | ||||
-rw-r--r-- | include/configs/xilinx_versal_mini.h | 3 | ||||
-rw-r--r-- | include/configs/xilinx_zynqmp_mini.h | 3 | ||||
-rw-r--r-- | include/configs/zynq_cse.h | 2 |
15 files changed, 0 insertions, 46 deletions
diff --git a/include/config_defaults.h b/include/config_defaults.h index 4ed09683b65..d211a41ef29 100644 --- a/include/config_defaults.h +++ b/include/config_defaults.h @@ -9,11 +9,4 @@ #ifndef _CONFIG_DEFAULTS_H_ #define _CONFIG_DEFAULTS_H_ -/* Support bootm-ing different OSes */ -#define CONFIG_BOOTM_LINUX 1 -#define CONFIG_BOOTM_NETBSD 1 -#define CONFIG_BOOTM_PLAN9 1 -#define CONFIG_BOOTM_RTEMS 1 -#define CONFIG_BOOTM_VXWORKS 1 - #endif diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 6eb8395162b..3a8d2d40d77 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -13,8 +13,6 @@ #define CONFIG_DISPLAY_BOARDINFO_LATE -#undef CONFIG_BOOTM_NETBSD - #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define USDHC1_BASE_ADDR 0x5b010000 #define USDHC2_BASE_ADDR 0x5b020000 diff --git a/include/configs/brsmarc1.h b/include/configs/brsmarc1.h index c3eb5baacc4..19e796edb12 100644 --- a/include/configs/brsmarc1.h +++ b/include/configs/brsmarc1.h @@ -61,11 +61,6 @@ BUR_COMMON_ENV \ " bootm ${loadaddr} - ${dtbaddr}\0" #endif /* !CONFIG_SPL_BUILD*/ -/* undefine command which we not need here */ -#undef CONFIG_BOOTM_NETBSD -#undef CONFIG_BOOTM_PLAN9 -#undef CONFIG_BOOTM_RTEMS - /* Support both device trees and ATAGs. */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index 7309e7d4831..c6e308b04d0 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -58,11 +58,6 @@ BUR_COMMON_ENV \ #define CONFIG_BOOTCOMMAND "mmc dev 1; run b_default" -/* undefine command which we not need here */ -#undef CONFIG_BOOTM_NETBSD -#undef CONFIG_BOOTM_PLAN9 -#undef CONFIG_BOOTM_RTEMS - /* Support both device trees and ATAGs. */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index 7f3fdea039f..67c52d76e72 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -38,10 +38,6 @@ #define CONFIG_POWER_PFUZE3000 #define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08 -#undef CONFIG_BOOTM_NETBSD -#undef CONFIG_BOOTM_PLAN9 -#undef CONFIG_BOOTM_RTEMS - /* I2C configs */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 736717486bf..0a4f30fbaf4 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -28,9 +28,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 1 -#undef CONFIG_BOOTM_PLAN9 -#undef CONFIG_BOOTM_RTEMS - /* I2C configs */ #define CONFIG_SYS_I2C_SPEED 100000 diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 6f3c34d1ad9..69a876fee35 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -13,8 +13,6 @@ #define CONFIG_DISPLAY_BOARDINFO_LATE -#undef CONFIG_BOOTM_NETBSD - #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define USDHC1_BASE_ADDR 0x5b010000 #define USDHC2_BASE_ADDR 0x5b020000 diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 49cdd610387..4677e09b475 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -35,9 +35,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 2 #endif -#undef CONFIG_BOOTM_PLAN9 -#undef CONFIG_BOOTM_RTEMS - /* I2C configs */ #define CONFIG_SYS_I2C_MXC #define CONFIG_SYS_I2C_SPEED 100000 diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index c2113439c30..1ceec5ab5ab 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -69,7 +69,6 @@ #undef CONFIG_CMD_IMLS #undef CONFIG_CMD_CRC32 -#undef CONFIG_BOOTM_NETBSD /* ENET Config */ /* ENET1 */ diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 5a9fd57060b..7a790ef1581 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -45,7 +45,6 @@ #undef CONFIG_CMD_IMLS #undef CONFIG_CMD_CRC32 -#undef CONFIG_BOOTM_NETBSD #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define USDHC1_BASE_ADDR 0x5B010000 diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index 02c4e9f8f67..c357c7bbe6a 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -44,7 +44,6 @@ #undef CONFIG_CMD_IMLS #undef CONFIG_CMD_CRC32 -#undef CONFIG_BOOTM_NETBSD #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define USDHC1_BASE_ADDR 0x5B010000 diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 77856a8f3a4..e1f92da48ca 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -30,10 +30,6 @@ /* MMC Config*/ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#undef CONFIG_BOOTM_NETBSD -#undef CONFIG_BOOTM_PLAN9 -#undef CONFIG_BOOTM_RTEMS - /* I2C configs */ #define CONFIG_SYS_I2C_MXC #define CONFIG_SYS_I2C_SPEED 100000 diff --git a/include/configs/xilinx_versal_mini.h b/include/configs/xilinx_versal_mini.h index 4b3691b4073..d30a697a57e 100644 --- a/include/configs/xilinx_versal_mini.h +++ b/include/configs/xilinx_versal_mini.h @@ -21,9 +21,6 @@ #undef CONFIG_ZLIB #undef CONFIG_GZIP #undef CONFIG_CMD_ENV -#undef CONFIG_BOOTM_NETBSD -#undef CONFIG_BOOTM_VXWORKS -#undef CONFIG_BOOTM_LINUX /* BOOTP options */ #undef CONFIG_BOOTP_BOOTFILESIZE diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h index 7138851daef..a6922896e0e 100644 --- a/include/configs/xilinx_zynqmp_mini.h +++ b/include/configs/xilinx_zynqmp_mini.h @@ -24,9 +24,6 @@ #undef CONFIG_GZIP #undef CONFIG_CMD_ENV #undef CONFIG_SYS_INIT_SP_ADDR -#undef CONFIG_BOOTM_NETBSD -#undef CONFIG_BOOTM_VXWORKS -#undef CONFIG_BOOTM_LINUX /* BOOTP options */ #undef CONFIG_BOOTP_BOOTFILESIZE diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h index daf7d75d300..917f35b24c5 100644 --- a/include/configs/zynq_cse.h +++ b/include/configs/zynq_cse.h @@ -19,8 +19,6 @@ #undef CONFIG_GZIP #undef CONFIG_SYS_CBSIZE -#undef CONFIG_BOOTM_VXWORKS -#undef CONFIG_BOOTM_LINUX #define CONFIG_SYS_CBSIZE 1024 |