Browse Source

boot/uboot: drop host-python2 support

host-python2 is gone, so drop the _NEEDS_PYTHON2 logic.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Peter Korsgaard 3 years ago
parent
commit
ea6a0a60e2
3 changed files with 10 additions and 32 deletions
  1. 6 0
      Config.in.legacy
  2. 3 25
      boot/uboot/Config.in
  3. 1 7
      boot/uboot/uboot.mk

+ 6 - 0
Config.in.legacy

@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_TARGET_UBOOT_NEEDS_PYTHON2
+	bool "host-python 2.7 support for U-Boot was removed"
+	select BR2_LEGACY
+	help
+	  Option was removed together with python 2.7 support.
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS
 	bool "gst1-plugins-bad plugin libmms was removed"
 	depends on BR2_USE_WCHAR

+ 3 - 25
boot/uboot/Config.in

@@ -143,45 +143,23 @@ config BR2_TARGET_UBOOT_NEEDS_DTC
 	  Select this option if your U-Boot board configuration
 	  requires the Device Tree compiler to be available.
 
-config BR2_TARGET_UBOOT_NEEDS_PYTHON
-	bool
-
-choice
-	bool "U-Boot needs host Python"
-
-config BR2_TARGET_UBOOT_NEEDS_PYTHON_NONE
-	bool "no"
-	depends on !BR2_TARGET_UBOOT_NEEDS_PYTHON
-	help
-	  Select this option if U-Boot does not need any
-	  host python to build.
-
-config BR2_TARGET_UBOOT_NEEDS_PYTHON2
-	bool "python 2.x"
-	help
-	  Select this option if U-Boot needs a host Python 2.x
-	  interpreter. This is the case for some U-Boot
-	  configurations, prior to U-Boot 2020.01.
-
 config BR2_TARGET_UBOOT_NEEDS_PYTHON3
-	bool "python 3.x"
+	bool "U-Boot needs host python 3.x"
 	help
 	  Select this option if U-Boot needs a host Python 3.x
 	  interpreter. This is the case for some U-Boot
 	  configurations, after U-Boot 2020.01.
 
-endchoice
-
 config BR2_TARGET_UBOOT_NEEDS_PYLIBFDT
 	bool "U-Boot needs pylibfdt"
-	select BR2_TARGET_UBOOT_NEEDS_PYTHON
+	select BR2_TARGET_UBOOT_NEEDS_PYTHON3
 	help
 	  Select this option if your U-Boot board configuration
 	  requires the Python libfdt library to be available.
 
 config BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS
 	bool "U-Boot needs pyelftools"
-	select BR2_TARGET_UBOOT_NEEDS_PYTHON
+	select BR2_TARGET_UBOOT_NEEDS_PYTHON3
 	help
 	  Select this option if your U-Boot board configuration
 	  requires the Python pyelftools library to be available.

+ 1 - 7
boot/uboot/uboot.mk

@@ -207,9 +207,7 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y)
 UBOOT_DEPENDENCIES += host-dtc
 endif
 
-ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON2),y)
-UBOOT_DEPENDENCIES += host-python host-python-setuptools
-else ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y)
+ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y)
 UBOOT_DEPENDENCIES += host-python3 host-python3-setuptools
 endif
 
@@ -218,12 +216,8 @@ UBOOT_DEPENDENCIES += host-swig
 endif
 
 ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS),y)
-ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON2),y)
-UBOOT_DEPENDENCIES += host-python-pyelftools
-else ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y)
 UBOOT_DEPENDENCIES += host-python3-pyelftools
 endif
-endif
 
 ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSSL),y)
 UBOOT_DEPENDENCIES += host-openssl