diff options
author | Sanjeev Premi <premi@ti.com> | 2011-10-12 16:33:50 +0530 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-11-11 12:07:14 +0100 |
commit | b2e9356130713d84e719c84ccf98850e266e2f6b (patch) | |
tree | b774c0af586fa9cf2221d1eeb20f951671b39ff5 /arch/arm/boards/pcm049/board.c | |
parent | 6756cd2cb2d06b6a75998ef6491265e45d49f198 (diff) | |
download | barebox-b2e9356130713d84e719c84ccf98850e266e2f6b.tar.gz barebox-b2e9356130713d84e719c84ccf98850e266e2f6b.tar.xz |
omap: Unify run_shell() in xload configuration
Currently, there are multiple definitions of run_shell()
for each board that can be build in "xload" configuration.
Now there is only one function used by all boards.
The functions defined in xload.c are used only when "xload"
configuration used; but it gets compiled unconditionally.
This has been fixed as well.
Signed-off-by: Sanjeev Premi <premi@ti.com>
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/pcm049/board.c')
-rw-r--r-- | arch/arm/boards/pcm049/board.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/arch/arm/boards/pcm049/board.c b/arch/arm/boards/pcm049/board.c index 8de333f0d9..30e24bc777 100644 --- a/arch/arm/boards/pcm049/board.c +++ b/arch/arm/boards/pcm049/board.c @@ -112,33 +112,3 @@ static int pcm049_devices_init(void) return 0; } device_initcall(pcm049_devices_init); - -#ifdef CONFIG_SHELL_NONE -int run_shell(void) -{ - int (*func)(void) = NULL; - - switch (omap4_bootsrc()) { - case OMAP_BOOTSRC_MMC1: - printf("booting from MMC1\n"); - func = omap_xload_boot_mmc(); - break; - case OMAP_BOOTSRC_UNKNOWN: - printf("unknown boot source. Fall back to nand\n"); - case OMAP_BOOTSRC_NAND: - printf("booting from NAND\n"); - func = omap_xload_boot_nand(SZ_128K, SZ_256K); - break; - } - - if (!func) { - printf("booting failed\n"); - while (1); - } - - shutdown_barebox(); - func(); - - while (1); -} -#endif |