99 lines
2.7 KiB
Diff
99 lines
2.7 KiB
Diff
From 99afbef73d291faf6ba069d36eef7d7b1eef6514 Mon Sep 17 00:00:00 2001
|
|
From: Peter Robinson <pbrobinson@gmail.com>
|
|
Date: Thu, 2 Jul 2015 23:26:44 +0100
|
|
Subject: [PATCH 3/5] Switch omap4 boards to use config_distro_defaults and
|
|
config_distro_bootcmd.
|
|
|
|
Add pxefile_addr_r to DEFAULT_LINUX_BOOT_ENV, as pxefile_addr_r is used
|
|
to store the pxe boot configuation file in config_distro_defaults.
|
|
adjust adress of scriptaddr to be unique
|
|
---
|
|
include/configs/ti_armv7_common.h | 3 ++-
|
|
include/configs/ti_omap4_common.h | 41 ++++++++++++++++-----------------------
|
|
2 files changed, 19 insertions(+), 25 deletions(-)
|
|
|
|
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
|
|
index d6073b2..3523e67 100644
|
|
--- a/include/configs/ti_armv7_common.h
|
|
+++ b/include/configs/ti_armv7_common.h
|
|
@@ -54,7 +54,8 @@
|
|
#define DEFAULT_LINUX_BOOT_ENV \
|
|
"loadaddr=0x82000000\0" \
|
|
"kernel_addr_r=0x82000000\0" \
|
|
- "scriptaddr=0x82000000\0" \
|
|
+ "pxefile_addr_r=0x87F00000\0" \
|
|
+ "scriptaddr=0x87E00000\0" \
|
|
"fdtaddr=0x88000000\0" \
|
|
"fdt_addr_r=0x88000000\0" \
|
|
"rdaddr=0x88080000\0" \
|
|
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
|
|
index e966134..51b7265 100644
|
|
--- a/include/configs/ti_omap4_common.h
|
|
+++ b/include/configs/ti_omap4_common.h
|
|
@@ -78,6 +78,18 @@
|
|
#define CONFIG_USB_TTY 1
|
|
#define CONFIG_SYS_CONSOLE_IS_IN_ENV 1
|
|
|
|
+#ifndef CONFIG_SPL_BUILD
|
|
+#include <config_distro_defaults.h>
|
|
+#include <config_distro_bootcmd.h>
|
|
+
|
|
+#define BOOTENV_INIT_COMMAND "run findfdt ;"
|
|
+
|
|
+#define BOOT_TARGET_DEVICES(func) \
|
|
+ func(MMC, mmc, 0) \
|
|
+ func(USB, usb, 0) \
|
|
+ func(PXE, pxe, na) \
|
|
+ func(DHCP, dhcp, na)
|
|
+
|
|
/*
|
|
* Environment setup
|
|
*/
|
|
@@ -85,7 +97,7 @@
|
|
DEFAULT_LINUX_BOOT_ENV \
|
|
"console=ttyO2,115200n8\0" \
|
|
"fdtfile=undefined\0" \
|
|
- "bootpart=0:2\0" \
|
|
+ "bootpart=1\0" \
|
|
"bootdir=/boot\0" \
|
|
"bootfile=zImage\0" \
|
|
"usbtty=cdc_acm\0" \
|
|
@@ -125,30 +137,11 @@
|
|
"if test $fdtfile = undefined; then " \
|
|
"echo WARNING: Could not determine device tree to use; fi; \0" \
|
|
"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
|
|
+ BOOTENV
|
|
|
|
-#define CONFIG_BOOTCOMMAND \
|
|
- "run findfdt; " \
|
|
- "mmc dev ${mmcdev}; if mmc rescan; then " \
|
|
- "echo SD/MMC found on device ${mmcdev};" \
|
|
- "if run loadbootscript; then " \
|
|
- "run bootscript; " \
|
|
- "else " \
|
|
- "if run loadbootenv; then " \
|
|
- "run importbootenv; " \
|
|
- "fi;" \
|
|
- "if test -n ${uenvcmd}; then " \
|
|
- "echo Running uenvcmd ...;" \
|
|
- "run uenvcmd;" \
|
|
- "fi;" \
|
|
- "fi;" \
|
|
- "if run loadimage; then " \
|
|
- "run loadfdt;" \
|
|
- "run mmcboot; " \
|
|
- "fi; " \
|
|
- "if run loaduimage; then " \
|
|
- "run uimageboot;" \
|
|
- "fi; " \
|
|
- "fi"
|
|
+#else
|
|
+#define BOOT_TARGET_DEVICES
|
|
+#endif
|
|
|
|
/*
|
|
* Defines for SPL
|
|
--
|
|
2.4.5
|
|
|