diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2008-03-11 13:48:44 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2008-03-11 13:48:44 +0000 |
| commit | 7e8dbb134a4c8488fe533b8611528637930e0a02 (patch) | |
| tree | 6408bb8eb701cc38d96deef0090cdbbd831b6c21 /conf/machine | |
| parent | 84c5f5d53e3417913c75df26cf33678efe0a148e (diff) | |
| parent | 6b6cf4dab96836c4c814ffc79a05fc12ff113a62 (diff) | |
merge of '1458e9ca6c6d9b78bff4114c4a3b09c7aa6b7a8e'
and 'df907de16e9f058a9d98b4ee458c93e7c4965a9c'
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/at32stk1000.conf | 3 | ||||
| -rw-r--r-- | conf/machine/atngw100.conf | 2 | ||||
| -rw-r--r-- | conf/machine/mainstone.conf | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf index add4c7e2d9..50e7138854 100644 --- a/conf/machine/at32stk1000.conf +++ b/conf/machine/at32stk1000.conf @@ -24,4 +24,7 @@ EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536" KERNEL_IMAGETYPE = "uImage" PREFERRED_VERSION_u-boot = "1.1.4" +UBOOT_ENTRYPOINT = "0x90000000" +UBOOT_LOADADDRESS = "0x10000000" + diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf index 559bd40c75..67c350bd97 100644 --- a/conf/machine/atngw100.conf +++ b/conf/machine/atngw100.conf @@ -23,6 +23,6 @@ PREFERRED_VERSION_u-boot = "1.1.4" KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT = "0x90000000" -UBOOT_LOADADRESS = "0x10000000" +UBOOT_LOADADDRESS = "0x10000000" diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf index af3e5a5cc3..68dcfb069a 100644 --- a/conf/machine/mainstone.conf +++ b/conf/machine/mainstone.conf @@ -7,15 +7,14 @@ TARGET_ARCH = "arm" GUI_MACHINE_CLASS = "smallscreen" PACKAGE_EXTRA_ARCHS = "armv5te" -PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" +PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" require conf/machine/include/tune-xscale.inc # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" -# used by opie-collections.inc ROOT_FLASH_SIZE = "16" MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen keyboard alsa irda" -EXTRA_IMAGECMD_jffs2 = "--pad --little-endian -e 0x40000 --pad=0x01000000" +EXTRA_IMAGECMD_jffs2 = "--little-endian -e 0x40000 --pad=0x02000000" |