From 469f49f7957b8b02e11a4a5cd61d797eb5e7b1f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Thu, 30 Mar 2023 12:33:20 +0200 Subject: [PATCH] bsp: move octeon to subtarget structure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OpenWrt 22.03 introduced a generic subtarget for the octeon platform and moved all targets without a subtarget into it. Adjust our BSP and config to accomodate this change. Signed-off-by: Fabian Bläse --- bsp/octeon.bsp | 2 +- bsp/octeon/.config | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bsp/octeon.bsp b/bsp/octeon.bsp index aa0260e7..6d7618a1 100644 --- a/bsp/octeon.bsp +++ b/bsp/octeon.bsp @@ -2,5 +2,5 @@ chipset=octeon subtarget=generic images=( - "openwrt-${chipset}-ubnt_edgerouter-4-*" + "openwrt-${chipset}-${subtarget}-ubnt_edgerouter-4-*" ) diff --git a/bsp/octeon/.config b/bsp/octeon/.config index 9a561d24..50ce5ba2 100644 --- a/bsp/octeon/.config +++ b/bsp/octeon/.config @@ -2,10 +2,10 @@ # Do no edit manually # CONFIG_TARGET_octeon=y +CONFIG_TARGET_octeon_generic=y CONFIG_TARGET_MULTI_PROFILE=y -CONFIG_TARGET_PER_DEVICE_ROOTFS=y -CONFIG_TARGET_DEVICE_octeon_DEVICE_ubnt_edgerouter-4=y -CONFIG_TARGET_DEVICE_PACKAGES_octeon_DEVICE_ubnt_edgerouter-4="" +CONFIG_TARGET_DEVICE_octeon_generic_DEVICE_ubnt_edgerouter-4=y +CONFIG_TARGET_DEVICE_PACKAGES_octeon_generic_DEVICE_ubnt_edgerouter-4="" CONFIG_BUSYBOX_CUSTOM=y CONFIG_TARGET_PER_DEVICE_ROOTFS=y # CONFIG_BUSYBOX_CONFIG_BRCTL is not set