[U-Boot] [PATCH 2/5] port wandboards to use the generic distro configs

Robert Nelson
2013-12-06T05:07:10Z

On Thu, Dec 5, 2013 at 11:01 PM, Dennis Gilmore <dennis@ausil.us> wrote:
> El Thu, 5 Dec 2013 21:47:43 -0600
> Robert Nelson <robertcnelson@gmail.com> escribi?:
>> On Thu, Dec 5, 2013 at 8:18 PM, Dennis Gilmore <dennis@ausil.us>
>> wrote:
>> > Signed-off-by: Dennis Gilmore <dennis@ausil.us>
>> > ---
>> > include/configs/wandboard.h | 40
>> > +++++++++++++++++++++++++++++++++++----- 1 file changed, 35
>> > insertions(+), 5 deletions(-)
>> >
>> > diff --git a/include/configs/wandboard.h
>> > b/include/configs/wandboard.h index e9c7e64..02d8968 100644
>> > --- a/include/configs/wandboard.h
>> > +++ b/include/configs/wandboard.h
>> > @@ -40,6 +40,9 @@
>> > #define CONFIG_CONS_INDEX 1
>> > #define CONFIG_BAUDRATE 115200
>> >
>> > +/* enable generic distro config */
>> > +#define DISTRO_DEFAULTS 1
>> > +
>> > /* Command definition */
>> > #include <config_cmd_default.h>
>> >
>> > @@ -48,7 +51,6 @@
>> > #define CONFIG_CMD_BMODE
>> > #define CONFIG_CMD_SETEXPR
>> >
>> > -#define CONFIG_BOOTDELAY 5
>> >
>> > #define CONFIG_SYS_MEMTEST_START 0x10000000
>> > #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START +
>> > 500 * SZ_1M) @@ -65,6 +67,9 @@
>> > #define CONFIG_CMD_MMC
>> > #define CONFIG_GENERIC_MMC
>> > #define CONFIG_BOUNCE_BUFFER
>> > +
>> > +#define CONFIG_BOOTDELAY 5
>> > +
>> > #define CONFIG_CMD_EXT2
>> > #define CONFIG_CMD_FAT
>> > #define CONFIG_DOS_PARTITION
>> > @@ -74,6 +79,11 @@
>> > #define CONFIG_CMD_DHCP
>> > #define CONFIG_CMD_MII
>> > #define CONFIG_CMD_NET
>> > +
>> > +#define CONFIG_OF_LIBFDT
>> > +#define CONFIG_CMD_BOOTZ
>> > +
>> > +/* Ethernet Configuration */
>> > #define CONFIG_FEC_MXC
>> > #define CONFIG_MII
>> > #define IMX_FEC_BASE ENET_BASE_ADDR
>> > @@ -113,8 +123,30 @@
>> > "fdt_high=0xffffffff\0" \
>> > "initrd_high=0xffffffff\0" \
>> > "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
>> > - "fdt_addr=0x11000000\0" \
>> > + "fdt_addr=0x11100000\0" \
>> > + "fdt_addr_r=0x11200000\0" \
>> > + "pxefile_addr_r=0x11300000\0" \
>> > + "scr_addr_r=0x11400000\0" \
>> > + "kernel_addr_r=0x11500000\0" \
>> > + "ramdisk_addr_r=0x13500000\0" \
>> > "boot_fdt=try\0" \
>> > + "bootcmd_setup=mmc rescan\0" \
>> > + "bootcmd_pxe=setenv bootfile \"\" ;dhcp; tftp
>> > ${fdt_addr} /dtb/${fdt_file}; pxe get; pxe boot\0" \
>> > + "bootcmd_disk_scr=ext2load ${boot_ifc} ${bootdevice}
>> > ${scr_addr_r} boot.scr &&
>>
>> Why all the non-generic "ext2load"'s? use just "load", then it'll work
>> with both fat, ext2/3/4 & btrfs...
>>
>> Regards,
>
> the pxe code requires you specify the filesystem for the sysboot
> command, and as /boot needs to be ext ive kept it consistent. Ive also
> not narrowed down the option to enable load to work, in my testing it
> did not work.

Ah, i see the issue, "#define CONFIG_CMD_FS_GENERIC" isn't defined yet
for the wandboard in mainline u-boot, as you don't set it either in
your patch, so of course a generic "load" won't work..

So if you add:

#define CONFIG_CMD_EXT4
#define CONFIG_CMD_FS_GENERIC

after:
#define CONFIG_CMD_EXT2

in your patch you can drop all the ext2load non-sense for generic loads.

I've been shipping ubuntu/debian images with '#define
CONFIG_CMD_FS_GENERIC' and 'load' for the wand since v2013.07 with no
issues..

Regards,

--
Robert Nelson