From: Dalon Westergreen <dwesterg@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v8 2/7] arm: socfpga: update de0 nano default environment
Date: Sat, 28 Jan 2017 15:05:13 -0800 [thread overview]
Message-ID: <1485644718-20435-3-git-send-email-dwesterg@gmail.com> (raw)
In-Reply-To: <1485644718-20435-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_de0_nano_soc_defconfig | 3 +--
include/configs/socfpga_common.h | 2 +-
include/configs/socfpga_de0_nano_soc.h | 19 +------------------
3 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig
index af41e1e..4837809 100644
--- a/configs/socfpga_de0_nano_soc_defconfig
+++ b/configs/socfpga_de0_nano_soc_defconfig
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y
CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc"
+CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de0_sockit.dtb"
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
@@ -20,7 +21,6 @@ CONFIG_CMD_ASKENV=y
CONFIG_CMD_GREPENV=y
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_MMC=y
-CONFIG_CMD_SF=y
CONFIG_CMD_SPI=y
CONFIG_CMD_I2C=y
CONFIG_CMD_USB=y
@@ -35,7 +35,6 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
-CONFIG_CMD_UBI=y
CONFIG_SPL_DM=y
CONFIG_DFU_MMC=y
CONFIG_DM_GPIO=y
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 744aee9..ed6d8ea 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -319,7 +319,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 2
#endif
#else
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION 3
+#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION 1
#endif
#endif
diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h
index 6b9546e..97216ea 100644
--- a/include/configs/socfpga_de0_nano_soc.h
+++ b/include/configs/socfpga_de0_nano_soc.h
@@ -18,7 +18,7 @@
#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */
/* Booting Linux */
-#define CONFIG_BOOTFILE "fitImage"
+#define CONFIG_BOOTFILE "zImage"
#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE)
#define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot"
#define CONFIG_LOADADDR 0x01000000
@@ -32,23 +32,6 @@
#define CONFIG_ENV_IS_IN_MMC
-/* Extra Environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
- "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" \
-
/* The rest of the configuration is shared */
#include <configs/socfpga_common.h>
--
2.7.4
next prev parent reply other threads:[~2017-01-28 23:05 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-28 23:05 [U-Boot] [PATCH v8 0/7] arm: socfpga: update default u-boot environment Dalon Westergreen
2017-01-28 23:05 ` [U-Boot] [PATCH v8 1/7] arm: socfpga: add env settings to common header Dalon Westergreen
2017-01-30 14:55 ` Alexander Graf
2017-01-30 15:11 ` Dalon Westergreen
2017-01-30 15:14 ` Alexander Graf
2017-01-28 23:05 ` Dalon Westergreen [this message]
2017-01-30 15:04 ` [U-Boot] [PATCH v8 2/7] arm: socfpga: update de0 nano default environment Alexander Graf
2017-01-28 23:05 ` [U-Boot] [PATCH v8 3/7] arm: socfpga: update cyclone5 socdk " Dalon Westergreen
2017-01-28 23:05 ` [U-Boot] [PATCH v8 4/7] arm: socfpga: update arria5 " Dalon Westergreen
2017-01-28 23:05 ` [U-Boot] [PATCH v8 5/7] arm: socfpga: Update DE1 environment Dalon Westergreen
2017-01-30 15:07 ` Alexander Graf
2017-01-30 15:17 ` Westergreen, Dalon
2017-01-28 23:05 ` [U-Boot] [PATCH v8 6/7] arm: socfpga: Update SoCKit environment Dalon Westergreen
2017-01-28 23:05 ` [U-Boot] [PATCH v8 7/7] arm: socfpga: Update sr1500 environment 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=1485644718-20435-3-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox