u-boot: enable fw_printenv

package/u-boot/Makefile

@@ -113,27 +113,24 @@ do-build:
 		PATH='$(HOST_PATH)' \
 		CROSS_COMPILE='$(TARGET_CROSS)' \
 		$(MAKE))
-ifneq ($(OS_FOR_BUILD),Darwin)
 	(cd $(WRKBUILD) && env \
 		PATH='$(HOST_PATH)' \
 		CROSS_COMPILE='$(TARGET_CROSS)' \
-		$(MAKE) env)
-endif
+		$(MAKE) envtools)
 
 u-boot-install:
 	$(CP) $(WRKBUILD)/$(UBOOT) $(FW_DIR)
+	$(INSTALL_DIR) $(IDIR_U_BOOT)/etc
+	$(CP) ./files/fw_env.config $(IDIR_U_BOOT)/etc
+	$(INSTALL_DIR) $(IDIR_U_BOOT)/usr/bin
+	$(INSTALL_BIN) $(WRKBUILD)/tools/env/fw_printenv \
+		$(IDIR_U_BOOT)/usr/bin
+	cd $(IDIR_U_BOOT)/usr/bin && ln -s fw_printenv fw_setenv
 ifeq ($(ADK_TARGET_SYSTEM_ROCKPI4_PLUS),y)
 	$(CP) $(WRKBUILD)/idbloader.img $(FW_DIR)
 endif
 ifeq ($(ADK_TARGET_SYSTEM_IMGTEC_CI20),y)
 	$(CP) $(WRKBUILD)/spl/u-boot-spl.bin $(FW_DIR)
-endif
-	$(INSTALL_DIR) $(IDIR_U_BOOT)/etc
-	$(CP) ./files/fw_env.config $(IDIR_U_BOOT)/etc
-ifneq ($(OS_FOR_BUILD),Darwin)
-	$(INSTALL_DIR) $(IDIR_U_BOOT)/usr/bin
-	$(INSTALL_BIN) ./files/uboot_print_env $(IDIR_U_BOOT)/usr/bin
-	$(INSTALL_BIN) ./files/uboot_set_env $(IDIR_U_BOOT)/usr/bin
 endif
 ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y)
 	$(INSTALL_BIN) ./files/boot.script.bpi $(FW_DIR)

package/u-boot/files/fw_env.config

@@ -1 +1 @@
-/mnt/uboot.env      0x0000          0x4000
+/dev/mmcblk0		-0x20000	0x20000

package/u-boot/files/uboot_print_env

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-mount -r /dev/mmcblk0p1 /mnt
-fw_printenv "$@"
-umount /mnt

package/u-boot/files/uboot_set_env

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-mount /dev/mmcblk0p1 /mnt
-fw_setenv "$@"
-umount /mnt