Skip to content

Commit 6a622a5

Browse files
author
Fayaz Akthar
committed
Revert "am64x_am243x: sysfw: update binaries to version v11.02.00"
Incorrect system firmware binaries for am64x were added. This reverts commit fbc7d63.
1 parent 05d3aeb commit 6a622a5

File tree

12 files changed

+32
-700
lines changed

12 files changed

+32
-700
lines changed

source/drivers/sciclient/include/tisci/security/tisci_keywriter_lite.h

Lines changed: 0 additions & 96 deletions
This file was deleted.

source/drivers/sciclient/include/tisci/security/tisci_msmc_gasket.h

Lines changed: 0 additions & 107 deletions
This file was deleted.

source/drivers/sciclient/include/tisci/tisci_boardcfg.h

Lines changed: 1 addition & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,6 @@ extern "C"
6868
#define TISCI_BOARDCFG_SEC_ABI_MAJ_VALUE 0x00
6969
#define TISCI_BOARDCFG_SEC_ABI_MIN_VALUE 0x01
7070

71-
#ifdef CONFIG_SMS_LITE_COPROCESSOR
72-
/* Size of reserved 0 substructure in sms-lite secure boardconfig */
73-
#define TISCI_BOARDCFG_SEC_RESV0_SIZE (8U)
74-
/* Size of reserved 1 substructure in sms-lite secure baordconfig */
75-
#define TISCI_BOARDCFG_SEC_RESV1_SIZE (10U)
76-
#endif
77-
7871
/**
7972
* \brief Contains a unique magic number for each substructure and the size
8073
* of the associated superstructure for data validation/API
@@ -268,8 +261,7 @@ struct tisci_boardcfg_dkek {
268261
* authentication resources
269262
* \param enable_saul_psil_global_config_writes Flag for allowing pairing requests
270263
* from PSIL. Set to 0x5A to enable
271-
* \param safety_host_present If safety host is defined. Set to 0x5A to enable
272-
* \param safety_host ID of the host designated as safety host in the system
264+
* \param rsvd Reserved
273265
*/
274266
struct tisci_boardcfg_sa2ul_cfg {
275267
struct tisci_boardcfg_substructure_header subhdr;
@@ -331,47 +323,6 @@ struct tisci_boardcfg_sec_handover {
331323
uint8_t rsvd[4];
332324
};
333325

334-
#ifdef CONFIG_SMS_LITE_COPROCESSOR
335-
336-
/**
337-
* \brief Secure boardconfig reserved structure 0.
338-
*/
339-
struct tisci_boardcfg_sec_resv0 {
340-
uint8_t resv[TISCI_BOARDCFG_SEC_RESV0_SIZE];
341-
};
342-
343-
/**
344-
* \brief Secure boardconfig reserved structure 1.
345-
*/
346-
struct tisci_boardcfg_sec_resv1 {
347-
uint8_t resv[TISCI_BOARDCFG_SEC_RESV1_SIZE];
348-
};
349-
350-
/**
351-
* \brief Format of the complete board configuration.
352-
*
353-
* \param tisci_boardcfg_abi_rev Secure Board Config ABI version (separate from DMSC ABI version)
354-
* \param tisci_boardcfg_proc_acl Processor Access control list
355-
* \param tisci_boardcfg_host_hierarchy Host hierarchy list
356-
* \param otp_config OTP Configuration
357-
* \param dkek_config DKEK Configuration
358-
* \param resv0 Reserved structure 0
359-
* \param tisci_boardcfg_sa2ul_cfg SA2UL resource configuration
360-
* \param resv1 Reserved structure 1
361-
*/
362-
struct tisci_boardcfg_sec {
363-
struct tisci_boardcfg_abi_rev rev;
364-
struct tisci_boardcfg_proc_acl processor_acl_list;
365-
struct tisci_boardcfg_host_hierarchy host_hierarchy;
366-
struct tisci_boardcfg_extended_otp otp_config;
367-
struct tisci_boardcfg_dkek dkek_config;
368-
struct tisci_boardcfg_sec_resv0 resv0;
369-
struct tisci_boardcfg_secure_debug_config sec_dbg_config;
370-
struct tisci_boardcfg_sec_resv1 resv1;
371-
} __attribute__((__packed__));
372-
373-
#else
374-
375326
/**
376327
* \brief Format of the complete board configuration.
377328
*
@@ -395,8 +346,6 @@ struct tisci_boardcfg_sec {
395346
struct tisci_boardcfg_sec_handover sec_handover_cfg;
396347
} __attribute__((__packed__));
397348

398-
#endif
399-
400349
/**
401350
* \def TISCI_BOARDCFG_TRACE_DST_UART0
402351
* Traces to UART0 in wakeupss enabled.
@@ -429,17 +378,13 @@ struct tisci_boardcfg_sec {
429378
*
430379
* \def TISCI_BOARDCFG_TRACE_SRC_SUPR
431380
* Traces from supervisor tasks are allowed.
432-
*
433-
* \def TISCI_BOARDCFG_TRACE_SRC_LPM
434-
* Traces from low power sequence are allowed.
435381
*/
436382
#define TISCI_BOARDCFG_TRACE_SRC_PM TISCI_BIT(0)
437383
#define TISCI_BOARDCFG_TRACE_SRC_RM TISCI_BIT(1)
438384
#define TISCI_BOARDCFG_TRACE_SRC_SEC TISCI_BIT(2)
439385
#define TISCI_BOARDCFG_TRACE_SRC_BASE TISCI_BIT(3)
440386
#define TISCI_BOARDCFG_TRACE_SRC_USER TISCI_BIT(4)
441387
#define TISCI_BOARDCFG_TRACE_SRC_SUPR TISCI_BIT(5)
442-
#define TISCI_BOARDCFG_TRACE_SRC_LPM TISCI_BIT(6)
443388

444389
/**
445390
* \brief Debug console configuration.
@@ -454,45 +399,6 @@ struct tisci_boardcfg_dbg_cfg {
454399
uint16_t trace_src_enables;
455400
} __attribute__((__packed__));
456401

457-
#ifdef CONFIG_SMS_LITE_COPROCESSOR
458-
459-
/**
460-
* \brief Boot mode service configuration.
461-
*
462-
* \param subhdr Magic and size for integrity check.
463-
* \param allowed_host Host allowed to use the boot mode service.
464-
*/
465-
struct tisci_boardcfg_boot_mode_cfg {
466-
struct tisci_boardcfg_substructure_header subhdr;
467-
uint8_t allowed_host;
468-
};
469-
470-
/**
471-
* \brief Reservied structure 1
472-
*/
473-
struct tisci_boardcfg_resv {
474-
uint8_t resv[7];
475-
} __attribute__((__packed__));
476-
477-
/**
478-
* \brief Format of the complete board configuration.
479-
*
480-
* \param tisci_boardcfg_abi_rev Board Config ABI version (separate from DMSC ABI version)
481-
* \param control DMSC feature control selections
482-
* \param bm_writer_cfg Boot mode writer service configuration
483-
* \param resv1 Reserved structure 1
484-
* \param debug_cfg Debug/trace configuration
485-
*/
486-
struct tisci_boardcfg {
487-
struct tisci_boardcfg_abi_rev rev;
488-
struct tisci_boardcfg_control control;
489-
struct tisci_boardcfg_boot_mode_cfg bm_writer_cfg;
490-
struct tisci_boardcfg_resv resv;
491-
struct tisci_boardcfg_dbg_cfg debug_cfg;
492-
} __attribute__((__packed__));
493-
494-
#else
495-
496402
/**
497403
* \brief Format of the complete board configuration.
498404
*
@@ -510,7 +416,6 @@ struct tisci_boardcfg {
510416
struct tisci_boardcfg_dbg_cfg debug_cfg;
511417
} __attribute__((__packed__));
512418

513-
#endif
514419

515420
/**
516421
* \brief structure to hold the board configuration hashes received via X509 certificate

source/drivers/sciclient/include/tisci/tisci_boardcfg_macros.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ extern "C"
7676
#define TISCI_BOARDCFG_SECPROXY_DISABLE_MAIN_NAV_SECURE_PROXY_MASK (0x01U)
7777

7878
#define TISCI_BOARDCFG_DEBUG_TRACE_DST_ENABLES_MASK (0x0FU)
79-
#define TISCI_BOARDCFG_DEBUG_TRACE_SRC_ENABLES_MASK (0x7FU)
79+
#define TISCI_BOARDCFG_DEBUG_TRACE_SRC_ENABLES_MASK (0x3FU)
8080

8181
#define TISCI_BOARDCFG_CONTROL_MAGIC_NUM (0xC1D3U)
8282
#define TISCI_BOARDCFG_SECPROXY_MAGIC_NUM (0x1207U)

source/drivers/sciclient/include/tisci/tisci_core.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ extern "C"
7171
#define TISCI_MSG_FLAG_FW_CAP_LPM_IO_ONLY_PLUS_DDR TISCI_BIT(6)
7272
#define TISCI_MSG_FLAG_FW_CAP_IO_ISOLATION TISCI_BIT(7)
7373
#define TISCI_MSG_FLAG_FW_CAP_DM TISCI_BIT(8)
74-
#define TISCI_MSG_FLAG_FW_CAP_LPM_ABORT TISCI_BIT(9)
7574

7675
/**
7776
* \brief Notification message to indicate the DMSC is available.

source/drivers/sciclient/include/tisci/tisci_protocol.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,6 @@ struct tisci_sec_header {
365365
/* Keywriter lite TISCI message to write keys from a buffer */
366366
#define TISCI_MSG_KEY_WRITER_LITE (0x9045U)
367367

368-
/******************************************************/
369-
370368
/* Processor Control APIs */
371369

372370
/** Message to get a Processor */
@@ -402,9 +400,6 @@ struct tisci_sec_header {
402400
*/
403401
#define TISCI_MSG_MCELF_PROC_AUTH_BOOT_FINISH (0xC124U)
404402

405-
/** Message to R/W MSMC timeout gasket configuration registers */
406-
#define TISCI_MSG_CONFIGURE_MSMC_GASKET (0xC125U)
407-
408403
/* RM IDs */
409404

410405
/**
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
Binary file not shown.
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)