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 <yangbo.lu@nxp.com>

package/boot/uboot-layerscape-armv8_32b/Makefile

@@ -7,7 +7,7 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=uboot-layerscape-32bit
+PKG_NAME:=uboot-layerscape-armv8_32b
 PKG_VERSION:=v1.0
 PKG_RELEASE:=1
 
@@ -24,11 +24,11 @@ PKG_MAINTAINER:=Jiang Yutang <jiangyutang1978@gmail.com>
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-define Package/uboot-layerscape-32b
+define Package/uboot-layerscape-armv8_32b
   SECTION:=boot
   CATEGORY:=Boot Loaders
-  DEPENDS:=@TARGET_layerscape_32b
-  TITLE:=32-bit U-Boot for Layerscape boards
+  DEPENDS:=@TARGET_layerscape_armv8_32b
+  TITLE:=U-Boot for ARMv8 32-bit based Layerscape boards
   DEFAULT:=y
   HIDDEN:=1
 endef
@@ -43,9 +43,9 @@ 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
+	$(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-32b))
+$(eval $(call BuildPackage,uboot-layerscape-armv8_32b))

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

target/linux/layerscape/32b/profiles/00-default.mk

@@ -1 +0,0 @@
-../../64b/profiles/00-default.mk

target/linux/layerscape/Makefile

@@ -12,15 +12,15 @@ DEVICE_TYPE:=developerboard
 KERNEL_PATCHVER:=4.4
 KERNELNAME:=Image dtbs
 FEATURES:=squashfs nand usb pcie gpio
-SUBTARGETS:=64b 32b
+SUBTARGETS:=armv8_64b armv8_32b
 MAINTAINER:=Yangbo Lu <yangbo.lu@nxp.com>
 
-include $(INCLUDE_DIR)/target.mk
-
 define Target/Description
-	Build firmware images for $(BOARDNAME) SoC devices.
+	Build firmware images for NXP Layerscape based boards.
 endef
 
+include $(INCLUDE_DIR)/target.mk
+
 DEFAULT_PACKAGES += kmod-usb3 kmod-usb-dwc3 kmod-usb-storage
 
 $(eval $(call BuildTarget))

target/linux/layerscape/armv8_32b/target.mk

@@ -6,9 +6,9 @@
 #
 
 ARCH:=arm
-BOARDNAME:=layerscape 32b boards
+BOARDNAME:=ARMv8 32-bit based boards
 CPU_TYPE:=cortex-a9
 
 define Target/Description
-	Build firmware images for $(BOARDNAME) SoC devices.
+	Build firmware images for NXP Layerscape ARMv8 32-bit based boards.
 endef

target/linux/layerscape/armv8_64b/profiles/00-default.mk

@@ -0,0 +1,18 @@
+define Profile/Default
+	NAME:=Default Profile
+	PRIORITY:=1
+endef
+
+define Profile/Default/Description
+	Default package set compatible with most boards.
+endef
+
+DEFAULT_PACKAGES+= \
+	rcw-layerscape-ls1043ardb uboot-layerscape-$(SUBTARGET)-ls1043ardb \
+	fman-layerscape-ls1043ardb \
+	rcw-layerscape-ls1046ardb uboot-layerscape-$(SUBTARGET)-ls1046ardb \
+	fman-layerscape-ls1046ardb \
+	rcw-layerscape-ls1012ardb uboot-layerscape-$(SUBTARGET)-ls1012ardb \
+	kmod-ppfe ppfe-ls1012ardb
+
+$(eval $(call Profile,Default))

target/linux/layerscape/armv8_64b/target.mk

@@ -6,9 +6,8 @@
 #
 
 ARCH:=aarch64
-BOARDNAME:=layerscape 64b boards
+BOARDNAME:=ARMv8 64-bit based boards
 
 define Target/Description
-	Build firmware images for $(BOARDNAME) SoC devices.
+	Build firmware images for NXP Layerscape ARMv8 64-bit based boards.
 endef
-

target/linux/layerscape/image/Makefile

@@ -37,11 +37,11 @@ define Device/Default
   DEVICE_DTS :=
   IMAGES = firmware.bin
 
-ifeq ($(SUBTARGET),64b)
+ifeq ($(SUBTARGET),armv8_64b)
   KERNEL_LOADADDR = 0x80080000
   KERNEL_ENTRY_POINT = 0x80080000
 endif
-ifeq ($(SUBTARGET),32b)
+ifeq ($(SUBTARGET),armv8_32b)
   KERNEL_LOADADDR = 0x80008000
   KERNEL_ENTRY_POINT = 0x80008000
 endif
@@ -50,12 +50,7 @@ endef
 define Device/ls1043ardb
   DEVICE_TITLE := ls1043ardb-$(SUBTARGET)
   DEVICE_PACKAGES += rcw-layerscape-ls1043ardb uboot-layerscape-$(SUBTARGET)-ls1043ardb fman-layerscape-ls1043ardb
-ifeq ($(SUBTARGET),64b)
-  DEVICE_DTS = freescale/fsl-ls1043a-rdb
-endif
-ifeq ($(SUBTARGET),32b)
   DEVICE_DTS = ../../../arm64/boot/dts/freescale/fsl-ls1043a-rdb
-endif
   IMAGE/firmware.bin = append-ls-rcw $(1) | pad-to 1M | append-ls-uboot $(1) | pad-to 3M | \
   					append-ls-fman $(1) | pad-to 4M | append-ls-dtb $$(DEVICE_DTS) | pad-to 5M | \
   					append-kernel | pad-to 10M | append-rootfs | pad-rootfs | check-size 67108865
@@ -65,12 +60,7 @@ TARGET_DEVICES += ls1043ardb
 define Device/ls1046ardb
   DEVICE_TITLE := ls1046ardb-$(SUBTARGET)
   DEVICE_PACKAGES += rcw-layerscape-ls1046ardb uboot-layerscape-$(SUBTARGET)-ls1046ardb fman-layerscape-ls1046ardb
-ifeq ($(SUBTARGET),64b)
-  DEVICE_DTS = freescale/fsl-ls1046a-rdb
-endif
-ifeq ($(SUBTARGET),32b)
   DEVICE_DTS = ../../../arm64/boot/dts/freescale/fsl-ls1046a-rdb
-endif
   IMAGE/firmware.bin = append-ls-rcw $(1) | pad-to 1M | append-ls-uboot $(1) | pad-to 3M | \
   					append-ls-fman $(1) | pad-to 4M | append-ls-dtb $$(DEVICE_DTS) | pad-to 5M | \
   					append-kernel | pad-to 10M | append-ls-rootfs-ext4 $(1) 22M | check-size 33554433
@@ -80,12 +70,7 @@ TARGET_DEVICES += ls1046ardb
 define Device/ls1012ardb
   DEVICE_TITLE := ls1012ardb-$(SUBTARGET)
   DEVICE_PACKAGES += rcw-layerscape-ls1012ardb uboot-layerscape-$(SUBTARGET)-ls1012ardb kmod-ppfe ppfe-ls1012ardb
-ifeq ($(SUBTARGET),64b)
-  DEVICE_DTS = freescale/fsl-ls1012a-rdb
-endif
-ifeq ($(SUBTARGET),32b)
   DEVICE_DTS = ../../../arm64/boot/dts/freescale/fsl-ls1012a-rdb
-endif
   IMAGE/firmware.bin = append-ls-rcw $(1) | pad-to 1M | append-ls-uboot $(1) | pad-to 3M | \
   					append-ls-dtb $$(DEVICE_DTS) | pad-to 4M | append-kernel | pad-to 9M | \
   					append-ls-rootfs-ext4 $(1) 23M | check-size 33554433
@@ -95,12 +80,7 @@ TARGET_DEVICES += ls1012ardb
 define Device/ls1088ardb
   DEVICE_TITLE := ls1088ardb-$(SUBTARGET)
   DEVICE_PACKAGES += rcw-layerscape-ls1088ardb uboot-layerscape-$(SUBTARGET)-ls1088ardb mc-binary-ls1088ardb
-ifeq ($(SUBTARGET),64b)
-  DEVICE_DTS = freescale/fsl-ls1088a-rdb
-endif
-ifeq ($(SUBTARGET),32b)
   DEVICE_DTS = ../../../arm64/boot/dts/freescale/fsl-ls1088a-rdb
-endif
   IMAGE/firmware.bin = append-ls-dtb $$(DEVICE_DTS) | pad-to 1M | append-kernel | pad-to 6M | \
   					append-ls-rootfs-ext4 $(1) 17M | check-size 24117249
 endef
@@ -109,12 +89,7 @@ TARGET_DEVICES += ls1088ardb
 define Device/ls2088ardb
   DEVICE_TITLE := ls2088ardb-$(SUBTARGET)
   DEVICE_PACKAGES += rcw-layerscape-ls2088ardb uboot-layerscape-$(SUBTARGET)-ls2088ardb mc-binary-ls2088ardb
-ifeq ($(SUBTARGET),64b)
-  DEVICE_DTS = freescale/fsl-ls2088a-rdb
-endif
-ifeq ($(SUBTARGET),32b)
   DEVICE_DTS = ../../../arm64/boot/dts/freescale/fsl-ls2088a-rdb
-endif
   IMAGE/firmware.bin = append-ls-dtb $$(DEVICE_DTS) | pad-to 1M | append-kernel | pad-to 6M | \
 					append-rootfs | pad-rootfs | check-size 24117249
 endef