From: Dalon Westergreen <dwesterg@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v5 3/7] arm: socfpga: update cyclone5 socdk default environment
Date: Tue, 24 Jan 2017 20:13:58 -0800 [thread overview]
Message-ID: <1485317642-4887-4-git-send-email-dwesterg@gmail.com> (raw)
In-Reply-To: <1485317642-4887-1-git-send-email-dwesterg@gmail.com>
From: Dalon Westergreen <dalon.westergreen@intel.com>
Remove the default environment as it is now in a common
header.
Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig
to set the linux devicetree name.
Signed-off-by: Dalon Westergreen <dalon.westergreen@intel.com>
Acked-by: Marek Vasut <marex@denx.de>
---
configs/socfpga_cyclone5_defconfig | 1 +
include/configs/socfpga_cyclone5_socdk.h | 25 -------------------------
2 files changed, 1 insertion(+), 25 deletions(-)
diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig
index 8b050b9..cba1e9c 100644
--- a/configs/socfpga_cyclone5_defconfig
+++ b/configs/socfpga_cyclone5_defconfig
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_SOCFPGA_CYCLONE5_SOCDK=y
CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
+CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_socdk.dtb"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h
index 7ced6a6..96b2b87 100644
--- a/include/configs/socfpga_cyclone5_socdk.h
+++ b/include/configs/socfpga_cyclone5_socdk.h
@@ -36,31 +36,6 @@
#define CONFIG_ENV_IS_IN_MMC
-/* Extra Environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
- "verify=n\0" \
- "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
- "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
- "bootm ${loadaddr} - ${fdt_addr}\0" \
- "bootimage=zImage\0" \
- "fdt_addr=100\0" \
- "fdtimage=socfpga.dtb\0" \
- "bootm ${loadaddr} - ${fdt_addr}\0" \
- "mmcroot=/dev/mmcblk0p2\0" \
- "mmcboot=setenv bootargs " CONFIG_BOOTARGS \
- " root=${mmcroot} rw rootwait;" \
- "bootz ${loadaddr} - ${fdt_addr}\0" \
- "mmcload=mmc rescan;" \
- "load mmc 0:1 ${loadaddr} ${bootimage};" \
- "load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
- "qspiload=sf probe && mtdparts default && run ubiload\0" \
- "qspiboot=setenv bootargs " CONFIG_BOOTARGS \
- " ubi.mtd=1,64 root=ubi0:rootfs rw rootfstype=ubifs;"\
- "bootz ${loadaddr} - ${fdt_addr}\0" \
- "ubiload=ubi part UBI && ubifsmount ubi0 && " \
- "ubifsload ${loadaddr} /boot/${bootimage} && " \
- "ubifsload ${fdt_addr} /boot/${fdtimage}\0"
-
/* The rest of the configuration is shared */
#include <configs/socfpga_common.h>
--
2.7.4
next prev parent reply other threads:[~2017-01-25 4:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-25 4:13 [U-Boot] [PATCH v5 0/7] Dalon Westergreen
2017-01-25 4:13 ` [U-Boot] [PATCH v5 1/7] arm: socfpga: add env settings to common header Dalon Westergreen
2017-01-25 4:13 ` [U-Boot] [PATCH v5 2/7] arm: socfpga: update de0 nano default environment Dalon Westergreen
2017-01-25 4:13 ` Dalon Westergreen [this message]
2017-01-25 4:13 ` [U-Boot] [PATCH v5 4/7] arm: socfpga: update arria5 socdk " Dalon Westergreen
2017-01-25 4:14 ` [U-Boot] [PATCH v5 5/7] arm: socfpga: Update DE1 environment Dalon Westergreen
2017-01-25 4:14 ` [U-Boot] [PATCH v5 6/7] arm: socfpga: Update SoCKit environment Dalon Westergreen
2017-01-25 4:14 ` [U-Boot] [PATCH v5 7/7] arm: socfpga: Update sr1500 environment Dalon Westergreen
2017-01-25 9:48 ` [U-Boot] [PATCH v5 0/7] Marek Vasut
2017-01-25 14:39 ` Dinh Nguyen
2017-01-25 17:33 ` Dalon Westergreen
2017-01-25 20:21 ` Marek Vasut
2017-01-25 21:52 ` Frank Kunz
2017-01-26 4:45 ` Dalon Westergreen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1485317642-4887-4-git-send-email-dwesterg@gmail.com \
--to=dwesterg@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.