Consider CONFIG_ZERO_BOOTDELAY_CHECK when CONFIG_AUTOBOOT_KEYED is set

[u-boot] / boards.cfg

diff --git a/boards.cfg b/boards.cfg
index 1af87c0f0c3dbc5b58383cd6cccb8c674e033c21..becf258e490ab07848e04cc83274743e65c3a53e 100644 (file)
--- a/boards.cfg
+++ b/boards.cfg
@@ -11,6 +11,11 @@
 #      Lines starting with '#' are comments.
 #      Blank lines are ignored.
 #
+#      The CPU field takes the form:
+#              cpu[:spl_cpu]
+#      If spl_cpu is specified the make variable CPU will be set to this
+#      during the SPL build.
+#
 #      The options field takes the form:
 #              <board config name>[:comma separated config options]
 #      Each config option has the form (value defaults to "1"):
@@ -731,6 +736,10 @@ P1021RDB-PC_NAND             powerpc     mpc85xx     p1_p2_rdb_pc        freesca
 P1021RDB-PC_SDCARD           powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1021RDB,SDCARD
 P1021RDB-PC_SPIFLASH         powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1021RDB,SPIFLASH
 P1022DS                      powerpc     mpc85xx     p1022ds             freescale
+P1022DS_SPIFLASH             powerpc     mpc85xx     p1022ds             freescale     -           P1022DS:SPIFLASH
+P1022DS_36BIT_SPIFLASH       powerpc     mpc85xx     p1022ds             freescale     -           P1022DS:36BIT,SPIFLASH
+P1022DS_SDCARD               powerpc     mpc85xx     p1022ds             freescale     -           P1022DS:SDCARD
+P1022DS_36BIT_SDCARD         powerpc     mpc85xx     p1022ds             freescale     -           P1022DS:36BIT,SDCARD
 P1022DS_36BIT                powerpc     mpc85xx     p1022ds             freescale      -           P1022DS:36BIT
 P1023RDS                     powerpc     mpc85xx     p1023rds            freescale      -           P1023RDS
 P1023RDS_NAND                powerpc     mpc85xx     p1023rds            freescale      -           P1023RDS:NAND