140 lines
3.7 KiB
Diff
140 lines
3.7 KiB
Diff
From 69b8812eec97af45dbd54699988f30044e40869e Mon Sep 17 00:00:00 2001
|
|
From: Dennis Gilmore <dennis@ausil.us>
|
|
Date: Wed, 10 Sep 2014 10:57:16 -0500
|
|
Subject: [PATCH 08/12] wandboard: port to generic distro booting
|
|
|
|
set the variables and functions needed for generic distro booting.
|
|
---
|
|
include/configs/wandboard.h | 48 ++++++++++++++++++++++++---------------------
|
|
1 file changed, 26 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
|
|
index 7d96908..cd42523 100644
|
|
--- a/include/configs/wandboard.h
|
|
+++ b/include/configs/wandboard.h
|
|
@@ -51,8 +51,6 @@
|
|
#define CONFIG_CMD_BMODE
|
|
#define CONFIG_CMD_SETEXPR
|
|
|
|
-#define CONFIG_BOOTDELAY 5
|
|
-
|
|
#define CONFIG_SYS_MEMTEST_START 0x10000000
|
|
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
|
|
#define CONFIG_LOADADDR 0x12000000
|
|
@@ -74,15 +72,8 @@
|
|
#define CONFIG_CMD_MMC
|
|
#define CONFIG_GENERIC_MMC
|
|
#define CONFIG_BOUNCE_BUFFER
|
|
-#define CONFIG_CMD_EXT2
|
|
-#define CONFIG_CMD_FAT
|
|
-#define CONFIG_DOS_PARTITION
|
|
|
|
/* Ethernet Configuration */
|
|
-#define CONFIG_CMD_PING
|
|
-#define CONFIG_CMD_DHCP
|
|
-#define CONFIG_CMD_MII
|
|
-#define CONFIG_CMD_NET
|
|
#define CONFIG_FEC_MXC
|
|
#define CONFIG_MII
|
|
#define IMX_FEC_BASE ENET_BASE_ADDR
|
|
@@ -110,6 +101,16 @@
|
|
#define CONFIG_IMX_HDMI
|
|
#define CONFIG_IMX_VIDEO_SKIP
|
|
|
|
+#ifndef CONFIG_SPL_BUILD
|
|
+#include <config_distro_defaults.h>
|
|
+#include <config_distro_bootcmd.h>
|
|
+
|
|
+#define BOOT_TARGET_DEVICES(func) \
|
|
+ func(MMC, mmc, 0) \
|
|
+ func(PXE, pxe, na) \
|
|
+ func(DHCP, dhcp, na)
|
|
+
|
|
+
|
|
#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
|
|
#define CONFIG_DEFAULT_FDT_FILE "imx6dl-wandboard.dtb"
|
|
#elif defined(CONFIG_MX6Q)
|
|
@@ -119,13 +120,16 @@
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"script=boot.scr\0" \
|
|
"image=zImage\0" \
|
|
- "console=ttymxc0\0" \
|
|
+ "console=ttymxc0,115200\0" \
|
|
"splashpos=m,m\0" \
|
|
- "fdt_high=0xffffffff\0" \
|
|
- "initrd_high=0xffffffff\0" \
|
|
- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
|
|
- "fdt_addr=0x18000000\0" \
|
|
+ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
|
|
+ "fdt_addr_r=0x18000000\0" \
|
|
"boot_fdt=try\0" \
|
|
+ "pxefile_addr_r=0x17f00000\0" \
|
|
+ "scriptaddr=0x17e00000\0" \
|
|
+ "kernel_addr_r=0x11000000\0" \
|
|
+ "ramdisk_addr_r=0x18100000\0" \
|
|
+ "bootm_size=0x20000000\0" \
|
|
"ip_dyn=yes\0" \
|
|
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
|
|
"mmcpart=1\0" \
|
|
@@ -144,7 +148,7 @@
|
|
"mmc write ${loadaddr} 0x2 ${fw_sz}; " \
|
|
"fi; " \
|
|
"fi\0" \
|
|
- "mmcargs=setenv bootargs console=${console},${baudrate} " \
|
|
+ "mmcargs=setenv bootargs console=${console} " \
|
|
"root=${mmcroot}; run videoargs\0" \
|
|
"videoargs=" \
|
|
"setenv nextcon 0; " \
|
|
@@ -193,7 +197,7 @@
|
|
"else " \
|
|
"bootz; " \
|
|
"fi;\0" \
|
|
- "netargs=setenv bootargs console=${console},${baudrate} " \
|
|
+ "netargs=setenv bootargs console=${console} " \
|
|
"root=/dev/nfs " \
|
|
"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
|
|
"netboot=echo Booting from net ...; " \
|
|
@@ -216,7 +220,8 @@
|
|
"fi; " \
|
|
"else " \
|
|
"bootz; " \
|
|
- "fi;\0"
|
|
+ "fi;\0" \
|
|
+ BOOTENV
|
|
|
|
#define CONFIG_BOOTCOMMAND \
|
|
"mmc dev ${mmcdev}; if mmc rescan; then " \
|
|
@@ -230,6 +235,10 @@
|
|
"fi; " \
|
|
"else run netboot; fi"
|
|
|
|
+#else
|
|
+#define BOOT_TARGET_DEVICES
|
|
+#endif
|
|
+
|
|
/* Miscellaneous configurable options */
|
|
#define CONFIG_SYS_LONGHELP
|
|
#define CONFIG_SYS_HUSH_PARSER
|
|
@@ -243,8 +252,6 @@
|
|
|
|
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
|
|
|
|
-#define CONFIG_CMDLINE_EDITING
|
|
-
|
|
/* Physical Memory Map */
|
|
#define CONFIG_NR_DRAM_BANKS 1
|
|
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
|
|
@@ -267,9 +274,6 @@
|
|
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
|
|
#define CONFIG_SYS_MMC_ENV_DEV 0
|
|
|
|
-#define CONFIG_OF_LIBFDT
|
|
-#define CONFIG_CMD_BOOTZ
|
|
-
|
|
#ifndef CONFIG_SYS_DCACHE_OFF
|
|
#define CONFIG_CMD_CACHE
|
|
#endif
|
|
--
|
|
2.1.0
|
|
|