diff options
| author | Patrik Ryd <patrik.ryd@linaro.org> | 2011-06-01 10:41:56 +0200 |
|---|---|---|
| committer | Patrik Ryd <patrik.ryd@linaro.org> | 2011-06-01 10:41:56 +0200 |
| commit | 475816e13520c76a77fc5d6e13c6d1e4cf787c2f (patch) | |
| tree | 99509070eab9d598185f32c553ad9041647f8300 | |
| parent | 601ff71c8d46b5e90e13613974a16d10f2006bb3 (diff) | |
| download | u-boot-pandroid-475816e13520c76a77fc5d6e13c6d1e4cf787c2f.tar.gz | |
| -rw-r--r-- | board/omap4430panda/mmc.c | 7 | ||||
| -rw-r--r-- | common/cmd_bootm.c | 2 | ||||
| -rw-r--r-- | include/configs/omap4430panda.h | 12 |
3 files changed, 16 insertions, 5 deletions
diff --git a/board/omap4430panda/mmc.c b/board/omap4430panda/mmc.c index 996d29ee..bf29f157 100644 --- a/board/omap4430panda/mmc.c +++ b/board/omap4430panda/mmc.c @@ -28,6 +28,8 @@ #include <common.h> #include <mmc.h> + +#if (CONFIG_FASTBOOT) #include <fastboot.h> #define EFI_VERSION 0x00010000 @@ -292,6 +294,7 @@ int fastboot_oem(const char *cmd) return do_format(); return -1; } +#endif void board_mmc_init(void) { @@ -304,8 +307,12 @@ int board_late_init(void) printf("mmc init failed?\n"); return 1; } +#if (CONFIG_FASTBOOT) printf("\nefi partition table:\n"); return load_ptbl(); +#else + return 0; +#endif } diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index e1ca3558..3bbb9e58 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -1421,6 +1421,7 @@ static unsigned char boothdr[512]; #define ALIGN(n,pagesz) ((n + (pagesz - 1)) & (~(pagesz - 1))) +#if (CONFIG_FASTBOOT) /* booti <addr> [ mmc0 | mmc1 [ <partition> ] ] */ int do_booti (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { @@ -1521,3 +1522,4 @@ U_BOOT_CMD( "<addr>\n - boot application image stored in memory\n" "\t'addr' should be the address of boot image which is zImage+ramdisk.img\n" ); +#endif diff --git a/include/configs/omap4430panda.h b/include/configs/omap4430panda.h index 1e2445b5..37016519 100644 --- a/include/configs/omap4430panda.h +++ b/include/configs/omap4430panda.h @@ -35,7 +35,6 @@ #define CONFIG_OMAP44XX 1 /* which is a 44XX */ #define CONFIG_OMAP4430 1 /* which is in a 4430 */ #define CONFIG_4430PANDA 1 /* working with Panda */ -#define CONFIG_FASTBOOT 1 /* Using fastboot interface */ #define BOARD_LATE_INIT 1 @@ -137,7 +136,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "bootcmd=go 0x80008000\0" #else -#define CONFIG_BOOTDELAY 0 +#define CONFIG_BOOTDELAY 3 #endif /*CONFIG_4430ZEBU */ @@ -147,10 +146,13 @@ " ip=dhcp" #else -#define CONFIG_BOOTARGS "console=ttyO2,115200n8 mem=512M" \ - " init=/init vram=32M omapfb.vram=0:16M androidboot.console=ttyO2" +#define CONFIG_BOOTARGS "console=ttyO2,115200n8 androidboot.console=ttyO2" \ + " mem=456M@0x80000000 mem=512M@0xA0000000" \ + " root=/dev/mmcblk0p2 rw rootdelay=2 init=/init" \ + " vram=32M omapfb.vram=0:16M" \ + " omapdss.def_disp=hdmi consoleblank=0" -#define CONFIG_BOOTCOMMAND "booti mmc0" +#define CONFIG_BOOTCOMMAND "fatload mmc 0 0x82000000 uImage; bootm 0x82000000" #endif |