projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
env: Finish migration of common ENV options
[oweals/u-boot.git]
/
include
/
configs
/
ls1046ardb.h
diff --git
a/include/configs/ls1046ardb.h
b/include/configs/ls1046ardb.h
index 33ac30329d57704bd6d078a79b84b5f49030fd12..efedfd59236c09d903021a21d4ab6df457d25334 100644
(file)
--- a/
include/configs/ls1046ardb.h
+++ b/
include/configs/ls1046ardb.h
@@
-1,6
+1,7
@@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2016 Freescale Semiconductor
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2016 Freescale Semiconductor
+ * Copyright 2019 NXP
*/
#ifndef __LS1046ARDB_H__
*/
#ifndef __LS1046ARDB_H__
@@
-12,7
+13,6
@@
#define CONFIG_DDR_CLK_FREQ 100000000
#define CONFIG_LAYERSCAPE_NS_ACCESS
#define CONFIG_DDR_CLK_FREQ 100000000
#define CONFIG_LAYERSCAPE_NS_ACCESS
-#define CONFIG_MISC_INIT_R
#define CONFIG_DIMM_SLOTS_PER_CTLR 1
/* Physical Memory Map */
#define CONFIG_DIMM_SLOTS_PER_CTLR 1
/* Physical Memory Map */
@@
-25,10
+25,6
@@
#define CONFIG_DDR_ECC
#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER
#define CONFIG_MEM_INIT_VALUE 0xdeadbeef
#define CONFIG_DDR_ECC
#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER
#define CONFIG_MEM_INIT_VALUE 0xdeadbeef
-#define CONFIG_FSL_DDR_BIST /* enable built-in memory test */
-#ifndef CONFIG_SPL
-#define CONFIG_FSL_DDR_INTERACTIVE /* Interactive debugging */
-#endif
#ifdef CONFIG_SD_BOOT
#define CONFIG_SYS_FSL_PBL_PBI board/freescale/ls1046ardb/ls1046ardb_pbi.cfg
#ifdef CONFIG_SD_BOOT
#define CONFIG_SYS_FSL_PBL_PBI board/freescale/ls1046ardb/ls1046ardb_pbi.cfg
@@
-161,14
+157,14
@@
#define CONFIG_ENV_OVERWRITE
#endif
#define CONFIG_ENV_OVERWRITE
#endif
-#if
defined(CONFIG_SD_BOOT)
+#if
def CONFIG_TFABOOT
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_DEV 0
-#define CONFIG_ENV_OFFSET (3 * 1024 * 1024)
-#define CONFIG_
ENV_SIZE 0x2
000
+
+#define CONFIG_
SYS_FSL_QSPI_BASE 0x40000
000
#else
#else
-#
define CONFIG_ENV_SIZE 0x2000 /* 8KB */
-#define CONFIG_
ENV_OFFSET 0x300000 /* 3MB */
-#
define CONFIG_ENV_SECT_SIZE 0x40000 /* 256KB */
+#
if defined(CONFIG_SD_BOOT)
+#define CONFIG_
SYS_MMC_ENV_DEV 0
+#
endif
#endif
#define AQR105_IRQ_MASK 0x80000000
#endif
#define AQR105_IRQ_MASK 0x80000000
@@
-180,9
+176,6
@@
#endif
#ifdef CONFIG_SYS_DPAA_FMAN
#endif
#ifdef CONFIG_SYS_DPAA_FMAN
-#define CONFIG_FMAN_ENET
-#define CONFIG_PHY_AQUANTIA
-#define CONFIG_PHYLIB_10G
#define RGMII_PHY1_ADDR 0x1
#define RGMII_PHY2_ADDR 0x2
#define RGMII_PHY1_ADDR 0x1
#define RGMII_PHY2_ADDR 0x2
@@
-209,6
+202,12
@@
#ifndef SPL_NO_MISC
#undef CONFIG_BOOTCOMMAND
#ifndef SPL_NO_MISC
#undef CONFIG_BOOTCOMMAND
+#ifdef CONFIG_TFABOOT
+#define QSPI_NOR_BOOTCOMMAND "run distro_bootcmd; run qspi_bootcmd; " \
+ "env exists secureboot && esbc_halt;;"
+#define SD_BOOTCOMMAND "run distro_bootcmd;run sd_bootcmd; " \
+ "env exists secureboot && esbc_halt;"
+#else
#if defined(CONFIG_QSPI_BOOT)
#define CONFIG_BOOTCOMMAND "run distro_bootcmd; run qspi_bootcmd; " \
"env exists secureboot && esbc_halt;;"
#if defined(CONFIG_QSPI_BOOT)
#define CONFIG_BOOTCOMMAND "run distro_bootcmd; run qspi_bootcmd; " \
"env exists secureboot && esbc_halt;;"
@@
-217,6
+216,7
@@
"env exists secureboot && esbc_halt;"
#endif
#endif
"env exists secureboot && esbc_halt;"
#endif
#endif
+#endif
#include <asm/fsl_secure_boot.h>
#include <asm/fsl_secure_boot.h>