From f8a5ac1a8835b9c826286469379a143ff9e532d5 Mon Sep 17 00:00:00 2001 From: Sandeep Sheriker Mallikarjun Date: Wed, 13 Sep 2017 11:51:13 -0700 Subject: [PATCH] at91: Renaming subtarget sama5d3 to sama5 Renaming at91 subtarget sama5d3 to sama5 and using at91-sama5d3_xplained as a target device in sama5 subtarget.This will enable to add other sama5d2 & sama5d4 target devices in sama5 subtraget.This will avoid code duplication when sama5d2 & sama5d4 added as different subtarget. Signed-off-by: Sandeep Sheriker Mallikarjun --- target/linux/at91/Makefile | 4 ++-- target/linux/at91/image/Makefile | 5 +++-- target/linux/at91/image/{sama5d3.mk => sama5.mk} | 3 +-- target/linux/at91/{sama5d3 => sama5}/config-default | 0 target/linux/at91/{sama5d3 => sama5}/target.mk | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) rename target/linux/at91/image/{sama5d3.mk => sama5.mk} (72%) rename target/linux/at91/{sama5d3 => sama5}/config-default (100%) rename target/linux/at91/{sama5d3 => sama5}/target.mk (52%) diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile index a3e0be7c8a1a..948419a7aa4c 100644 --- a/target/linux/at91/Makefile +++ b/target/linux/at91/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk ARCH:=arm BOARD:=at91 MAINTAINER:=Claudio Mignanti -BOARDNAME:=Atmel AT91 +BOARDNAME:=Microchip (Atmel AT91) FEATURES:=squashfs targz ext2 usb usbgadget ubifs -SUBTARGETS:=legacy sama5d3 +SUBTARGETS:=sama5 legacy KERNEL_PATCHVER:=4.4 diff --git a/target/linux/at91/image/Makefile b/target/linux/at91/image/Makefile index d1ae61484a71..6e2b6b6101a9 100644 --- a/target/linux/at91/image/Makefile +++ b/target/linux/at91/image/Makefile @@ -13,8 +13,9 @@ ifeq ($(SUBTARGET),legacy) include ./legacy.mk UBIFS_OPTS := -m 2048 -e 126KiB -c 2048 endif -ifeq ($(SUBTARGET),sama5d3) -include ./sama5d3.mk + +ifeq ($(SUBTARGET),sama5) +include ./sama5.mk UBIFS_OPTS := -m 2048 -e 124KiB -c 2048 endif diff --git a/target/linux/at91/image/sama5d3.mk b/target/linux/at91/image/sama5.mk similarity index 72% rename from target/linux/at91/image/sama5d3.mk rename to target/linux/at91/image/sama5.mk index fb02ee1bc029..11d8538dffc4 100644 --- a/target/linux/at91/image/sama5d3.mk +++ b/target/linux/at91/image/sama5.mk @@ -1,8 +1,7 @@ define Device/at91-sama5d3_xplained $(Device/evaluation-dtb) - DEVICE_TITLE := Atmel AT91SAMA5D3XPLAINED + DEVICE_TITLE := Microchip(Atmel AT91) SAMA5D3 Xplained KERNEL_SIZE := 6144k SUBPAGESIZE := 2048 endef TARGET_DEVICES += at91-sama5d3_xplained - diff --git a/target/linux/at91/sama5d3/config-default b/target/linux/at91/sama5/config-default similarity index 100% rename from target/linux/at91/sama5d3/config-default rename to target/linux/at91/sama5/config-default diff --git a/target/linux/at91/sama5d3/target.mk b/target/linux/at91/sama5/target.mk similarity index 52% rename from target/linux/at91/sama5d3/target.mk rename to target/linux/at91/sama5/target.mk index 0319f4bf0d69..7ccf30b3866b 100644 --- a/target/linux/at91/sama5d3/target.mk +++ b/target/linux/at91/sama5/target.mk @@ -1,9 +1,9 @@ -BOARDNAME:=SAMA5D3 (Cortex-A5) +BOARDNAME:=SAMA5 Xplained boards(Cortex-A5) CPU_TYPE:=cortex-a5 DEFAULT_PACKAGES += kmod-usb2 define Target/Description - Build generic firmware for SAMA5D3 AT91 platforms + Build generic firmware for Microchip(Atmel AT91) SAMA5 MPU's using the ARMv7 instruction set. endef -- 2.30.2