From 806624add541bd828516a58aab20ae19ae9e431f Mon Sep 17 00:00:00 2001 From: Yangbo Lu Date: Thu, 29 Jun 2017 11:19:07 +0800 Subject: layerscape: rename subtargets and update makefile files Rename subtargets 32b/64b with armv8_32b/armv8_64b which are more proper, and update makefile files. There also will be other subtargets added in the future, like armv7. Signed-off-by: Yangbo Lu --- package/boot/uboot-layerscape-32b/Makefile | 51 ------------------------ package/boot/uboot-layerscape-armv8_32b/Makefile | 51 ++++++++++++++++++++++++ package/boot/uboot-layerscape/Makefile | 4 +- 3 files changed, 53 insertions(+), 53 deletions(-) delete mode 100644 package/boot/uboot-layerscape-32b/Makefile create mode 100644 package/boot/uboot-layerscape-armv8_32b/Makefile (limited to 'package') diff --git a/package/boot/uboot-layerscape-32b/Makefile b/package/boot/uboot-layerscape-32b/Makefile deleted file mode 100644 index 2ea03e5f4f..0000000000 --- a/package/boot/uboot-layerscape-32b/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (C) 2016 Jiang Yutang -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=uboot-layerscape-32bit -PKG_VERSION:=v1.0 -PKG_RELEASE:=1 - -PKG_SOURCE_PROTO:=git -PKG_MIRROR_HASH:=a29edbeddde4b3007ac349c2a5ee434719049ac4753e459dbb1bab21e1c585da -PKG_SOURCE_URL:=https://github.com/fsl-jyt/uboot-ls-32b.git -PKG_SOURCE_VERSION:=6476195551ea83193afd06d0c441483c04729c8d - -PKG_LICENSE:=GPL-2.0 GPL-2.0+ -PKG_LICENSE_FILES:=Licenses/README - -PKG_MAINTAINER:=Jiang Yutang - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/kernel.mk - -define Package/uboot-layerscape-32b - SECTION:=boot - CATEGORY:=Boot Loaders - DEPENDS:=@TARGET_layerscape_32b - TITLE:=32-bit U-Boot for Layerscape boards - DEFAULT:=y - HIDDEN:=1 -endef - -define Build/Configure - -endef - -define Build/Compile - -endef - -define Build/InstallDev - $(INSTALL_DIR) $(STAGING_DIR_IMAGE) - $(CP) $(PKG_BUILD_DIR)/ls1043ardb-uboot.bin $(STAGING_DIR_IMAGE)/ls1043ardb-32b-uboot.bin - $(CP) $(PKG_BUILD_DIR)/ls1046ardb-uboot.bin $(STAGING_DIR_IMAGE)/ls1046ardb-32b-uboot.bin - $(CP) $(PKG_BUILD_DIR)/ls1012ardb-uboot.bin.swap $(STAGING_DIR_IMAGE)/ls1012ardb-32b-uboot.bin -endef - -$(eval $(call BuildPackage,uboot-layerscape-32b)) diff --git a/package/boot/uboot-layerscape-armv8_32b/Makefile b/package/boot/uboot-layerscape-armv8_32b/Makefile new file mode 100644 index 0000000000..85e338ade4 --- /dev/null +++ b/package/boot/uboot-layerscape-armv8_32b/Makefile @@ -0,0 +1,51 @@ +# +# Copyright (C) 2016 Jiang Yutang +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=uboot-layerscape-armv8_32b +PKG_VERSION:=v1.0 +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=git +PKG_MIRROR_HASH:=a29edbeddde4b3007ac349c2a5ee434719049ac4753e459dbb1bab21e1c585da +PKG_SOURCE_URL:=https://github.com/fsl-jyt/uboot-ls-32b.git +PKG_SOURCE_VERSION:=6476195551ea83193afd06d0c441483c04729c8d + +PKG_LICENSE:=GPL-2.0 GPL-2.0+ +PKG_LICENSE_FILES:=Licenses/README + +PKG_MAINTAINER:=Jiang Yutang + +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 +endef + +define Build/Configure + +endef + +define Build/Compile + +endef + +define Build/InstallDev + $(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.swap $(STAGING_DIR_IMAGE)/ls1012ardb-armv8_32b-uboot.bin +endef + +$(eval $(call BuildPackage,uboot-layerscape-armv8_32b)) diff --git a/package/boot/uboot-layerscape/Makefile b/package/boot/uboot-layerscape/Makefile index f98205335b..f933141e89 100644 --- a/package/boot/uboot-layerscape/Makefile +++ b/package/boot/uboot-layerscape/Makefile @@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk define U-Boot/Default BUILD_TARGET:=layerscape - BUILD_SUBTARGET:=64b + BUILD_SUBTARGET:=armv8_64b BUILD_DEVICES:=$(1) UBOOT_IMAGE:=u-boot-dtb.bin HIDDEN:=y @@ -50,7 +50,7 @@ UBOOT_TARGETS := \ define Build/InstallDev $(INSTALL_DIR) $(STAGING_DIR_IMAGE) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-64b-uboot.bin + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-$(BUILD_SUBTARGET)-uboot.bin endef define Package/u-boot/install/default -- cgit v1.2.3