uboot-tools: migrate uboot-envtools to uboot-tools

Generalize and merge uboot-envtools package into uboot-tools package.
Remove existing uboot-envtools package.

Signed-off-by: Scott Mercer <TheRootEd24@gmail.com>

36 files changed, 45 insertions, 90 deletions

diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile
deleted file mode 100644
index 5b52c3b395..0000000000
--- a/package/boot/uboot-envtools/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=uboot-envtools
-PKG_DISTNAME:=u-boot
-PKG_VERSION:=2025.01
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:= \
-    https://ftp.denx.de/pub/u-boot \
-    https://mirror.cyberbits.eu/u-boot \
-    ftp://ftp.denx.de/pub/u-boot
-PKG_HASH:=cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f
-PKG_SOURCE_SUBDIR:=$(PKG_DISTNAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_DISTNAME)-$(PKG_VERSION)
-
-PKG_BUILD_DEPENDS:=fstools
-
-PKG_LICENSE:=GPL-2.0 GPL-2.0+
-PKG_LICENSE_FILES:=Licenses/README
-
-PKG_FLAGS:=nonshared
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/uboot-envtools
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=Boot Loaders
-  TITLE:=read/modify U-Boot bootloader environment
-  URL:=http://www.denx.de/wiki/U-Boot
-endef
-
-define Package/uboot-envtools/description
- This package includes tools to read and modify U-Boot bootloader environment.
-endef
-
-define Build/Configure
-	$(call Build/Compile/Default,tools-only_defconfig)
-endef
-
-define Build/Compile
-	$(call Build/Compile/Default,envtools)
-endef
-
-# We need to override the ARCH passed by buildsystem as otherwise the defconfig
-# for tools-only wont match and the includes for sandbox will be dropped
-MAKE_FLAGS += \
-	ARCH="sandbox" \
-	TARGET_CFLAGS="$(TARGET_CFLAGS)" \
-	TARGET_LDFLAGS="$(TARGET_LDFLAGS)"
-
-define Package/uboot-envtools/conffiles
-/etc/config/ubootenv
-/etc/fw_env.config
-/etc/fw_sys.config
-endef
-
-define Package/uboot-envtools/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/env/fw_printenv $(1)/usr/sbin
-	$(LN) fw_printenv $(1)/usr/sbin/fw_setenv
-	$(INSTALL_BIN) ./files/fw_printsys $(1)/usr/sbin
-	$(INSTALL_BIN) ./files/fw_setsys $(1)/usr/sbin
-	$(INSTALL_BIN) ./files/fw_loadenv $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/board.d
-	$(INSTALL_DATA) ./files/fw_defaults $(1)/etc/board.d/05_fw_defaults
-	$(INSTALL_DIR) $(1)/lib
-	$(INSTALL_DATA) ./files/uboot-envtools.sh $(1)/lib
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(if $(wildcard ./files/$(BOARD)_$(SUBTARGET)), \
-		$(INSTALL_DATA) ./files/$(BOARD)_$(SUBTARGET) \
-		$(1)/etc/uci-defaults/30_uboot-envtools, \
-		$(if $(wildcard ./files/$(BOARD)), \
-			$(INSTALL_DATA) ./files/$(BOARD) \
-			$(1)/etc/uci-defaults/30_uboot-envtools \
-		) \
-	)
-endef
-
-$(eval $(call BuildPackage,uboot-envtools))
diff --git a/package/boot/uboot-tools/Makefile b/package/boot/uboot-tools/Makefile
index 03917bd949..de738725f2 100644
--- a/package/boot/uboot-tools/Makefile
+++ b/package/boot/uboot-tools/Makefile
@@ -35,6 +35,26 @@ define Package/uboot-tools/description
 	to work with the U-Boot bootloader,
 endef
 
+define Package/uboot-envtools
+	SECTION:=utils
+	CATEGORY:=Utilities
+	SUBMENU:=Boot Loaders
+	PKG_FLAGS+=nonshared
+	TITLE:=read/modify U-Boot bootloader environment
+	URL:=http://www.denx.de/wiki/U-Boot
+endef
+
+define Package/uboot-envtools/description
+	This package includes tools to read and modify U-Boot
+	bootloader environment.
+endef
+
+define Package/uboot-envtools/conffiles
+	/etc/config/ubootenv
+	/etc/fw_env.config
+	/etc/fw_sys.config
+endef
+
 define Build/Configure
 	$(MAKE) -C $(PKG_BUILD_DIR) tools-only_defconfig
 	$(MAKE) -C $(PKG_BUILD_DIR) syncconfig
@@ -46,4 +66,29 @@ MAKE_FLAGS += \
 	TARGET_LDFLAGS="$(TARGET_LDFLAGS)"
 
 define Build/Compile
+	$(call Build/Compile/Default,envtools)
 endef
+
+define Package/uboot-envtools/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/env/fw_printenv $(1)/usr/sbin
+	$(LN) fw_printenv $(1)/usr/sbin/fw_setenv
+	$(INSTALL_BIN) ./uboot-envtools/files/fw_printsys $(1)/usr/sbin
+	$(INSTALL_BIN) ./uboot-envtools/files/fw_setsys $(1)/usr/sbin
+	$(INSTALL_BIN) ./uboot-envtools/files/fw_loadenv $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/board.d
+	$(INSTALL_DATA) ./uboot-envtools/files/fw_defaults $(1)/etc/board.d/05_fw_defaults
+	$(INSTALL_DIR) $(1)/lib
+	$(INSTALL_DATA) ./uboot-envtools/files/uboot-envtools.sh $(1)/lib
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(if $(wildcard ./uboot-envtools/files/$(BOARD)_$(SUBTARGET)), \
+		$(INSTALL_DATA) ./uboot-envtools/files/$(BOARD)_$(SUBTARGET) \
+		$(1)/etc/uci-defaults/30_uboot-envtools, \
+		$(if $(wildcard ./uboot-envtools/files/$(BOARD)), \
+			$(INSTALL_DATA) ./uboot-envtools/files/$(BOARD) \
+			$(1)/etc/uci-defaults/30_uboot-envtools \
+		) \
+	)
+endef
+
+$(eval $(call BuildPackage,uboot-envtools))
diff --git a/package/boot/uboot-envtools/patches/001-compile.patch b/package/boot/uboot-tools/patches/001-envtools-compile.patch
index 9b1b6b5d35..9b1b6b5d35 100644
--- a/package/boot/uboot-envtools/patches/001-compile.patch
+++ b/package/boot/uboot-tools/patches/001-envtools-compile.patch
diff --git a/package/boot/uboot-envtools/patches/002-Revert-tools-env-use-run-to-store-lockfile.patch b/package/boot/uboot-tools/patches/002-envtools-revert-tools-env-use-run-to-store-lockfile.patch
index e843e4252b..e843e4252b 100644
--- a/package/boot/uboot-envtools/patches/002-Revert-tools-env-use-run-to-store-lockfile.patch
+++ b/package/boot/uboot-tools/patches/002-envtools-revert-tools-env-use-run-to-store-lockfile.patch
diff --git a/package/boot/uboot-envtools/files/apm821xx b/package/boot/uboot-tools/uboot-envtools/files/apm821xx
index 1076f931bb..1076f931bb 100644
--- a/package/boot/uboot-envtools/files/apm821xx
+++ b/package/boot/uboot-tools/uboot-envtools/files/apm821xx
diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-tools/uboot-envtools/files/ath79
index dc46d5ed39..dc46d5ed39 100644
--- a/package/boot/uboot-envtools/files/ath79
+++ b/package/boot/uboot-tools/uboot-envtools/files/ath79
diff --git a/package/boot/uboot-envtools/files/cns3xxx b/package/boot/uboot-tools/uboot-envtools/files/cns3xxx
index c8cca3091d..c8cca3091d 100644
--- a/package/boot/uboot-envtools/files/cns3xxx
+++ b/package/boot/uboot-tools/uboot-envtools/files/cns3xxx
diff --git a/package/boot/uboot-envtools/files/fw_defaults b/package/boot/uboot-tools/uboot-envtools/files/fw_defaults
index 42558aaa88..42558aaa88 100644
--- a/package/boot/uboot-envtools/files/fw_defaults
+++ b/package/boot/uboot-tools/uboot-envtools/files/fw_defaults
diff --git a/package/boot/uboot-envtools/files/fw_loadenv b/package/boot/uboot-tools/uboot-envtools/files/fw_loadenv
index 9fe302ce89..9fe302ce89 100644
--- a/package/boot/uboot-envtools/files/fw_loadenv
+++ b/package/boot/uboot-tools/uboot-envtools/files/fw_loadenv
diff --git a/package/boot/uboot-envtools/files/fw_printsys b/package/boot/uboot-tools/uboot-envtools/files/fw_printsys
index 0c4c4ab257..0c4c4ab257 100644
--- a/package/boot/uboot-envtools/files/fw_printsys
+++ b/package/boot/uboot-tools/uboot-envtools/files/fw_printsys
diff --git a/package/boot/uboot-envtools/files/fw_setsys b/package/boot/uboot-tools/uboot-envtools/files/fw_setsys
index 1cdb1a70f7..1cdb1a70f7 100644
--- a/package/boot/uboot-envtools/files/fw_setsys
+++ b/package/boot/uboot-tools/uboot-envtools/files/fw_setsys
diff --git a/package/boot/uboot-envtools/files/imx_cortexa7 b/package/boot/uboot-tools/uboot-envtools/files/imx_cortexa7
index df6a436260..df6a436260 100644
--- a/package/boot/uboot-envtools/files/imx_cortexa7
+++ b/package/boot/uboot-tools/uboot-envtools/files/imx_cortexa7
diff --git a/package/boot/uboot-envtools/files/imx_cortexa9 b/package/boot/uboot-tools/uboot-envtools/files/imx_cortexa9
index c6d6d94d16..c6d6d94d16 100644
--- a/package/boot/uboot-envtools/files/imx_cortexa9
+++ b/package/boot/uboot-tools/uboot-envtools/files/imx_cortexa9
diff --git a/package/boot/uboot-envtools/files/ipq40xx b/package/boot/uboot-tools/uboot-envtools/files/ipq40xx
index 717158b042..717158b042 100644
--- a/package/boot/uboot-envtools/files/ipq40xx
+++ b/package/boot/uboot-tools/uboot-envtools/files/ipq40xx
diff --git a/package/boot/uboot-envtools/files/ipq806x b/package/boot/uboot-tools/uboot-envtools/files/ipq806x
index 443a0e13d4..443a0e13d4 100644
--- a/package/boot/uboot-envtools/files/ipq806x
+++ b/package/boot/uboot-tools/uboot-envtools/files/ipq806x
diff --git a/package/boot/uboot-envtools/files/kirkwood b/package/boot/uboot-tools/uboot-envtools/files/kirkwood
index b6b483ac4f..b6b483ac4f 100644
--- a/package/boot/uboot-envtools/files/kirkwood
+++ b/package/boot/uboot-tools/uboot-envtools/files/kirkwood
diff --git a/package/boot/uboot-envtools/files/lantiq b/package/boot/uboot-tools/uboot-envtools/files/lantiq
index 81af7e804f..81af7e804f 100644
--- a/package/boot/uboot-envtools/files/lantiq
+++ b/package/boot/uboot-tools/uboot-envtools/files/lantiq
diff --git a/package/boot/uboot-envtools/files/layerscape b/package/boot/uboot-tools/uboot-envtools/files/layerscape
index acc5a073ad..acc5a073ad 100644
--- a/package/boot/uboot-envtools/files/layerscape
+++ b/package/boot/uboot-tools/uboot-envtools/files/layerscape
diff --git a/package/boot/uboot-envtools/files/mediatek_filogic b/package/boot/uboot-tools/uboot-envtools/files/mediatek_filogic
index 8fbd4052b7..8fbd4052b7 100644
--- a/package/boot/uboot-envtools/files/mediatek_filogic
+++ b/package/boot/uboot-tools/uboot-envtools/files/mediatek_filogic
diff --git a/package/boot/uboot-envtools/files/mediatek_mt7622 b/package/boot/uboot-tools/uboot-envtools/files/mediatek_mt7622
index fd40b664e4..fd40b664e4 100644
--- a/package/boot/uboot-envtools/files/mediatek_mt7622
+++ b/package/boot/uboot-tools/uboot-envtools/files/mediatek_mt7622
diff --git a/package/boot/uboot-envtools/files/mediatek_mt7623 b/package/boot/uboot-tools/uboot-envtools/files/mediatek_mt7623
index 008aff5785..008aff5785 100644
--- a/package/boot/uboot-envtools/files/mediatek_mt7623
+++ b/package/boot/uboot-tools/uboot-envtools/files/mediatek_mt7623
diff --git a/package/boot/uboot-envtools/files/mediatek_mt7629 b/package/boot/uboot-tools/uboot-envtools/files/mediatek_mt7629
index ce09caffab..ce09caffab 100644
--- a/package/boot/uboot-envtools/files/mediatek_mt7629
+++ b/package/boot/uboot-tools/uboot-envtools/files/mediatek_mt7629
diff --git a/package/boot/uboot-envtools/files/mpc85xx b/package/boot/uboot-tools/uboot-envtools/files/mpc85xx
index a74466ab3a..a74466ab3a 100644
--- a/package/boot/uboot-envtools/files/mpc85xx
+++ b/package/boot/uboot-tools/uboot-envtools/files/mpc85xx
diff --git a/package/boot/uboot-envtools/files/mvebu b/package/boot/uboot-tools/uboot-envtools/files/mvebu
index c4ce76cf24..c4ce76cf24 100644
--- a/package/boot/uboot-envtools/files/mvebu
+++ b/package/boot/uboot-tools/uboot-envtools/files/mvebu
diff --git a/package/boot/uboot-envtools/files/mxs b/package/boot/uboot-tools/uboot-envtools/files/mxs
index fc5cd54078..fc5cd54078 100644
--- a/package/boot/uboot-envtools/files/mxs
+++ b/package/boot/uboot-tools/uboot-envtools/files/mxs
diff --git a/package/boot/uboot-envtools/files/octeon b/package/boot/uboot-tools/uboot-envtools/files/octeon
index a6faed6eb3..a6faed6eb3 100644
--- a/package/boot/uboot-envtools/files/octeon
+++ b/package/boot/uboot-tools/uboot-envtools/files/octeon
diff --git a/package/boot/uboot-envtools/files/oxnas b/package/boot/uboot-tools/uboot-envtools/files/oxnas
index bd407c67d5..bd407c67d5 100644
--- a/package/boot/uboot-envtools/files/oxnas
+++ b/package/boot/uboot-tools/uboot-envtools/files/oxnas
diff --git a/package/boot/uboot-envtools/files/pistachio b/package/boot/uboot-tools/uboot-envtools/files/pistachio
index 53515641bc..53515641bc 100644
--- a/package/boot/uboot-envtools/files/pistachio
+++ b/package/boot/uboot-tools/uboot-envtools/files/pistachio
diff --git a/package/boot/uboot-envtools/files/qoriq b/package/boot/uboot-tools/uboot-envtools/files/qoriq
index d024a7f008..d024a7f008 100644
--- a/package/boot/uboot-envtools/files/qoriq
+++ b/package/boot/uboot-tools/uboot-envtools/files/qoriq
diff --git a/package/boot/uboot-envtools/files/qualcommax_ipq50xx b/package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq50xx
index 8c3d2f55be..8c3d2f55be 100644
--- a/package/boot/uboot-envtools/files/qualcommax_ipq50xx
+++ b/package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq50xx
diff --git a/package/boot/uboot-envtools/files/qualcommax_ipq60xx b/package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq60xx
index 2dc60bebe1..2dc60bebe1 100644
--- a/package/boot/uboot-envtools/files/qualcommax_ipq60xx
+++ b/package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq60xx
diff --git a/package/boot/uboot-envtools/files/qualcommax_ipq807x b/package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq807x
index 21ec0ae5b1..21ec0ae5b1 100644
--- a/package/boot/uboot-envtools/files/qualcommax_ipq807x
+++ b/package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq807x
diff --git a/package/boot/uboot-envtools/files/ramips b/package/boot/uboot-tools/uboot-envtools/files/ramips
index 34d5b5015e..34d5b5015e 100644
--- a/package/boot/uboot-envtools/files/ramips
+++ b/package/boot/uboot-tools/uboot-envtools/files/ramips
diff --git a/package/boot/uboot-envtools/files/realtek b/package/boot/uboot-tools/uboot-envtools/files/realtek
index 055730eb27..055730eb27 100644
--- a/package/boot/uboot-envtools/files/realtek
+++ b/package/boot/uboot-tools/uboot-envtools/files/realtek
diff --git a/package/boot/uboot-envtools/files/rockchip_armv8 b/package/boot/uboot-tools/uboot-envtools/files/rockchip_armv8
index 075776a1ff..075776a1ff 100644
--- a/package/boot/uboot-envtools/files/rockchip_armv8
+++ b/package/boot/uboot-tools/uboot-envtools/files/rockchip_armv8
diff --git a/package/boot/uboot-envtools/files/uboot-envtools.sh b/package/boot/uboot-tools/uboot-envtools/files/uboot-envtools.sh
index 980c9962b1..980c9962b1 100644
--- a/package/boot/uboot-envtools/files/uboot-envtools.sh
+++ b/package/boot/uboot-tools/uboot-envtools/files/uboot-envtools.sh