summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Boor <florian.boor@kernelconcepts.de>2009-06-04 22:53:17 +0200
committerFlorian Boor <florian.boor@kernelconcepts.de>2009-06-04 22:53:17 +0200
commit84da8738de685a0cce37759ac3aa08c1579d9427 (patch)
tree2520aab1c6a8538a061938bd547983631ff9d0b3
parent5b113a7dd9b00f8a511feb219ea165634343bb17 (diff)
micro2440.conf: Merge in some bits from mini2440.conf, add support for u-boot.
-rw-r--r--conf/machine/micro2440.conf16
1 files changed, 13 insertions, 3 deletions
diff --git a/conf/machine/micro2440.conf b/conf/machine/micro2440.conf
index 2b7134faf5..24ec36d9e4 100644
--- a/conf/machine/micro2440.conf
+++ b/conf/machine/micro2440.conf
@@ -4,8 +4,18 @@
TARGET_ARCH = "arm"
-PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_VERSION_linux = "2.6.29"
+IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
+ files/device_table_add-s3c_serial.txt"
+
+PREFERRED_VERSION_u-boot = "git"
+UBOOT_MACHINE = "mini2440_config"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-mini2440"
+
+# This can be used as alternative, stable kernel
+# PREFERRED_PROVIDER_virtual/kernel = "linux"
+# PREFERRED_VERSION_linux = "2.6.29"
+
# This is not necessarily true, there is a 800x480 display as well
MACHINE_DISPLAY_WIDTH_PIXELS = "240"
@@ -20,7 +30,7 @@ SERIAL_CONSOLE = "115200 ttySAC0"
IMAGE_FSTYPES = "jffs2 tar.gz"
-MACHINE_FEATURES = "kernel26 touchscreen screen usbhost usbgadget sound alsa ethernet"
+MACHINE_FEATURES = "kernel26 touchscreen screen usbhost usbgadget sound alsa ethernet mmc mmcroot i2c spi"
require conf/machine/include/tune-arm920t.inc