domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mxs: fix image build issues

Browse Source 
stage u-boot images in KERNEL_BUILD_DIR for building images
always select uboot-mxs

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau
2017-01-25 07:31:01 +01:00
parent 1c0addb156
commit 07c9bde0da
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
package/boot/uboot-mxs/Makefile
View File

@@ -6,6 +6,7 @@
# #
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_VERSION:=2016.01 PKG_VERSION:=2016.01
PKG_RELEASE:=1 PKG_RELEASE:=1
@@ -18,6 +19,8 @@ include $(INCLUDE_DIR)/package.mk
define U-Boot/Default define U-Boot/Default
BUILD_TARGET:=mxs BUILD_TARGET:=mxs
UBOOT_IMAGE:=u-boot.sb UBOOT_IMAGE:=u-boot.sb
DEFAULT:=y
HIDDEN:=1
endef endef
define U-Boot/mx23_olinuxino define U-Boot/mx23_olinuxino
@@ -32,9 +35,10 @@ UBOOT_TARGETS := \
mx23_olinuxino \ mx23_olinuxino \
duckbill duckbill
define Build/Compile UBOOT_MAKE_FLAGS += $(UBOOT_IMAGE)
$(MAKE) -C $(PKG_BUILD_DIR) \
CROSS_COMPILE=$(TARGET_CROSS) $(UBOOT_IMAGE) define Build/InstallDev
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(KERNEL_BUILD_DIR)/$(BUILD_VARIANT)-$(UBOOT_IMAGE)
endef endef
$(eval $(call BuildPackage/U-Boot)) $(eval $(call BuildPackage/U-Boot))

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

@@ -40,7 +40,7 @@ define Image/Build/SDCard-vfat-ext4
./gen_sdcard_vfat_ext4.sh \ ./gen_sdcard_vfat_ext4.sh \
$(BIN_DIR)/$(2) \ $(BIN_DIR)/$(2) \
$(BIN_DIR)/uboot-mxs-$(4)/uboot-mxs-$(4).sb \ $(KDIR)/$(4)-u-boot.sb \
$(KDIR)/boot.img \ $(KDIR)/boot.img \
$(KDIR)/root.$(1) \ $(KDIR)/root.$(1) \
$(CONFIG_TARGET_BOOTFS_PARTSIZE) \ $(CONFIG_TARGET_BOOTFS_PARTSIZE) \
@@ -51,7 +51,7 @@ endef
define Image/Build/SDCard-ext4-ext4 define Image/Build/SDCard-ext4-ext4
./gen_sdcard_ext4_ext4.sh \ ./gen_sdcard_ext4_ext4.sh \
$(BIN_DIR)/$(2) \ $(BIN_DIR)/$(2) \
$(BIN_DIR)/uboot-mxs-$(4)/uboot-mxs-$(4).sb \ $(KDIR)/$(4)-u-boot.sb \
$(KDIR)/root.$(1) \ $(KDIR)/root.$(1) \
$(CONFIG_TARGET_ROOTFS_PARTSIZE) $(CONFIG_TARGET_ROOTFS_PARTSIZE)
$(call Image/Gzip,$(BIN_DIR)/$(2)) $(call Image/Gzip,$(BIN_DIR)/$(2))