On Sun, 2017-02-19 at 03:28 +0100, Marek Vasut wrote:
On 02/19/2017 02:52 AM, Dalon Westergreen wrote:
This adds a common environment and support for distro boot in the common socfpga header.
Signed-off-by: Dalon Westergreen dwesterg@gmail.com
-- Changes in V2: - Remove unneeded CONFIG_BOOTFILE and fdt_addr - cleanup spacing in MMC env size
include/configs/socfpga_common.h | 53 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 4 deletions(-)
[...]
+#define BOOT_TARGET_DEVICES(func) \
- BOOT_TARGET_DEVICES_MMC(func) \
- BOOT_TARGET_DEVICES_PXE(func) \
- func(DHCP, dhcp, na)
+#include <config_distro_bootcmd.h>
+#ifndef CONFIG_EXTRA_ENV_SETTINGS +#define CONFIG_EXTRA_ENV_SETTINGS \
- "verify=n\0" \
This is still here ...
okay, i think i misunderstood what you meant... i am removing verify=n b/c i dont believe it is wise as a default, but as far as fdtfile my intent is to keep it. sysboot / extlinux uses ${soc}-${board}.dtb as the default devicetree which will result in socfpga-sr1500.dtb as an example. sysboot will however use ${fdtfile} first if found.
- "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
- "bootm_size=0xa000000\0" \
- "kernel_addr_r="__stringify(CONFIG_SYS_LOAD_ADDR)"\0" \
- "fdt_addr_r=0x02000000\0" \
- "scriptaddr=0x02100000\0" \
- "pxefile_addr_r=0x02200000\0" \
- "ramdisk_addr_r=0x02300000\0" \
- BOOTENV
+#endif +#endif
#endif /* __CONFIG_SOCFPGA_COMMON_H__ */
--dalon