mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
74 lines
1.9 KiB
Diff
74 lines
1.9 KiB
Diff
|
From 734e94e98824c0cadaeaebf13f9955a673320e9a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Vagrant Cascadian <vagrant@debian.org>
|
||
|
|
Date: Sat, 28 May 2016 16:08:39 -0700
|
||
|
|
Subject: [PATCH 1/2] Convert odroid to use distro_bootcmd.
|
||
|
|
|
||
|
|
---
|
||
|
|
include/configs/odroid.h | 22 ++++++++++++++++++----
|
||
|
|
1 file changed, 18 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
|
||
|
|
index 60ed013959..caa1b03a22 100644
|
||
|
|
--- a/include/configs/odroid.h
|
||
|
|
+++ b/include/configs/odroid.h
|
||
|
|
@@ -43,7 +43,6 @@
|
||
|
|
|
||
|
|
/* Console configuration */
|
||
|
|
|
||
|
|
-#define CONFIG_BOOTCOMMAND "run autoboot"
|
||
|
|
#define CONFIG_DEFAULT_CONSOLE "ttySAC1,115200n8"
|
||
|
|
|
||
|
|
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
|
||
|
|
@@ -52,7 +51,7 @@
|
||
|
|
#define CONFIG_SYS_MONITOR_BASE 0x00000000
|
||
|
|
|
||
|
|
#define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV
|
||
|
|
-#define CONFIG_ENV_SIZE 4096
|
||
|
|
+#define CONFIG_ENV_SIZE 8192
|
||
|
|
#define CONFIG_ENV_OFFSET (SZ_1K * 1280) /* 1.25 MiB offset */
|
||
|
|
#define CONFIG_ENV_OVERWRITE
|
||
|
|
|
||
|
|
@@ -85,6 +84,20 @@
|
||
|
|
"bl2 raw 0x1f 0x1d;" \
|
||
|
|
"tzsw raw 0x83f 0x138\0"
|
||
|
|
|
||
|
|
+#define BOOT_TARGET_DEVICES(func) \
|
||
|
|
+ func(MMC, mmc, 1) \
|
||
|
|
+ func(MMC, mmc, 0)
|
||
|
|
+
|
||
|
|
+#include <config_distro_bootcmd.h>
|
||
|
|
+
|
||
|
|
+#define MEM_LAYOUT_ENV_SETTINGS \
|
||
|
|
+ "bootm_size=0x10000000\0" \
|
||
|
|
+ "kernel_addr_r=0x42000000\0" \
|
||
|
|
+ "fdt_addr_r=0x43000000\0" \
|
||
|
|
+ "ramdisk_addr_r=0x43300000\0" \
|
||
|
|
+ "scriptaddr=0x50000000\0" \
|
||
|
|
+ "pxefile_addr_r=0x51000000\0"
|
||
|
|
+
|
||
|
|
/*
|
||
|
|
* Bootable media layout:
|
||
|
|
* dev: SD eMMC(part boot)
|
||
|
|
@@ -163,7 +176,6 @@
|
||
|
|
"mmcbootpart=1\0" \
|
||
|
|
"mmcrootdev=0\0" \
|
||
|
|
"mmcrootpart=2\0" \
|
||
|
|
- "bootdelay=0\0" \
|
||
|
|
"dfu_alt_system="CONFIG_DFU_ALT \
|
||
|
|
"dfu_alt_info=Please reset the board\0" \
|
||
|
|
"consoleon=set console console=ttySAC1,115200n8; save; reset\0" \
|
||
|
|
@@ -171,7 +183,9 @@
|
||
|
|
"initrdname=uInitrd\0" \
|
||
|
|
"initrdaddr=42000000\0" \
|
||
|
|
"scriptaddr=0x42000000\0" \
|
||
|
|
- "fdtaddr=40800000\0"
|
||
|
|
+ "fdtaddr=40800000\0" \
|
||
|
|
+ MEM_LAYOUT_ENV_SETTINGS \
|
||
|
|
+ BOOTENV
|
||
|
|
|
||
|
|
/* GPT */
|
||
|
|
|
||
|
|
--
|
||
|
|
2.16.1
|
||
|
|
|