summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 08b394e)
raw | patch | inline | side by side (parent: 08b394e)
author | Badri S <badri@ti.com> | |
Fri, 30 Oct 2020 09:01:29 +0000 (14:31 +0530) | ||
committer | Sivaraj R <sivaraj@ti.com> | |
Sat, 31 Oct 2020 04:09:47 +0000 (23:09 -0500) |
To enable SBL certificate generation without ROM mmWaveBootTest
repo which had the gpKey.pem added the GP device degenrate key to
PDK repo
Signed-off-by: Badri S <badri@ti.com>
repo which had the gpKey.pem added the GP device degenrate key to
PDK repo
Signed-off-by: Badri S <badri@ti.com>
packages/ti/boot/sbl/build/sbl_img.mk | patch | blob | history | |
packages/ti/boot/sbl/src/uart/sbl_xmodem.c | patch | blob | history | |
packages/ti/boot/sbl/tools/tpr12SBLImageGen/unix/aarch64-none-elf-objcopy | [new file with mode: 0755] | patch | blob |
packages/ti/build/makerules/common.mk | [changed mode: 0755->0644] | patch | blob | history |
packages/ti/build/makerules/tpr12_gpkey.pem | [new file with mode: 0755] | patch | blob |
index af7b484f93c853b81e53b0f03fbb1d136b05dcf8..b75a3729000eded325cbedf4660ea4ea4d470d5f 100644 (file)
# Select the SBL_OBJ_COPY to use.
#
SBL_OBJ_COPY := $(TOOLCHAIN_PATH_GCC_ARCH64)/bin/$(GCC_ARCH64_BIN_PREFIX)-objcopy
-#SoCs like TPR12 do not have GCC tool. So use TI ARM CGT objcopy instead
+#SoCs like TPR12 do not have GCC tool. So we package it as part of SBL
+#TI ARM CGT objcopy does not copy .data sections correctly so cannot be used
ifeq ("$(wildcard ${TOOLCHAIN_PATH_GCC_ARCH64})","")
-SBL_OBJ_COPY := ${TOOLCHAIN_PATH_R5}/bin/armobjcopy$(EXE_EXT)
+SBL_OBJ_COPY := ${PDK_SBL_COMP_PATH}/tools/tpr12SBLImageGen/unix/aarch64-none-elf-objcopy
endif
export SBL_OBJ_COPY
diff --git a/packages/ti/boot/sbl/src/uart/sbl_xmodem.c b/packages/ti/boot/sbl/src/uart/sbl_xmodem.c
index 18a55acb7bab92ef9bdd85b7c81cbc4fd26721fe..65adf75342d8a68fffef97b046b4191e02190eed 100644 (file)
#error "UART base address is set assuming UART instance 0 (MSS SCIA)"
#endif
uint32_t sbl_uart_baseAddr = CSL_MSS_SCIA_U_BASE;
+ /* Workaround for TPR12 ROM not sending ACK for EOT which results in host
+ * side terminal app still waiting after completing 100% transfer of
+ * SBL image */
UART_putc(XMODEM_STS_ACK);
#else
UART_HwAttrs uart_cfg;
diff --git a/packages/ti/boot/sbl/tools/tpr12SBLImageGen/unix/aarch64-none-elf-objcopy b/packages/ti/boot/sbl/tools/tpr12SBLImageGen/unix/aarch64-none-elf-objcopy
new file mode 100755 (executable)
index 0000000..95f7edc
Binary files /dev/null and b/packages/ti/boot/sbl/tools/tpr12SBLImageGen/unix/aarch64-none-elf-objcopy differ
index 0000000..95f7edc
Binary files /dev/null and b/packages/ti/boot/sbl/tools/tpr12SBLImageGen/unix/aarch64-none-elf-objcopy differ
SBL_BIN_FILE=sbl_img_bin
endif
-#For SoCs like TPR12 which do not have GCC toolchain installed, arm-none-eabi-objcopy is used instead of gcc aarch64-none-elf-objcopy
-#arm-none-eabi-objcopy does not support --gap-fill=0xff option so set objcopy option based on objcopy tool used
-
-ifneq ($(findstring "%arm-none-eabi-objcopy",$(SBL_OBJ_COPY)), "")
- export LC_ALL=C
- SBL_OBJ_COPY_OPTS :=
-else
- SBL_OBJ_COPY_OPTS := --gap-fill=0xff
-endif
+SBL_OBJ_COPY_OPTS := --gap-fill=0xff
sbl_img_bin: $(EXE_NAME)
$(SBL_OBJ_COPY) $(SBL_OBJ_COPY_OPTS) -O binary $< $(SBL_BIN_PATH)
endif
$(SBL_CERT_GEN) -b $(SBL_BIN_PATH) -o $(SBL_TIIMAGE_PATH) -c R5 -l $(SBL_RUN_ADDRESS) -k $($(APP_NAME)_SBL_CERT_KEY) -d DEBUG -j DBG_FULL_ENABLE -m $(SBL_MCU_STARTUP_MODE)
else ifeq ($(SOC),$(filter $(SOC), tpr12))
-ifneq ("$(wildcard ${TPR12_ROM_SCRIPT_PATH}/gpkey.pem)","")
- source $(PDK_INSTALL_PATH)/ti/build/makerules/tpr12rom_sign_non_secure.sh -b $(SBL_BIN_PATH) -c R5 -k ${TPR12_ROM_SCRIPT_PATH}/gpkey.pem -i
+ifneq ($(OS),Windows_NT)
+ $(CHMOD) a+x $(PDK_INSTALL_PATH)/ti/build/makerules/tpr12rom_sign_non_secure.sh
+ $(PDK_INSTALL_PATH)/ti/build/makerules/tpr12rom_sign_non_secure.sh -b $(SBL_BIN_PATH) -c R5 -k ${PDK_INSTALL_PATH}/ti/build/makerules/tpr12_gpkey.pem -i
cat R5-cert.bin $(SBL_BIN_PATH) > $(SBL_TIIMAGE_PATH)
else
- echo "Bypassing SBL signing as TPR12 ROM private key unavailable"
+ echo "Bypassing SBL signing as available only in unix environment presently"
endif
endif
$(ECHO) \# SBL image $@ created.
diff --git a/packages/ti/build/makerules/tpr12_gpkey.pem b/packages/ti/build/makerules/tpr12_gpkey.pem
--- /dev/null
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----