Browse Source

add fw_printenv/fw_setenv

Waldemar Brodkorb 10 years ago
parent
commit
3114feafb1
1 changed files with 14 additions and 2 deletions
  1. 14 2
      package/u-boot/Makefile

+ 14 - 2
package/u-boot/Makefile

@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 
 PKG_NAME:=		u-boot
 PKG_NAME:=		u-boot
 PKG_VERSION:=		2015.01
 PKG_VERSION:=		2015.01
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		383051a656ebe11757b17d38a3326387e4a1b0949ca8a9e8ee506bf71dac9fde
 PKG_HASH:=		383051a656ebe11757b17d38a3326387e4a1b0949ca8a9e8ee506bf71dac9fde
 PKG_DESCR:=		portable bootloader
 PKG_DESCR:=		portable bootloader
 PKG_SECTION:=		base/boot
 PKG_SECTION:=		base/boot
@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		u-boot-host
 PKG_URL:=		http://www.denx.de/wiki/U-Boot	
 PKG_URL:=		http://www.denx.de/wiki/U-Boot	
 PKG_SITES:=		ftp://ftp.denx.de/pub/u-boot/
 PKG_SITES:=		ftp://ftp.denx.de/pub/u-boot/
 
 
+PKG_CFLINE_U_BOOT:=	select ADK_KERNEL_ATAGS if ADK_TARGET_ARCH_ARM
+
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
 
 PKG_SYSTEM_DEPENDS:=	raspberry-pi raspberry-pi2 atmel-ngw100
 PKG_SYSTEM_DEPENDS:=	raspberry-pi raspberry-pi2 atmel-ngw100
@@ -47,7 +49,7 @@ host-build:
 		$(HOST_MAKE_FLAGS) tools $(MAKE_TRACE) )
 		$(HOST_MAKE_FLAGS) tools $(MAKE_TRACE) )
 
 
 u-boot-hostinstall:
 u-boot-hostinstall:
-	$(INSTALL_BIN) $(WRKBUILD)/tools/mkimage \
+	$(INSTALL_BIN) $(WRKBUILD)/tools/mk{,env}image \
 		$(STAGING_HOST_DIR)/usr/bin
 		$(STAGING_HOST_DIR)/usr/bin
 
 
 do-configure:
 do-configure:
@@ -56,9 +58,19 @@ do-configure:
 do-build:
 do-build:
 	(cd $(WRKBUILD) && env CROSS_COMPILE='$(TARGET_CROSS)' \
 	(cd $(WRKBUILD) && env CROSS_COMPILE='$(TARGET_CROSS)' \
 		GCC_HONOUR_COPTS=s $(MAKE))
 		GCC_HONOUR_COPTS=s $(MAKE))
+	(cd $(WRKBUILD) && env CROSS_COMPILE='$(TARGET_CROSS)' \
+		GCC_HONOUR_COPTS=s $(MAKE) env)
 
 
 u-boot-install:
 u-boot-install:
 	$(CP) $(WRKBUILD)/u-boot.bin $(FW_DIR)
 	$(CP) $(WRKBUILD)/u-boot.bin $(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 -sf fw_printenv fw_setenv)
+	$(INSTALL_BIN) ./files/uboot_print_env $(IDIR_U_BOOT)/usr/bin
+	$(INSTALL_BIN) ./files/uboot_set_env $(IDIR_U_BOOT)/usr/bin
 
 
 include $(ADK_TOPDIR)/mk/host-bottom.mk
 include $(ADK_TOPDIR)/mk/host-bottom.mk
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk