diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-25 15:47:54 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-25 15:47:54 +0000 |
| commit | 85e3e7265be8389f65c52f4585ad9b4667c96dc2 (patch) | |
| tree | b10bfe0154668dbf0a322f7a379bab1f549da6db /meta/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch | |
| parent | c6422207156a33edaf2d8dd72a37ef2d7ce7e966 (diff) | |
| download | poky-85e3e7265be8389f65c52f4585ad9b4667c96dc2.tar.gz | |
u-boot-mkimage-native: use 1.3.2 version instead of Openmoko patched version
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4114 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch')
| -rw-r--r-- | meta/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/meta/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch b/meta/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch deleted file mode 100644 index 7e3aa4f480..0000000000 --- a/meta/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | Index: u-boot/include/configs/neo1973_gta01.h | ||
| 2 | =================================================================== | ||
| 3 | --- u-boot.orig/include/configs/neo1973_gta01.h 2007-02-27 00:43:16.000000000 +0100 | ||
| 4 | +++ u-boot/include/configs/neo1973_gta01.h 2007-02-27 00:47:49.000000000 +0100 | ||
| 5 | @@ -115,8 +115,8 @@ | ||
| 6 | #include <cmd_confdefs.h> | ||
| 7 | |||
| 8 | #define CONFIG_BOOTDELAY 3 | ||
| 9 | -#define CONFIG_BOOTARGS "rootfstype=jffs2 root=/dev/mtdblock4 console=ttySAC0,115200 console=tty0 loglevel=8" | ||
| 10 | -#define CONFIG_BOOTCOMMAND "nand read.e 0x32000000 0x34000 0x200000; bootm 0x32000000" | ||
| 11 | +#define CONFIG_BOOTARGS "" | ||
| 12 | +#define CONFIG_BOOTCOMMAND "setenv bootargs ${bootargs_base} ${mtdparts}; nand read.e 0x32000000 kernel; bootm 0x32000000" | ||
| 13 | |||
| 14 | #define CONFIG_DOS_PARTITION 1 | ||
| 15 | |||
| 16 | @@ -181,11 +181,14 @@ | ||
| 17 | #define CONFIG_USBD_PRODUCTID_CDCACM 0x5119 /* CDC ACM */ | ||
| 18 | #define CONFIG_USBD_MANUFACTURER "OpenMoko, Inc" | ||
| 19 | #define CONFIG_USBD_PRODUCT_NAME "Neo1973 Bootloader " U_BOOT_VERSION | ||
| 20 | -#define CONFIG_EXTRA_ENV_SETTINGS "usbtty=cdc_acm\0" | ||
| 21 | #define CONFIG_USBD_DFU 1 | ||
| 22 | #define CONFIG_USBD_DFU_XFER_SIZE 4096 /* 0x4000 */ | ||
| 23 | #define CONFIG_USBD_DFU_INTERFACE 2 | ||
| 24 | |||
| 25 | +#define CONFIG_EXTRA_ENV_SETTINGS \ | ||
| 26 | + "usbtty=cdc_acm\0" \ | ||
| 27 | + "bootargs_base=rootfstype=jffs2 root=/dev/mtdblock4 console=ttySAC0,115200 console=tty0 loglevel=8\0" \ | ||
| 28 | + "" | ||
| 29 | |||
| 30 | /*----------------------------------------------------------------------- | ||
| 31 | * Physical Memory Map | ||