103 lines
2.6 KiB
Diff
103 lines
2.6 KiB
Diff
|
From 7e0336cebce63d25a8e54cf4430dbd00dc445e7b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dennis Gilmore <dennis@ausil.us>
|
||
|
|
Date: Mon, 13 Oct 2014 23:17:32 -0500
|
||
|
|
Subject: [PATCH 12/13] port the riotboard to distro generic configs, patch by
|
||
|
|
pbrobinson
|
||
|
|
|
||
|
|
---
|
||
|
|
include/configs/embestmx6boards.h | 39 ++++++++++++++++++++++++---------------
|
||
|
|
1 file changed, 24 insertions(+), 15 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
|
||
|
|
index 185edbe..e75ee89 100644
|
||
|
|
--- a/include/configs/embestmx6boards.h
|
||
|
|
+++ b/include/configs/embestmx6boards.h
|
||
|
|
@@ -22,7 +22,7 @@
|
||
|
|
#define CONFIG_SYS_GENERIC_BOARD
|
||
|
|
|
||
|
|
#define CONFIG_MXC_UART_BASE UART2_BASE
|
||
|
|
-#define CONFIG_CONSOLE_DEV "ttymxc1"
|
||
|
|
+#define CONFIG_CONSOLE_DEV "ttymxc1,115200"
|
||
|
|
#define CONFIG_MMCROOT "/dev/mmcblk1p2"
|
||
|
|
|
||
|
|
#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
|
||
|
|
@@ -78,14 +78,7 @@
|
||
|
|
#define CONFIG_CMD_MMC
|
||
|
|
#define CONFIG_GENERIC_MMC
|
||
|
|
#define CONFIG_BOUNCE_BUFFER
|
||
|
|
-#define CONFIG_CMD_EXT2
|
||
|
|
-#define CONFIG_CMD_FAT
|
||
|
|
-#define CONFIG_DOS_PARTITION
|
||
|
|
-
|
||
|
|
-#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
|
||
|
|
@@ -120,8 +113,6 @@
|
||
|
|
#define CONFIG_CMD_SETEXPR
|
||
|
|
#undef CONFIG_CMD_IMLS
|
||
|
|
|
||
|
|
-#define CONFIG_BOOTDELAY 1
|
||
|
|
-
|
||
|
|
#define CONFIG_LOADADDR 0x12000000
|
||
|
|
#define CONFIG_SYS_TEXT_BASE 0x17800000
|
||
|
|
|
||
|
|
@@ -163,16 +154,29 @@
|
||
|
|
#define SF_ENV ""
|
||
|
|
#endif
|
||
|
|
|
||
|
|
+#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)
|
||
|
|
+
|
||
|
|
+
|
||
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||
|
|
"script=boot.scr\0" \
|
||
|
|
"image=zImage\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" \
|
||
|
|
"console=" CONFIG_CONSOLE_DEV "\0" \
|
||
|
|
- "fdt_high=0xffffffff\0" \
|
||
|
|
- "initrd_high=0xffffffff\0" \
|
||
|
|
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
|
||
|
|
"mmcpart=1\0" \
|
||
|
|
"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
|
||
|
|
@@ -252,6 +256,10 @@
|
||
|
|
"fi; " \
|
||
|
|
"else run netboot; fi"
|
||
|
|
|
||
|
|
+#else
|
||
|
|
+#define BOOT_TARGET_DEVICES
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
#define CONFIG_ARP_TIMEOUT 200UL
|
||
|
|
|
||
|
|
/* Miscellaneous configurable options */
|
||
|
|
@@ -335,4 +343,5 @@
|
||
|
|
#define CONFIG_IMX_HDMI
|
||
|
|
#define CONFIG_IMX_VIDEO_SKIP
|
||
|
|
|
||
|
|
+
|
||
|
|
#endif /* __RIOTBOARD_CONFIG_H */
|
||
|
|
--
|
||
|
|
2.1.0
|
||
|
|
|