summaryrefslogtreecommitdiff
path: root/include/configs/T104xRDB.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-11-11 14:19:04 -0500
committerTom Rini <trini@konsulko.com>2019-11-11 14:19:04 -0500
commit0b73ef0c02313e651af4b0a8e206c7c4a198e7f8 (patch)
tree6e84ad48ccdb4b02b3a272ec30e7967426c15e13 /include/configs/T104xRDB.h
parenta4b7485e2f311b1319b1b9cd59f5666536e24a28 (diff)
parentbef18454044e62800ece687b8d50ddd853117660 (diff)
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
- Rename CONFIG_SECURE_BOOT to CONFIG_NXP_ESBC. - Few bug fixes and updates related to SPI, hwconfig, ethernet, fsl-layerscape, pci, icid, PSCI
Diffstat (limited to 'include/configs/T104xRDB.h')
-rw-r--r--include/configs/T104xRDB.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 53ee1484d0..7cc3db943e 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -13,7 +13,7 @@
#ifdef CONFIG_RAMBOOT_PBL
-#ifndef CONFIG_SECURE_BOOT
+#ifndef CONFIG_NXP_ESBC
#define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/freescale/t104xrdb/t104x_pbi.cfg
#else
#define CONFIG_SYS_FSL_PBL_PBI \
@@ -32,7 +32,7 @@
#define BOOT_PAGE_OFFSET 0x27000
#ifdef CONFIG_NAND
-#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
@@ -163,7 +163,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_OFFSET (512 * 0x800)
#elif defined(CONFIG_NAND)
-#ifdef CONFIG_SECURE_BOOT
+#ifdef CONFIG_NXP_ESBC
#define CONFIG_RAMBOOT_NAND
#define CONFIG_BOOTSCRIPT_COPY_RAM
#endif