diff options
author | Poonam Aggrwal <poonam.aggrwal@freescale.com> | 2009-05-30 16:42:12 +0530 |
---|---|---|
committer | Justin Waters <justin.waters@timesys.com> | 2009-10-07 15:47:49 -0400 |
commit | 3c2e9a056c7ba80126879c8acf1e57d59fc86174 (patch) | |
tree | ed4c59467b013eaa30fd41170de7dd79b9006dd6 | |
parent | e6a211e6e14cc1527662e9e5159f58747d0e02a2 (diff) |
Environment updated with different boot commands for P2020RDB
Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com>
-rw-r--r-- | common/env_common.c | 15 | ||||
-rw-r--r-- | common/env_embedded.c | 15 | ||||
-rw-r--r-- | include/configs/P10XX_20XX_RDB.h | 50 | ||||
-rw-r--r-- | tools/env/fw_env.c | 16 |
4 files changed, 91 insertions, 5 deletions
diff --git a/common/env_common.c b/common/env_common.c index f1aaed23990..2af5d528fcb 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -67,6 +67,21 @@ uchar default_environment[] = { #ifdef CONFIG_RAMBOOTCOMMAND "ramboot=" CONFIG_RAMBOOTCOMMAND "\0" #endif +#ifdef CONFIG_HDBOOT + "usbhdboot=" CONFIG_HDBOOT "\0" +#endif +#ifdef CONFIG_USB_EXT2_BOOT + "usbext2boot=" CONFIG_USB_EXT2_BOOT "\0" +#endif +#ifdef CONFIG_USB_FAT_BOOT + "usbfatboot=" CONFIG_USB_FAT_BOOT "\0" +#endif +#ifdef CONFIG_NANDBOOT + "nandboot=" CONFIG_NANDBOOT "\0" +#endif +#ifdef CONFIG_NORBOOT + "norboot=" CONFIG_NORBOOT "\0" +#endif #ifdef CONFIG_NFSBOOTCOMMAND "nfsboot=" CONFIG_NFSBOOTCOMMAND "\0" #endif diff --git a/common/env_embedded.c b/common/env_embedded.c index ae6cac4390d..5dfc73ee861 100644 --- a/common/env_embedded.c +++ b/common/env_embedded.c @@ -111,6 +111,21 @@ env_t environment __PPCENV__ = { #if defined(CONFIG_RAMBOOTCOMMAND) "ramboot=" CONFIG_RAMBOOTCOMMAND "\0" #endif +#if defined(CONFIG_HDBOOT) + "usbhdboot=" CONFIG_HDBOOT "\0" +#endif +#if defined(CONFIG_USB_EXT2_BOOT) + "usbext2boot=" CONFIG_USB_EXT2_BOOT "\0" +#endif +#if defined(CONFIG_USB_FAT_BOOT) + "usbfatboot=" CONFIG_USB_FAT_BOOT "\0" +#endif +#if defined(CONFIG_NANDBOOT) + "nandboot=" CONFIG_NANDBOOT "\0" +#endif +#if defined(CONFIG_NORBOOT) + "norboot=" CONFIG_NORBOOT "\0" +#endif #if defined(CONFIG_NFSBOOTCOMMAND) "nfsboot=" CONFIG_NFSBOOTCOMMAND "\0" #endif diff --git a/include/configs/P10XX_20XX_RDB.h b/include/configs/P10XX_20XX_RDB.h index 220d4a1601d..3325fb0f9a2 100644 --- a/include/configs/P10XX_20XX_RDB.h +++ b/include/configs/P10XX_20XX_RDB.h @@ -656,6 +656,8 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ + "loadaddr=2000000\0" \ + "bootfile=uImage" \ "tftpflash=tftpboot $loadaddr $uboot; " \ "protect off " MK_STR(TEXT_BASE) " +$filesize; " \ "erase " MK_STR(TEXT_BASE) " +$filesize; " \ @@ -664,9 +666,16 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0" \ "consoledev=ttyS0\0" \ "ramdiskaddr=2000000\0" \ - "ramdiskfile=p10xx_20xx_rdb/ramdisk.uboot\0" \ + "ramdiskfile=rootfs.ext2.gz.uboot\0" \ "fdtaddr=c00000\0" \ - "fdtfile=p10xx_20xx_rdb/p10xx_20xx_rdb.dtb\0" \ + "fdtfile=p2020rdb.dtb\0" \ + "bdev=sda1\0" \ + "jffs2nor=mtdblock3\0" \ + "norbootaddr=ef080000\0" \ + "norfdtaddr=ef040000\0" \ + "jffs2nand=mtdblock10\0" \ + "nandbootaddr=100000\0" \ + "nandfdtaddr=80000\0" #define CONFIG_NFSBOOTCOMMAND \ "setenv bootargs root=/dev/nfs rw " \ @@ -677,6 +686,41 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); "tftp $fdtaddr $fdtfile;" \ "bootm $loadaddr - $fdtaddr" +#define CONFIG_HDBOOT \ + "setenv bootargs root=/dev/$bdev rw rootdelay=30 " \ + "console=$consoledev,$baudrate $othbootargs;" \ + "bootm $norbootaddr - $norfdtaddr" + +#define CONFIG_USB_FAT_BOOT \ + "setenv bootargs root=/dev/ram rw " \ + "console=$consoledev,$baudrate $othbootargs;" \ + "fatload usb 0:1 $loadaddr $bootfile;" \ + "fatload usb 0:1 $fdtaddr $fdtfile;" \ + "fatload usb 0:1 $ramdiskaddr $ramdiskfile;" \ + "bootm $loadaddr $ramdiskaddr $fdtaddr" + +#if 0 +#undef CONFIG_USB_EXT2_BOOT \ + "setenv bootargs root=/dev/ram rw " \ + "console=$consoledev,$baudrate $othbootargs;" \ + "ext2load usb 0:1 $loadaddr $bootfile;" \ + "ext2load usb 0:1 $fdtaddr $fdtfile;" \ + "ext2load usb 0:1 $ramdiskaddr $ramdiskfile;" \ + "bootm $loadaddr $ramdiskaddr $fdtaddr" +#endif + +#define CONFIG_NORBOOT \ + "setenv bootargs root=/dev/$jffs2nor rw " \ + "console=$consoledev,$baudrate rootfstype=jffs2 $othbootargs;" \ + "bootm $norbootaddr - $norfdtaddr" + +#define CONFIG_NANDBOOT \ + "setenv bootargs root=/dev/$jffs2nand rw rootfstype=jffs2 " \ + "console=$consoledev,$baudrate $othbootargs;" \ + "nand read 2000000 100000 400000;" \ + "nand read 3000000 80000 80000;" \ + "bootm 2000000 - 3000000;" + #define CONFIG_RAMBOOTCOMMAND \ "setenv bootargs root=/dev/ram rw " \ "console=$consoledev,$baudrate $othbootargs;" \ @@ -685,6 +729,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); "tftp $fdtaddr $fdtfile;" \ "bootm $loadaddr $ramdiskaddr $fdtaddr" -#define CONFIG_BOOTCOMMAND CONFIG_RAMBOOTCOMMAND +#define CONFIG_BOOTCOMMAND CONFIG_HDBOOT #endif /* __CONFIG_H */ diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index a46205d8687..21a78370818 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -133,8 +133,20 @@ static char default_environment[] = { #if defined(CONFIG_RAMBOOTCOMMAND) "ramboot=" CONFIG_RAMBOOTCOMMAND "\0" #endif -#if defined(CONFIG_NFSBOOTCOMMAND) - "nfsboot=" CONFIG_NFSBOOTCOMMAND "\0" +#if defined(CONFIG_HDBOOT) + "usbhdboot=" CONFIG_HDBOOT "\0" +#endif +#if defined(CONFIG_USB_EXT2_BOOT) + "usbext2boot=" CONFIG_USB_EXT2_BOOT "\0" +#endif +#if defined(CONFIG_USB_FAT_BOOT) + "usbfatboot=" CONFIG_USB_FAT_BOOT "\0" +#endif +#if defined(CONFIG_NANDBOOT) + "nandboot=" CONFIG_NANDBOOT "\0" +#endif +#if defined(CONFIG_NORBOOT) + "norboot=" CONFIG_NORBOOT "\0" #endif #if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0) "bootdelay=" MK_STR (CONFIG_BOOTDELAY) "\0" |