mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-28 22:57:37 +00:00
148 lines
4.5 KiB
Diff
148 lines
4.5 KiB
Diff
diff -urN a/include/configs/udoo.h b/include/configs/udoo.h
|
|
--- a/include/configs/udoo.h 2014-05-18 11:32:41.255898800 -0600
|
|
+++ b/include/configs/udoo.h 2014-05-18 11:34:20.295534234 -0600
|
|
@@ -118,102 +118,72 @@
|
|
#define CONFIG_GENERIC_MMC
|
|
#define CONFIG_BOUNCE_BUFFER
|
|
#define CONFIG_CMD_EXT2
|
|
+#define CONFIG_CMD_EXT4
|
|
+#define CONFIG_CMD_FS_GENERIC
|
|
#define CONFIG_CMD_FAT
|
|
#define CONFIG_DOS_PARTITION
|
|
|
|
+#define CONFIG_IDENT_STRING " Arch Linux ARM"
|
|
+
|
|
+#if defined(CONFIG_MX6Q)
|
|
#define CONFIG_DEFAULT_FDT_FILE "imx6q-udoo.dtb"
|
|
+#else
|
|
+#define CONFIG_DEFAULT_FDT_FILE "imx6dl-udoo.dtb"
|
|
+#endif
|
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
- "script=boot.scr\0" \
|
|
"uimage=/boot/uImage\0" \
|
|
+ "zimage=/boot/zImage\0" \
|
|
"console=ttymxc1\0" \
|
|
"splashpos=m,m\0" \
|
|
"fdt_high=0xffffffff\0" \
|
|
"initrd_high=0xffffffff\0" \
|
|
- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
|
|
+ "fdt_file=/boot/dtbs/" CONFIG_DEFAULT_FDT_FILE "\0" \
|
|
"fdt_addr=0x11000000\0" \
|
|
- "boot_fdt=try\0" \
|
|
"ip_dyn=yes\0" \
|
|
"hdmi_patch=\0" \
|
|
+ "memory=mem=1024M\0" \
|
|
"mmcdev=0\0" \
|
|
"mmcpart=1\0" \
|
|
"mmcroot=/dev/mmcblk0p1 rootwait rw\0" \
|
|
- "update_sd_firmware_filename=u-boot.imx\0" \
|
|
- "update_sd_firmware=" \
|
|
- "if test ${ip_dyn} = yes; then " \
|
|
- "setenv get_cmd dhcp; " \
|
|
- "else " \
|
|
- "setenv get_cmd tftp; " \
|
|
- "fi; " \
|
|
- "if mmc dev ${mmcdev}; then " \
|
|
- "if ${get_cmd} ${update_sd_firmware_filename}; then " \
|
|
- "setexpr fw_sz ${filesize} / 0x200; " \
|
|
- "setexpr fw_sz ${fw_sz} + 1; " \
|
|
- "mmc write ${loadaddr} 0x2 ${fw_sz}; " \
|
|
- "fi; " \
|
|
- "fi\0" \
|
|
"mmcargs=setenv bootargs console=${console},${baudrate} " \
|
|
"root=${mmcroot} " \
|
|
"${hdmi_patch} " \
|
|
+ "${memory} " \
|
|
"fbmem=24M video=mxcfb0:dev=hdmi,1920x1080M@60,bpp=32\0" \
|
|
- "loadbootscript=" \
|
|
- "ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
|
|
- "bootscript=echo Running bootscript from mmc ...; " \
|
|
- "source\0" \
|
|
- "loaduimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
|
|
- "loadfdt=ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
|
|
- "mmcboot=echo Booting from mmc ...; " \
|
|
+ "loadbootenv=load mmc ${mmcdev}:${mmcpart} ${loadaddr} /boot/uEnv.txt\0" \
|
|
+ "importbootenv=echo Importing environment from mmc (uEnv.txt)...; " \
|
|
+ "env import -t $loadaddr $filesize\0" \
|
|
+ "loaduimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
|
|
+ "loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${zimage}\0" \
|
|
+ "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
|
|
+ "mmcbootm=echo Booting from mmc ...; " \
|
|
"run mmcargs; " \
|
|
- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
|
|
- "if run loadfdt; then " \
|
|
- "bootm ${loadaddr} - ${fdt_addr}; " \
|
|
- "else " \
|
|
- "if test ${boot_fdt} = try; then " \
|
|
- "bootm; " \
|
|
- "else " \
|
|
- "echo WARN: Cannot load the DT; " \
|
|
- "fi; " \
|
|
- "fi; " \
|
|
- "else " \
|
|
- "bootm; " \
|
|
- "fi;\0" \
|
|
- "netargs=setenv bootargs console=${console},${baudrate} " \
|
|
- "root=/dev/nfs " \
|
|
- "${hdmi_patch} " \
|
|
- "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
|
|
- "netboot=echo Booting from net ...; " \
|
|
- "run netargs; " \
|
|
- "if test ${ip_dyn} = yes; then " \
|
|
- "setenv get_cmd dhcp; " \
|
|
- "else " \
|
|
- "setenv get_cmd tftp; " \
|
|
- "fi; " \
|
|
- "${get_cmd} ${uimage}; " \
|
|
- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
|
|
- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
|
|
- "bootm ${loadaddr} - ${fdt_addr}; " \
|
|
- "else " \
|
|
- "if test ${boot_fdt} = try; then " \
|
|
- "bootm; " \
|
|
- "else " \
|
|
- "echo WARN: Cannot load the DT; " \
|
|
- "fi; " \
|
|
- "fi; " \
|
|
- "else " \
|
|
- "bootm; " \
|
|
- "fi;\0"
|
|
+ "bootm ${loadaddr};\0" \
|
|
+ "mmcbootz=echo Booting from mmc ...; " \
|
|
+ "run mmcargs; " \
|
|
+ "bootz ${loadaddr} - ${fdt_addr};\0"
|
|
|
|
#define CONFIG_BOOTCOMMAND \
|
|
- "mmc dev ${mmcdev}; if mmc rescan; then " \
|
|
- "if run loadbootscript; then " \
|
|
- "run bootscript; " \
|
|
- "else " \
|
|
- "if run loaduimage; then " \
|
|
- "run mmcboot; " \
|
|
- "else run netboot; " \
|
|
- "fi; " \
|
|
- "fi; " \
|
|
- "else run netboot; fi"
|
|
+ "mmc dev ${mmcdev}; if mmc rescan; then " \
|
|
+ "if run loadbootenv; then " \
|
|
+ "run importbootenv;" \
|
|
+ "fi;" \
|
|
+ "echo Checking if uenvcmd is set ...;" \
|
|
+ "if test -n $uenvcmd; then " \
|
|
+ "echo Running uenvcmd ...;" \
|
|
+ "run uenvcmd;" \
|
|
+ "fi;" \
|
|
+ "echo Running default loaduimage ...;" \
|
|
+ "if run loaduimage; then " \
|
|
+ "run mmcbootm;" \
|
|
+ "fi;" \
|
|
+ "echo Running default loadzimage ...;" \
|
|
+ "if run loadzimage; then " \
|
|
+ "run loadfdt;" \
|
|
+ "run mmcbootz;" \
|
|
+ "fi;" \
|
|
+ "fi;"
|
|
|
|
/* Miscellaneous configurable options */
|
|
#define CONFIG_SYS_LONGHELP
|