mirror of
https://git.yoctoproject.org/poky
synced 2026-05-02 09:32:14 +02:00
70abc059eb
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3014 311d38ba-8fff-0310-9ca6-ca027cbcb966
32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
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
|