Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/400435/?format=api
{ "id": 400435, "url": "http://patchwork.ozlabs.org/api/patches/400435/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/1413532834-10380-7-git-send-email-b18965@freescale.com/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/projects/18/?format=api", "name": "U-Boot", "link_name": "uboot", "list_id": "u-boot.lists.denx.de", "list_email": "u-boot@lists.denx.de", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1413532834-10380-7-git-send-email-b18965@freescale.com>", "list_archive_url": null, "date": "2014-10-17T08:00:32", "name": "[U-Boot,v3,6/8] arm: ls102xa: Add SD boot support for LS1021AQDS board", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "7e9824ff589eed3e00b8bf4f11cfee6efd8ea851", "submitter": { "id": 13010, "url": "http://patchwork.ozlabs.org/api/people/13010/?format=api", "name": "Alison Wang", "email": "b18965@freescale.com" }, "delegate": { "id": 2666, "url": "http://patchwork.ozlabs.org/api/users/2666/?format=api", "username": "yorksun", "first_name": "York", "last_name": "Sun", "email": "yorksun@freescale.com" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/1413532834-10380-7-git-send-email-b18965@freescale.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/400435/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/400435/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Received": [ "from theia.denx.de (theia.denx.de [85.214.87.163])\n\tby ozlabs.org (Postfix) with ESMTP id 2556E1400E9\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 17 Oct 2014 19:02:12 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby theia.denx.de (Postfix) with ESMTP id 02EDBA73E7;\n\tFri, 17 Oct 2014 10:01:53 +0200 (CEST)", "from theia.denx.de ([127.0.0.1])\n\tby localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id x1PFiu1x1OL5; Fri, 17 Oct 2014 10:01:52 +0200 (CEST)", "from theia.denx.de (localhost [127.0.0.1])\n\tby theia.denx.de (Postfix) with ESMTP id 5B010A73EF;\n\tFri, 17 Oct 2014 10:01:52 +0200 (CEST)", "from localhost (localhost [127.0.0.1])\n\tby theia.denx.de (Postfix) with ESMTP id 21680A7429\n\tfor <u-boot@lists.denx.de>; Fri, 17 Oct 2014 10:01:45 +0200 (CEST)", "from theia.denx.de ([127.0.0.1])\n\tby localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id O2iW0ITX18mm for <u-boot@lists.denx.de>;\n\tFri, 17 Oct 2014 10:01:45 +0200 (CEST)", "from na01-bl2-obe.outbound.protection.outlook.com\n\t(mail-bl2on0138.outbound.protection.outlook.com [65.55.169.138])\n\tby theia.denx.de (Postfix) with ESMTPS id 565D0A7412\n\tfor <u-boot@lists.denx.de>; Fri, 17 Oct 2014 10:01:32 +0200 (CEST)", "from BY2PR03CA003.namprd03.prod.outlook.com (10.255.93.20) by\n\tDM2PR03MB381.namprd03.prod.outlook.com (10.141.55.11) with Microsoft\n\tSMTP Server (TLS) id 15.0.1049.19; Fri, 17 Oct 2014 08:01:28 +0000", "from BN1BFFO11FD015.protection.gbl (10.255.93.4) by\n\tBY2PR03CA003.outlook.office365.com (10.255.93.20) with Microsoft SMTP\n\tServer (TLS) id 15.0.1054.13 via Frontend Transport;\n\tFri, 17 Oct 2014 08:01:27 +0000", "from az84smr01.freescale.net (192.88.158.2) by\n\tBN1BFFO11FD015.mail.protection.outlook.com (10.58.144.78) with\n\tMicrosoft SMTP\n\tServer (TLS) id 15.0.1039.16 via Frontend Transport; Fri, 17 Oct 2014\n\t08:01:27 +0000", "from titan.ap.freescale.net ([10.192.208.233])\n\tby az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id\n\ts9H81CJJ023491; Fri, 17 Oct 2014 01:01:25 -0700" ], "X-policyd-weight": "NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5\n\tNOT_IN_BL_NJABL=-1.5 (only DNSBL check requested)", "From": "Alison Wang <b18965@freescale.com>", "To": "<yorksun@freescale.com>, <u-boot@lists.denx.de>", "Date": "Fri, 17 Oct 2014 16:00:32 +0800", "Message-ID": "<1413532834-10380-7-git-send-email-b18965@freescale.com>", "X-Mailer": "git-send-email 2.1.0.27.g96db324", "In-Reply-To": "<1413532834-10380-1-git-send-email-b18965@freescale.com>", "References": "<1413532834-10380-1-git-send-email-b18965@freescale.com>", "X-EOPAttributedMessage": "0", "X-Forefront-Antispam-Report": "CIP:192.88.158.2; CTRY:US; IPV:CAL; IPV:NLI;\n\tEFV:NLI; SFV:NSPM;\n\tSFS:(10019020)(6009001)(189002)(199003)(54534003)(87936001)(87286001)(50986999)(76482002)(50226001)(62966002)(120916001)(76176999)(95666004)(106466001)(4396001)(92566001)(47776003)(20776003)(36756003)(64706001)(21056001)(77156001)(105606002)(93916002)(92726001)(33646002)(50466002)(85852003)(69596002)(104016003)(97736003)(46102003)(31966008)(229853001)(81156004)(104166001)(85306004)(102836001)(107046002)(80022003)(99396003)(68736004)(19580395003)(6806004)(88136002)(48376002)(84676001)(19580405001)(44976005)(26826002)(89996001)(42262002);\n\tDIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR03MB381;\n\tH:az84smr01.freescale.net; FPR:; MLV:ovrnspm;\n\tPTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; ", "MIME-Version": "1.0", "X-Microsoft-Antispam": [ "UriScan:;", "BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB381;" ], "X-Forefront-PRVS": "0367A50BB1", "Received-SPF": "Fail (protection.outlook.com: domain of freescale.com does not\n\tdesignate 192.88.158.2 as permitted sender)\n\treceiver=protection.outlook.com; \n\tclient-ip=192.88.158.2; helo=az84smr01.freescale.net;", "Authentication-Results": "spf=fail (sender IP is 192.88.158.2)\n\tsmtp.mailfrom=alison.wang@freescale.com; ", "X-OriginatorOrg": "freescale.com", "Cc": "Alison Wang <alison.wang@freescale.com>", "Subject": "[U-Boot] [PATCH v3 6/8] arm: ls102xa: Add SD boot support for\n\tLS1021AQDS board", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.13", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<http://lists.denx.de/mailman/options/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<http://lists.denx.de/pipermail/u-boot>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<http://lists.denx.de/mailman/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Sender": "u-boot-bounces@lists.denx.de", "Errors-To": "u-boot-bounces@lists.denx.de" }, "content": "This patch adds SD boot support for LS1021AQDS board. SPL\nframework is used. PBL initialize the internal RAM and copy\nSPL to it, then SPL initialize DDR using SPD and copy u-boot\nfrom SD card to DDR, finally SPL transfer control to u-boot.\n\nSigned-off-by: Alison Wang <alison.wang@freescale.com>\nSigned-off-by: Jason Jin <jason.jin@freescale.com>\n---\nChange log:\n v3: Update MAINTAINERS file.\n Update PBI and RCW for SD boot.\n v2: Use generic u-boot-spl.lds. \n\n arch/arm/cpu/armv7/ls102xa/Makefile | 1 +\n arch/arm/cpu/armv7/ls102xa/spl.c | 33 ++++++++++++++\n arch/arm/include/asm/arch-ls102xa/spl.h | 20 ++++++++\n board/freescale/ls1021aqds/MAINTAINERS | 1 +\n board/freescale/ls1021aqds/ddr.c | 5 +-\n board/freescale/ls1021aqds/ls1021aqds.c | 31 +++++++++++++\n board/freescale/ls1021aqds/ls102xa_pbi.cfg | 12 +++++\n board/freescale/ls1021aqds/ls102xa_rcw_sd.cfg | 14 ++++++\n configs/ls1021aqds_sdcard_defconfig | 4 ++\n include/configs/ls1021aqds.h | 66 +++++++++++++++++++++++++++\n 10 files changed, 186 insertions(+), 1 deletion(-)\n create mode 100644 arch/arm/cpu/armv7/ls102xa/spl.c\n create mode 100644 arch/arm/include/asm/arch-ls102xa/spl.h\n create mode 100644 board/freescale/ls1021aqds/ls102xa_pbi.cfg\n create mode 100644 board/freescale/ls1021aqds/ls102xa_rcw_sd.cfg\n create mode 100644 configs/ls1021aqds_sdcard_defconfig", "diff": "diff --git a/arch/arm/cpu/armv7/ls102xa/Makefile b/arch/arm/cpu/armv7/ls102xa/Makefile\nindex d82ce8d..56ef3a7 100644\n--- a/arch/arm/cpu/armv7/ls102xa/Makefile\n+++ b/arch/arm/cpu/armv7/ls102xa/Makefile\n@@ -10,3 +10,4 @@ obj-y\t+= timer.o\n \n obj-$(CONFIG_OF_LIBFDT) += fdt.o\n obj-$(CONFIG_SYS_HAS_SERDES) += fsl_ls1_serdes.o ls102xa_serdes.o\n+obj-$(CONFIG_SPL) += spl.o\ndiff --git a/arch/arm/cpu/armv7/ls102xa/spl.c b/arch/arm/cpu/armv7/ls102xa/spl.c\nnew file mode 100644\nindex 0000000..1dfbf54\n--- /dev/null\n+++ b/arch/arm/cpu/armv7/ls102xa/spl.c\n@@ -0,0 +1,33 @@\n+/*\n+ * Copyright 2014 Freescale Semiconductor, Inc.\n+ *\n+ * SPDX-License-Identifier:\tGPL-2.0+\n+ */\n+\n+#include <common.h>\n+#include <spl.h>\n+\n+u32 spl_boot_device(void)\n+{\n+#ifdef CONFIG_SPL_MMC_SUPPORT\n+\treturn BOOT_DEVICE_MMC1;\n+#endif\n+\treturn BOOT_DEVICE_NAND;\n+}\n+\n+u32 spl_boot_mode(void)\n+{\n+\tswitch (spl_boot_device()) {\n+\tcase BOOT_DEVICE_MMC1:\n+#ifdef CONFIG_SPL_FAT_SUPPORT\n+\t\treturn MMCSD_MODE_FAT;\n+#else\n+\t\treturn MMCSD_MODE_RAW;\n+#endif\n+\tcase BOOT_DEVICE_NAND:\n+\t\treturn 0;\n+\tdefault:\n+\t\tputs(\"spl: error: unsupported device\\n\");\n+\t\thang();\n+\t}\n+}\ndiff --git a/arch/arm/include/asm/arch-ls102xa/spl.h b/arch/arm/include/asm/arch-ls102xa/spl.h\nnew file mode 100644\nindex 0000000..26e4ea1\n--- /dev/null\n+++ b/arch/arm/include/asm/arch-ls102xa/spl.h\n@@ -0,0 +1,20 @@\n+/*\n+ * Copyright 2014 Freescale Semiconductor, Inc.\n+ *\n+ * SPDX-License-Identifier:\tGPL-2.0+\n+ */\n+\n+#ifndef __ASM_ARCH_SPL_H__\n+#define __ASM_ARCH_SPL_H__\n+\n+#define BOOT_DEVICE_NONE\t0\n+#define BOOT_DEVICE_XIP\t\t1\n+#define BOOT_DEVICE_XIPWAIT\t2\n+#define BOOT_DEVICE_NAND\t3\n+#define BOOT_DEVICE_ONENAND\t4\n+#define BOOT_DEVICE_MMC1\t5\n+#define BOOT_DEVICE_MMC2\t6\n+#define BOOT_DEVICE_MMC2_2\t7\n+#define BOOT_DEVICE_SPI\t\t10\n+\n+#endif\t/* __ASM_ARCH_SPL_H__ */\ndiff --git a/board/freescale/ls1021aqds/MAINTAINERS b/board/freescale/ls1021aqds/MAINTAINERS\nindex ccf4513..de11203 100644\n--- a/board/freescale/ls1021aqds/MAINTAINERS\n+++ b/board/freescale/ls1021aqds/MAINTAINERS\n@@ -5,3 +5,4 @@ F:\tboard/freescale/ls1021aqds/\n F:\tinclude/configs/ls1021aqds.h\n F:\tconfigs/ls1021aqds_nor_defconfig\n F:\tconfigs/ls1021aqds_ddr4_nor_defconfig\n+F:\tconfigs/ls1021aqds_sdcard_defconfig\ndiff --git a/board/freescale/ls1021aqds/ddr.c b/board/freescale/ls1021aqds/ddr.c\nindex 5898e33..a539ff9 100644\n--- a/board/freescale/ls1021aqds/ddr.c\n+++ b/board/freescale/ls1021aqds/ddr.c\n@@ -153,9 +153,12 @@ phys_size_t initdram(int board_type)\n {\n \tphys_size_t dram_size;\n \n+#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL)\n \tputs(\"Initializing DDR....using SPD\\n\");\n \tdram_size = fsl_ddr_sdram();\n-\n+#else\n+\tdram_size = fsl_ddr_sdram_size();\n+#endif\n \treturn dram_size;\n }\n \ndiff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c\nindex b744250..34f54ab 100644\n--- a/board/freescale/ls1021aqds/ls1021aqds.c\n+++ b/board/freescale/ls1021aqds/ls1021aqds.c\n@@ -13,6 +13,7 @@\n #include <mmc.h>\n #include <fsl_esdhc.h>\n #include <fsl_ifc.h>\n+#include <spl.h>\n \n #include \"../common/qixis.h\"\n #include \"ls1021aqds_qixis.h\"\n@@ -29,10 +30,13 @@ enum {\n int checkboard(void)\n {\n \tchar buf[64];\n+#if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_QSPI_BOOT)\n \tu8 sw;\n+#endif\n \n \tputs(\"Board: LS1021AQDS\\n\");\n \n+#if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_QSPI_BOOT)\n \tsw = QIXIS_READ(brdcfg[0]);\n \tsw = (sw & QIXIS_LBMAP_MASK) >> QIXIS_LBMAP_SHIFT;\n \n@@ -46,6 +50,7 @@ int checkboard(void)\n \t\tprintf(\"IFCCard\\n\");\n \telse\n \t\tprintf(\"invalid setting of SW%u\\n\", QIXIS_LBMAP_SWITCH);\n+#endif\n \n \tprintf(\"Sys ID:0x%02x, Sys Ver: 0x%02x\\n\",\n \t QIXIS_READ(id), QIXIS_READ(arch));\n@@ -154,6 +159,32 @@ int board_early_init_f(void)\n \treturn 0;\n }\n \n+#ifdef CONFIG_SPL_BUILD\n+void board_init_f(ulong dummy)\n+{\n+\tstruct ccsr_cci400 *cci = (struct ccsr_cci400 *)CONFIG_SYS_CCI400_ADDR;\n+\n+\t/* Set global data pointer */\n+\tgd = &gdata;\n+\n+\t/* Clear the BSS */\n+\tmemset(__bss_start, 0, __bss_end - __bss_start);\n+\n+\tget_clocks();\n+\n+\tpreloader_console_init();\n+\n+#ifdef CONFIG_SPL_I2C_SUPPORT\n+\ti2c_init_all();\n+#endif\n+\tout_le32(&cci->ctrl_ord, CCI400_CTRLORD_TERM_BARRIER);\n+\n+\tdram_init();\n+\n+\tboard_init_r(NULL, 0);\n+}\n+#endif\n+\n int config_board_mux(int ctrl_type)\n {\n \tu8 reg12;\ndiff --git a/board/freescale/ls1021aqds/ls102xa_pbi.cfg b/board/freescale/ls1021aqds/ls102xa_pbi.cfg\nnew file mode 100644\nindex 0000000..f1a1b63\n--- /dev/null\n+++ b/board/freescale/ls1021aqds/ls102xa_pbi.cfg\n@@ -0,0 +1,12 @@\n+#PBI commands\n+\n+09570200 ffffffff\n+09570158 00000300\n+8940007c 21f47300\n+\n+#Configure Scratch register\n+09ee0200 10000000\n+#Configure alternate space\n+09570158 00001000\n+#Flush PBL data\n+096100c0 000FFFFF\ndiff --git a/board/freescale/ls1021aqds/ls102xa_rcw_sd.cfg b/board/freescale/ls1021aqds/ls102xa_rcw_sd.cfg\nnew file mode 100644\nindex 0000000..4cdd2a5\n--- /dev/null\n+++ b/board/freescale/ls1021aqds/ls102xa_rcw_sd.cfg\n@@ -0,0 +1,14 @@\n+#PBL preamble and RCW header\n+aa55aa55 01ee0100\n+\n+#enable IFC, disable QSPI and DSPI\n+#0608000a 00000000 00000000 00000000\n+#00000000 00404000 60025a00 21042000\n+#00200000 00000000 00000000 01038000\n+#00000000 001b1200 00000000 00000000\n+\n+#disable IFC, enable QSPI and DSPI\n+0608000a 00000000 00000000 00000000\n+60000000 00407900 60025a00 21046000\n+00000000 00000000 00000000 00038000\n+20024800 001b7200 00000000 00000000\ndiff --git a/configs/ls1021aqds_sdcard_defconfig b/configs/ls1021aqds_sdcard_defconfig\nnew file mode 100644\nindex 0000000..e03c3b4\n--- /dev/null\n+++ b/configs/ls1021aqds_sdcard_defconfig\n@@ -0,0 +1,4 @@\n+CONFIG_SPL=y\n+CONFIG_SYS_EXTRA_OPTIONS=\"RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT\"\n++S:CONFIG_ARM=y\n++S:CONFIG_TARGET_LS1021AQDS=y\ndiff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h\nindex 7e78e78..71021cf 100644\n--- a/include/configs/ls1021aqds.h\n+++ b/include/configs/ls1021aqds.h\n@@ -37,8 +37,47 @@ unsigned long get_board_sys_clk(void);\n unsigned long get_board_ddr_clk(void);\n #endif\n \n+#if defined(CONFIG_SD_BOOT) || defined(CONFIG_QSPI_BOOT)\n+#define CONFIG_SYS_CLK_FREQ 100000000\n+#define CONFIG_DDR_CLK_FREQ 100000000\n+#define CONFIG_QIXIS_I2C_ACCESS\n+#else\n #define CONFIG_SYS_CLK_FREQ\t\tget_board_sys_clk()\n #define CONFIG_DDR_CLK_FREQ\t\tget_board_ddr_clk()\n+#endif\n+\n+#ifdef CONFIG_RAMBOOT_PBL\n+#define CONFIG_SYS_FSL_PBL_PBI\tboard/freescale/ls1021aqds/ls102xa_pbi.cfg\n+#endif\n+\n+#ifdef CONFIG_SD_BOOT\n+#define CONFIG_SYS_FSL_PBL_RCW\tboard/freescale/ls1021aqds/ls102xa_rcw_sd.cfg\n+#define CONFIG_SPL_FRAMEWORK\n+#define CONFIG_SPL_LDSCRIPT\t\"arch/$(ARCH)/cpu/u-boot-spl.lds\"\n+#define CONFIG_SPL_LIBCOMMON_SUPPORT\n+#define CONFIG_SPL_LIBGENERIC_SUPPORT\n+#define CONFIG_SPL_ENV_SUPPORT\n+#define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT\n+#define CONFIG_SPL_I2C_SUPPORT\n+#define CONFIG_SPL_WATCHDOG_SUPPORT\n+#define CONFIG_SPL_SERIAL_SUPPORT\n+#define CONFIG_SPL_MMC_SUPPORT\n+#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR\t\t0xe8\n+#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS\t\t0x400\n+\n+#define CONFIG_SPL_TEXT_BASE\t\t0x10000000\n+#define CONFIG_SPL_MAX_SIZE\t\t0x1a000\n+#define CONFIG_SPL_STACK\t\t0x1001d000\n+#define CONFIG_SPL_PAD_TO\t\t0x1c000\n+#define CONFIG_SYS_TEXT_BASE\t\t0x82000000\n+\n+#define CONFIG_SYS_SPL_MALLOC_START\t0x80200000\n+#define CONFIG_SYS_SPL_MALLOC_SIZE\t0x100000\n+#define CONFIG_SPL_BSS_START_ADDR\t0x80100000\n+#define CONFIG_SPL_BSS_MAX_SIZE\t\t0x80000\n+#define CONFIG_SYS_MONITOR_LEN\t\t0x80000\n+#define CONFIG_SYS_NO_FLASH\n+#endif\n \n #ifndef CONFIG_SYS_TEXT_BASE\n #define CONFIG_SYS_TEXT_BASE\t\t0x67f80000\n@@ -72,6 +111,7 @@ unsigned long get_board_ddr_clk(void);\n /*\n * IFC Definitions\n */\n+#if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_QSPI_BOOT)\n #define CONFIG_FSL_IFC\n #define CONFIG_SYS_FLASH_BASE\t\t0x60000000\n #define CONFIG_SYS_FLASH_BASE_PHYS\tCONFIG_SYS_FLASH_BASE\n@@ -164,6 +204,7 @@ unsigned long get_board_ddr_clk(void);\n #define CONFIG_CMD_NAND\n \n #define CONFIG_SYS_NAND_BLOCK_SIZE\t(128 * 1024)\n+#endif\n \n /*\n * QIXIS Definitions\n@@ -325,7 +366,12 @@ unsigned long get_board_ddr_clk(void);\n \n #define CONFIG_CMDLINE_TAG\n #define CONFIG_CMDLINE_EDITING\n+\n+#if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_QSPI_BOOT)\n #define CONFIG_CMD_IMLS\n+#else\n+#undef CONFIG_CMD_IMLS\n+#endif\n \n #define CONFIG_HWCONFIG\n #define HWCONFIG_BUFFER_SIZE\t\t128\n@@ -373,17 +419,37 @@ unsigned long get_board_ddr_clk(void);\n #define CONFIG_SYS_INIT_SP_ADDR \\\n \t(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)\n \n+#ifdef CONFIG_SPL_BUILD\n+#define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE\n+#else\n #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */\n+#endif\n \n /*\n * Environment\n */\n #define CONFIG_ENV_OVERWRITE\n \n+#if defined(CONFIG_SD_BOOT)\n+#define CONFIG_ENV_OFFSET\t\t(1024 * 1024)\n+#define CONFIG_ENV_IS_IN_MMC\n+#define CONFIG_SYS_MMC_ENV_DEV\t\t0\n+#define CONFIG_ENV_SIZE\t\t\t0x2000\n+#elif defined(CONFIG_NAND_BOOT)\n+#define CONFIG_ENV_IS_IN_NAND\n+#define CONFIG_ENV_SIZE\t\t\t0x2000\n+#define CONFIG_ENV_OFFSET\t\t(10 * CONFIG_SYS_NAND_BLOCK_SIZE)\n+#elif defined(CONFIG_QSPI_BOOT)\n+#define CONFIG_ENV_IS_IN_SPI_FLASH\n+#define CONFIG_ENV_SIZE\t\t\t0x2000 /* 8KB */\n+#define CONFIG_ENV_OFFSET\t\t0x100000 /* 1MB */\n+#define CONFIG_ENV_SECT_SIZE\t\t0x10000\n+#else\n #define CONFIG_ENV_IS_IN_FLASH\n #define CONFIG_ENV_ADDR\t\t(CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)\n #define CONFIG_ENV_SIZE\t\t\t0x2000\n #define CONFIG_ENV_SECT_SIZE\t\t0x20000 /* 128K (one sector) */\n+#endif\n \n #define CONFIG_OF_LIBFDT\n #define CONFIG_OF_BOARD_SETUP\n", "prefixes": [ "U-Boot", "v3", "6/8" ] }