PKGBUILDs/alarm/uboot-wandboard/0001-arch-linux-arm-modifications.patch

162 lines
5 KiB
Diff
Raw Normal View History

2015-11-03 01:11:03 +00:00
From 901b53bdb99f888eb2a21cf8a50d9d49bdf2fb5e Mon Sep 17 00:00:00 2001
2014-11-23 21:01:41 +00:00
From: Kevin Mihelich <kevin@archlinuxarm.org>
2015-11-03 01:11:03 +00:00
Date: Sat, 31 Oct 2015 12:27:08 -0600
2014-11-23 21:01:41 +00:00
Subject: [PATCH] arch linux arm modifications
Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
---
2015-11-03 01:11:03 +00:00
include/configs/mx6_common.h | 4 ++-
include/configs/wandboard.h | 80 ++++++++++++++++++++++++++------------------
2 files changed, 51 insertions(+), 33 deletions(-)
2014-11-23 21:01:41 +00:00
2015-11-03 01:11:03 +00:00
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index ef4cb68..254458d 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -68,7 +68,7 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
2014-08-17 17:51:55 +00:00
2015-11-03 01:11:03 +00:00
#ifndef CONFIG_BOOTDELAY
-#define CONFIG_BOOTDELAY 3
+#define CONFIG_BOOTDELAY 1
#endif
2014-08-17 17:51:55 +00:00
2015-11-03 01:11:03 +00:00
/* allow to overwrite serial and ethaddr */
@@ -82,6 +82,8 @@
#define CONFIG_SUPPORT_RAW_INITRD
#define CONFIG_CMD_FS_GENERIC
2014-08-17 17:51:55 +00:00
#define CONFIG_DOS_PARTITION
2015-06-07 23:57:33 +00:00
+#define CONFIG_CMD_PART
+#define CONFIG_PARTITION_UUIDS
2015-11-03 01:11:03 +00:00
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_EXT4
#define CONFIG_CMD_EXT4_WRITE
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 6e8aec2..f8eb0ca 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -86,19 +86,26 @@
#define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP
2013-07-26 01:34:52 +00:00
+#define CONFIG_IDENT_STRING " Arch Linux ARM"
+
2015-11-03 01:11:03 +00:00
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
2013-07-26 01:34:52 +00:00
#define CONFIG_EXTRA_ENV_SETTINGS \
2015-11-03 01:11:03 +00:00
"script=boot.scr\0" \
"image=zImage\0" \
2014-08-17 17:51:55 +00:00
+ "bootdir=/boot\0" \
2015-11-03 01:11:03 +00:00
"console=ttymxc0\0" \
2014-08-17 17:51:55 +00:00
"splashpos=m,m\0" \
2015-11-03 01:11:03 +00:00
"fdtfile=undefined\0" \
+ "fdtdir=/boot/dtbs\0" \
2014-08-17 17:51:55 +00:00
"fdt_high=0xffffffff\0" \
2015-11-03 01:11:03 +00:00
"initrd_high=0xffffffff\0" \
"fdt_addr=0x18000000\0" \
2014-08-17 17:51:55 +00:00
+ "rdaddr=0x12A00000\0" \
+ "rdfile=initramfs-linux.img\0" \
2015-11-03 01:11:03 +00:00
"boot_fdt=try\0" \
+ "optargs=\0" \
2014-08-17 17:51:55 +00:00
"ip_dyn=yes\0" \
- "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
+ "mmcdev=0\0" \
2015-11-03 01:11:03 +00:00
"mmcpart=1\0" \
"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
"update_sd_firmware_filename=u-boot.imx\0" \
@@ -116,7 +123,9 @@
"fi; " \
"fi\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
- "root=${mmcroot}; run videoargs\0" \
2014-08-17 17:51:55 +00:00
+ "${optargs} " \
2015-06-07 23:57:33 +00:00
+ "root=${root} " \
2014-08-17 17:51:55 +00:00
+ "video=${video}\0" \
"videoargs=" \
"setenv nextcon 0; " \
"if hdmidet; then " \
2015-11-03 01:11:03 +00:00
@@ -143,27 +152,43 @@
2014-08-17 17:51:55 +00:00
"echo '- no FWBADAPT-7WVGA-LCD-F07A-0102 display';" \
"fi; " \
"setenv bootargs ${bootargs} ${fbmem}\0" \
- "loadbootscript=" \
- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
- "bootscript=echo Running bootscript from mmc ...; " \
- "source\0" \
2014-03-19 21:35:55 +00:00
- "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
2015-11-03 01:11:03 +00:00
- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \
2014-03-19 21:35:55 +00:00
- "mmcboot=echo Booting from mmc ...; " \
2014-08-17 17:51:55 +00:00
- "run mmcargs; " \
2014-03-19 21:35:55 +00:00
- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
- "if run loadfdt; then " \
- "bootz ${loadaddr} - ${fdt_addr}; " \
- "else " \
- "if test ${boot_fdt} = try; then " \
2014-08-17 17:51:55 +00:00
- "bootz; " \
2015-11-03 01:11:03 +00:00
+ "loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${image}\0" \
2015-06-07 23:57:33 +00:00
+ "loadrd=load ${devtype} ${bootpart} ${rdaddr} ${bootdir}/${rdfile}\0" \
2015-11-03 01:11:03 +00:00
+ "loadfdt=echo loading ${fdtdir}/${fdtfile} ...; load ${devtype} ${bootpart} ${fdt_addr} ${fdtdir}/${fdtfile}\0" \
2015-06-07 23:57:33 +00:00
+ "mmcboot=usb start;" \
+ "for devtype in mmc usb; do " \
+ "setenv devnum 0;" \
+ "while ${devtype} dev ${devnum}; do " \
+ "echo ${devtype} found on device ${devnum};" \
+ "setenv bootpart ${devnum}:1;" \
+ "part uuid ${devtype} ${bootpart} uuid;" \
+ "setenv root PARTUUID=${uuid} rw rootwait;" \
+ "echo Checking for: ${bootdir}/uEnv.txt ...;" \
+ "if test -e ${devtype} ${bootpart} ${bootdir}/uEnv.txt; then " \
+ "load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/uEnv.txt;" \
+ "env import -t ${loadaddr} ${filesize};" \
+ "echo Loaded environment from ${bootdir}/uEnv.txt;" \
+ "echo Checking if uenvcmd is set ...;" \
+ "if test -n ${uenvcmd}; then " \
+ "echo Running uenvcmd ...;" \
+ "run uenvcmd;" \
+ "fi;" \
+ "fi;" \
+ "if run loadimage; then " \
+ "run mmcargs;" \
+ "if run loadfdt; then " \
+ "if run loadrd; then " \
2015-11-03 01:11:03 +00:00
+ "bootz ${loadaddr} ${rdaddr}:${filesize} ${fdt_addr};" \
2015-06-07 23:57:33 +00:00
+ "else " \
2015-11-03 01:11:03 +00:00
+ "bootz ${loadaddr} - ${fdt_addr};" \
2015-06-07 23:57:33 +00:00
+ "fi;" \
+ "fi;" \
"else " \
2014-03-19 21:35:55 +00:00
- "echo WARN: Cannot load the DT; " \
- "fi; " \
2015-06-07 23:57:33 +00:00
- "fi; " \
2014-03-19 21:35:55 +00:00
- "else " \
2014-08-17 17:51:55 +00:00
- "bootz; " \
2015-06-07 23:57:33 +00:00
- "fi;\0" \
+ "echo No kernel found;" \
2014-08-17 17:51:55 +00:00
+ "fi;" \
2015-06-07 23:57:33 +00:00
+ "setexpr devnum ${devnum} + 1;" \
+ "done;" \
+ "done;\0" \
2013-08-13 17:25:09 +00:00
"netargs=setenv bootargs console=${console},${baudrate} " \
"root=/dev/nfs " \
2015-11-03 01:11:03 +00:00
"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
@@ -202,16 +227,7 @@
2014-08-17 17:51:55 +00:00
#define CONFIG_BOOTCOMMAND \
2015-11-03 01:11:03 +00:00
"run findfdt; " \
2014-08-17 17:51:55 +00:00
- "mmc dev ${mmcdev}; if mmc rescan; then " \
- "if run loadbootscript; then " \
- "run bootscript; " \
- "else " \
- "if run loadimage; then " \
- "run mmcboot; " \
- "else run netboot; " \
- "fi; " \
- "fi; " \
- "else run netboot; fi"
2015-11-03 01:11:03 +00:00
+ "run mmcboot;"
2013-07-26 01:34:52 +00:00
2015-11-03 01:11:03 +00:00
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
2014-11-23 21:01:41 +00:00
--
2015-11-03 01:11:03 +00:00
2.6.1
2014-11-23 21:01:41 +00:00