summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/bug.conf16
-rw-r--r--conf/machine/include/omap3.inc2
2 files changed, 17 insertions, 1 deletions
diff --git a/conf/machine/bug.conf b/conf/machine/bug.conf
new file mode 100644
index 0000000000..cec3d5b785
--- /dev/null
+++ b/conf/machine/bug.conf
@@ -0,0 +1,16 @@
+#@TYPE: Machine
+#@NAME: Bug Labs BUG Computer
+#@DESCRIPTION: Machine configuration for the BUG base unit.
+TARGET_ARCH = "arm"
+
+MACHINE_EXTRA_RRECOMMENDS = "marvell-gspi-fw"
+PREFERRED_PROVIDER_virtual/kernel = "linux-bug"
+
+MACHINE_FEATURES = "kernel26 screen touchscreen hotplug alsa wifi usbhost usbgadget"
+SERIAL_CONSOLE = "-L 115200 ttymxc4"
+
+CPU_FEATURES += "vfp"
+
+require conf/machine/include/tune-arm1136jf-s.inc
+
+KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index fc801aa2a7..5d6d9ffbff 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,7 +1,7 @@
require conf/machine/include/tune-cortexa8.inc
PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r30"
+MACHINE_KERNEL_PR = "r31"
KERNEL_IMAGETYPE = "uImage"