mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-28 22:57:37 +00:00
79 lines
2.8 KiB
Diff
79 lines
2.8 KiB
Diff
diff -urN a/include/configs/wandboard.h b/include/configs/wandboard.h
|
|
--- a/include/configs/wandboard.h 2014-05-17 13:09:55.544901200 -0600
|
|
+++ b/include/configs/wandboard.h 2014-05-17 13:10:26.309787812 -0600
|
|
@@ -108,6 +108,8 @@
|
|
#define CONFIG_DEFAULT_FDT_FILE "imx6q-wandboard.dtb"
|
|
#endif
|
|
|
|
+#define CONFIG_IDENT_STRING " Arch Linux ARM"
|
|
+
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"script=boot.scr\0" \
|
|
"image=zImage\0" \
|
|
@@ -123,8 +125,7 @@
|
|
"video=\0" \
|
|
"mmcdev=0\0" \
|
|
"mmcpart=1\0" \
|
|
- "mmcroot=/dev/mmcblk0p2 ro\0" \
|
|
- "mmcrootfstype=ext4 rootwait\0" \
|
|
+ "mmcroot=/dev/mmcblk0p1 rw rootwait\0" \
|
|
"update_sd_firmware_filename=u-boot.imx\0" \
|
|
"update_sd_firmware=" \
|
|
"if test ${ip_dyn} = yes; then " \
|
|
@@ -142,35 +143,23 @@
|
|
"mmcargs=setenv bootargs console=${console},${baudrate} " \
|
|
"${optargs} " \
|
|
"root=${mmcroot} " \
|
|
- "rootfstype=${mmcrootfstype} " \
|
|
"video=${video}\0" \
|
|
- "loadbootenv=load mmc ${mmcdev}:${mmcpart} ${loadaddr} uEnv.txt\0" \
|
|
+ "loadbootenv=load mmc ${mmcdev}:${mmcpart} ${loadaddr} /boot/uEnv.txt\0" \
|
|
"importbootenv=echo Importing environment from mmc (uEnv.txt)...; " \
|
|
"env import -t $loadaddr $filesize\0" \
|
|
"loadbootscript=" \
|
|
"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
|
|
"bootscript=echo Running bootscript from mmc ...; " \
|
|
"source\0" \
|
|
- "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
|
|
- "loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} zImage\0" \
|
|
- "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /dtbs/${fdt_file}\0" \
|
|
- "mmcboot=echo Booting from mmc ...; " \
|
|
+ "loaduimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} /boot/uImage\0" \
|
|
+ "loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} /boot/zImage\0" \
|
|
+ "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /boot/dtbs/${fdt_file}\0" \
|
|
+ "mmcbootz=echo Booting from mmc ...; " \
|
|
"run mmcargs; " \
|
|
"bootz ${loadaddr} - ${fdt_addr};\0" \
|
|
- "mmcbootdefault=echo Booting from mmc ...; " \
|
|
- "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 " \
|
|
- "bootz ${loadaddr}; " \
|
|
- "else " \
|
|
- "echo WARN: Cannot load the DT; " \
|
|
- "fi; " \
|
|
- "fi; " \
|
|
- "else " \
|
|
- "bootz ${loadaddr}; " \
|
|
- "fi;\0" \
|
|
+ "mmcbootm=echo Booting from mmc ...; " \
|
|
+ "run mmcargs; " \
|
|
+ "bootm ${loadaddr};\0" \
|
|
"netargs=setenv bootargs console=${console},${baudrate} " \
|
|
"root=/dev/nfs " \
|
|
"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
|
|
@@ -211,7 +200,11 @@
|
|
"echo Running default loadzimage ...;" \
|
|
"if run loadzimage; then " \
|
|
"run loadfdt;" \
|
|
- "run mmcboot;" \
|
|
+ "run mmcbootz;" \
|
|
+ "fi;" \
|
|
+ "echo Running default loaduimage ...;" \
|
|
+ "if run loaduimage; then " \
|
|
+ "run mmcbootm;" \
|
|
"fi;" \
|
|
"fi;"
|
|
|