airoha: move en7523 in dedicated subtarget

In preparation for EN7581 SoC support, move en7523 in dedicated
subtarget.

This is needed as EN7581 is now 64bit but en7523 is 32bit hence have
very different kernel config.

Also rename patch to a more friendly number sequence.

Link: https://github.com/openwrt/openwrt/pull/16730
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

diff --git a/target/linux/airoha/Makefile b/target/linux/airoha/Makefile
index 99ce7443ece6cda2a97d26d7b7516f69141a0716..f9ced4d45da45e211636f2742a1df985e9a803f9 100644 (file)
--- a/target/linux/airoha/Makefile
+++ b/target/linux/airoha/Makefile
@@ -3,13 +3,11 @@ include $(TOPDIR)/rules.mk
 ARCH:=arm
 BOARD:=airoha
 BOARDNAME:=Airoha ARM
-CPU_TYPE:=cortex-a7
+SUBTARGETS:=en7523
 FEATURES:=dt squashfs nand ramdisk gpio source-only
 
 KERNEL_PATCHVER:=6.6
 
 include $(INCLUDE_DIR)/target.mk
 
-KERNELNAME:=Image dtbs
-
 $(eval $(call BuildTarget))

diff --git a/target/linux/airoha/config-6.6 b/target/linux/airoha/en7523/config-6.6
similarity index 100%
rename from target/linux/airoha/config-6.6
rename to target/linux/airoha/en7523/config-6.6

diff --git a/target/linux/airoha/en7523/target.mk b/target/linux/airoha/en7523/target.mk
new file mode 100644 (file)
index 0000000..eec7bb4
--- /dev/null
+++ b/target/linux/airoha/en7523/target.mk
@@ -0,0 +1,6 @@
+ARCH:=arm
+SUBTARGET:=en7523
+BOARDNAME:=EN7523
+CPU_TYPE:=cortex-a7
+KERNELNAME:=Image dtbs
+FEATURES+=source-only
\ No newline at end of file

diff --git a/target/linux/airoha/generic/target.mk b/target/linux/airoha/generic/target.mk
deleted file mode 100644 (file)
index f5cb1fb..0000000
--- a/target/linux/airoha/generic/target.mk
+++ /dev/null
@@ -1 +0,0 @@
-BOARDNAME:=Generic

diff --git a/target/linux/airoha/image/Makefile b/target/linux/airoha/image/Makefile
index c6def5ad653b6a83521a62f586b3e2e19c6ebfc8..dd5878bfe15ba9f34cfb04132bc0ff542f356d7d 100644 (file)
--- a/target/linux/airoha/image/Makefile
+++ b/target/linux/airoha/image/Makefile
@@ -1,12 +1,6 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-KERNEL_LOADADDR := 0x80208000
-
-define Target/Description
-       Build firmware images for Airoha EN7523 ARM based boards.
-endef
-
 # default all platform image(fit) build
 define Device/Default
   PROFILES = Default $$(DEVICE_NAME)
@@ -22,16 +16,10 @@ define Device/Default
        pad-rootfs | append-metadata
 endef
 
+include $(SUBTARGET).mk
+
 define Image/Build
        $(call Image/Build/$(1),$(1))
 endef
 
-define Device/airoha_en7523-evb
-  DEVICE_VENDOR := Airoha
-  DEVICE_MODEL := EN7523 Evaluation Board
-  DEVICE_DTS := en7523-evb
-  DEVICE_DTS_DIR := ../dts
-endef
-TARGET_DEVICES += airoha_en7523-evb
-
 $(eval $(call BuildImage))

diff --git a/target/linux/airoha/image/en7523.mk b/target/linux/airoha/image/en7523.mk
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..aca37a9923a00815c3aa3880bbf0cdc9ac63dce5 100644 (file)
--- a/target/linux/airoha/image/en7523.mk
+++ b/target/linux/airoha/image/en7523.mk
@@ -0,0 +1,13 @@
+KERNEL_LOADADDR := 0x80208000
+
+define Target/Description
+       Build firmware images for Airoha EN7523 ARM based boards.
+endef
+
+define Device/airoha_en7523-evb
+  DEVICE_VENDOR := Airoha
+  DEVICE_MODEL := EN7523 Evaluation Board
+  DEVICE_DTS := en7523-evb
+  DEVICE_DTS_DIR := ../dts
+endef
+TARGET_DEVICES += airoha_en7523-evb
\ No newline at end of file

diff --git a/target/linux/airoha/patches-6.6/0005-spi-Add-support-for-the-Airoha-EN7523-SoC-SPI-contro.patch b/target/linux/airoha/patches-6.6/300-spi-Add-support-for-the-Airoha-EN7523-SoC-SPI-contro.patch
similarity index 100%
rename from target/linux/airoha/patches-6.6/0005-spi-Add-support-for-the-Airoha-EN7523-SoC-SPI-contro.patch
rename to target/linux/airoha/patches-6.6/300-spi-Add-support-for-the-Airoha-EN7523-SoC-SPI-contro.patch