mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-28 22:57:37 +00:00
62 lines
2.2 KiB
Diff
62 lines
2.2 KiB
Diff
|
From 9d224c6927d9c46c08fdb2446022f1239128589a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Frans-Willem Hardijzer <fw@hardijzer.nl>
|
||
|
|
Date: Tue, 25 Aug 2015 12:21:00 +0000
|
||
|
|
Subject: [PATCH] Arch Linux ARM modifications
|
||
|
|
|
||
|
|
---
|
||
|
|
include/configs/mx6cuboxi.h | 17 +++++++++++++----
|
||
|
|
1 file changed, 13 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
|
||
|
|
index 3d5bba7..2ef3f40 100644
|
||
|
|
--- a/include/configs/mx6cuboxi.h
|
||
|
|
+++ b/include/configs/mx6cuboxi.h
|
||
|
|
@@ -83,12 +83,18 @@
|
||
|
|
|
||
|
|
#define CONFIG_MXC_UART_BASE UART1_BASE
|
||
|
|
#define CONFIG_CONSOLE_DEV "ttymxc0"
|
||
|
|
-#define CONFIG_MMCROOT "/dev/mmcblk0p2"
|
||
|
|
+#define CONFIG_MMCROOT "/dev/mmcblk0p1"
|
||
|
|
#define CONFIG_SYS_FSL_USDHC_NUM 1
|
||
|
|
#define CONFIG_SYS_MMC_ENV_DEV 0 /* SDHC2 */
|
||
|
|
|
||
|
|
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
|
||
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||
|
|
+ "bootdir=/boot\0" \
|
||
|
|
+ "fdtdir=/boot/dtbs\0" \
|
||
|
|
+ "bootenv=uEnv.txt\0" \
|
||
|
|
+ "loadbootenv=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${bootdir}/${bootenv};\0" \
|
||
|
|
+ "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
|
||
|
|
+ "env import -t ${loadaddr} $filesize};\0" \
|
||
|
|
"script=boot.scr\0" \
|
||
|
|
"image=zImage\0" \
|
||
|
|
"fdtfile=undefined\0" \
|
||
|
|
@@ -116,11 +122,11 @@
|
||
|
|
"mmcargs=setenv bootargs console=${console},${baudrate} " \
|
||
|
|
"root=${mmcroot}\0" \
|
||
|
|
"loadbootscript=" \
|
||
|
|
- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
|
||
|
|
+ "load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${bootdir}/${script};\0" \
|
||
|
|
"bootscript=echo Running bootscript from mmc ...; " \
|
||
|
|
"source\0" \
|
||
|
|
- "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
|
||
|
|
- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtfile}\0" \
|
||
|
|
+ "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${bootdir}/${image}\0" \
|
||
|
|
+ "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtdir}/${fdtfile}\0" \
|
||
|
|
"mmcboot=echo Booting from mmc ...; " \
|
||
|
|
"run mmcargs; " \
|
||
|
|
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
|
||
|
|
@@ -176,6 +182,9 @@
|
||
|
|
"run findfdt; " \
|
||
|
|
"mmc dev ${mmcdev};" \
|
||
|
|
"if mmc rescan; then " \
|
||
|
|
+ "if run loadbootenv; then " \
|
||
|
|
+ "run importbootenv; " \
|
||
|
|
+ "fi; " \
|
||
|
|
"if run loadbootscript; then " \
|
||
|
|
"run bootscript; " \
|
||
|
|
"else " \
|
||
|
|
--
|
||
|
|
2.5.0
|
||
|
|
|