freescale/layerscape: Rename the config CONFIG_SECURE_BOOT name
Rename CONFIG_SECURE_BOOT to CONFIG_NXP_ESBC to avoid conflict with UEFI secure boot. Signed-off-by: Udit Agarwal <udit.agarwal@nxp.com> Signed-off-by: Priyanka Jain <priyanka.jain@nxp.com>
This commit is contained in:
committed by
Priyanka Jain
parent
56e6f810b0
commit
5536c3c9d0
@@ -66,13 +66,13 @@
|
||||
board/freescale/ls1021atwr/ls102xa_rcw_sd_ifc.cfg
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SECURE_BOOT
|
||||
#ifdef CONFIG_NXP_ESBC
|
||||
/*
|
||||
* HDR would be appended at end of image and copied to DDR along
|
||||
* with U-Boot image.
|
||||
*/
|
||||
#define CONFIG_U_BOOT_HDR_SIZE (16 << 10)
|
||||
#endif /* ifdef CONFIG_SECURE_BOOT */
|
||||
#endif /* ifdef CONFIG_NXP_ESBC */
|
||||
|
||||
#define CONFIG_SPL_MAX_SIZE 0x1a000
|
||||
#define CONFIG_SPL_STACK 0x1001d000
|
||||
|
||||
@@ -192,7 +192,7 @@
|
||||
#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
|
||||
#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
|
||||
|
||||
#ifdef CONFIG_SECURE_BOOT
|
||||
#ifdef CONFIG_NXP_ESBC
|
||||
#include <asm/fsl_secure_boot.h>
|
||||
#endif
|
||||
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
#define CONFIG_SPL_BSS_START_ADDR 0x8f000000
|
||||
#define CONFIG_SPL_BSS_MAX_SIZE 0x80000
|
||||
|
||||
#ifdef CONFIG_SECURE_BOOT
|
||||
#ifdef CONFIG_NXP_ESBC
|
||||
#define CONFIG_U_BOOT_HDR_SIZE (16 << 10)
|
||||
/*
|
||||
* HDR would be appended at end of image and copied to DDR along
|
||||
@@ -85,7 +85,7 @@
|
||||
#define CONFIG_SYS_MONITOR_LEN (0x100000 + CONFIG_U_BOOT_HDR_SIZE)
|
||||
#else
|
||||
#define CONFIG_SYS_MONITOR_LEN 0x100000
|
||||
#endif /* ifdef CONFIG_SECURE_BOOT */
|
||||
#endif /* ifdef CONFIG_NXP_ESBC */
|
||||
#endif
|
||||
|
||||
/* NAND SPL */
|
||||
@@ -100,9 +100,9 @@
|
||||
#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000
|
||||
#define CONFIG_SPL_BSS_MAX_SIZE 0x80000
|
||||
|
||||
#ifdef CONFIG_SECURE_BOOT
|
||||
#ifdef CONFIG_NXP_ESBC
|
||||
#define CONFIG_U_BOOT_HDR_SIZE (16 << 10)
|
||||
#endif /* ifdef CONFIG_SECURE_BOOT */
|
||||
#endif /* ifdef CONFIG_NXP_ESBC */
|
||||
|
||||
#ifdef CONFIG_U_BOOT_HDR_SIZE
|
||||
/*
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
CONFIG_SPL_BSS_MAX_SIZE)
|
||||
#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000
|
||||
|
||||
#ifdef CONFIG_SECURE_BOOT
|
||||
#ifdef CONFIG_NXP_ESBC
|
||||
#define CONFIG_U_BOOT_HDR_SIZE (16 << 10)
|
||||
/*
|
||||
* HDR would be appended at end of image and copied to DDR along
|
||||
@@ -84,7 +84,7 @@
|
||||
#define CONFIG_SYS_MONITOR_LEN (0x100000 + CONFIG_U_BOOT_HDR_SIZE)
|
||||
#else
|
||||
#define CONFIG_SYS_MONITOR_LEN 0x100000
|
||||
#endif /* ifdef CONFIG_SECURE_BOOT */
|
||||
#endif /* ifdef CONFIG_NXP_ESBC */
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_QSPI_BOOT) && defined(CONFIG_SPL)
|
||||
|
||||
@@ -235,7 +235,7 @@ unsigned long long get_qixis_addr(void);
|
||||
#define CONFIG_SYS_SPL_MALLOC_SIZE 0x00100000
|
||||
#define CONFIG_SYS_SPL_MALLOC_START 0x80200000
|
||||
|
||||
#ifdef CONFIG_SECURE_BOOT
|
||||
#ifdef CONFIG_NXP_ESBC
|
||||
#define CONFIG_U_BOOT_HDR_SIZE (16 << 10)
|
||||
/*
|
||||
* HDR would be appended at end of image and copied to DDR along
|
||||
@@ -246,7 +246,7 @@ unsigned long long get_qixis_addr(void);
|
||||
#define CONFIG_SYS_MONITOR_LEN (0x100000 + CONFIG_U_BOOT_HDR_SIZE)
|
||||
#else
|
||||
#define CONFIG_SYS_MONITOR_LEN 0x100000
|
||||
#endif /* ifdef CONFIG_SECURE_BOOT */
|
||||
#endif /* ifdef CONFIG_NXP_ESBC */
|
||||
|
||||
#endif
|
||||
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */
|
||||
|
||||
@@ -407,7 +407,7 @@ unsigned long get_board_ddr_clk(void);
|
||||
QIXIS_SDID_MASK) != QIXIS_ESDHC_NO_ADAPTER)
|
||||
|
||||
/* Initial environment variables */
|
||||
#ifdef CONFIG_SECURE_BOOT
|
||||
#ifdef CONFIG_NXP_ESBC
|
||||
#undef CONFIG_EXTRA_ENV_SETTINGS
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"hwconfig=fsl_ddr:bank_intlv=auto\0" \
|
||||
@@ -426,7 +426,7 @@ unsigned long get_board_ddr_clk(void);
|
||||
"sf read 0xa0740000 0x740000 0x4000;esbc_validate 0xa0740000;" \
|
||||
"fsl_mc start mc 0xa0a00000 0xa0e00000\0" \
|
||||
"mcmemsize=0x70000000 \0"
|
||||
#else /* if !(CONFIG_SECURE_BOOT) */
|
||||
#else /* if !(CONFIG_NXP_ESBC) */
|
||||
#ifdef CONFIG_TFABOOT
|
||||
#define QSPI_MC_INIT_CMD \
|
||||
"sf probe 0:0;sf read 0x80000000 0xA00000 0x100000;" \
|
||||
@@ -522,7 +522,7 @@ unsigned long get_board_ddr_clk(void);
|
||||
"mcmemsize=0x70000000 \0"
|
||||
#endif
|
||||
#endif /* CONFIG_TFABOOT */
|
||||
#endif /* CONFIG_SECURE_BOOT */
|
||||
#endif /* CONFIG_NXP_ESBC */
|
||||
|
||||
#ifdef CONFIG_FSL_MC_ENET
|
||||
#define CONFIG_FSL_MEMAC
|
||||
|
||||
@@ -352,7 +352,7 @@ unsigned long get_board_ddr_clk(void);
|
||||
|
||||
/* Initial environment variables */
|
||||
#undef CONFIG_EXTRA_ENV_SETTINGS
|
||||
#ifdef CONFIG_SECURE_BOOT
|
||||
#ifdef CONFIG_NXP_ESBC
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"hwconfig=fsl_ddr:bank_intlv=auto\0" \
|
||||
"loadaddr=0x80100000\0" \
|
||||
@@ -442,7 +442,7 @@ unsigned long get_board_ddr_clk(void);
|
||||
"mcinitcmd=fsl_mc start mc 0x580a00000" \
|
||||
" 0x580e00000 \0"
|
||||
#endif /* CONFIG_TFABOOT */
|
||||
#endif /* CONFIG_SECURE_BOOT */
|
||||
#endif /* CONFIG_NXP_ESBC */
|
||||
|
||||
#ifdef CONFIG_TFABOOT
|
||||
#define SD_BOOTCOMMAND \
|
||||
|
||||
Reference in New Issue
Block a user