[U-Boot] Please pull u-boot-ti/master
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)
---------------------------------------------------------------- Andreas Bießmann (1): devkit8000: add rootwait to mmcboot option
Bastian Ruppert (6): davinci: ea20: reorganisation LCD startup davinci: ea20: the console is always set to the serial line video: cfb_console: logo can be positioned via the splashpos variable video: cfb_console: add function to plot the logo area black da850/omap-l138: davinci_emac: Suppress auto negotiation if needed davinci: ea20: add some configs and default environmet variables
Ilya Yanok (4): net/bootp: add VCI support for BOOTP also OMAP: spl: call timer_init() from SPL am335x_evm: enable networking in SPL OMAP: networking support for SPL
Joel A Fernandes (1): am33xx: Fix fetching of mmc1 bootmode from bootrom for AM33XX
arch/arm/cpu/armv7/omap-common/Makefile | 3 + arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 6 +- arch/arm/cpu/armv7/omap-common/spl.c | 11 ++ arch/arm/cpu/armv7/omap-common/spl_net.c | 52 +++++++++ arch/arm/include/asm/omap_common.h | 13 ++- board/davinci/ea20/ea20.c | 32 ++++-- board/ti/beagle/beagle.c | 2 +- common/Makefile | 4 + common/cmd_nvedit.c | 8 ++ common/env_common.c | 7 +- drivers/net/davinci_emac.c | 3 +- drivers/video/cfb_console.c | 140 +++++++++++++++++++----- include/bootstage.h | 6 +- include/config_uncmd_spl.h | 44 ++++++++ include/configs/am335x_evm.h | 5 +- include/configs/devkit8000.h | 1 + include/configs/ea20.h | 108 +++++++++++------- lib/Makefile | 9 +- lib/hashtable.c | 2 + mkconfig | 1 + net/bootp.c | 27 ++++- spl/Makefile | 3 + 22 files changed, 391 insertions(+), 96 deletions(-) create mode 100644 arch/arm/cpu/armv7/omap-common/spl_net.c create mode 100644 include/config_uncmd_spl.h
Hi Tom,
On Thu, 20 Sep 2012 16:52:14 -0700, Tom Rini trini@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);'.
Amicalement,
-----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 trini@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
participants (2)
-
Albert ARIBAUD -
Tom Rini