diff options
| -rw-r--r-- | package/boot/uboot-layerscape-armv8_32b/Makefile | 67 | ||||
| -rw-r--r-- | package/boot/uboot-layerscape/Makefile | 53 | ||||
| -rw-r--r-- | target/linux/layerscape/image/Makefile | 30 |
3 files changed, 92 insertions, 58 deletions
diff --git a/package/boot/uboot-layerscape-armv8_32b/Makefile b/package/boot/uboot-layerscape-armv8_32b/Makefile index 3d3b684dc1..415d9bdbea 100644 --- a/package/boot/uboot-layerscape-armv8_32b/Makefile +++ b/package/boot/uboot-layerscape-armv8_32b/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uboot-layerscape-armv8_32b -PKG_SOURCE_DATE:=2018-01-22 +PKG_VERSION:=lsdk-1806 PKG_RELEASE:=1 # Layerscape ARMv8 platforms use 64-bit u-boot to support both 32-bit and 64-bit @@ -17,37 +17,60 @@ PKG_RELEASE:=1 # uboot-layerscape's source code. PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/yangbolu1991/u-boot-lede.git -PKG_SOURCE_VERSION:=40a40dfd8136fcc314dd442a3b24a41b1e5652dd -PKG_MIRROR_HASH:=3dde5a33d19c573cbdce74f5d7edb6c5ca2a26a39d503c3efe5d5ad06f01e9f5 - -PKG_MAINTAINER:=Yangbo Lu <yangbo.lu@nxp.com> +PKG_SOURCE_VERSION:=a2a01facee0918bf724b4f0aec6746e2f1271519 +PKG_MIRROR_HASH:=5fcb58c14cdc934793ff315e178ad1d9d2ff55fcaac394b48ec116d1b11ca324 include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/kernel.mk - -define Package/uboot-layerscape-armv8_32b - SECTION:=boot - CATEGORY:=Boot Loaders - DEPENDS:=@TARGET_layerscape_armv8_32b - TITLE:=U-Boot for ARMv8 32-bit based Layerscape boards - DEFAULT:=y - HIDDEN:=1 + +define Package/uboot-layerscape-armv8_32b/Config + define Package/u-boot-$(1)-image + SECTION:=boot + CATEGORY:=Boot Loaders + TITLE:=$(2) + DEPENDS:=@TARGET_layerscape_armv8_32b + CONFIG:=$(3) + endef endef -define Build/Configure +define Package/uboot-layerscape-armv8_32b/ls1012ardb + TITLE:=U-Boot image for NXP LS1012ARDB + CONFIG:=ls1012ardb-uboot.bin +endef +define Package/uboot-layerscape-armv8_32b/ls1012afrdm + TITLE:=U-Boot image for NXP LS1012FRDM + CONFIG:=ls1012afrdm-uboot.bin endef -define Build/Compile +define Package/uboot-layerscape-armv8_32b/ls1043ardb + TITLE:=U-Boot image for NXP LS1043ARDB + CONFIG:=ls1043ardb-uboot.bin +endef +define Package/uboot-layerscape-armv8_32b/ls1046ardb + TITLE:=U-Boot image for NXP LS1046ARDB + CONFIG:=ls1046ardb-uboot.bin endef -define Build/InstallDev +define Build/Compile +endef + +define Package/uboot-layerscape-armv8_32b/Install + define Package/u-boot-$(1)-image/install $(INSTALL_DIR) $(STAGING_DIR_IMAGE) - $(CP) $(PKG_BUILD_DIR)/ls1043ardb-uboot.bin $(STAGING_DIR_IMAGE)/ls1043ardb-armv8_32b-uboot.bin - $(CP) $(PKG_BUILD_DIR)/ls1046ardb-uboot.bin $(STAGING_DIR_IMAGE)/ls1046ardb-armv8_32b-uboot.bin - $(CP) $(PKG_BUILD_DIR)/ls1012ardb-uboot.bin $(STAGING_DIR_IMAGE)/ls1012ardb-armv8_32b-uboot.bin - $(CP) $(PKG_BUILD_DIR)/ls1012afrdm-uboot.bin $(STAGING_DIR_IMAGE)/ls1012afrdm-armv8_32b-uboot.bin + $(CP) $(PKG_BUILD_DIR)/$(CONFIG) $(STAGING_DIR_IMAGE)/ + endef endef -$(eval $(call BuildPackage,uboot-layerscape-armv8_32b)) +UBOOTS := \ + ls1012ardb \ + ls1012afrdm \ + ls1043ardb \ + ls1046ardb + +$(foreach u,$(UBOOTS), \ + $(eval $(Package/uboot-layerscape-armv8_32b/$(u))) \ + $(eval $(call Package/uboot-layerscape-armv8_32b/Config,$(u),$(TITLE),$(CONFIG))) \ + $(eval $(call Package/uboot-layerscape-armv8_32b/Install,$(u))) \ + $(eval $(call BuildPackage,u-boot-$(u)-image)) \ +) diff --git a/package/boot/uboot-layerscape/Makefile b/package/boot/uboot-layerscape/Makefile index 1805c1f0d3..9e4079e386 100644 --- a/package/boot/uboot-layerscape/Makefile +++ b/package/boot/uboot-layerscape/Makefile @@ -6,16 +6,15 @@ # include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=uboot-layerscape -PKG_SOURCE_DATE:=2017-12-07 +PKG_VERSION:=lsdk-1806 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/qoriq-open-source/u-boot.git -PKG_SOURCE_VERSION:=9f7df1b406ff11409021cd2112beedd6b57bb600 -PKG_MIRROR_HASH:=b3756f814b731af2d03b0582ece90b2de564955b778f341fbfc34fa9bd849819 +PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/u-boot +PKG_SOURCE_VERSION:=b3f98d438eefd1b355efdec0b50af5813ff8d0e1 +PKG_MIRROR_HASH:=59e35957055658e7fdefb16b92f954356985a8191942d93f254861c75c47b32b include $(INCLUDE_DIR)/u-boot.mk include $(INCLUDE_DIR)/package.mk @@ -25,49 +24,49 @@ define U-Boot/Default BUILD_SUBTARGET:=armv8_64b BUILD_DEVICES:=$(1) UBOOT_IMAGE:=u-boot-dtb.bin - HIDDEN:=y +endef + +define U-Boot/ls1012ardb + NAME:=NXP LS1012ARDB + UBOOT_CONFIG:=ls1012ardb_qspi +endef + +define U-Boot/ls1012afrdm + NAME:=NXP LS1012AFRDM + UBOOT_CONFIG:=ls1012afrdm_qspi endef define U-Boot/ls1043ardb - NAME:=NXP ls1043ardb 64b Dev Board + NAME:=NXP LS1043ARDB endef define U-Boot/ls1046ardb - NAME:=NXP ls1046ardb 64b Dev Board + NAME:=NXP LS1046ARDB UBOOT_CONFIG:=ls1046ardb_qspi endef -define U-Boot/ls1012ardb - NAME:=NXP ls1012ardb 64b Dev Board - UBOOT_CONFIG:=ls1012ardb_qspi -endef - define U-Boot/ls1088ardb - NAME:=NXP ls1088ardb 64b Dev Board + NAME:=NXP LS1088ARDB UBOOT_CONFIG:=ls1088ardb_qspi endef define U-Boot/ls2088ardb - NAME:=NXP ls2088ardb 64b Dev Board + NAME:=NXP LS2088ARDB UBOOT_CONFIG:=ls2080ardb endef -define U-Boot/ls1012afrdm - NAME:=NXP ls1012afrdm 64b Dev Board - UBOOT_CONFIG:=ls1012afrdm_qspi -endef - UBOOT_TARGETS := \ - ls1043ardb \ - ls1046ardb \ - ls1012ardb \ - ls1088ardb \ - ls2088ardb \ - ls1012afrdm + ls1012ardb \ + ls1012afrdm \ + ls1043ardb \ + ls1046ardb \ + ls1088ardb \ + ls2088ardb define Build/InstallDev $(INSTALL_DIR) $(STAGING_DIR_IMAGE) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-$(BUILD_SUBTARGET)-uboot.bin + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) \ + $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-uboot.bin endef define Package/u-boot/install/default diff --git a/target/linux/layerscape/image/Makefile b/target/linux/layerscape/image/Makefile index 5bf094f14c..8e85f76848 100644 --- a/target/linux/layerscape/image/Makefile +++ b/target/linux/layerscape/image/Makefile @@ -15,7 +15,7 @@ define Build/append-ls-rcw endef define Build/append-ls-uboot - dd if=$(STAGING_DIR_IMAGE)/$(1)-$(SUBTARGET)-uboot.bin >> $@ + dd if=$(STAGING_DIR_IMAGE)/$(1)-uboot.bin >> $@ endef define Build/append-ls-ppa @@ -79,8 +79,11 @@ endef define Device/ls1043ardb DEVICE_TITLE := ls1043ardb-$(SUBTARGET) - DEVICE_PACKAGES += layerscape-rcw-ls1043ardb uboot-layerscape-$(SUBTARGET)-ls1043ardb \ - layerscape-fman-ls1043ardb layerscape-ppa-ls1043ardb + DEVICE_PACKAGES += layerscape-rcw-ls1043ardb layerscape-fman-ls1043ardb \ + layerscape-ppa-ls1043ardb + ifeq ($(SUBTARGET),armv8_32b) + DEVICE_PACKAGES += u-boot-ls1043ardb-image + endif DEVICE_DTS = ../../../arm64/boot/dts/freescale/fsl-ls1043a-rdb-sdk IMAGE/firmware.bin = append-ls-rcw $(1) | pad-to 1M | \ append-ls-uboot $(1) | pad-to 4M | \ @@ -94,8 +97,11 @@ TARGET_DEVICES += ls1043ardb define Device/ls1046ardb DEVICE_TITLE := ls1046ardb-$(SUBTARGET) - DEVICE_PACKAGES += layerscape-rcw-ls1046ardb uboot-layerscape-$(SUBTARGET)-ls1046ardb \ - layerscape-fman-ls1046ardb layerscape-ppa-ls1046ardb + DEVICE_PACKAGES += layerscape-rcw-ls1046ardb layerscape-fman-ls1046ardb \ + layerscape-ppa-ls1046ardb + ifeq ($(SUBTARGET),armv8_32b) + DEVICE_PACKAGES += u-boot-ls1046ardb-image + endif DEVICE_DTS = ../../../arm64/boot/dts/freescale/fsl-ls1046a-rdb-sdk FILESYSTEMS := ubifs UBIFS_OPTS := -m 1 -e 262016 -c 128 @@ -114,8 +120,11 @@ TARGET_DEVICES += ls1046ardb define Device/ls1012ardb DEVICE_TITLE := ls1012ardb-$(SUBTARGET) - DEVICE_PACKAGES += layerscape-rcw-ls1012ardb uboot-layerscape-$(SUBTARGET)-ls1012ardb \ - kmod-ppfe layerscape-ppfe layerscape-ppa-ls1012ardb + DEVICE_PACKAGES += layerscape-rcw-ls1012ardb layerscape-ppfe \ + layerscape-ppa-ls1012ardb kmod-ppfe + ifeq ($(SUBTARGET),armv8_32b) + DEVICE_PACKAGES += u-boot-ls1012ardb-image + endif DEVICE_DTS = ../../../arm64/boot/dts/freescale/fsl-ls1012a-rdb FILESYSTEMS := ubifs UBIFS_OPTS := -m 1 -e 262016 -c 128 @@ -134,8 +143,11 @@ TARGET_DEVICES += ls1012ardb define Device/ls1012afrdm DEVICE_TITLE := ls1012afrdm-$(SUBTARGET) - DEVICE_PACKAGES += layerscape-rcw-ls1012afrdm uboot-layerscape-$(SUBTARGET)-ls1012afrdm \ - kmod-ppfe layerscape-ppfe layerscape-ppa-ls1012afrdm + DEVICE_PACKAGES += layerscape-rcw-ls1012afrdm layerscape-ppfe \ + layerscape-ppa-ls1012afrdm kmod-ppfe + ifeq ($(SUBTARGET),armv8_32b) + DEVICE_PACKAGES += u-boot-ls1012afrdm-image + endif DEVICE_DTS = ../../../arm64/boot/dts/freescale/fsl-ls1012a-frdm FILESYSTEMS := ubifs UBIFS_OPTS := -m 1 -e 262016 -c 128 |