From 2214c648537a275b174f01be678052456879b138 Mon Sep 17 00:00:00 2001 From: Jamin Lin Date: Mon, 4 Jul 2022 16:50:35 +0800 Subject: [PATCH] ast2605: remove ast2605 target machine AST2605 will not be supported, so remove ast2605 target machines and the corresponding settings. Signed-off-by: Jamin Lin Change-Id: I59c66e5a8c50c598d078734f598b888476794129 --- .../image_types_phosphor_aspeed.bbclass | 24 --------- .../conf/machine/include/ast2605-ssp.inc | 2 - .../conf/machine/ast2605-default.conf | 51 ------------------- .../images/aspeed-image-ast2605-ssp.bb | 38 -------------- .../recipes-aspeed/images/aspeed-image-sdk.bb | 6 --- .../rom-patcher/rom-patcher/meson.build | 4 -- 6 files changed, 125 deletions(-) delete mode 100644 meta-aspeed-sdk/conf/machine/include/ast2605-ssp.inc delete mode 100644 meta-aspeed-sdk/meta-ast2600-sdk/conf/machine/ast2605-default.conf delete mode 100644 meta-aspeed-sdk/recipes-aspeed/images/aspeed-image-ast2605-ssp.bb delete mode 100644 meta-aspeed-sdk/recipes-aspeed/rom-patcher/rom-patcher/meson.build diff --git a/meta-aspeed-sdk/classes/image_types_phosphor_aspeed.bbclass b/meta-aspeed-sdk/classes/image_types_phosphor_aspeed.bbclass index 06d7f43255d8..1c6701893525 100644 --- 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 deleted file mode 100644 index 0159ac00a44d..000000000000 --- a/meta-aspeed-sdk/conf/machine/include/ast2605-ssp.inc +++ /dev/null @@ -1,2 +0,0 @@ -MACHINE_FEATURES:append = " ast2605-ssp" - 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 deleted file mode 100644 index 3938801671b1..000000000000 --- a/meta-aspeed-sdk/meta-ast2600-sdk/conf/machine/ast2605-default.conf +++ /dev/null @@ -1,51 +0,0 @@ -require conf/machine/include/ast2600-sdk.inc -require conf/machine/include/ast-ssp.inc -require conf/machine/include/ast2605-ssp.inc - -# Overwrite flash layout -FLASH_SIZE = "65536" -FLASH_AST2605_SSP_SIZE = "64" -FLASH_UBOOT_OFFSET = "0" -FLASH_KERNEL_OFFSET = "1024" -FLASH_ROFS_OFFSET = "10240" -FLASH_RWFS_OFFSET:flash-65536 = "47104" - -# U-Boot Build Settings -UBOOT_MACHINE = "evb-ast2605_defconfig" -UBOOT_DEVICETREE = "ast2600-evb" -AST2605_SSP_BINARY = "boot.bin" - -UBOOT_ENTRYPOINT:aspeed-g6 = "0x82008000" -UBOOT_LOADADDRESS:aspeed-g6 = "0x82008000" -# We use zephyr.bin in https://github.com/AspeedTech-BMC/rom-patcher as the default ssp image. -# zephyr.bin will be patched by rom-patcher during the build process. -# If you want to use another ssp image that need to be patched by rom-patcher, please -# unmark AST2605_SSP_PATH and assign the absolute path of your unpatched ssp image. - -#AST2605_SSP_PATH = "/path/to/ssp/image.bin" - -# If you already have a patched ssp image that needn't to be patched by rom-patcher, -# please unmark AST2605_PATCHED_SSP_PATH and assign the absolute path of the patched image. - -#AST2605_PATCHED_SSP_PATH = "/path/to/patched/ssp/image.bin" - -# Kernel Build Settings -KERNEL_DEVICETREE = "aspeed-ast2600-evb.dtb" -KBUILD_DEFCONFIG = "aspeed_ast2605_defconfig" -KERNEL_EXTRA_ARGS += "ZRELADDR=0x82008000" - -MACHINE_FEATURES += "\ - obmc-phosphor-fan-mgmt \ - obmc-phosphor-chassis-mgmt \ - obmc-phosphor-flash-mgmt \ - obmc-host-ipmi \ - obmc-host-state-mgmt \ - obmc-chassis-state-mgmt \ - obmc-bmc-state-mgmt \ - " - -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-aspeed-obmc" -PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" -VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control" -VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control" - 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 deleted file mode 100644 index cbb2f5854440..000000000000 --- a/meta-aspeed-sdk/recipes-aspeed/images/aspeed-image-ast2605-ssp.bb +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION = "Generate AST2605 SSP image for ASPEED BMC SoCs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${ASPEEDSDKBASE}/LICENSE;md5=a3740bd0a194cd6dcafdc482a200a56f" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -PR = "r0" - -DEPENDS = " \ - rom-patcher-native \ - " - -do_patch[noexec] = "1" -do_configure[noexec] = "1" -do_compile[noexec] = "1" -do_install[noexec] = "1" - -inherit python3native deploy - -create_ast2605_ssp_image() { - echo "Generating AST2605 SSP Image ..." - if [ ! -z ${AST2605_PATCHED_SSP_PATH} ]; then - install ${AST2605_PATCHED_SSP_PATH} ${DEPLOY_DIR_IMAGE}/boot.bin - exit 0 - fi - - if [ ! -z ${AST2605_SSP_PATH} ]; then - rom-patcher ${AST2605_SSP_PATH} - else - rom-patcher ${DEPLOY_DIR_IMAGE}/zephyr.bin - fi - install ${S}/boot.bin ${DEPLOY_DIR_IMAGE} -} - -do_deploy () { - create_ast2605_ssp_image -} - -addtask deploy before do_build after do_compile diff --git a/meta-aspeed-sdk/recipes-aspeed/images/aspeed-image-sdk.bb b/meta-aspeed-sdk/recipes-aspeed/images/aspeed-image-sdk.bb index dfd0babd648a..faacf6b4409b 100644 --- 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 deleted file mode 100644 index 320dafc8074e..000000000000 --- a/meta-aspeed-sdk/recipes-aspeed/rom-patcher/rom-patcher/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -project('rom-patcher', 'c', version: '1.0.0') - -executable('rom-patcher', ['opcode.c', 'ddr4_init.c', 'bootloader.c', 'main.c'], install: true) -