-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 09/21/12 14:07, Albert ARIBAUD wrote: > Hi Tom, > > On Thu, 20 Sep 2012 16:52:14 -0700, Tom Rini <tr...@ti.com> wrote: > >> Hey Albert, >> >> The following changes since commit >> d193c1b6eb05041c94ad9aacd8c94189d1dbc5f8: >> >> Merge remote-tracking branch 'u-boot-imx/master' (2012-09-21 >> 00:26:19 +0200) >> >> are available in the git repository at: >> >> >> git://git.denx.de/u-boot-ti master >> >> for you to fetch changes up to >> 2acdff706b6e762bac3d0f8ef20812e4d05e9a6b: >> >> am33xx: Fix fetching of mmc1 bootmode from bootrom for AM33XX >> (2012-09-20 16:46:35 -0700) > > This breaks two boards: ca9x4_ct_vxp and highbank, with the > following diagnostic: > > bootp.c: In function 'DhcpExtended': bootp.c:451:2: error: > 'CONFIG_VCI_STRING' undeclared (first use in this function) > bootp.c:451:2: note: each undeclared identifier is reported only > once for each function it appears in > > The culprit seems to be b780d62c2082e9a8ede763e83a94f41e88a1651d > ("net/bootp: add VCI support for BOOTP also"): > > 450 #ifdef CONFIG_BOOTP_VCI_STRING 451 put_vci(e, > CONFIG_VCI_STRING); 452 #endif > > 451 should probably be 'put_vci(e, CONFIG_BOOTP_VCI_STRING);'.
You are correct. I've corrected, pushed and am doing a MAKEALL -a arm currently, I'll re-submit once it passes. Sorry / Thanks! - -- Tom -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iQIcBAEBAgAGBQJQXNl3AAoJENk4IS6UOR1WLNwQALAMP0Cnx3K7fcrUPZTm8PYZ 22vl0Slab93lnr883PGnMch9brYe8abZfWak/z+ZBwWo26xvPQzIB9x9Op5T47P4 Mpy4JWqCeGJZpf+KDw2kxpEukDwOnCHm0C+sBFksGJ4Ujg+Wh+z2CYV0OLt+JJC1 Np0ak/kRswNbVOC5gsgrWy8LjuIONfS/92XItfMdQG+SKL6qJiJZsYvgZE+xrjDn XCy1xw3m21Wv533UCsaKEk6HkMyObfDPQeeP+iCbJ1Zul6WFGe3quZtcAaISyVit duJNqXxDK4TD7xhFh1YnlrLMDBc9hJe50wvDJYV2yV1o/EPvt8XHbdm7gmwzMb8/ qa3+q0aTNgS73wecOzXuO/nJ9d8tDG/hA1u6sFCjE4d5Y9/EK+SISxqNWXoo9BU7 S2GNgE7wxcuQ0UYg+3vhpDl863CzbehlxvmbVMufVAr57ZslwJeDCUrUazm9B/bT bcPFBhVE+LTtpCtBv7i29ZVbIlHjeFdbjsh4tKh3ZkQ/ge/KYHsdjGMRj4K+tBsm Vq9jUTU3la009LNsb1JLE9mILlP4XGWhqiZEDZlJciNsezsyjjRzcVeU6x0LVvyY IdbAdYaRo2HR/5aTHP26nHqfgM0IJtkalBXpuU7Cz971HvNg+wzEJC8re+EN5Ru5 fiR8Ku+oY8fSzdBudxMb =1rrq -----END PGP SIGNATURE----- _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot