sunxi: fix uboot install location
Install uboot files to KERNEL_BUILD_DIR instead of BIN_DIR to fix ImageBuilder. Similar fixes are necessary for many (all?) other uboot targets. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> SVN-Revision: 46605
This commit is contained in:
parent
1de658c27b
commit
58fc927889
2 changed files with 9 additions and 9 deletions
|
@ -17,7 +17,7 @@ PKG_SOURCE_URL:= \
|
||||||
|
|
||||||
PKG_MD5SUM:=3dac9a0b46fed77fc768ad3bd2d68c05
|
PKG_MD5SUM:=3dac9a0b46fed77fc768ad3bd2d68c05
|
||||||
|
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
|
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
|
||||||
|
|
||||||
PKG_LICENSE:=GPL-2.0 GPL-2.0+
|
PKG_LICENSE:=GPL-2.0 GPL-2.0+
|
||||||
PKG_LICENSE_FILES:=Licenses/README
|
PKG_LICENSE_FILES:=Licenses/README
|
||||||
|
@ -138,16 +138,16 @@ define Build/Compile
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/uboot/install/default
|
define Package/uboot/install/default
|
||||||
$(INSTALL_DIR) $(BIN_DIR)/uboot-$(BOARD)-$(1)
|
|
||||||
$(CP) $(PKG_BUILD_DIR)/u-boot.bin \
|
$(CP) $(PKG_BUILD_DIR)/u-boot.bin \
|
||||||
$(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-u-boot.bin
|
$(KERNEL_BUILD_DIR)/uboot-$(BOARD)-$(1)-u-boot.bin
|
||||||
$(CP) $(PKG_BUILD_DIR)/spl/sunxi-spl.bin \
|
$(CP) $(PKG_BUILD_DIR)/spl/sunxi-spl.bin \
|
||||||
$(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-spl.bin
|
$(KERNEL_BUILD_DIR)/uboot-$(BOARD)-$(1)-spl.bin
|
||||||
$(CP) $(PKG_BUILD_DIR)/u-boot-sunxi-with-spl.bin \
|
$(CP) $(PKG_BUILD_DIR)/u-boot-sunxi-with-spl.bin \
|
||||||
$(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-u-boot-with-spl.bin
|
$(KERNEL_BUILD_DIR)/uboot-$(BOARD)-$(1)-u-boot-with-spl.bin
|
||||||
$(CP) uEnv.txt \
|
$(CP) uEnv.txt \
|
||||||
$(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-uEnv.txt
|
$(KERNEL_BUILD_DIR)/uboot-$(BOARD)-$(1)-uEnv.txt
|
||||||
mkimage -C none -A arm -T script -d $(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-uEnv.txt $(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-boot.scr
|
mkimage -C none -A arm -T script -d $(KERNEL_BUILD_DIR)/uboot-$(BOARD)-$(1)-uEnv.txt \
|
||||||
|
$(KERNEL_BUILD_DIR)/uboot-$(BOARD)-$(1)-boot.scr
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/uboot/install/template
|
define Package/uboot/install/template
|
||||||
|
|
|
@ -32,7 +32,7 @@ define Image/Build/SDCard
|
||||||
rm -f $(KDIR)/boot.img
|
rm -f $(KDIR)/boot.img
|
||||||
mkdosfs $(KDIR)/boot.img -C $(FAT32_BLOCKS)
|
mkdosfs $(KDIR)/boot.img -C $(FAT32_BLOCKS)
|
||||||
|
|
||||||
mcopy -i $(KDIR)/boot.img $(BIN_DIR)/uboot-sunxi-$(PROFILE)/$(IMG_PREFIX)-$(PROFILE)-boot.scr ::boot.scr
|
mcopy -i $(KDIR)/boot.img $(KDIR)/uboot-sunxi-$(PROFILE)-boot.scr ::boot.scr
|
||||||
mcopy -i $(KDIR)/boot.img $(DTS_DIR)/$(2).dtb ::dtb
|
mcopy -i $(KDIR)/boot.img $(DTS_DIR)/$(2).dtb ::dtb
|
||||||
mcopy -i $(KDIR)/boot.img $(BIN_DIR)/$(IMG_PREFIX)-uImage ::uImage
|
mcopy -i $(KDIR)/boot.img $(BIN_DIR)/$(IMG_PREFIX)-uImage ::uImage
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@ define Image/Build/SDCard
|
||||||
$(KDIR)/root.$(1) \
|
$(KDIR)/root.$(1) \
|
||||||
$(CONFIG_SUNXI_SD_BOOT_PARTSIZE) \
|
$(CONFIG_SUNXI_SD_BOOT_PARTSIZE) \
|
||||||
$(CONFIG_TARGET_ROOTFS_PARTSIZE) \
|
$(CONFIG_TARGET_ROOTFS_PARTSIZE) \
|
||||||
$(BIN_DIR)/uboot-sunxi-$(PROFILE)/$(IMG_PREFIX)-$(PROFILE)-u-boot-with-spl.bin
|
$(KDIR)/uboot-sunxi-$(PROFILE)-u-boot-with-spl.bin
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Image/Build/Profile/A10-OLinuXino-Lime
|
define Image/Build/Profile/A10-OLinuXino-Lime
|
||||||
|
|
Loading…
Reference in a new issue