diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-06-14 04:51:44 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-06-14 04:51:44 +0000 |
| commit | 998f6f792ea953caf0ca7ab8b7fbe858d68a510f (patch) | |
| tree | 90754e0b123fbf58fc099648a68eae3dda0f8004 /packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-defaultenv.patch | |
| parent | 60dfd703b4c5180533ec14102c276fc4fb70a5a3 (diff) | |
| parent | 1d4ca5c243ec65cf27ec1d4d908163da029e6fcc (diff) | |
merge of '443650a5c3bfafa4e922391b71d87087c6b6f355'
and 'a59cc92c385b66015a1eb53d505bf4f139187778'
Diffstat (limited to 'packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-defaultenv.patch')
| -rw-r--r-- | packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-defaultenv.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-defaultenv.patch b/packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-defaultenv.patch new file mode 100644 index 0000000000..7e3aa4f480 --- /dev/null +++ b/packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-defaultenv.patch @@ -0,0 +1,31 @@ +Index: u-boot/include/configs/neo1973_gta01.h +=================================================================== +--- u-boot.orig/include/configs/neo1973_gta01.h 2007-02-27 00:43:16.000000000 +0100 ++++ u-boot/include/configs/neo1973_gta01.h 2007-02-27 00:47:49.000000000 +0100 +@@ -115,8 +115,8 @@ + #include <cmd_confdefs.h> + + #define CONFIG_BOOTDELAY 3 +-#define CONFIG_BOOTARGS "rootfstype=jffs2 root=/dev/mtdblock4 console=ttySAC0,115200 console=tty0 loglevel=8" +-#define CONFIG_BOOTCOMMAND "nand read.e 0x32000000 0x34000 0x200000; bootm 0x32000000" ++#define CONFIG_BOOTARGS "" ++#define CONFIG_BOOTCOMMAND "setenv bootargs ${bootargs_base} ${mtdparts}; nand read.e 0x32000000 kernel; bootm 0x32000000" + + #define CONFIG_DOS_PARTITION 1 + +@@ -181,11 +181,14 @@ + #define CONFIG_USBD_PRODUCTID_CDCACM 0x5119 /* CDC ACM */ + #define CONFIG_USBD_MANUFACTURER "OpenMoko, Inc" + #define CONFIG_USBD_PRODUCT_NAME "Neo1973 Bootloader " U_BOOT_VERSION +-#define CONFIG_EXTRA_ENV_SETTINGS "usbtty=cdc_acm\0" + #define CONFIG_USBD_DFU 1 + #define CONFIG_USBD_DFU_XFER_SIZE 4096 /* 0x4000 */ + #define CONFIG_USBD_DFU_INTERFACE 2 + ++#define CONFIG_EXTRA_ENV_SETTINGS \ ++ "usbtty=cdc_acm\0" \ ++ "bootargs_base=rootfstype=jffs2 root=/dev/mtdblock4 console=ttySAC0,115200 console=tty0 loglevel=8\0" \ ++ "" + + /*----------------------------------------------------------------------- + * Physical Memory Map |