How to add a custom machine in flexbuild based on LSDK release

[小狼]

我根据手册执行添加ls1043anh03_tfa_defconfig和sdk.yml

CONFIG_ARM=y
CONFIG_TARGET_LS1043Anh03=y
CONFIG_TFABOOT=y
CONFIG_SYS_TEXT_BASE=0x82000000
CONFIG_NR_DRAM_BANKS=2
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0x500000
CONFIG_ENV_SECT_SIZE=0x20000
CONFIG_DM_GPIO=y
CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-nh03"
CONFIG_DISTRO_DEFAULTS=y

......

BUILD_LAYERSCAPE_IMAGE: y
CONFIG_MACHINE:
LS1012ARDB: y
LS1012AQDS: n
LS1012AFRWY: y
LS1021ATWR: y
LS1021AQDS: n
LS1028ARDB: y
LS1028AQDS: n
LS1043ARDB: y
LS1043ANH03: y

我已经添加，当我执行

$ cd components/firmware/atf

$ git checkout LSDK-21.08 -b LSDK-21.08-LS1043Anh03 或者 $ git checkout LSDK-21.08 -b LSDK-21.08-LS1043ANH03

报错

~/flexbuild_lsdk2108_github/components/firmware/atf$ git checkout LSDK-21.08 -b LSDK-21.08-LS1043Anh03
warning: refname 'LSDK-21.08' is ambiguous.
warning: refname 'LSDK-21.08' is ambiguous.
fatal: Ambiguous object name: 'LSDK-21.08'.

/flexbuild_lsdk2108_github/components/firmware/atf$ git checkout LSDK-21.08 -b LSDK-21.08-LS1043ANH03
warning: refname 'LSDK-21.08' is ambiguous.
warning: refname 'LSDK-21.08' is ambiguous.
fatal: Ambiguous object name: 'LSDK-21.08'

[khushbur]

Hi @小狼 

You are getting this error because you have LSDK-21.08 branch in both local and remote location

You can try deleting  LSDK-21.08 branch from local setup or you can run below command.

git checkout  LSDK-21.08-LS1043Anh0

Thanks

Khushbu