ast2605: remove ast2605 target machine

AST2605 will not be supported, so remove ast2605 target machines and the corresponding settings. Signed-off-by: Jamin Lin <[email protected]> Change-Id: I59c66e5a8c50c598d078734f598b888476794129
AspeedTech-BMC · Jul 5, 2022 · 2214c64 · 2214c64
1 parent 57ae241
commit 2214c64
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 125 deletions.
diff --git a/meta-aspeed-sdk/classes/image_types_phosphor_aspeed.bbclass b/meta-aspeed-sdk/classes/image_types_phosphor_aspeed.bbclass
@@ -10,11 +10,6 @@ do_generate_image_uboot_file() {
             if=${DEPLOY_DIR_IMAGE}/${FLASH_UBOOT_SPL_IMAGE}.${UBOOT_SUFFIX} \
             of=${image_dst}
         uboot_offset=${FLASH_UBOOT_SPL_SIZE}
-    elif [ ! -z ${AST2605_SSP_BINARY} ]; then
-        dd bs=1k conv=notrunc seek=${FLASH_UBOOT_OFFSET} \
-            if=${DEPLOY_DIR_IMAGE}/${AST2605_SSP_BINARY} \
-            of=${image_dst}
-        uboot_offset=${FLASH_AST2605_SSP_SIZE}
     fi
 
     dd bs=1k conv=notrunc seek=${uboot_offset} \
@@ -26,7 +21,6 @@ do_generate_image_uboot_file() {
 python do_generate_static:append() {
     uboot_offset = int(d.getVar('FLASH_UBOOT_OFFSET', True))
     spl_binary = d.getVar('SPL_BINARY', True)
-    ast2605_ssp_binary = d.getVar('AST2605_SSP_BINARY', True)
 
     if spl_binary:
         _append_image(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True),
@@ -36,13 +30,6 @@ python do_generate_static:append() {
                       int(d.getVar('FLASH_UBOOT_OFFSET', True)),
                       int(d.getVar('FLASH_UBOOT_SPL_SIZE', True)))
         uboot_offset += int(d.getVar('FLASH_UBOOT_SPL_SIZE', True))
-    elif ast2605_ssp_binary:
-        _append_image(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True),
-                                   '%s' % (
-                                    d.getVar('AST2605_SSP_BINARY', True))),
-                      int(d.getVar('FLASH_UBOOT_OFFSET', True)),
-                      int(d.getVar('FLASH_UBOOT_SPL_SIZE', True)))
-        uboot_offset += int(d.getVar('FLASH_AST2605_SSP_SIZE', True))
 
     _append_image(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True),
                                '%s.%s' % (
@@ -61,11 +48,6 @@ do_make_ubi:append() {
             if=${DEPLOY_DIR_IMAGE}/${FLASH_UBOOT_SPL_IMAGE}.${UBOOT_SUFFIX} \
             of=${IMGDEPLOYDIR}/${IMAGE_NAME}.ubi.mtd
         uboot_offset=${FLASH_UBOOT_SPL_SIZE}
-    elif [ ! -z ${AST2605_SSP_BINARY} ]; then
-        dd bs=1k conv=notrunc seek=${FLASH_UBOOT_OFFSET} \
-            if=${DEPLOY_DIR_IMAGE}/${AST2605_SSP_BINARY} \
-            of=${IMGDEPLOYDIR}/${IMAGE_NAME}.ubi.mtd
-        uboot_offset=${FLASH_AST2605_SSP_SIZE}
     fi
 
     dd bs=1k conv=notrunc seek=${uboot_offset} \
@@ -78,9 +60,3 @@ do_generate_ubi_tar[depends] += "${@bb.utils.contains('MACHINE_FEATURES', 'ast-s
 do_generate_static_tar[depends] += "${@bb.utils.contains('MACHINE_FEATURES', 'ast-secure', 'aspeed-image-secureboot:do_deploy', '', d)}"
 do_generate_ext4_tar[depends] += "${@bb.utils.contains('MACHINE_FEATURES', 'ast-secure', 'aspeed-image-secureboot:do_deploy', '', d)}"
 do_generate_static[depends] += "${@bb.utils.contains('MACHINE_FEATURES', 'ast-secure', 'aspeed-image-secureboot:do_deploy', '', d)}"
-
-do_make_ubi[depends] += "${@bb.utils.contains('MACHINE_FEATURES', 'ast2605-ssp', 'aspeed-image-ast2605-ssp:do_deploy', '', d)}"
-do_generate_ubi_tar[depends] += "${@bb.utils.contains('MACHINE_FEATURES', 'ast2605-ssp', 'aspeed-image-ast2605-ssp:do_deploy', '', d)}"
-do_generate_static_tar[depends] += "${@bb.utils.contains('MACHINE_FEATURES', 'ast2605-ssp', 'aspeed-image-ast2605-ssp:do_deploy', '', d)}"
-do_generate_ext4_tar[depends] += "${@bb.utils.contains('MACHINE_FEATURES', 'ast2605-ssp', 'aspeed-image-ast2605-ssp:do_deploy', '', d)}"
-do_generate_static[depends] += "${@bb.utils.contains('MACHINE_FEATURES', 'ast2605-ssp', 'aspeed-image-ast2605-ssp:do_deploy', '', d)}"
diff --git a/meta-aspeed-sdk/conf/machine/include/ast2605-ssp.inc b/meta-aspeed-sdk/conf/machine/include/ast2605-ssp.inc
diff --git a/meta-aspeed-sdk/meta-ast2600-sdk/conf/machine/ast2605-default.conf b/meta-aspeed-sdk/meta-ast2600-sdk/conf/machine/ast2605-default.conf
diff --git a/meta-aspeed-sdk/recipes-aspeed/images/aspeed-image-ast2605-ssp.bb b/meta-aspeed-sdk/recipes-aspeed/images/aspeed-image-ast2605-ssp.bb
diff --git a/meta-aspeed-sdk/recipes-aspeed/images/aspeed-image-sdk.bb b/meta-aspeed-sdk/recipes-aspeed/images/aspeed-image-sdk.bb
@@ -35,11 +35,6 @@ do_compile() {
             if=${DEPLOY_DIR_IMAGE}/${ASPEED_IMAGE_UBOOT_SPL_IMAGE}.${UBOOT_SUFFIX} \
             of=${B}/aspeed-sdk.bin
         uboot_offset=${ASPEED_IMAGE_UBOOT_SPL_SIZE_KB}
-    elif [ ! -z ${AST2605_SSP_BINARY} ] ; then
-        dd bs=1k conv=notrunc seek=${ASPEED_IMAGE_UBOOT_OFFSET_KB} \
-            if=${DEPLOY_DIR_IMAGE}/${AST2605_SSP_BINARY} \
-            of=${B}/aspeed-sdk.bin
-        uboot_offset=${FLASH_AST2605_SSP_SIZE}
     fi
 
     dd bs=1k conv=notrunc seek=${uboot_offset} \
@@ -79,7 +74,6 @@ do_deploy:ast-mmc() {
 do_compile[depends] = " \
     virtual/kernel:do_deploy \
     u-boot:do_deploy \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'ast2605-ssp', 'aspeed-image-ast2605-ssp:do_deploy', '', d)} \
     ${@bb.utils.contains('MACHINE_FEATURES', 'ast-secure', 'aspeed-image-secureboot:do_deploy', '', d)} \
     "
 do_fetch[noexec] = "1"

diff --git a/meta-aspeed-sdk/recipes-aspeed/rom-patcher/rom-patcher/meson.build b/meta-aspeed-sdk/recipes-aspeed/rom-patcher/rom-patcher/meson.build