From mboxrd@z Thu Jan 1 00:00:00 1970 From: Albert ARIBAUD Date: Fri, 21 Sep 2012 23:07:12 +0200 Subject: [U-Boot] Please pull u-boot-ti/master In-Reply-To: <20120920235214.GG1763@bill-the-cat> References: <20120920235214.GG1763@bill-the-cat> Message-ID: <20120921230712.4381cd70@lilith> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Tom, On Thu, 20 Sep 2012 16:52:14 -0700, Tom Rini 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);'. Amicalement, -- Albert.