diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2008-02-12 15:14:08 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2008-02-12 15:14:08 +0000 |
| commit | f5201f61e5ef7c839f1deb992fa89c579f27e588 (patch) | |
| tree | cd8a86687142a7ee1b08210ee6dcd104933e48b5 /conf | |
| parent | 5e20762710bc6192195a5a771d4fae5a32339f3b (diff) | |
| parent | 4337f518ff1eef5452e10b7ee9f4dc48010048f1 (diff) | |
merge of '9a8a930122d29384549135ea3382884efdb4000e'
and 'a0976fae9659c5e0c23233eaa6f5a6e777a1a044'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/davinci-sffsdr.conf | 2 | ||||
| -rw-r--r-- | conf/machine/mpc8313e-rdb.conf | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/conf/machine/davinci-sffsdr.conf b/conf/machine/davinci-sffsdr.conf index ecff6fae13..faf86c5ed0 100644 --- a/conf/machine/davinci-sffsdr.conf +++ b/conf/machine/davinci-sffsdr.conf @@ -19,7 +19,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" #ROOT_FLASH_SIZE = "29" -MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa" +MACHINE_FEATURES = "kernel26 serial" require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf index 27706cbd4a..a43f621406 100644 --- a/conf/machine/mpc8313e-rdb.conf +++ b/conf/machine/mpc8313e-rdb.conf @@ -14,6 +14,8 @@ KERNEL_IMAGETYPE = "uImage" PREFERRED_VERSION_u-boot = "1.3.1" UBOOT_MACHINE = "MPC8313ERDB_33_config" +UBOOT_ENTRYPOINT = "0" +UBOOT_LOADADDRESS = "0" #rootfs on NAND flash EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x4000 --no-cleanmarkers" |