mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-09-19 22:08:32 +00:00
95 lines
4.8 KiB
Diff
95 lines
4.8 KiB
Diff
diff -urN a/include/configs/mx6dl_udoo.h b/include/configs/mx6dl_udoo.h
|
|
--- a/include/configs/mx6dl_udoo.h 2013-11-22 17:53:46.998815980 -0700
|
|
+++ b/include/configs/mx6dl_udoo.h 2013-11-23 14:24:58.258132950 -0700
|
|
@@ -174,30 +174,23 @@
|
|
#ifdef UDOO_LINUX
|
|
#define CONFIG_LOADADDR 0x10800000
|
|
#define CONFIG_RD_LOADADDR (0x10800000 + 0x300000)
|
|
+#define CONFIG_IDENT_STRING " Arch Linux ARM"
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"netdev=eth0\0" \
|
|
"ethprime=FEC0\0" \
|
|
- "uboot=u-boot.bin\0" \
|
|
- "kernel=uImage\0" \
|
|
- "nfsroot=/opt/eldk/arm\0" \
|
|
- "bootargs_base=setenv bootargs console=ttymxc0,115200\0" \
|
|
- "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
|
|
- "bootcmd_net=run bootargs_base bootargs_nfs; tftpboot ${loadaddr} ${kernel}; bootm\0" \
|
|
- "bootargs_mmc=setenv bootargs ${bootargs} ip=dhcp root=/dev/mmcblk0p1 rootwait\0" \
|
|
- "bootcmd_mmc=run bootargs_base bootargs_mmc; mmc dev 3; mmc read ${loadaddr} 0x800 0x2000; bootm\0" \
|
|
"ethact=FEC0\0" \
|
|
- "bootargs=console=ttymxc0,115200 root=/dev/nfs ip=dhcp nfsroot=192.168.1.101:/opt/eldk/arm,v3,tcp\0" \
|
|
- "memory=mem=768M\0" \
|
|
- "bootdev=mmc dev 2; ext2load mmc 2:1\0" \
|
|
+ "loadaddr=0x10800000\0" \
|
|
+ "uimage=/boot/uImage\0" \
|
|
+ "script=/boot/boot.scr\0" \
|
|
+ "memory=mem=1024M\0" \
|
|
"root=root=/dev/mmcblk0p1\0" \
|
|
"option=rootwait rw fixrtc rootflags=barrier=1\0" \
|
|
- "setvideomode=setenv videomode video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24\0" \
|
|
+ "videomode=video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24\0" \
|
|
"cpu_freq=arm_freq=996\0" \
|
|
- "run_from_nfs=0\0" \
|
|
- "setbootargs_nfs=setenv bootargs console=ttymxc1,115200 root=/dev/nfs nfsroot=${ip_server}:${nfs_path}nolock,wsize=4096,rsize=4096 ip=${ip_local} ${memory} ${cpu_freq} ${videomode}\0" \
|
|
"setbootargs=setenv bootargs console=ttymxc1,115200 ${root} ${option} ${memory} ${cpu_freq} ${videomode}\0" \
|
|
- "setbootdev=setenv boot_dev ${bootdev} 10800000 /boot/uImage\0" \
|
|
- "bootcmd=run setvideomode; run setbootargs; run setbootdev; run boot_dev; bootm 10800000\0" \
|
|
+ "loadscript=if ext4load mmc 2:1 ${loadaddr} ${script}; then source ${loadaddr}; fi\0" \
|
|
+ "loaduimage=ext4load mmc 2:1 ${loadaddr} ${uimage}\0" \
|
|
+ "bootcmd=mmc dev 2; run loadscript; run setbootargs; run loaduimage; bootm ${loadaddr}\0" \
|
|
"stdin=serial\0" \
|
|
"stdout=serial\0" \
|
|
"stderr=serial\0"
|
|
diff -urN a/include/configs/mx6q_udoo.h b/include/configs/mx6q_udoo.h
|
|
--- a/include/configs/mx6q_udoo.h 2013-11-22 17:53:46.998815980 -0700
|
|
+++ b/include/configs/mx6q_udoo.h 2013-11-23 14:25:12.943070804 -0700
|
|
@@ -164,38 +164,30 @@
|
|
#endif
|
|
|
|
#ifdef UDOO_LINUX
|
|
+#define CONFIG_IDENT_STRING " Arch Linux ARM"
|
|
#define CONFIG_LOADADDR 0x10800000
|
|
#define CONFIG_RD_LOADADDR (0x10800000 + 0x300000)
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"netdev=eth0\0" \
|
|
"ethprime=FEC0\0" \
|
|
- "uboot=u-boot.bin\0" \
|
|
- "kernel=uImage\0" \
|
|
- "nfsroot=/opt/eldk/arm\0" \
|
|
- "bootargs_base=setenv bootargs console=ttymxc0,115200\0" \
|
|
- "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
|
|
- "bootcmd_net=run bootargs_base bootargs_nfs; tftpboot ${loadaddr} ${kernel}; bootm\0" \
|
|
- "bootargs_mmc=setenv bootargs ${bootargs} ip=dhcp root=/dev/mmcblk0p1 rootwait\0" \
|
|
- "bootcmd_mmc=run bootargs_base bootargs_mmc; mmc dev 3; mmc read ${loadaddr} 0x800 0x2000; bootm\0" \
|
|
"ethact=FEC0\0" \
|
|
- "bootargs=console=ttymxc0,115200 root=/dev/nfs ip=dhcp nfsroot=192.168.1.101:/opt/eldk/arm,v3,tcp\0" \
|
|
- "memory=mem=768M\0" \
|
|
- "bootdev=mmc dev 2; ext2load mmc 2:1\0" \
|
|
+ "loadaddr=0x10800000\0" \
|
|
+ "uimage=/boot/uImage\0" \
|
|
+ "script=/boot/boot.scr\0" \
|
|
+ "memory=mem=1024M\0" \
|
|
"root=root=/dev/mmcblk0p1\0" \
|
|
"option=rootwait rw fixrtc rootflags=barrier=1\0" \
|
|
- "setvideomode=setenv videomode video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24\0" \
|
|
+ "videomode=video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24\0" \
|
|
"cpu_freq=arm_freq=996\0" \
|
|
- "run_from_nfs=0\0" \
|
|
- "setbootargs_nfs=setenv bootargs console=ttymxc1,115200 root=/dev/nfs nfsroot=${ip_server}:${nfs_path}nolock,wsize=4096,rsize=4096 ip=${ip_local} ${memory} ${cpu_freq} ${videomode}\0" \
|
|
"setbootargs=setenv bootargs console=ttymxc1,115200 ${root} ${option} ${memory} ${cpu_freq} ${videomode}\0" \
|
|
- "setbootdev=setenv boot_dev ${bootdev} 10800000 /boot/uImage\0" \
|
|
- "bootcmd=run setvideomode; run setbootargs; run setbootdev; run boot_dev; bootm 10800000\0" \
|
|
+ "loadscript=if ext4load mmc 2:1 ${loadaddr} ${script}; then source ${loadaddr}; fi\0" \
|
|
+ "loaduimage=ext4load mmc 2:1 ${loadaddr} ${uimage}\0" \
|
|
+ "bootcmd=mmc dev 2; run loadscript; run setbootargs; run loaduimage; bootm ${loadaddr}\0" \
|
|
"stdin=serial\0" \
|
|
"stdout=serial\0" \
|
|
"stderr=serial\0"
|
|
#endif
|
|
|
|
-
|
|
#define CONFIG_ARP_TIMEOUT 200UL
|
|
|
|
/*
|