From d7dc5b1b4d12fbc23b3e19c7a5bee9b7e020d233 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Wed, 23 Oct 2024 12:19:03 +0200 Subject: [PATCH] airoha: rename subtarget from en7581 to an7581 The Airoha EN7581 got renamed to AN7581 due to move from Econet to Airoha. To save on compatibility, use both compatible for the device. Signed-off-by: Christian Marangi --- target/linux/airoha/Makefile | 2 +- .../airoha/{en7581 => an7581}/config-6.6 | 0 .../linux/airoha/{en7581 => an7581}/target.mk | 6 +++--- ...n7581-evb-emmc.dts => an7581-evb-emmc.dts} | 6 +++--- .../dts/{en7581-evb.dts => an7581-evb.dts} | 6 +++--- .../airoha/dts/{en7581.dtsi => an7581.dtsi} | 0 .../airoha/image/{en7581.mk => an7581.mk} | 20 +++++++++---------- target/linux/airoha/modules.mk | 16 +++++++-------- 8 files changed, 28 insertions(+), 28 deletions(-) rename target/linux/airoha/{en7581 => an7581}/config-6.6 (100%) rename target/linux/airoha/{en7581 => an7581}/target.mk (55%) rename target/linux/airoha/dts/{en7581-evb-emmc.dts => an7581-evb-emmc.dts} (95%) rename target/linux/airoha/dts/{en7581-evb.dts => an7581-evb.dts} (96%) rename target/linux/airoha/dts/{en7581.dtsi => an7581.dtsi} (100%) rename target/linux/airoha/image/{en7581.mk => an7581.mk} (55%) diff --git a/target/linux/airoha/Makefile b/target/linux/airoha/Makefile index 58d5f1f78a..61b7b87692 100644 --- a/target/linux/airoha/Makefile +++ b/target/linux/airoha/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk ARCH:=arm BOARD:=airoha BOARDNAME:=Airoha ARM -SUBTARGETS:=en7523 en7581 +SUBTARGETS:=en7523 an7581 FEATURES:=dt squashfs nand ramdisk gpio KERNEL_PATCHVER:=6.6 diff --git a/target/linux/airoha/en7581/config-6.6 b/target/linux/airoha/an7581/config-6.6 similarity index 100% rename from target/linux/airoha/en7581/config-6.6 rename to target/linux/airoha/an7581/config-6.6 diff --git a/target/linux/airoha/en7581/target.mk b/target/linux/airoha/an7581/target.mk similarity index 55% rename from target/linux/airoha/en7581/target.mk rename to target/linux/airoha/an7581/target.mk index d890d9ef58..1c0e8d02f6 100644 --- a/target/linux/airoha/en7581/target.mk +++ b/target/linux/airoha/an7581/target.mk @@ -1,11 +1,11 @@ ARCH:=aarch64 -SUBTARGET:=en7581 -BOARDNAME:=EN7581 +SUBTARGET:=an7581 +BOARDNAME:=AN7581 CPU_TYPE:=cortex-a53 KERNELNAME:=Image dtbs FEATURES+=pwm source-only define Target/Description - Build firmware images for Airoha en7581 ARM based boards. + Build firmware images for Airoha an7581 ARM based boards. endef diff --git a/target/linux/airoha/dts/en7581-evb-emmc.dts b/target/linux/airoha/dts/an7581-evb-emmc.dts similarity index 95% rename from target/linux/airoha/dts/en7581-evb-emmc.dts rename to target/linux/airoha/dts/an7581-evb-emmc.dts index 04c09e77b3..91d7977795 100644 --- a/target/linux/airoha/dts/en7581-evb-emmc.dts +++ b/target/linux/airoha/dts/an7581-evb-emmc.dts @@ -6,11 +6,11 @@ #include #include -#include "en7581.dtsi" +#include "an7581.dtsi" / { - model = "Airoha EN7581 Evaluation Board"; - compatible = "airoha,en7581-evb", "airoha,en7581"; + model = "Airoha AN7581 Evaluation Board"; + compatible = "airoha,an7581-evb", "airoha,an7581", "airoha,en7581"; aliases { serial0 = &uart1; diff --git a/target/linux/airoha/dts/en7581-evb.dts b/target/linux/airoha/dts/an7581-evb.dts similarity index 96% rename from target/linux/airoha/dts/en7581-evb.dts rename to target/linux/airoha/dts/an7581-evb.dts index 630cd76ae8..3cf531a29c 100644 --- a/target/linux/airoha/dts/en7581-evb.dts +++ b/target/linux/airoha/dts/an7581-evb.dts @@ -7,11 +7,11 @@ #include #include #include -#include "en7581.dtsi" +#include "an7581.dtsi" / { - model = "Airoha EN7581 Evaluation Board"; - compatible = "airoha,en7581-evb", "airoha,en7581"; + model = "Airoha AN7581 Evaluation Board"; + compatible = "airoha,an7581-evb", "airoha,an7581", "airoha,en7581"; aliases { serial0 = &uart1; diff --git a/target/linux/airoha/dts/en7581.dtsi b/target/linux/airoha/dts/an7581.dtsi similarity index 100% rename from target/linux/airoha/dts/en7581.dtsi rename to target/linux/airoha/dts/an7581.dtsi diff --git a/target/linux/airoha/image/en7581.mk b/target/linux/airoha/image/an7581.mk similarity index 55% rename from target/linux/airoha/image/en7581.mk rename to target/linux/airoha/image/an7581.mk index 7fc6b8ec0e..78918879f7 100644 --- a/target/linux/airoha/image/en7581.mk +++ b/target/linux/airoha/image/an7581.mk @@ -4,24 +4,24 @@ define Device/FitImageLzma KERNEL_NAME := Image endef -define Device/airoha_en7581-evb +define Device/airoha_an7581-evb $(call Device/FitImageLzma) DEVICE_VENDOR := Airoha - DEVICE_MODEL := EN7581 Evaluation Board (SNAND) - DEVICE_PACKAGES := kmod-leds-pwm kmod-i2c-en7581 kmod-pwm-airoha kmod-input-gpio-keys-polled - DEVICE_DTS := en7581-evb + DEVICE_MODEL := AN7581 Evaluation Board (SNAND) + DEVICE_PACKAGES := kmod-leds-pwm kmod-i2c-an7581 kmod-pwm-airoha kmod-input-gpio-keys-polled + DEVICE_DTS := an7581-evb DEVICE_DTS_DIR := ../dts DEVICE_DTS_CONFIG := config@1 KERNEL_LOADADDR := 0x80088000 IMAGE/sysupgrade.bin := append-kernel | pad-to 128k | append-rootfs | pad-rootfs | append-metadata endef -TARGET_DEVICES += airoha_en7581-evb +TARGET_DEVICES += airoha_an7581-evb -define Device/airoha_en7581-evb-emmc +define Device/airoha_an7581-evb-emmc DEVICE_VENDOR := Airoha - DEVICE_MODEL := EN7581 Evaluation Board (EMMC) - DEVICE_DTS := en7581-evb-emmc + DEVICE_MODEL := AN7581 Evaluation Board (EMMC) + DEVICE_DTS := an7581-evb-emmc DEVICE_DTS_DIR := ../dts - DEVICE_PACKAGES := kmod-i2c-en7581 + DEVICE_PACKAGES := kmod-i2c-an7581 endef -TARGET_DEVICES += airoha_en7581-evb-emmc +TARGET_DEVICES += airoha_an7581-evb-emmc diff --git a/target/linux/airoha/modules.mk b/target/linux/airoha/modules.mk index 38126d5bc4..cbefe38996 100644 --- a/target/linux/airoha/modules.mk +++ b/target/linux/airoha/modules.mk @@ -5,25 +5,25 @@ OTHER_MENU:=Other modules I2C_MT7621_MODULES:= \ CONFIG_I2C_MT7621:drivers/i2c/busses/i2c-mt7621 -define KernelPackage/i2c-en7581 +define KernelPackage/i2c-an7581 SUBMENU:=$(OTHER_MENU) $(call i2c_defaults,$(I2C_MT7621_MODULES),79) TITLE:=Airoha I2C Controller DEPENDS:=+kmod-i2c-core \ - @(TARGET_airoha_en7581) + @(TARGET_airoha_an7581) endef -define KernelPackage/i2c-en7581/description +define KernelPackage/i2c-an7581/description Kernel modules for enable mt7621 i2c controller. endef -$(eval $(call KernelPackage,i2c-en7581)) +$(eval $(call KernelPackage,i2c-an7581)) -define KernelPackage/pwm-en7581 +define KernelPackage/pwm-an7581 SUBMENU:=$(OTHER_MENU) TITLE:=Airoha EN7581 PWM - DEPENDS:=@(TARGET_airoha_en7581) + DEPENDS:=@(TARGET_airoha_an7581) KCONFIG:= \ CONFIG_PWM=y \ CONFIG_PWM_AIROHA=y \ @@ -33,10 +33,10 @@ define KernelPackage/pwm-en7581 AUTOLOAD:=$(call AutoProbe,pwm-airoha) endef -define KernelPackage/pwm-en7581/description +define KernelPackage/pwm-an7581/description Kernel module to use the PWM channel on Airoha SoC endef -$(eval $(call KernelPackage,pwm-en7581)) +$(eval $(call KernelPackage,pwm-an7581)) -- 2.30.2