forked from pool/u-boot
75 lines
2.0 KiB
Diff
75 lines
2.0 KiB
Diff
|
From 49a231145790724f4d7d386c414ab66980e4c459 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alexander Graf <agraf@suse.de>
|
||
|
|
Date: Tue, 1 Mar 2016 10:05:10 +0100
|
||
|
|
Subject: [PATCH] omap3: Move to distro bootcmd
|
||
|
|
|
||
|
|
Signed-off-by: Alexander Graf <agraf@suse.de>
|
||
|
|
|
||
|
|
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
|
||
|
|
index 65f08a1..63623a0 100644
|
||
|
|
--- a/include/configs/omap3_beagle.h
|
||
|
|
+++ b/include/configs/omap3_beagle.h
|
||
|
|
@@ -126,9 +126,12 @@
|
||
|
|
|
||
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||
|
|
"loadaddr=0x80200000\0" \
|
||
|
|
+ "kernel_addr_r=0x80200000\0" \
|
||
|
|
"rdaddr=0x81000000\0" \
|
||
|
|
+ "initrd_addr_r=0x81000000\0" \
|
||
|
|
"fdt_high=0xffffffff\0" \
|
||
|
|
- "fdtaddr=0x80f80000\0" \
|
||
|
|
+ "fdtaddr=0x90f80000\0" \
|
||
|
|
+ "fdt_addr_r=0x90f80000\0" \
|
||
|
|
"usbtty=cdc_acm\0" \
|
||
|
|
"bootfile=uImage\0" \
|
||
|
|
"ramdisk=ramdisk.gz\0" \
|
||
|
|
@@ -223,39 +226,17 @@
|
||
|
|
"userbutton=if gpio input 173; then run userbutton_xm; " \
|
||
|
|
"else run userbutton_nonxm; fi;\0" \
|
||
|
|
"userbutton_xm=gpio input 4;\0" \
|
||
|
|
- "userbutton_nonxm=gpio input 7;\0"
|
||
|
|
-/* "run userbutton" will return 1 (false) if pressed and 0 (true) if not */
|
||
|
|
+ "userbutton_nonxm=gpio input 7;\0" \
|
||
|
|
+ BOOTENV
|
||
|
|
+
|
||
|
|
+#define BOOT_TARGET_DEVICES(func) \
|
||
|
|
+ func(MMC, mmc, 0)
|
||
|
|
+
|
||
|
|
#define CONFIG_BOOTCOMMAND \
|
||
|
|
"run findfdt; " \
|
||
|
|
- "mmc dev ${mmcdev}; if mmc rescan; then " \
|
||
|
|
- "if run userbutton; then " \
|
||
|
|
- "setenv bootenv uEnv.txt;" \
|
||
|
|
- "else " \
|
||
|
|
- "setenv bootenv user.txt;" \
|
||
|
|
- "fi;" \
|
||
|
|
- "echo SD/MMC found on device ${mmcdev};" \
|
||
|
|
- "if run loadbootenv; then " \
|
||
|
|
- "echo Loaded environment from ${bootenv};" \
|
||
|
|
- "run importbootenv;" \
|
||
|
|
- "fi;" \
|
||
|
|
- "if test -n $uenvcmd; then " \
|
||
|
|
- "echo Running uenvcmd ...;" \
|
||
|
|
- "run uenvcmd;" \
|
||
|
|
- "fi;" \
|
||
|
|
- "if run loadbootscript; then " \
|
||
|
|
- "run bootscript; " \
|
||
|
|
- "else " \
|
||
|
|
- "if run loadimage; then " \
|
||
|
|
- "run mmcboot;" \
|
||
|
|
- "fi;" \
|
||
|
|
- "fi; " \
|
||
|
|
- "fi;" \
|
||
|
|
- "run nandboot;" \
|
||
|
|
- "setenv bootfile zImage;" \
|
||
|
|
- "if run loadimage; then " \
|
||
|
|
- "run loadfdt;" \
|
||
|
|
- "run mmcbootz; " \
|
||
|
|
- "fi; " \
|
||
|
|
+ "run distro_bootcmd"
|
||
|
|
+
|
||
|
|
+#include <config_distro_bootcmd.h>
|
||
|
|
|
||
|
|
/*
|
||
|
|
* OMAP3 has 12 GP timers, they can be driven by the system clock
|