hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ipq40xx: copy Fritz4040 UBoot to STAGING_DIR_IMAGE 

Copy U-Boot to STAGING_DIR_IMAGE (and append it to the EVA-image from
there) to fix image generation using the image-builder.

Also remove the bootloader from DEVICE_PACKAGES and instead use the
BUILD_DEVICES directive from within the U-Boot makefile.

This fixes eva-image generation using the OpenWRT image-builder.

Signed-off-by: David Bauer <mail@david-bauer.net>
(cherry picked from commit 634c733065)
openwrt-18.06
David Bauer 2019-01-04 21:17:20 +01:00 committed by Christian Lamparter
parent 400601f0e3
commit dcfca830a8
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/boot/uboot-fritz4040/Makefile
View File

@ -21,11 +21,12 @@ include $(INCLUDE_DIR)/package.mk
define U-Boot/Default define U-Boot/Default
BUILD_TARGET:=ipq40xx BUILD_TARGET:=ipq40xx
UBOOT_IMAGE:=uboot-fritz4040.bin
endef endef
define U-Boot/fritz4040 define U-Boot/fritz4040
NAME:=FritzBox 4040 NAME:=FritzBox 4040
UBOOT_IMAGE:=uboot-fritz4040.bin
BUILD_DEVICES:=avm_fritzbox-4040
endef endef
UBOOT_CONFIGURE_VARS += USE_PRIVATE_LIBGCC=yes UBOOT_CONFIGURE_VARS += USE_PRIVATE_LIBGCC=yes
@ -45,6 +46,11 @@ define Build/Compile
(cd $(PKG_BUILD_DIR); ./fritz/fritzcreator.sh;) (cd $(PKG_BUILD_DIR); ./fritz/fritzcreator.sh;)
endef endef
define Build/InstallDev
$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
$(CP) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(UBOOT_IMAGE)
endef
define Package/u-boot/install define Package/u-boot/install
$(Package/u-boot/install/default) $(Package/u-boot/install/default)
$(INSTALL_BIN) ./files/upload-to-f4040.sh $(1)/ $(INSTALL_BIN) ./files/upload-to-f4040.sh $(1)/

4
target/linux/ipq40xx/image/Makefile
View File

@ -80,12 +80,12 @@ define Device/avm_fritzbox-4040
BOARD_NAME := fritz4040 BOARD_NAME := fritz4040
DEVICE_TITLE := AVM Fritz!Box 4040 DEVICE_TITLE := AVM Fritz!Box 4040
IMAGE_SIZE := 29753344 IMAGE_SIZE := 29753344
UBOOT_PATH := $$(BIN_DIR)/u-boot-fritz4040/uboot-fritz4040.bin UBOOT_PATH := $(STAGING_DIR_IMAGE)/uboot-fritz4040.bin
UBOOT_PARTITION_SIZE := 524288 UBOOT_PARTITION_SIZE := 524288
IMAGES = eva.bin sysupgrade.bin IMAGES = eva.bin sysupgrade.bin
IMAGE/eva.bin := append-uboot | pad-to $$$$(UBOOT_PARTITION_SIZE) | append-kernel | append-rootfs | pad-rootfs IMAGE/eva.bin := append-uboot | pad-to $$$$(UBOOT_PARTITION_SIZE) | append-kernel | append-rootfs | pad-rootfs
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata
DEVICE_PACKAGES := fritz-tffs fritz-caldata u-boot-fritz4040 DEVICE_PACKAGES := fritz-tffs fritz-caldata
endef endef
TARGET_DEVICES += avm_fritzbox-4040 TARGET_DEVICES += avm_fritzbox-4040