-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Vagrant Cascadian wrote on 2014-07-06 03:21: > If you take a look at: > > debian/patches/0001-wandboard-uEnv.txt-bootz-n-fixes.patch > > It looks like t could probably be adapted for the udoo-quad. If > you'd be willing to try adjusting those changes to the udoo-quad > board, that'd be great. If not, I'll try to work on it sometime...
I already used this patch to enhance the UDOO board config and it works fine. I've attached my updated patch. Cheers, - -- Michael Fladischer Fladi.at -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Using GnuPG with Icedove - http://www.enigmail.net/ iQIcBAEBCgAGBQJTuZzdAAoJEGlMre9Rx7W2+wkP/RXHugQ3KtgCtCU4JO9dr7le ijcJG28Us57YyihnUvHNsUqxTw7JxmZeN6f2ZHhSlgTZOxhzpssXg+VOknaM49pm 81vA2vut2GCijpf5bjA4pSaNlK5ja12vuxq78/xABGueOqkJy/hOPoJhEhi495uV jCTSxdQV6iNw3/7aTSl1vEp8uA4WFCahEiri7uzy6X21n7xUQoSBtQBEXYOUGPSr Q2cTFh8CNyftEyMqnwWYjbNibURuSPfLtdnzEWkNhQu3gRmnwjPuVks54xTdnqO+ iQGqnfmg4UOMIHFQFCGT3+nqvuZn3TAcKzs1QSkuUdfS0Ytp8XjDJ1t8mMvX99DU AMKN7aJ0Gn3nmOS8cE8UWTqj4o74KeS4CGPePJ0MycW2ElzZEHG9SVs4q2eFw3DE B8qgGpVVl+nr4gZnS8MgAZOS3lp8GHISEBw6qP/PxTi1rbmsraeAYEV8279W30oz B0M1Cd8F6W0fd8VzXMrpTI84tBtv0UOB9mjjQ9Toe4w7Ky2kfAUHYXw9Ki9C1Vgx uRGUTCRGgUtGQNRyUne1BIHb81afvtrCtRpAHwgEKdyzQy10fp7vnQo2NtQ2HrFH xUlg3frhCwo9a6sdYHWJFq01Wmc5vvqxyfQ5TijYhRMNsSR+BoYdAMAjmVtdURUe KfwQgWcwjh5+HTDfgNI1 =xwPz -----END PGP SIGNATURE-----
diff --git a/debian/env-configs/udoo_quad.config b/debian/env-configs/udoo_quad.config new file mode 100644 index 0000000..9ffdf9f --- /dev/null +++ b/debian/env-configs/udoo_quad.config @@ -0,0 +1,9 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundant +# environment sector is assumed present. +# +# XXX this configuration might miss a fifth parameter for the "Number of +# sectors" + +# MTD device name Device offset Env. size Flash sector size +/dev/mmcblk0 0xC0000 0x2000 diff --git a/debian/patches/series b/debian/patches/series index 4708f35..9345fba 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -34,3 +34,4 @@ sunxi-cubietruck/0017-ahci-provide-sunxi-SATA-driver-using-AHCI-platform-f.patch sunxi-cubietruck/0018-sunxi-Remove-mmc-DMA-support.patch am335x-bootscript.diff am335x-try-boot-from-first-partition.diff +udoo_quad-support.patch diff --git a/debian/patches/udoo_quad-support.patch b/debian/patches/udoo_quad-support.patch new file mode 100644 index 0000000..4a1c2ab --- /dev/null +++ b/debian/patches/udoo_quad-support.patch @@ -0,0 +1,95 @@ +Description: Features and sane scripts for UDOO board + Enable the following features: + * Ext4 + * Generic FS (load) + * Raw initramfs + Tweak scripts to: + * use generic "load" command to load files from FS. + * provide "loadzimage" macro. + * account for different locations of boot script file. +Author: Michael Fladischer <[email protected]> +Last-Update: 2014-07-01 +Forwarded: no + +--- a/include/configs/udoo.h ++++ b/include/configs/udoo.h +@@ -93,6 +93,8 @@ + #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 + +@@ -128,12 +130,16 @@ + "fi\0" \ + "mmcargs=setenv bootargs console=${console},${baudrate} " \ + "root=${mmcroot}\0" \ ++ "loadbootenv=load mmc ${mmcdev}:${mmcpart} ${loadaddr} 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" \ ++ "load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${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} ${fdt_file}\0" \ ++ "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ ++ "loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} zImage\0" \ ++ "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +@@ -175,16 +181,32 @@ + "fi;\0" + + #define CONFIG_BOOTCOMMAND \ +- "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" ++ "mmc dev ${mmcdev};" \ ++ "if mmc rescan; then " \ ++ "echo SD/MMC found on device ${mmcdev};" \ ++ "if run loadbootenv; then " \ ++ "run importbootenv;" \ ++ "fi;" \ ++ "echo Checking if uenvcmd is set ...;" \ ++ "if test -n $uenvcmd; then " \ ++ "echo Running uenvcmd ...;" \ ++ "run uenvcmd;" \ ++ "fi;" \ ++ "if run loadbootscript; then " \ ++ "echo Running boot script ${script} ...;" \ ++ "run bootscript; " \ ++ "fi;" \ ++ "setenv script /boot/${script};" \ ++ "if run loadbootscript; then " \ ++ "echo Running boot script ${script} ...;" \ ++ "run bootscript; " \ ++ "fi;" \ ++ "echo Running default loadzimage ...;" \ ++ "if run loadzimage; then " \ ++ "run loadfdt;" \ ++ "run mmcboot;" \ ++ "fi;" \ ++ "fi;" + + /* Miscellaneous configurable options */ + #define CONFIG_SYS_LONGHELP +@@ -226,6 +248,7 @@ + + #define CONFIG_OF_LIBFDT + #define CONFIG_CMD_BOOTZ ++#define CONFIG_SUPPORT_RAW_INITRD + + #ifndef CONFIG_SYS_DCACHE_OFF + #define CONFIG_CMD_CACHE diff --git a/debian/targets b/debian/targets index a11546b..7b8c7dc 100644 --- a/debian/targets +++ b/debian/targets @@ -17,6 +17,7 @@ armhf mx6_cubox-i u-boot.img spl/u-boot-spl.bin SPL armhf nokia_rx51 u-boot.bin armhf omap3_beagle u-boot.bin spl/u-boot-spl.bin MLO armhf omap4_panda u-boot.bin spl/u-boot-spl.bin MLO +armhf udoo_quad u-boot.imx armhf wandboard_dl u-boot.imx armhf wandboard_quad u-boot.imx armhf wandboard_solo u-boot.imx

